添加新tag，调整配方

2025-02-09 16:00:30 +08:00 · 2025-02-09 16:00:30 +08:00 · 1baf7c3259
commit 1baf7c3259
parent 6303a8ec75
35 changed files with 79 additions and 38 deletions
--- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841
+++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841
@ -1,4 +1,4 @@
-// 1.20.1	2025-01-10T22:18:19.1617681	Tags for minecraft:item mod id superbwarfare
+// 1.20.1	2025-02-09T15:58:05.6327285	Tags for minecraft:item mod id superbwarfare
 cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json
 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json
 295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json
@ -28,6 +28,7 @@ af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/le
 144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json
 96a9ddc01147520bc6f573454a329bd67e8d0962 data/superbwarfare/tags/items/gun.json
 409af265147e812b6f6558c51f1cb83b0f61b7d3 data/superbwarfare/tags/items/handgun.json
+9b38dc57a6ea6b75f183dfe6376190aaf5b575f0 data/superbwarfare/tags/items/ingots/steel.json
 65ddb0a8a671cc65af8e3754fc23e7d24c3587b7 data/superbwarfare/tags/items/launcher.json
 b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json
 a53020091752016da6602ee1b8b7e08823614344 data/superbwarfare/tags/items/military_armor.json
@ -37,6 +38,7 @@ aaa533157491a82b8e23b2914deef67c4078cbed data/superbwarfare/tags/items/rifle.jso
 acd4d19dfadb71a1cec43e9c0f4a38fe8d3cf8cb data/superbwarfare/tags/items/shotgun.json
 4aca0fa3f8b9f2a4920041e35e46dae7e93d5482 data/superbwarfare/tags/items/smg.json
 13a23684e04832bea5dfbd2c0a9d9ed52dcb3422 data/superbwarfare/tags/items/sniper_rifle.json
+957ba1ad20a5bd810ef125677238efa833b8376d data/superbwarfare/tags/items/storage_blocks/steel.json
 9af8a0147d1e920ef2a2b990bc9010367cf3b7df data/superbwarfare/tags/items/use_handgun_ammo.json
 2899774c6325135847a85b09121ce25587aa275e data/superbwarfare/tags/items/use_rifle_ammo.json
 acd4d19dfadb71a1cec43e9c0f4a38fe8d3cf8cb data/superbwarfare/tags/items/use_shotgun_ammo.json
--- a/src/generated/resources/data/superbwarfare/tags/items/ingots/steel.json
+++ b/src/generated/resources/data/superbwarfare/tags/items/ingots/steel.json
@ -0,0 +1,9 @@
+{
+  "values": [
+    "#forge:ingots/steel",
+    {
+      "id": "dreamaticvoyage:fukamizu_bread_ingot",
+      "required": false
+    }
+  ]
+}
--- a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json
+++ b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json
@ -0,0 +1,9 @@
+{
+  "values": [
+    "#forge:storage_blocks/steel",
+    {
+      "id": "dreamaticvoyage:fukamizu_bread_block",
+      "required": false
+    }
+  ]
+}
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java
@ -37,12 +37,18 @@ public class ModItemTagProvider extends ItemTagsProvider {
        this.tag(forgeTag("ingots/tungsten")).add(ModItems.TUNGSTEN_INGOT.get());
        this.tag(forgeTag("ingots/silver")).add(ModItems.SILVER_INGOT.get());

+        this.tag(ModTags.Items.INGOTS_STEEL).addTag(forgeTag("ingots/steel"))
+                .addOptional(new ResourceLocation("dreamaticvoyage", "fukamizu_bread_ingot"));
+
        this.tag(Tags.Items.STORAGE_BLOCKS).addTags(forgeTag("storage_blocks/lead"), forgeTag("storage_blocks/steel"), forgeTag("storage_blocks/tungsten"), forgeTag("storage_blocks/silver"));
        this.tag(forgeTag("storage_blocks/lead")).add(ModItems.LEAD_BLOCK.get());
        this.tag(forgeTag("storage_blocks/steel")).add(ModItems.STEEL_BLOCK.get());
        this.tag(forgeTag("storage_blocks/tungsten")).add(ModItems.TUNGSTEN_BLOCK.get());
        this.tag(forgeTag("storage_blocks/silver")).add(ModItems.SILVER_BLOCK.get());

+        this.tag(ModTags.Items.STORAGE_BLOCK_STEEL).addTag(forgeTag("storage_blocks/steel"))
+                .addOptional(new ResourceLocation("dreamaticvoyage", "fukamizu_bread_block"));
+
        this.tag(Tags.Items.ORES).addTags(forgeTag("ores/lead"), forgeTag("ores/tungsten"), forgeTag("ores/silver"));
        this.tag(forgeTag("ores/lead")).add(ModItems.GALENA_ORE.get(), ModItems.DEEPSLATE_GALENA_ORE.get());
        this.tag(forgeTag("ores/tungsten")).add(ModItems.SCHEELITE_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get());
--- a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java
+++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java
@ -32,6 +32,9 @@ public class ModTags {
        public static final TagKey<Item> MILITARY_ARMOR = tag("military_armor");
        public static final TagKey<Item> MILITARY_ARMOR_HEAVY = tag("military_armor_heavy");

+        public static final TagKey<Item> INGOTS_STEEL = tag("ingots/steel");
+        public static final TagKey<Item> STORAGE_BLOCK_STEEL = tag("storage_blocks/steel");
+
        private static TagKey<Item> tag(String name) {
            return ItemTags.create(new ResourceLocation(ModUtils.MODID, name));
        }
--- a/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json
@ -20,7 +20,7 @@
      "item": "minecraft:compass"
    },
    "e": {
-      "tag": "forge:storage_blocks/steel"
+      "tag": "superbwarfare:storage_blocks/steel"
    },
    "f": {
      "item": "minecraft:chest"
--- a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json
@ -14,7 +14,7 @@
      "item": "minecraft:iron_ingot"
    },
    "c": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "d": {
      "item": "superbwarfare:tungsten_rod"
--- a/src/main/resources/data/superbwarfare/recipes/armor_plate_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/armor_plate_crafting.json
@ -14,7 +14,7 @@
      "tag": "minecraft:terracotta"
    },
    "c": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "d": {
      "tag": "minecraft:wool"
--- a/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json
@ -14,7 +14,7 @@
      "item": "superbwarfare:cell"
    },
    "e": {
-      "tag": "forge:storage_blocks/steel"
+      "tag": "superbwarfare:storage_blocks/steel"
    },
    "f": {
      "item": "superbwarfare:medium_armament_module"
--- a/src/main/resources/data/superbwarfare/recipes/cannon_core_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/cannon_core_crafting.json
@ -8,7 +8,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:storage_blocks/steel"
+      "tag": "superbwarfare:storage_blocks/steel"
    },
    "b": {
      "item": "minecraft:dispenser"
--- a/src/main/resources/data/superbwarfare/recipes/crowbar_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/crowbar_crafting.json
@ -8,7 +8,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "item": "minecraft:iron_ingot"
--- a/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json
@ -7,7 +7,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "tag": "forge:dyes/black"
--- a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json
@ -14,7 +14,7 @@
      "item": "minecraft:iron_ingot"
    },
    "c": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json
@ -8,7 +8,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "tag": "forge:ingots/copper"
--- a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/knife_crafting.json
@ -7,7 +7,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "forge:ingots/steel"
    },
    "b": {
      "item": "minecraft:stick"
--- a/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json
@ -14,7 +14,7 @@
      "item": "superbwarfare:cell"
    },
    "e": {
-      "tag": "forge:storage_blocks/steel"
+      "tag": "superbwarfare:storage_blocks/steel"
    },
    "f": {
      "item": "minecraft:chest"
--- a/src/main/resources/data/superbwarfare/recipes/light_armament_module_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/light_armament_module_crafting.json
@ -17,7 +17,7 @@
      "item": "minecraft:dispenser"
    },
    "d": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json
@ -7,7 +7,7 @@
    "item": "superbwarfare:common_material_pack"
  },
  "addition": {
-    "tag":"forge:ingots/steel"
+    "tag": "superbwarfare:ingots/steel"
  },
  "result": {
    "item": "superbwarfare:m_1911"
--- a/src/main/resources/data/superbwarfare/recipes/m4_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipes/m4_smithing.json
@ -7,7 +7,7 @@
    "item": "superbwarfare:rare_material_pack"
  },
  "addition": {
-    "tag":"forge:ingots/steel"
+    "tag": "superbwarfare:ingots/steel"
  },
  "result": {
    "item": "superbwarfare:m_4"
--- a/src/main/resources/data/superbwarfare/recipes/m870_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipes/m870_smithing.json
@ -7,7 +7,7 @@
    "item": "superbwarfare:rare_material_pack"
  },
  "addition": {
-    "tag":"forge:ingots/steel"
+    "tag": "superbwarfare:ingots/steel"
  },
  "result": {
    "item": "superbwarfare:m_870"
--- a/src/main/resources/data/superbwarfare/recipes/mk_42_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipes/mk_42_smithing.json
@ -7,7 +7,7 @@
    "item": "superbwarfare:cannon_core"
  },
  "addition": {
-    "tag": "forge:storage_blocks/steel"
+    "tag": "superbwarfare:storage_blocks/steel"
  },
  "result": {
    "item": "superbwarfare:container",
--- a/src/main/resources/data/superbwarfare/recipes/mle_1934_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipes/mle_1934_smithing.json
@ -7,7 +7,7 @@
    "item": "superbwarfare:cannon_core"
  },
  "addition": {
-    "tag": "forge:storage_blocks/steel"
+    "tag": "superbwarfare:storage_blocks/steel"
  },
  "result": {
    "item": "superbwarfare:container",
--- a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json
+++ b/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json
@ -11,7 +11,7 @@
      "item": "superbwarfare:fusee"
    },
    "b": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "c": {
      "item": "superbwarfare:high_energy_explosives"
--- a/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json
@ -11,7 +11,7 @@
      "item": "superbwarfare:empty_perk"
    },
    "b": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "c": {
      "item": "minecraft:piston"
--- a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json
@ -8,7 +8,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "tag": "forge:plates/copper"
--- a/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json
@ -8,7 +8,7 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "tag": "forge:ingots/copper"
--- a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json
@ -14,7 +14,7 @@
      "item": "superbwarfare:rare_material_pack"
    },
    "c": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "d": {
      "item": "minecraft:comparator"
--- a/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json
@ -2,12 +2,15 @@
  "type": "minecraft:crafting_shaped",
  "category": "misc",
  "pattern": [
-    "aaa",
+    "aba",
    "  a"
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
+    },
+    "b": {
+      "item": "superbwarfare:steel_ingot"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json
@ -2,11 +2,14 @@
  "type": "minecraft:crafting_shaped",
  "category": "misc",
  "pattern": [
-    "aaa"
+    "aba"
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
+    },
+    "b": {
+      "item": "superbwarfare:steel_ingot"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json
@ -8,10 +8,10 @@
  ],
  "key": {
    "a": {
-      "item": "superbwarfare:steel_ingot"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
-      "tag":"forge:ingots/steel"
+      "item": "superbwarfare:steel_ingot"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json
@ -1,9 +1,9 @@
 {
  "type": "minecraft:crafting_shapeless",
-  "category":"misc",
+  "category": "misc",
  "ingredients": [
    {
-      "item":"superbwarfare:steel_block"
+      "item": "superbwarfare:steel_block"
    }
  ],
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json
@ -3,12 +3,15 @@
  "category": "misc",
  "pattern": [
    "a",
-    "a",
+    "b",
    "a"
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
+    },
+    "b": {
+      "item": "superbwarfare:steel_ingot"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json
@ -3,14 +3,17 @@
  "category": "misc",
  "pattern": [
    "ab",
-    " b"
+    " c"
  ],
  "key": {
    "a": {
      "item": "minecraft:tripwire_hook"
    },
    "b": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
+    },
+    "c": {
+      "item": "superbwarfare:steel_ingot"
    }
  },
  "result": {
--- a/src/main/resources/data/superbwarfare/recipes/target_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/target_crafting.json
@ -11,7 +11,7 @@
      "item": "minecraft:target"
    },
    "b": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "c": {
      "item": "minecraft:armor_stand"
--- a/src/main/resources/data/superbwarfare/recipes/track_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipes/track_crafting.json
@ -8,13 +8,13 @@
  ],
  "key": {
    "a": {
-      "tag":"forge:ingots/steel"
+      "tag": "superbwarfare:ingots/steel"
    },
    "b": {
      "item": "superbwarfare:wheel"
    },
    "c": {
-      "tag": "forge:storage_blocks/steel"
+      "tag": "superbwarfare:storage_blocks/steel"
    }
  },
  "result": {