Backport datagen

Mrbysco · Aug 15, 2024 · ec938ac · ec938ac
1 parent b0995a2
commit ec938ac
Show file tree

Hide file tree

Showing 819 changed files with 20,655 additions and 3,595 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,6 +44,8 @@ minecraft {
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', "${mod_id}"
 
+            jvmArgs("-Xmx4G")
+
             mods {
                 "${mod_id}" {
                     source sourceSets.main
@@ -67,6 +69,8 @@ minecraft {
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', "${mod_id}"
 
+            jvmArgs("-Xmx4G")
+
             mods {
                 "${mod_id}" {
                     source sourceSets.main
@@ -90,6 +94,8 @@ minecraft {
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', "${mod_id}", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
+            jvmArgs("-Xmx4G")
+
             mods {
                 "${mod_id}" {
                     source sourceSets.main

diff --git a/gradle.properties b/gradle.properties
@@ -23,4 +23,4 @@ modrinth_id=Nwz7U1QT
 # Dependencies
 jei_version=15.3.0.4
 patchouli_version=1.20.1-84-FORGE
-patchouli_provider_version=1.20.1-1.0.9-Snapshot.2
+patchouli_provider_version=1.20.1-1.0.9-Snapshot.4
diff --git a/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90 b/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90
@@ -1,4 +1,11 @@
-// 1.20.1	2023-10-09T13:18:06.9011402	Tags for minecraft:item mod id forcecraft
+// 1.20.1	2024-08-15T22:47:42.484897	Tags for minecraft:item mod id forcecraft
+53afa95f4f2972f61ad4870a14ffdad392433608 data/forcecraft/tags/items/baconator_food.json
+f37c1227f073af48a0e3f526510a90a1f11811d7 data/forcecraft/tags/items/chu_jelly.json
+ca0dfb4cd17d1a8bebda73a2ba9587fde8c1486d data/forcecraft/tags/items/ender.json
+2266034e578a6f8f80f45b0fadae1a067a3319d6 data/forcecraft/tags/items/entity_flasks.json
+ba8baa1de0654d18f27068517c95b5fb869c254a data/forcecraft/tags/items/force_furnace.json
+eff2e9b711edce9a5ae1875f820c2b5272b0779f data/forcecraft/tags/items/force_logs.json
+f6578c63f571b1fa389775ac66b9218c094d5150 data/forcecraft/tags/items/fortune.json
 5ec6a48a81a06d202f30aee8ebfbbb9b9564386b data/forge/tags/items/ores.json
 f002772c304bb8350635523d7d3bb1c4fdb5796a data/forge/tags/items/ores/power.json
 b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/forge/tags/items/ores_in_ground/deepslate.json

diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-20T22:42:40.0863623	Loot Tables
+// 1.20.1	2024-08-15T22:47:42.479399	Loot Tables
 ca5af9d0e5bf5dbe2e2c28f177710795753d744a data/forcecraft/loot_tables/blocks/black_force_furnace.json
 d241beda60667659c0a5111512d10bfa846fdc88 data/forcecraft/loot_tables/blocks/blue_force_furnace.json
 e9eb4380443b0050fec72dd137f268485f812117 data/forcecraft/loot_tables/blocks/brown_force_furnace.json
@@ -111,6 +111,17 @@ e42ec7db52131d98b76e7c9f2c55ff6cd9d3413e data/forcecraft/loot_tables/blocks/wall
 62d700390e76061cd84d84deac5163115c63559e data/forcecraft/loot_tables/blocks/wall_force_white_torch.json
 978bdaf0685e3d54e79f98a7ad8fb35f2727a2fb data/forcecraft/loot_tables/blocks/wall_time_torch.json
 85043052fb03a7f7bd6241f2848cc068833a22e1 data/forcecraft/loot_tables/blocks/white_force_furnace.json
+0dc091408e4fdcc140418cafd9b75112c1ecf4c4 data/forcecraft/loot_tables/entities/angry_enderman.json
+f1f75d6da95336f7fdc0e6f8a5cc3e92fa713ee0 data/forcecraft/loot_tables/entities/blue_chu_chu.json
+693971ef52f8cb678877e55c230fee1209c52f9c data/forcecraft/loot_tables/entities/cold_chicken.json
+553095efdc12b65b9fac6559f8839f30a30b3839 data/forcecraft/loot_tables/entities/cold_cow.json
+d1c79f0e3c12d30dcd6dac64cd41fc41776fd753 data/forcecraft/loot_tables/entities/cold_pig.json
+60c15f99e6dee367087dab93f98a7aada6e19eed data/forcecraft/loot_tables/entities/creeper_tot.json
+d4248781dc628bab48f187e81a249226d436e495 data/forcecraft/loot_tables/entities/ender_tot.json
+f65b5c47fb6dba3eee707487b2bd3a7b7de8bec3 data/forcecraft/loot_tables/entities/fairy.json
+2c1de53f8e094e1176c37b0b8f273c8ec57774e9 data/forcecraft/loot_tables/entities/gold_chu_chu.json
+93e4f44fe4f321d104c078df83654d4dc4c1b273 data/forcecraft/loot_tables/entities/green_chu_chu.json
+ce7e61339241058bc098ea5c1d7e1ba8bf10f606 data/forcecraft/loot_tables/entities/red_chu_chu.json
 0ed4d70d997be807c121d7debff58e88536646a9 data/forcecraft/loot_tables/spoils/tier1.json
 7af9a23a3ff320d507b7ec0db456bcaf11c90dbe data/forcecraft/loot_tables/spoils/tier2.json
 e443d97f08eaf435708178f6beed3fd93352a066 data/forcecraft/loot_tables/spoils/tier3.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
diff --git a/...ted/resources/data/forcecraft/advancements/recipes/building_blocks/force_black_torch.json b/...ted/resources/data/forcecraft/advancements/recipes/building_blocks/force_black_torch.json
@@ -0,0 +1,46 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_dye": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:dyes/black"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_force_torch": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_torch"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_black_torch"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_force_torch",
+      "has_dye",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_black_torch"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...ated/resources/data/forcecraft/advancements/recipes/building_blocks/force_blue_torch.json b/...ated/resources/data/forcecraft/advancements/recipes/building_blocks/force_blue_torch.json
@@ -0,0 +1,46 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_dye": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:dyes/blue"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_force_torch": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_torch"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_blue_torch"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_force_torch",
+      "has_dye",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_blue_torch"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...generated/resources/data/forcecraft/advancements/recipes/building_blocks/force_brick.json b/...generated/resources/data/forcecraft/advancements/recipes/building_blocks/force_brick.json
@@ -0,0 +1,46 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_force_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_stone_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "minecraft:stone_bricks"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_brick"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_force_gem",
+      "has_stone_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_brick"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...ted/resources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black.json b/...ted/resources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black.json
@@ -0,0 +1,46 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_black_dye": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:dyes/black"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_force_brick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_brick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_brick_black"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_force_brick",
+      "has_black_dye",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_brick_black"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...esources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black_slab.json b/...esources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black_slab.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_brick_black"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_brick_black_slab"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_brick_black_slab"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...t/advancements/recipes/building_blocks/force_brick_black_slab_from_force_brick_black.json b/...t/advancements/recipes/building_blocks/force_brick_black_slab_from_force_brick_black.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_brick_black"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_brick_black_slab_from_force_brick_black"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_brick_black_slab_from_force_brick_black"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...ources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black_stairs.json b/...ources/data/forcecraft/advancements/recipes/building_blocks/force_brick_black_stairs.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "forcecraft:force_brick_black"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "forcecraft:force_brick_black_stairs"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "forcecraft:force_brick_black_stairs"
+    ]
+  },
+  "sends_telemetry_event": false
+}