Use more Forge tags in recipes

- Fix #3959 - Fix #4648
Creators-of-Create · Sep 2, 2024 · bbb9ac8 · bbb9ac8
1 parent a06b9c1
commit bbb9ac8
Show file tree

Hide file tree

Showing 58 changed files with 346 additions and 358 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/...ources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json b/...ources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:raw_zinc"
-            ]
+            "tag": "forge:raw_materials/zinc"
           }
         ]
       }

diff --git a/...ces/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json b/...ces/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...data/create/advancements/recipes/create.base/crafting/appliances/copper_diving_boots.json b/...data/create/advancements/recipes/create.base/crafting/appliances/copper_diving_boots.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...ata/create/advancements/recipes/create.base/crafting/appliances/copper_diving_helmet.json b/...ata/create/advancements/recipes/create.base/crafting/appliances/copper_diving_helmet.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...s/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json b/...s/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...e/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json b/...e/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/.../resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json b/.../resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...s/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe_vertical.json b/...s/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe_vertical.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json b/...resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json b/...resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...urces/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json b/...urces/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...rces/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json b/...rces/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...esources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json b/...esources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...sources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json b/...sources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...ources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json b/...ources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       }

diff --git a/...ources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json b/...ources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:raw_zinc"
-            ]
+            "tag": "forge:raw_materials/zinc"
           }
         ]
       }

diff --git a/...ated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json b/...ated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:copper_nugget"
-            ]
+            "tag": "forge:nuggets/copper"
           }
         ]
       }

diff --git a/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_raw_ore.json b/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_raw_ore.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:blasting",
   "ingredient": {
-    "item": "create:raw_zinc"
+    "tag": "forge:raw_materials/zinc"
   },
   "result": "create:zinc_ingot",
   "experience": 0.7,

diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json
@@ -13,10 +13,10 @@
       "item": "create:andesite_alloy"
     },
     "B": {
-      "item": "minecraft:copper_block"
+      "tag": "forge:storage_blocks/copper"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_boots.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_boots.json
@@ -10,7 +10,7 @@
       "item": "create:andesite_alloy"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_helmet.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_helmet.json
@@ -9,7 +9,7 @@
       "tag": "forge:glass"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json
@@ -8,7 +8,7 @@
       "tag": "forge:plates/copper"
     },
     "C": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe_vertical.json b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe_vertical.json
@@ -10,7 +10,7 @@
       "tag": "forge:plates/copper"
     },
     "C": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json
@@ -10,7 +10,7 @@
       "tag": "forge:plates/gold"
     },
     "C": {
-      "item": "minecraft:copper_block"
+      "tag": "forge:storage_blocks/copper"
     },
     "A": {
       "item": "create:andesite_alloy"

diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json
@@ -9,7 +9,7 @@
       "tag": "forge:plates/gold"
     },
     "C": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget.json b/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget.json
@@ -2,7 +2,7 @@
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   ],
   "result": {

diff --git a/...te/recipes/crushing/raw_aluminum_ore.json → ...create/recipes/crushing/raw_aluminum.json b/...te/recipes/crushing/raw_aluminum_ore.json → ...create/recipes/crushing/raw_aluminum.json
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper.json b/src/generated/resources/data/create/recipes/crushing/raw_copper.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_copper"
+      "tag": "forge:raw_materials/copper"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json b/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_copper_block"
+      "tag": "forge:storage_blocks/raw_copper"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold.json b/src/generated/resources/data/create/recipes/crushing/raw_gold.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_gold"
+      "tag": "forge:raw_materials/gold"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json b/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_gold_block"
+      "tag": "forge:storage_blocks/raw_gold"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron.json b/src/generated/resources/data/create/recipes/crushing/raw_iron.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_iron"
+      "tag": "forge:raw_materials/iron"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json b/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "minecraft:raw_iron_block"
+      "tag": "forge:storage_blocks/raw_iron"
     }
   ],
   "results": [

diff --git a/...create/recipes/crushing/raw_lead_ore.json → ...ata/create/recipes/crushing/raw_lead.json b/...create/recipes/crushing/raw_lead_ore.json → ...ata/create/recipes/crushing/raw_lead.json
diff --git a/...eate/recipes/crushing/raw_nickel_ore.json → ...a/create/recipes/crushing/raw_nickel.json b/...eate/recipes/crushing/raw_nickel_ore.json → ...a/create/recipes/crushing/raw_nickel.json
diff --git a/...eate/recipes/crushing/raw_osmium_ore.json → ...a/create/recipes/crushing/raw_osmium.json b/...eate/recipes/crushing/raw_osmium_ore.json → ...a/create/recipes/crushing/raw_osmium.json
diff --git a/...te/recipes/crushing/raw_platinum_ore.json → ...create/recipes/crushing/raw_platinum.json b/...te/recipes/crushing/raw_platinum_ore.json → ...create/recipes/crushing/raw_platinum.json
diff --git a/...recipes/crushing/raw_quicksilver_ore.json → ...ate/recipes/crushing/raw_quicksilver.json b/...recipes/crushing/raw_quicksilver_ore.json → ...ate/recipes/crushing/raw_quicksilver.json
diff --git a/...eate/recipes/crushing/raw_silver_ore.json → ...a/create/recipes/crushing/raw_silver.json b/...eate/recipes/crushing/raw_silver_ore.json → ...a/create/recipes/crushing/raw_silver.json
diff --git a/.../create/recipes/crushing/raw_tin_ore.json → ...data/create/recipes/crushing/raw_tin.json b/.../create/recipes/crushing/raw_tin_ore.json → ...data/create/recipes/crushing/raw_tin.json
diff --git a/...ate/recipes/crushing/raw_uranium_ore.json → .../create/recipes/crushing/raw_uranium.json b/...ate/recipes/crushing/raw_uranium_ore.json → .../create/recipes/crushing/raw_uranium.json
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "create:raw_zinc"
+      "tag": "forge:raw_materials/zinc"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json
@@ -2,7 +2,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "item": "create:raw_zinc_block"
+      "tag": "forge:storage_blocks/raw_zinc"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/item_application/copper_casing_from_log.json b/src/generated/resources/data/create/recipes/item_application/copper_casing_from_log.json
@@ -5,7 +5,7 @@
       "tag": "forge:stripped_logs"
     },
     {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/item_application/copper_casing_from_wood.json b/src/generated/resources/data/create/recipes/item_application/copper_casing_from_wood.json
@@ -5,7 +5,7 @@
       "tag": "forge:stripped_wood"
     },
     {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json b/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json
@@ -15,7 +15,7 @@
       "item": "create:fluid_pipe"
     },
     "C": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "result": {

diff --git a/src/generated/resources/data/create/recipes/mixing/brass_ingot.json b/src/generated/resources/data/create/recipes/mixing/brass_ingot.json
@@ -2,7 +2,7 @@
   "type": "create:mixing",
   "ingredients": [
     {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     },
     {
       "tag": "forge:ingots/zinc"

diff --git a/src/generated/resources/data/create/recipes/pressing/copper_ingot.json b/src/generated/resources/data/create/recipes/pressing/copper_ingot.json
@@ -2,7 +2,7 @@
   "type": "create:pressing",
   "ingredients": [
     {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   ],
   "results": [

diff --git a/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_raw_ore.json b/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_raw_ore.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:smelting",
   "ingredient": {
-    "item": "create:raw_zinc"
+    "tag": "forge:raw_materials/zinc"
   },
   "result": "create:zinc_ingot",
   "experience": 0.7,