Merge pull request #78 from Hojosa/development

Added Datagen for Recipes, Tags and LooTables
GrowthcraftCE · Feb 23, 2024 · 3ad46b1 · 3ad46b1
2 parents 55d1f59 + 7533a84
commit 3ad46b1
Show file tree

Hide file tree

Showing 484 changed files with 8,776 additions and 1,604 deletions.
diff --git a/build.gradle b/build.gradle
@@ -68,7 +68,7 @@ minecraft {
 
         data {
             workingDirectory project.file('run-data')
-            args '--mod', mod_id+',growthcraft_milk', '--all', '--output', file('src/generated/resources/'),
+            args '--mod', mod_id+',growthcraft_apiary'+',growthcraft_apples'+',growthcraft_bamboo'+',growthcraft_cellar'+',growthcraft_milk'+',growthcraft_rice', '--all', '--output', file('src/generated/resources/'),
             '--existing', file('src/main/resources/'), '--flat'
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.daemon=false
 # ------------------------------------------------
 minecraft_version=1.20.1
 minecraft_version_range=[1.20.1,1.21)
-forge_version=47.2.0
+forge_version=47.2.1
 forge_version_range=47,)
 loader_version_range=[47,)
 mapping_channel=official

diff --git a/...esources/data/forge/tags/blocks/ores.json → ...esources/data/forge/tags/blocks/ores.json b/...esources/data/forge/tags/blocks/ores.json → ...esources/data/forge/tags/blocks/ores.json
@@ -1,9 +1,8 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore",
     "growthcraft:salt_ore_deepslate",
-	"growthcraft:salt_ore_nether",
+    "growthcraft:salt_ore_nether",
     "growthcraft:salt_ore_end"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft:salt_ore_deepslate"
+  ]
+}
diff --git a/...ags/blocks/ores_in_ground/netherrack.json → ...ags/blocks/ores_in_ground/netherrack.json b/...ags/blocks/ores_in_ground/netherrack.json → ...ags/blocks/ores_in_ground/netherrack.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore_nether"
   ]

diff --git a/...rge/tags/blocks/ores_in_ground/stone.json → ...rge/tags/blocks/ores_in_ground/stone.json b/...rge/tags/blocks/ores_in_ground/stone.json → ...rge/tags/blocks/ores_in_ground/stone.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore"
   ]

diff --git a/...ces/data/forge/tags/items/crops/rice.json → ...ces/data/forge/tags/items/crops/rice.json b/...ces/data/forge/tags/items/crops/rice.json → ...ces/data/forge/tags/items/crops/rice.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_rice:rice_stalk"
   ]

diff --git a/...ces/data/growthcraft/tags/items/salt.json → ...ces/data/forge/tags/items/dusts/salt.json b/...ces/data/growthcraft/tags/items/salt.json → ...ces/data/forge/tags/items/dusts/salt.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt"
   ]

diff --git a/src/generated/resources/data/forge/tags/items/dyes/black.json b/src/generated/resources/data/forge/tags/items/dyes/black.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_black"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/blue.json b/src/generated/resources/data/forge/tags/items/dyes/blue.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_blue"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/brown.json b/src/generated/resources/data/forge/tags/items/dyes/brown.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_brown"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/cyan.json b/src/generated/resources/data/forge/tags/items/dyes/cyan.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_cyan"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/gray.json b/src/generated/resources/data/forge/tags/items/dyes/gray.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_gray"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/green.json b/src/generated/resources/data/forge/tags/items/dyes/green.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_green"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/light_blue.json b/src/generated/resources/data/forge/tags/items/dyes/light_blue.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_light_blue"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/light_gray.json b/src/generated/resources/data/forge/tags/items/dyes/light_gray.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_light_gray"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/lime.json b/src/generated/resources/data/forge/tags/items/dyes/lime.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_lime"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/magenta.json b/src/generated/resources/data/forge/tags/items/dyes/magenta.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_magenta"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/orange.json b/src/generated/resources/data/forge/tags/items/dyes/orange.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_orange"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/pink.json b/src/generated/resources/data/forge/tags/items/dyes/pink.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_pink"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/purple.json b/src/generated/resources/data/forge/tags/items/dyes/purple.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_purple"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/red.json b/src/generated/resources/data/forge/tags/items/dyes/red.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_red"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/white.json b/src/generated/resources/data/forge/tags/items/dyes/white.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_white"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/dyes/yellow.json b/src/generated/resources/data/forge/tags/items/dyes/yellow.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_yellow"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/fence_gates/wooden.json b/src/generated/resources/data/forge/tags/items/fence_gates/wooden.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "growthcraft_apples:apple_plank_fence_gate",
+    "growthcraft_bamboo:bamboo_plank_fence_gate"
+  ]
+}
diff --git a/.../data/forge/tags/items/fruits/grapes.json → .../data/forge/tags/items/fruits/grapes.json b/.../data/forge/tags/items/fruits/grapes.json → .../data/forge/tags/items/fruits/grapes.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grape_purple",
     "growthcraft_cellar:grape_red",

diff --git a/...s/data/forge/tags/items/grain/barley.json → ...s/data/forge/tags/items/grain/barley.json b/...s/data/forge/tags/items/grain/barley.json → ...s/data/forge/tags/items/grain/barley.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grain",
     "growthcraft_cellar:grain_amber",

diff --git a/...ces/data/forge/tags/items/grain/rice.json → ...ces/data/forge/tags/items/grain/rice.json b/...ces/data/forge/tags/items/grain/rice.json → ...ces/data/forge/tags/items/grain/rice.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_rice:rice"
   ]

diff --git a/...es/data/forge/tags/items/seeds/grape.json → ...s/data/forge/tags/items/seeds/grapes.json b/...es/data/forge/tags/items/seeds/grape.json → ...s/data/forge/tags/items/seeds/grapes.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grape_seeds_purple",
     "growthcraft_cellar:grape_seeds_red",

diff --git a/src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen.json b/src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:lead"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "growthcraft:rope_linen"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "growthcraft:rope_linen"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen_lengthen.json b/src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen_lengthen.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:lead"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "growthcraft:rope_linen_lengthen"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "growthcraft:rope_linen_lengthen"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...craft/advancements/recipes/misc/salt.json → ...craft/advancements/recipes/misc/salt.json b/...craft/advancements/recipes/misc/salt.json → ...craft/advancements/recipes/misc/salt.json
@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_salt_block": {
+    "has_item": {
       "conditions": {
         "items": [
           {
             "items": [
-              "growthcraft:salt_block"
+              "growthcraft:salt"
             ]
           }
         ]
@@ -22,13 +22,14 @@
   },
   "requirements": [
     [
-      "has_salt_block",
+      "has_item",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
       "growthcraft:salt"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...advancements/recipes/misc/salt_block.json → ...advancements/recipes/misc/salt_block.json b/...advancements/recipes/misc/salt_block.json → ...advancements/recipes/misc/salt_block.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_salt": {
+    "has_item": {
       "conditions": {
         "items": [
           {
@@ -22,13 +22,14 @@
   },
   "requirements": [
     [
-      "has_salt",
+      "has_item",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
       "growthcraft:salt_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ncements/recipes/tools/crowbar_black.json → ...ncements/recipes/tools/crowbar_black.json b/...ncements/recipes/tools/crowbar_black.json → ...ncements/recipes/tools/crowbar_black.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:black_carpet"
+              "minecraft:iron_ingot"
             ]
           }
         ]
@@ -30,5 +30,6 @@
     "recipes": [
       "growthcraft:crowbar_black"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ancements/recipes/tools/crowbar_blue.json → ...ancements/recipes/tools/crowbar_blue.json b/...ancements/recipes/tools/crowbar_blue.json → ...ancements/recipes/tools/crowbar_blue.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:blue_carpet"
+              "minecraft:iron_ingot"
             ]
           }
         ]
@@ -30,5 +30,6 @@
     "recipes": [
       "growthcraft:crowbar_blue"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
diff --git a/...ncements/recipes/tools/crowbar_brown.json → ...ncements/recipes/tools/crowbar_brown.json b/...ncements/recipes/tools/crowbar_brown.json → ...ncements/recipes/tools/crowbar_brown.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:brown_carpet"
+              "minecraft:iron_ingot"
             ]
           }
         ]
@@ -30,5 +30,6 @@
     "recipes": [
       "growthcraft:crowbar_brown"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }