Fix #257

railcraft-reborn · Oct 31, 2024 · 15d8424 · 15d8424
1 parent 9542d6e
commit 15d8424
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-25T09:12:57.842272	Recipes
+// 1.21.1	2024-10-31T19:28:27.921913	Recipes
 880902358e9080f4dacc6209cc212af527fd250d data/minecraft/advancement/recipes/misc/gunpowder.json
 a2bb90ba3405540cd1d5f9ebd56e3e9a414b903b data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json
 a9fb3f1e0ef2641d91709ce3fda5abfe1aa1d8f7 data/minecraft/advancement/recipes/misc/lead_ingot_from_blasting_lead_ore.json
@@ -813,7 +813,7 @@ fb3df89d79f37781949854428a35fa60dc57a9d8 data/railcraft/recipe/cyan_steel_tank_w
 8ccc4f610a5bfefccd06e21d67cbddd128a5812c data/railcraft/recipe/cyan_strengthened_glass.json
 c697fdecad3a49aa7a789ea11792f91cbf77762c data/railcraft/recipe/detector_track_kit.json
 08e91587a0921f3ae6de159ea69867a1b9f9875b data/railcraft/recipe/diamond_crowbar.json
-5e91f20e88a0e6dbded5845ddba73fbcc144f2cb data/railcraft/recipe/diamond_spike_maul.json
+5bbaa6ccb51cd714576e59649e23b26228d43666 data/railcraft/recipe/diamond_spike_maul.json
 17b31dd2ba20c6c86702386d1bb47090556cd901 data/railcraft/recipe/diamond_tunnel_bore_head.json
 14805f78c29239590dd27eefb0e959f0ee938cf3 data/railcraft/recipe/disembarking_track_kit.json
 f0c8c6eb426f93517955cb0645423b718abe8008 data/railcraft/recipe/distant_signal.json
@@ -929,7 +929,7 @@ ebd329be95d101bcda3afe958b7872fa6f680d11 data/railcraft/recipe/iron_junction_tra
 d4aa3f525b47f647188ca2133b7030cc30326611 data/railcraft/recipe/iron_locomotive_track.json
 3fc219605d3504b7039be88513294cc9b491c4ca data/railcraft/recipe/iron_one_way_track.json
 bdfb181211d30a6ef2ee0d3ee358db3f09badb61 data/railcraft/recipe/iron_routing_track.json
-4a3839bf87e0170cefb3bd74ef77deb4fecb2a2a data/railcraft/recipe/iron_spike_maul.json
+65722c6aa89d70da5764ba348a46d0ff8a49015f data/railcraft/recipe/iron_spike_maul.json
 3c893a10d4446b0c325e5cf783f4ab8f12d3d1d5 data/railcraft/recipe/iron_tank_gauge.json
 3c33b0d59db97bd995497ad085662425ddcd266e data/railcraft/recipe/iron_tank_valve.json
 5a6bbadeaacd7ddfe6b3e2a750994d403662f715 data/railcraft/recipe/iron_tank_wall.json
@@ -1145,23 +1145,23 @@ e4c4a89355f727ff3155488a87c80cf0991a8534 data/railcraft/recipe/silver_nugget.jso
 512c8635e9ed13ec1ac895832cf0a1511ca45a77 data/railcraft/recipe/steam_oven.json
 adf69c87678b8f4ed54eee5236b75a7491eff01c data/railcraft/recipe/steam_turbine.json
 88bc994b2f521accd14b7d6050ec83a84e266d20 data/railcraft/recipe/steel_anvil.json
-5e211cd3e22be4a6c5a6060f3388a35830b1099f data/railcraft/recipe/steel_axe.json
+3bfafd3ff38b49e11c6c4edd8e7b6d80c6b28cca data/railcraft/recipe/steel_axe.json
 88b7a428c81a6b4378f9f0df0f3c360dc4f24333 data/railcraft/recipe/steel_block_from_steel_ingot.json
 5a86c6b05fb9ae490b30a329923b2fd8da659c17 data/railcraft/recipe/steel_boots.json
 4e10edcc4df0fee098c491613999d4efb7ff721b data/railcraft/recipe/steel_chestplate.json
 8d7fff09cf7c97df8bd81e5808a06000c93d3141 data/railcraft/recipe/steel_crowbar.json
 d73aef17682f6b2fcc589ac25281891d90a9a524 data/railcraft/recipe/steel_gear.json
 00a7b14927ece350d716cd18f38ebd70f3ce7cd4 data/railcraft/recipe/steel_helmet.json
-8d61d36981f037c85f33d85699f08b4406c45123 data/railcraft/recipe/steel_hoe.json
+b29a75f81aa6af73f25477ed1ab35de9e9f7c29a data/railcraft/recipe/steel_hoe.json
 8dad7433f6b3d5756fd9e33a0439aedabee5c52e data/railcraft/recipe/steel_ingot.json
 90ffce6d3014f127a555ae7c5b059297d29f3b4b data/railcraft/recipe/steel_ingot_from_steel_nugget.json
 a5ba8e7d4289db3974fa9688fc50e26b0de1f47e data/railcraft/recipe/steel_leggings.json
 46200f25b0e45de16c68d724f5889fbe68130892 data/railcraft/recipe/steel_nugget.json
-02d1f3f29eebe84baecb408035e80826137d85f3 data/railcraft/recipe/steel_pickaxe.json
+36d3064f558a904578b61acf075703ab5bac9b68 data/railcraft/recipe/steel_pickaxe.json
 9264b87fbf0d57b52624b58a621c13cb0954c6ac data/railcraft/recipe/steel_shears.json
-4dc15dac5953e34c08a90e527387d7de32c29683 data/railcraft/recipe/steel_shovel.json
-ad11ade84ba91bd4b17376a0dd77cd36dc81dbf5 data/railcraft/recipe/steel_spike_maul.json
-abc831eb1f0206583a958e44f53afca04a079ddf data/railcraft/recipe/steel_sword.json
+3eadf0a3979a8f28af2f13dce9446b35d7d779d1 data/railcraft/recipe/steel_shovel.json
+d45f845b925bed6a5813f5d6a75a6bd86c055860 data/railcraft/recipe/steel_spike_maul.json
+c3041018840584766b666f3306261c72478f5290 data/railcraft/recipe/steel_sword.json
 1b626c6976298b309fb18cdd37922701bd82c07d data/railcraft/recipe/steel_tank_gauge.json
 58a8885bfd2109917685cac74106c198c596381d data/railcraft/recipe/steel_tank_valve.json
 8f68435d1df116c9eaf18ae3254fa3b9dceabfc4 data/railcraft/recipe/steel_tank_wall.json
@@ -1208,7 +1208,7 @@ fbceb326b7db9130f9591a3128e54f28faf0dec3 data/railcraft/recipe/tin_ingot_from_ti
 0abcee1bcf5f4f537fe70bbbe1954fc54225fed9 data/railcraft/recipe/tin_nugget.json
 0da8f6279e17784d4fd52525e4c052f9da75e2eb data/railcraft/recipe/token_signal.json
 4a827b4a4823cde4e14a1a4a49cb8c64223449c3 data/railcraft/recipe/token_signal_box.json
-a2078cf48a93b5b56fb370e6f02adf2bbc065a1d data/railcraft/recipe/torch_creosote.json
+046d694a44c59c6c28841a2fce69d3467e12610a data/railcraft/recipe/torch_creosote.json
 b12359877292fc2a1b60dd226b15511af02d3170 data/railcraft/recipe/track_layer.json
 dfc5ed1f52593d3d85725f0a4d938440a1fca96e data/railcraft/recipe/track_relayer.json
 fc976798edc56e32beb5572a815d1cbe07fcaa2a data/railcraft/recipe/track_remover.json

diff --git a/src/generated/resources/data/railcraft/recipe/diamond_spike_maul.json b/src/generated/resources/data/railcraft/recipe/diamond_spike_maul.json
@@ -6,7 +6,7 @@
       "tag": "c:gems/diamond"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     },
     "c": {
       "tag": "c:storage_blocks/diamond"

diff --git a/src/generated/resources/data/railcraft/recipe/iron_spike_maul.json b/src/generated/resources/data/railcraft/recipe/iron_spike_maul.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/iron"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     },
     "c": {
       "tag": "c:storage_blocks/iron"

diff --git a/src/generated/resources/data/railcraft/recipe/steel_axe.json b/src/generated/resources/data/railcraft/recipe/steel_axe.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/railcraft/recipe/steel_hoe.json b/src/generated/resources/data/railcraft/recipe/steel_hoe.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/railcraft/recipe/steel_pickaxe.json b/src/generated/resources/data/railcraft/recipe/steel_pickaxe.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/railcraft/recipe/steel_shovel.json b/src/generated/resources/data/railcraft/recipe/steel_shovel.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/railcraft/recipe/steel_spike_maul.json b/src/generated/resources/data/railcraft/recipe/steel_spike_maul.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     },
     "c": {
       "tag": "c:storage_blocks/steel"

diff --git a/src/generated/resources/data/railcraft/recipe/steel_sword.json b/src/generated/resources/data/railcraft/recipe/steel_sword.json
@@ -6,7 +6,7 @@
       "tag": "c:ingots/steel"
     },
     "b": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/railcraft/recipe/torch_creosote.json b/src/generated/resources/data/railcraft/recipe/torch_creosote.json
@@ -9,7 +9,7 @@
       "tag": "minecraft:wool"
     },
     "c": {
-      "item": "minecraft:stick"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [

diff --git a/src/main/java/mods/railcraft/data/recipes/RailcraftRecipeProvider.java b/src/main/java/mods/railcraft/data/recipes/RailcraftRecipeProvider.java
@@ -534,7 +534,7 @@ private void buildSteelItems(RecipeOutput recipeOutput) {
         .pattern("a")
         .pattern("b")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.STEEL_INGOT.get()),
             has(RailcraftTags.Items.STEEL_INGOT))
         .save(recipeOutput);
@@ -543,7 +543,7 @@ private void buildSteelItems(RecipeOutput recipeOutput) {
         .pattern("b")
         .pattern("b")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.STEEL_INGOT.get()),
             has(RailcraftTags.Items.STEEL_INGOT))
         .save(recipeOutput);
@@ -552,7 +552,7 @@ private void buildSteelItems(RecipeOutput recipeOutput) {
         .pattern(" b ")
         .pattern(" b ")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.STEEL_INGOT.get()),
             has(RailcraftTags.Items.STEEL_INGOT))
         .save(recipeOutput);
@@ -561,7 +561,7 @@ private void buildSteelItems(RecipeOutput recipeOutput) {
         .pattern("ab")
         .pattern(" b")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.STEEL_INGOT.get()),
             has(RailcraftTags.Items.STEEL_INGOT))
         .save(recipeOutput);
@@ -570,7 +570,7 @@ private void buildSteelItems(RecipeOutput recipeOutput) {
         .pattern(" b")
         .pattern(" b")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.STEEL_INGOT.get()),
             has(RailcraftTags.Items.STEEL_INGOT))
         .save(recipeOutput);
@@ -635,7 +635,7 @@ private void buildMaul(RecipeOutput recipeOutput) {
         .pattern(" b ")
         .pattern(" b ")
         .define('a', Tags.Items.INGOTS_IRON)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .define('c', Tags.Items.STORAGE_BLOCKS_IRON)
         .unlockedBy(getHasName(Items.IRON_BLOCK), has(Tags.Items.STORAGE_BLOCKS_IRON))
         .save(recipeOutput);
@@ -644,7 +644,7 @@ private void buildMaul(RecipeOutput recipeOutput) {
         .pattern(" b ")
         .pattern(" b ")
         .define('a', RailcraftTags.Items.STEEL_INGOT)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .define('c', RailcraftTags.Items.STEEL_BLOCK)
         .unlockedBy(getHasName(RailcraftItems.STEEL_BLOCK.get()),
             has(RailcraftTags.Items.STEEL_BLOCK))
@@ -654,7 +654,7 @@ private void buildMaul(RecipeOutput recipeOutput) {
         .pattern(" b ")
         .pattern(" b ")
         .define('a', Tags.Items.GEMS_DIAMOND)
-        .define('b', Items.STICK)
+        .define('b', Tags.Items.RODS_WOODEN)
         .define('c', Tags.Items.STORAGE_BLOCKS_DIAMOND)
         .unlockedBy(getHasName(Items.DIAMOND_BLOCK), has(Tags.Items.STORAGE_BLOCKS_DIAMOND))
         .save(recipeOutput);
@@ -1099,7 +1099,7 @@ private void buildMiscItems(RecipeOutput recipeOutput) {
         .pattern("c")
         .define('a', RailcraftItems.CREOSOTE_BOTTLE.get())
         .define('b', ItemTags.WOOL)
-        .define('c', Items.STICK)
+        .define('c', Tags.Items.RODS_WOODEN)
         .unlockedBy(getHasName(RailcraftItems.CREOSOTE_BOTTLE.get()),
             has(RailcraftItems.CREOSOTE_BOTTLE.get()))
         .save(recipeOutput, RailcraftConstants.rl("torch_creosote"));