Fix #242

railcraft-reborn · Aug 29, 2024 · 9d8292a · 9d8292a
1 parent b465c9a
commit 9d8292a
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 8 deletions.
diff --git a/src/generated/resources/.cache/7cc9f5a39f84776d809436456ff87e0cabca2d5a b/src/generated/resources/.cache/7cc9f5a39f84776d809436456ff87e0cabca2d5a
@@ -1,14 +1,16 @@
-// 1.21.1	2024-08-19T12:26:50.876519	Tags for minecraft:item mod id railcraft
+// 1.21.1	2024-08-25T09:12:57.850367	Tags for minecraft:item mod id railcraft
 e4b5c3cfded4b9b76efeda37728f26dc89261239 data/c/tags/item/armors/boots/steel.json
 5251495abc7cf69ab447d425014c585ffd3ee618 data/c/tags/item/armors/chestplates/steel.json
 e17d210ae3b04c5e5696fab17c38c94dcb437f75 data/c/tags/item/armors/helmets/steel.json
 7d0d4397207e7b1f0ad989437709d6cf04823431 data/c/tags/item/armors/leggings/steel.json
 80c9c8b25164675ff5415691211783f71c38107f data/c/tags/item/coal_coke.json
 300d1cc507f1bf874a5931bfa35e08cf1eb1d286 data/c/tags/item/dusts/charcoal.json
 a02497735a6ef3531075c69c738d773ae344a9d4 data/c/tags/item/dusts/coal.json
+18cabcebf78778a7e047f8e32b4631c3ad7db33e data/c/tags/item/dusts/ender_pearl.json
 289fb003679ca3b81c9fa60b0289ba9d0c8d6c8e data/c/tags/item/dusts/obsidian.json
 bbf7f6d0c00803b6e02d423b443d154ae326e93b data/c/tags/item/dusts/saltpeter.json
 49854da25a96b091c439bf470152ab1e94d57dd7 data/c/tags/item/dusts/sulfur.json
+18f97a8f6200b56e94e454448233f41d49541550 data/c/tags/item/gears.json
 92490b80fa24ea30d834e9ca91683e84f3ba7ef3 data/c/tags/item/gears/brass.json
 d14f18ce05fc15ee4f0e1575e7f298c00f079aa9 data/c/tags/item/gears/bronze.json
 f8776c632583384b22e94b57809091324a2e3015 data/c/tags/item/gears/copper.json
@@ -21,6 +23,7 @@ df739a62c8171731a87e8e3937a0c552a158924d data/c/tags/item/gears/silver.json
 b132144ce58c0e15f2bd6fc60521d1185f782191 data/c/tags/item/gears/steel.json
 4042e67b37e84696852d8328eca8efb8be267ab0 data/c/tags/item/gears/tin.json
 d50a8ba5bae7d9d2c2581ce4d0fd4471ee818797 data/c/tags/item/gears/zinc.json
+ede066700353e4bfe084025b8215df6e712fe5b6 data/c/tags/item/ingots.json
 75ab00fcba7527628f8180d4da1258f38eaf7993 data/c/tags/item/ingots/brass.json
 a0ce7d34162c16575f232fefea706bfee9997e5f data/c/tags/item/ingots/bronze.json
 2ce332cc17da714a47e7391f5318a5886db269f3 data/c/tags/item/ingots/invar.json
@@ -53,6 +56,7 @@ e04f5a6285f9ec10108641e77582345991282073 data/c/tags/item/ores/zinc.json
 ab8a6f7d61afc254cc8f018a4e9182ccac386840 data/c/tags/item/ores_in_ground/deepslate.json
 cba1c5a31aa2960efa0703b2e57f8390f53d4ce6 data/c/tags/item/ores_in_ground/netherrack.json
 679d265c52f455f2a0f0f9afcfb254016b47f407 data/c/tags/item/ores_in_ground/stone.json
+29116defc8cf089cc6b3a1c93669c60463c981d7 data/c/tags/item/plates.json
 4ba7bc1b06f9b82047c5bcd4d444e63e0e05e010 data/c/tags/item/plates/brass.json
 5a23b291f3458a08993c77163dd6ae9f6729a2b0 data/c/tags/item/plates/bronze.json
 a7ccebcdf1b41bc019d4ad2b6877842880b59e8c data/c/tags/item/plates/copper.json
@@ -65,6 +69,7 @@ a7ccebcdf1b41bc019d4ad2b6877842880b59e8c data/c/tags/item/plates/copper.json
 b1fe6bdc870219686421c34b2da9aa2ca0d430eb data/c/tags/item/plates/steel.json
 c575c0d7111690d959b7c02ea3f0c90f9ba1f71c data/c/tags/item/plates/tin.json
 2372c4063156cb52654545a3800f2000a85c20d7 data/c/tags/item/plates/zinc.json
+e408990ea3ea37faa1d9c116b7b53c1a9375d57a data/c/tags/item/raw_materials.json
 cb884e9e2d81ae8f3c727477640a978e19230d73 data/c/tags/item/raw_materials/lead.json
 3314b30b66e729f47e099a54fb1a1c76d57a7c6b data/c/tags/item/raw_materials/nickel.json
 aff7016ddb8fcd0b4eab937ab3cd56340f084a30 data/c/tags/item/raw_materials/silver.json
@@ -84,6 +89,7 @@ f34843bfb7b650f383c4d01e491bd1059bfad784 data/c/tags/item/storage_blocks/steel.j
 f20e839f832dcea6925586af038aa6dd6fcae88a data/c/tags/item/storage_blocks/zinc.json
 e3ba2fab927d9f5cba4296693574f0ca9cac69eb data/c/tags/item/tools/axes/steel.json
 88e186f1e72ff7a1d3bfbcb969ef18b8a7acbb5f data/c/tags/item/tools/hoes/steel.json
+05168ea5fb65c2a597f1ca271644789e1dd9aa9c data/c/tags/item/tools/melee_weapon.json
 c12118bda87efc5274515a86a0a7f3b189982de6 data/c/tags/item/tools/pickaxes/steel.json
 9c4696d2ed397966765f5b6e61664c5147e9bac9 data/c/tags/item/tools/shear.json
 15360ef6012773af817ef8496de52353494b4db3 data/c/tags/item/tools/shovels/steel.json

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-18T10:11:12.88424	Recipes
+// 1.21.1	2024-08-25T09:12:57.842272	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
@@ -855,7 +855,7 @@ fbfea4b732526a9d9257db6368b894a8a5ba812e data/railcraft/recipe/firestone_cracked
 d5896700377226b5b9a5a5da4ed803be9c60fe36 data/railcraft/recipe/fluid_fueled_firebox.json
 75b90b4d19136147f7c9d04d306d13c48cde298f data/railcraft/recipe/fluid_loader.json
 f3100c801c220225ceaa01ae99bc0f51a87eac5c data/railcraft/recipe/fluid_unloader.json
-402774c97d8bd2ac870aa5a6675e017315931647 data/railcraft/recipe/force_track_emitter.json
+3f349536fd966a45a2bf414272702a730e210dbe data/railcraft/recipe/force_track_emitter.json
 65cdd314ac161fb0a1b4afe123e69f8904fbf021 data/railcraft/recipe/frame_brass_plate.json
 081175e2723ef93adc9a3fb574c8df79a7eedfb8 data/railcraft/recipe/frame_bronze_plate.json
 c6b6b6ff668cabc80bdf8142626a998d89fcb5ea data/railcraft/recipe/frame_iron_plate.json

diff --git a/src/generated/resources/data/c/tags/item/dusts/ender_pearl.json b/src/generated/resources/data/c/tags/item/dusts/ender_pearl.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "railcraft:ender_dust"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/gears.json b/src/generated/resources/data/c/tags/item/gears.json
@@ -0,0 +1,16 @@
+{
+  "values": [
+    "#c:gears/steel",
+    "#c:gears/iron",
+    "#c:gears/tin",
+    "#c:gears/gold",
+    "#c:gears/lead",
+    "#c:gears/zinc",
+    "#c:gears/brass",
+    "#c:gears/invar",
+    "#c:gears/bronze",
+    "#c:gears/copper",
+    "#c:gears/nickel",
+    "#c:gears/silver"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json
@@ -0,0 +1,13 @@
+{
+  "values": [
+    "#c:ingots/steel",
+    "#c:ingots/tin",
+    "#c:ingots/zinc",
+    "#c:ingots/brass",
+    "#c:ingots/bronze",
+    "#c:ingots/nickel",
+    "#c:ingots/invar",
+    "#c:ingots/lead",
+    "#c:ingots/silver"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json
@@ -0,0 +1,16 @@
+{
+  "values": [
+    "#c:plates/steel",
+    "#c:plates/iron",
+    "#c:plates/tin",
+    "#c:plates/gold",
+    "#c:plates/lead",
+    "#c:plates/zinc",
+    "#c:plates/brass",
+    "#c:plates/invar",
+    "#c:plates/bronze",
+    "#c:plates/copper",
+    "#c:plates/nickel",
+    "#c:plates/silver"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "#c:raw_materials/tin",
+    "#c:raw_materials/zinc",
+    "#c:raw_materials/nickel",
+    "#c:raw_materials/silver",
+    "#c:raw_materials/lead"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/tools/melee_weapon.json b/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "railcraft:steel_sword"
+  ]
+}
diff --git a/src/generated/resources/data/railcraft/recipe/force_track_emitter.json b/src/generated/resources/data/railcraft/recipe/force_track_emitter.json
@@ -6,7 +6,7 @@
       "tag": "c:plates/tin"
     },
     "b": {
-      "item": "railcraft:ender_dust"
+      "tag": "c:dusts/ender_pearl"
     },
     "c": {
       "item": "railcraft:charge_coil"

diff --git a/src/main/java/mods/railcraft/data/RailcraftItemTagsProvider.java b/src/main/java/mods/railcraft/data/RailcraftItemTagsProvider.java
@@ -25,6 +25,16 @@ public RailcraftItemTagsProvider(PackOutput packOutput,
   @SuppressWarnings("unchecked")
   @Override
   protected void addTags(HolderLookup.Provider provider) {
+    this.tag(Tags.Items.INGOTS)
+        .addTag(RailcraftTags.Items.STEEL_INGOT)
+        .addTag(RailcraftTags.Items.TIN_INGOT)
+        .addTag(RailcraftTags.Items.ZINC_INGOT)
+        .addTag(RailcraftTags.Items.BRASS_INGOT)
+        .addTag(RailcraftTags.Items.BRONZE_INGOT)
+        .addTag(RailcraftTags.Items.NICKEL_INGOT)
+        .addTag(RailcraftTags.Items.INVAR_INGOT)
+        .addTag(RailcraftTags.Items.LEAD_INGOT)
+        .addTag(RailcraftTags.Items.SILVER_INGOT);
     this.tag(RailcraftTags.Items.STEEL_INGOT)
         .add(RailcraftItems.STEEL_INGOT.get());
     this.tag(RailcraftTags.Items.TIN_INGOT)
@@ -44,6 +54,12 @@ protected void addTags(HolderLookup.Provider provider) {
     this.tag(RailcraftTags.Items.SILVER_INGOT)
         .add(RailcraftItems.SILVER_INGOT.get());
 
+    this.tag(Tags.Items.RAW_MATERIALS)
+        .addTag(RailcraftTags.Items.TIN_RAW)
+        .addTag(RailcraftTags.Items.ZINC_RAW)
+        .addTag(RailcraftTags.Items.NICKEL_RAW)
+        .addTag(RailcraftTags.Items.SILVER_RAW)
+        .addTag(RailcraftTags.Items.LEAD_RAW);
     this.tag(RailcraftTags.Items.TIN_RAW)
         .add(RailcraftItems.TIN_RAW.get());
     this.tag(RailcraftTags.Items.ZINC_RAW)
@@ -117,6 +133,19 @@ protected void addTags(HolderLookup.Provider provider) {
         .addTag(RailcraftTags.Items.ZINC_BLOCK)
         .addTag(RailcraftTags.Items.COAL_COKE_BLOCK);
 
+    this.tag(RailcraftTags.Items.PLATES)
+        .addTag(RailcraftTags.Items.STEEL_PLATE)
+        .addTag(RailcraftTags.Items.IRON_PLATE)
+        .addTag(RailcraftTags.Items.TIN_PLATE)
+        .addTag(RailcraftTags.Items.GOLD_PLATE)
+        .addTag(RailcraftTags.Items.LEAD_PLATE)
+        .addTag(RailcraftTags.Items.ZINC_PLATE)
+        .addTag(RailcraftTags.Items.BRASS_PLATE)
+        .addTag(RailcraftTags.Items.INVAR_PLATE)
+        .addTag(RailcraftTags.Items.BRONZE_PLATE)
+        .addTag(RailcraftTags.Items.COPPER_PLATE)
+        .addTag(RailcraftTags.Items.NICKEL_PLATE)
+        .addTag(RailcraftTags.Items.SILVER_PLATE);
     this.tag(RailcraftTags.Items.STEEL_PLATE)
         .add(RailcraftItems.STEEL_PLATE.get());
     this.tag(RailcraftTags.Items.IRON_PLATE)
@@ -142,6 +171,19 @@ protected void addTags(HolderLookup.Provider provider) {
     this.tag(RailcraftTags.Items.SILVER_PLATE)
         .add(RailcraftItems.SILVER_PLATE.get());
 
+    this.tag(RailcraftTags.Items.GEARS)
+        .addTag(RailcraftTags.Items.STEEL_GEAR)
+        .addTag(RailcraftTags.Items.IRON_GEAR)
+        .addTag(RailcraftTags.Items.TIN_GEAR)
+        .addTag(RailcraftTags.Items.GOLD_GEAR)
+        .addTag(RailcraftTags.Items.LEAD_GEAR)
+        .addTag(RailcraftTags.Items.ZINC_GEAR)
+        .addTag(RailcraftTags.Items.BRASS_GEAR)
+        .addTag(RailcraftTags.Items.INVAR_GEAR)
+        .addTag(RailcraftTags.Items.BRONZE_GEAR)
+        .addTag(RailcraftTags.Items.COPPER_GEAR)
+        .addTag(RailcraftTags.Items.NICKEL_GEAR)
+        .addTag(RailcraftTags.Items.SILVER_GEAR);
     this.tag(RailcraftTags.Items.STEEL_GEAR)
         .add(RailcraftItems.STEEL_GEAR.get());
     this.tag(RailcraftTags.Items.IRON_GEAR)
@@ -219,7 +261,8 @@ protected void addTags(HolderLookup.Provider provider) {
         .add(RailcraftItems.SULFUR_DUST.get());
     this.tag(RailcraftTags.Items.OBSIDIAN_DUST)
         .add(RailcraftItems.OBSIDIAN_DUST.get());
-
+    this.tag(RailcraftTags.Items.ENDER_DUST)
+        .add(RailcraftItems.ENDER_DUST.get());
 
     this.tag(RailcraftTags.Items.CROWBAR)
         .add(RailcraftItems.STEEL_CROWBAR.get())
@@ -253,8 +296,7 @@ protected void addTags(HolderLookup.Provider provider) {
         .add(RailcraftItems.THROTTLE_TRACK_KIT.get())
         .add(RailcraftItems.TRANSITION_TRACK_KIT.get());
 
-    this.tag(RailcraftTags.Items.SLAG)
-        .add(RailcraftItems.SLAG.get());
+    this.tag(RailcraftTags.Items.SLAG).add(RailcraftItems.SLAG.get());
 
     this.copy(RailcraftTags.Blocks.IRON_TANK_WALL, RailcraftTags.Items.IRON_TANK_WALL);
     this.copy(RailcraftTags.Blocks.IRON_TANK_GAUGE, RailcraftTags.Items.IRON_TANK_GAUGE);
@@ -294,6 +336,7 @@ protected void addTags(HolderLookup.Provider provider) {
 
     // TOOLS
     this.tag(Tags.Items.TOOLS_SHEAR).add(RailcraftItems.STEEL_SHEARS.get());
+    this.tag(Tags.Items.MELEE_WEAPON_TOOLS).add(RailcraftItems.STEEL_SWORD.get());
     this.tag(RailcraftTags.Items.TOOLS_AXES_STEEL).add(RailcraftItems.STEEL_AXE.get());
     this.tag(RailcraftTags.Items.TOOLS_HOES_STEEL).add(RailcraftItems.STEEL_HOE.get());
     this.tag(RailcraftTags.Items.TOOLS_PICKAXES_STEEL).add(RailcraftItems.STEEL_PICKAXE.get());

diff --git a/src/main/java/mods/railcraft/data/recipes/RailcraftRecipeProvider.java b/src/main/java/mods/railcraft/data/recipes/RailcraftRecipeProvider.java
@@ -1141,7 +1141,7 @@ private void buildMiscItems(RecipeOutput recipeOutput) {
         .pattern("cdc")
         .pattern("aba")
         .define('a', RailcraftTags.Items.TIN_PLATE)
-        .define('b', RailcraftItems.ENDER_DUST.get())
+        .define('b', RailcraftTags.Items.ENDER_DUST)
         .define('c', RailcraftItems.CHARGE_COIL.get())
         .define('d', Tags.Items.STORAGE_BLOCKS_DIAMOND)
         .unlockedBy(getHasName(RailcraftItems.ENDER_DUST.get()),

diff --git a/src/main/java/mods/railcraft/tags/RailcraftTags.java b/src/main/java/mods/railcraft/tags/RailcraftTags.java
@@ -52,6 +52,7 @@ public static class Items {
     public static final TagKey<Item> BRASS_BLOCK = storageBlocksTag("brass");
     public static final TagKey<Item> COAL_COKE_BLOCK = storageBlocksTag("coal_coke");
 
+    public static final TagKey<Item> PLATES = commonTag("plates");
     public static final TagKey<Item> STEEL_PLATE = platesTag("steel");
     public static final TagKey<Item> IRON_PLATE = platesTag("iron");
     public static final TagKey<Item> TIN_PLATE = platesTag("tin");
@@ -65,6 +66,7 @@ public static class Items {
     public static final TagKey<Item> NICKEL_PLATE = platesTag("nickel");
     public static final TagKey<Item> SILVER_PLATE = platesTag("silver");
 
+    public static final TagKey<Item> GEARS = commonTag("gears");
     public static final TagKey<Item> STEEL_GEAR = gearsTag("steel");
     public static final TagKey<Item> IRON_GEAR = gearsTag("iron");
     public static final TagKey<Item> TIN_GEAR = gearsTag("tin");
@@ -101,6 +103,7 @@ public static class Items {
     public static final TagKey<Item> CHARCOAL_DUST = dustsTag("charcoal");
     public static final TagKey<Item> SULFUR_DUST = dustsTag("sulfur");
     public static final TagKey<Item> OBSIDIAN_DUST = dustsTag("obsidian");
+    public static final TagKey<Item> ENDER_DUST = dustsTag("ender_pearl");
 
     public static final TagKey<Item> IRON_TANK_GAUGE = tag("iron_tank_gauge");
     public static final TagKey<Item> IRON_TANK_VALVE = tag("iron_tank_valve");