diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 274af83d3..995e6275e 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2025-02-09T15:58:05.6327285 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2025-02-09T16:13:02.6424176 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 +3cc00928c041f710b50eb1f7a817e0345f6f96b3 data/superbwarfare/tags/items/ingots/cemented_carbide.json 9b38dc57a6ea6b75f183dfe6376190aaf5b575f0 data/superbwarfare/tags/items/ingots/steel.json 65ddb0a8a671cc65af8e3754fc23e7d24c3587b7 data/superbwarfare/tags/items/launcher.json b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json @@ -38,7 +39,8 @@ 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 +30a6a2a2031c2fc53accf833c1760697462c5b33 data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json +a391df0529d05dbae8f9bc6e9ddce039b63e545a 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 diff --git a/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json b/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json new file mode 100644 index 000000000..74f9889b7 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/items/ingots/cemented_carbide.json @@ -0,0 +1,9 @@ +{ + "values": [ + "superbwarfare:cemented_carbide_ingot", + { + "id": "dreamaticvoyage:hqss_bread_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json new file mode 100644 index 000000000..f523d8d4f --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/cemented_carbide.json @@ -0,0 +1,9 @@ +{ + "values": [ + "superbwarfare:cemented_carbide_block", + { + "id": "dreamaticvoyage:hqss_bread_bricks", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json index 986d426ba..3e2ba4719 100644 --- a/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json +++ b/src/generated/resources/data/superbwarfare/tags/items/storage_blocks/steel.json @@ -2,7 +2,7 @@ "values": [ "#forge:storage_blocks/steel", { - "id": "dreamaticvoyage:fukamizu_bread_block", + "id": "dreamaticvoyage:fukamizu_bread_bricks", "required": false } ] diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index b91f2d469..2f408cc6d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -39,6 +39,8 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.INGOTS_STEEL).addTag(forgeTag("ingots/steel")) .addOptional(new ResourceLocation("dreamaticvoyage", "fukamizu_bread_ingot")); + this.tag(ModTags.Items.INGOTS_CEMENTED_CARBIDE).add(ModItems.CEMENTED_CARBIDE_INGOT.get()) + .addOptional(new ResourceLocation("dreamaticvoyage", "hqss_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()); @@ -47,7 +49,9 @@ public class ModItemTagProvider extends ItemTagsProvider { 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")); + .addOptional(new ResourceLocation("dreamaticvoyage", "fukamizu_bread_bricks")); + this.tag(ModTags.Items.STORAGE_BLOCK_CEMENTED_CARBIDE).add(ModItems.CEMENTED_CARBIDE_BLOCK.get()) + .addOptional(new ResourceLocation("dreamaticvoyage", "hqss_bread_bricks")); 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()); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java index f5e7f9cf7..e52be89bf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java @@ -35,6 +35,9 @@ public class ModTags { public static final TagKey INGOTS_STEEL = tag("ingots/steel"); public static final TagKey STORAGE_BLOCK_STEEL = tag("storage_blocks/steel"); + public static final TagKey INGOTS_CEMENTED_CARBIDE = tag("ingots/cemented_carbide"); + public static final TagKey STORAGE_BLOCK_CEMENTED_CARBIDE = tag("storage_blocks/cemented_carbide"); + private static TagKey tag(String name) { return ItemTags.create(new ResourceLocation(ModUtils.MODID, name)); } diff --git a/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json b/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json index c7e1cd387..de76d9283 100644 --- a/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:ak_12" diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json index 8834e8a8a..db6aa7651 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json @@ -2,11 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - "aaa", + "aba", " a" ], "key": { "a": { + "tag": "superbwarfare:ingots/cemented_carbide" + }, + "b": { "item": "superbwarfare:cemented_carbide_ingot" } }, diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json index c4ac19054..da446a21c 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json @@ -2,10 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - "aaa" + "aba" ], "key": { "a": { + "tag": "superbwarfare:ingots/cemented_carbide" + }, + "b": { "item": "superbwarfare:cemented_carbide_ingot" } }, diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json index eac622ec3..ef40fb21c 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json @@ -3,11 +3,14 @@ "category": "equipment", "pattern": [ "aaa", - "aaa", + "aba", "aaa" ], "key": { "a": { + "tag": "superbwarfare:ingots/cemented_carbide" + }, + "b": { "item": "superbwarfare:cemented_carbide_ingot" } }, diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json index aa3fb7113..7dbc94525 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json @@ -3,11 +3,14 @@ "category": "misc", "pattern": [ "a", - "a", + "b", "a" ], "key": { "a": { + "tag": "superbwarfare:ingots/cemented_carbide" + }, + "b": { "item": "superbwarfare:cemented_carbide_ingot" } }, diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json index 3311742f8..bc09e9b75 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json @@ -3,13 +3,16 @@ "category": "misc", "pattern": [ "ab", - " b" + " c" ], "key": { "a": { "item": "minecraft:tripwire_hook" }, "b": { + "tag": "superbwarfare:ingots/cemented_carbide" + }, + "c": { "item": "superbwarfare:cemented_carbide_ingot" } }, diff --git a/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json b/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json index 000029128..39c22ea4b 100644 --- a/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:devotion" diff --git 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 index e11468b3f..5b091665b 100644 --- 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 @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - "aaa", + "aca", "aba" ], "key": { @@ -11,6 +11,9 @@ }, "b": { "tag": "forge:dyes/black" + }, + "c": { + "item": "superbwarfare:steel_ingot" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json b/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json index b93944717..858c6ded8 100644 --- a/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:hk_416" diff --git a/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json b/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json index 24f4e46ff..e5c300adb 100644 --- a/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:iron_ingot" }, "b": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/m60_smithing.json b/src/main/resources/data/superbwarfare/recipes/m60_smithing.json index b687ccb92..e801f19a1 100644 --- a/src/main/resources/data/superbwarfare/recipes/m60_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m60_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:m_60" diff --git a/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json b/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json index e01c271bb..209cb086d 100644 --- a/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json @@ -17,7 +17,7 @@ "item": "superbwarfare:light_armament_module" }, "d": { - "item":"superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json b/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json index d7a4d24fe..a41e17722 100644 --- a/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:mk_14" diff --git a/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json b/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json index 64959be52..711847b6a 100644 --- a/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:qbz_95" diff --git a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json index bf5105b3e..e262cf5a3 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json @@ -3,15 +3,18 @@ "category": "misc", "pattern": [ "aba", - "aaa", + "aca", "aaa" ], "key": { "a": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { "tag": "forge:dyes/green" + }, + "c": { + "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json b/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json index 4b69ae000..fa625b7c2 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json @@ -2,15 +2,18 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - "aaa", + "aca", "aba" ], "key": { "a": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { "tag": "forge:dyes/green" + }, + "c": { + "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/svd_smithing.json b/src/main/resources/data/superbwarfare/recipes/svd_smithing.json index 32364069f..b5e904ba4 100644 --- a/src/main/resources/data/superbwarfare/recipes/svd_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/svd_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:svd" diff --git a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json b/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json index 2b2b5c2d3..f0ccb5638 100644 --- a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:trachelium" diff --git a/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json b/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json index ef9cdc0c9..f08e98885 100644 --- a/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json @@ -3,15 +3,18 @@ "category": "misc", "pattern": [ "aba", - "aaa", + "aca", "aaa" ], "key": { "a": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { "item": "minecraft:sand" + }, + "c": { + "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json b/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json index f093e1643..f045f12a1 100644 --- a/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json @@ -2,15 +2,18 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - "aaa", + "aca", "aba" ], "key": { "a": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { "item": "minecraft:sand" + }, + "c": { + "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/vector_smithing.json b/src/main/resources/data/superbwarfare/recipes/vector_smithing.json index da4102fec..a062d7900 100644 --- a/src/main/resources/data/superbwarfare/recipes/vector_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/vector_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:epic_material_pack" }, "addition": { - "item": "superbwarfare:cemented_carbide_ingot" + "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { "item": "superbwarfare:vector"