diff --git a/src/generated/resources/assets/modern_industrialization/lang/en_us.json b/src/generated/resources/assets/modern_industrialization/lang/en_us.json index 69142dc08..7c9ab88fd 100644 --- a/src/generated/resources/assets/modern_industrialization/lang/en_us.json +++ b/src/generated/resources/assets/modern_industrialization/lang/en_us.json @@ -1446,6 +1446,17 @@ "tag.c.tiny_dusts.uranium_235": "Uranium 235 Tiny Dusts", "tag.c.tiny_dusts.uranium_238": "Uranium 238 Tiny Dusts", "tag.c.tiny_dusts.yttrium": "Yttrium Tiny Dusts", + "tag.c.wires": "Wires", + "tag.c.wires.aluminum": "Aluminum Wires", + "tag.c.wires.annealed_copper": "Annealed Copper Wires", + "tag.c.wires.copper": "Copper Wires", + "tag.c.wires.cupronickel": "Cupronickel Wires", + "tag.c.wires.electrum": "Electrum Wires", + "tag.c.wires.kanthal": "Kanthal Wires", + "tag.c.wires.platinum": "Platinum Wires", + "tag.c.wires.silver": "Silver Wires", + "tag.c.wires.superconductor": "Superconductor Wires", + "tag.c.wires.tin": "Tin Wires", "tag.modern_industrialization.barrels": "Barrels", "tag.modern_industrialization.fluid_pipes": "Fluid Pipes", "tag.modern_industrialization.forge_hammer_tools": "Forge Hammer Tools", diff --git a/src/generated/resources/data/c/tags/item/wires.json b/src/generated/resources/data/c/tags/item/wires.json new file mode 100644 index 000000000..39f35b1cc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#c:wires/aluminum", + "#c:wires/annealed_copper", + "#c:wires/copper", + "#c:wires/cupronickel", + "#c:wires/electrum", + "#c:wires/kanthal", + "#c:wires/platinum", + "#c:wires/silver", + "#c:wires/superconductor", + "#c:wires/tin" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/aluminum.json b/src/generated/resources/data/c/tags/item/wires/aluminum.json new file mode 100644 index 000000000..160fdd2bb --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/aluminum.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:aluminum_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/annealed_copper.json b/src/generated/resources/data/c/tags/item/wires/annealed_copper.json new file mode 100644 index 000000000..c8cb97553 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/annealed_copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:annealed_copper_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/copper.json b/src/generated/resources/data/c/tags/item/wires/copper.json new file mode 100644 index 000000000..281862a2f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:copper_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/cupronickel.json b/src/generated/resources/data/c/tags/item/wires/cupronickel.json new file mode 100644 index 000000000..21adf5b57 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/cupronickel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:cupronickel_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/electrum.json b/src/generated/resources/data/c/tags/item/wires/electrum.json new file mode 100644 index 000000000..ddf1c2dee --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/electrum.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:electrum_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/kanthal.json b/src/generated/resources/data/c/tags/item/wires/kanthal.json new file mode 100644 index 000000000..20554a054 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/kanthal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:kanthal_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/platinum.json b/src/generated/resources/data/c/tags/item/wires/platinum.json new file mode 100644 index 000000000..4d8e135b3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/platinum.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:platinum_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/silver.json b/src/generated/resources/data/c/tags/item/wires/silver.json new file mode 100644 index 000000000..af3f6f589 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/silver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:silver_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/superconductor.json b/src/generated/resources/data/c/tags/item/wires/superconductor.json new file mode 100644 index 000000000..dbac5294c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/superconductor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:superconductor_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/wires/tin.json b/src/generated/resources/data/c/tags/item/wires/tin.json new file mode 100644 index 000000000..f0456073b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/wires/tin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "modern_industrialization:tin_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json index c113fbf8c..6db847b12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "tag": "c:wires/aluminum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json index bc4d86306..2739a69c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "tag": "c:wires/aluminum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json index 1378a757b..c30cd8a7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:aluminum_wire" + "tag": "c:wires/aluminum" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json index 0b83564b4..079fb6ded 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_wire" + "tag": "c:wires/aluminum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json index cfc0407b2..609cd221e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "tag": "c:wires/aluminum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json index a8e168d74..469ec41d1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "tag": "c:wires/annealed_copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json index 9ecda3dff..4b7d77049 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "tag": "c:wires/annealed_copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json index afb6c1050..a967c1c8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:annealed_copper_wire" + "tag": "c:wires/annealed_copper" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json index 11196f57c..40162daad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_wire" + "tag": "c:wires/annealed_copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json index fdf1d4052..a281e935a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "tag": "c:wires/annealed_copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json index 31e95a409..274928339 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json index 58d4a4ea7..3e4bf9b92 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json index 33698b776..0a3cebd12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json index 55ae6bb93..c86ac543a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json index 95108c222..900f17019 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json index ba116c5f0..623728403 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_wire" + "tag": "c:wires/copper" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json index 978dcb3aa..385a5e520 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json index c2b3a29d9..8ee7b4382 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json index 8efa58aee..9646eaca4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json index 78a56d9ee..eeb24d904 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json index f7e74726c..146f506dc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json index 353cf9ef0..0b2b0f242 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_wire" + "tag": "c:wires/cupronickel" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json index e7fb86515..7c4750cae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json index 1d8aeec3f..57e9e9fc5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json index 39c5f3514..3cb535622 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json index 5807f2d80..2eab763c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json index c4c8dd9f9..af1e1baf7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json index dade5c2cf..e0c8b03d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_wire" + "tag": "c:wires/electrum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json index 68c90d328..6896c4062 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "tag": "c:wires/kanthal" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json index 9451f98e1..c71ab7c60 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "tag": "c:wires/kanthal" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json index 189457d92..837f9a858 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:kanthal_wire" + "tag": "c:wires/kanthal" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json index c74f4756e..df2cf358e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_wire" + "tag": "c:wires/kanthal" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json index 944a14ab9..9e39fdafe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "tag": "c:wires/kanthal" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json index e3779de72..b69e66f08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json index b561fc7f9..8bf444095 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json index 01dc18bbd..1a9b2e27a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json index 72dd66fd3..f00838663 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json index beefd464d..bafa29fde 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json index 1a3d07486..e16ab2b71 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_wire" + "tag": "c:wires/platinum" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json index 3ce9da608..c1c59d8b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:silver_wire" + "tag": "c:wires/silver" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json index 243117429..f71c31819 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:silver_wire" + "tag": "c:wires/silver" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json index 35ab75d2e..01a935589 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:silver_wire" + "tag": "c:wires/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json index 0dc7426a0..c1918fc9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silver_wire" + "tag": "c:wires/silver" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json index 9a1cceb4d..3482c72d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:silver_wire" + "tag": "c:wires/silver" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json index f97e97e91..b2e637fa4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_wire" + "tag": "c:wires/superconductor" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json index 55cd84ab4..dc9165720 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:tin_wire" + "tag": "c:wires/tin" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json index 2fcdbaa08..0d9df4140 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json @@ -11,7 +11,7 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:tin_wire" + "tag": "c:wires/tin" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json index d771d6e53..78669dcdc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json @@ -6,7 +6,7 @@ "item": "modern_industrialization:rubber_sheet" }, "w": { - "item": "modern_industrialization:tin_wire" + "tag": "c:wires/tin" } }, "pattern": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json index 85b761a38..82a957c40 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_wire" + "tag": "c:wires/tin" } ], "item_outputs": [ diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json index 2b16632c4..cc0349ef6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json @@ -9,7 +9,7 @@ }, { "amount": 3, - "item": "modern_industrialization:tin_wire" + "tag": "c:wires/tin" } ], "item_outputs": [ diff --git a/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java b/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java index 58c1ae53c..8fbf6b41e 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java @@ -27,6 +27,8 @@ import aztech.modern_industrialization.datagen.tag.TagsToGenerate; import aztech.modern_industrialization.items.SortOrder; +import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -101,20 +103,26 @@ public class MIParts { public static final PartTemplate[] ITEM_PURE_METAL = new PartTemplate[] { INGOT, NUGGET, TINY_DUST, DUST }; public static final List TAGGED_PARTS_LIST = PartKeyProvider.of(BLOCK, DUST, GEAR, INGOT, NUGGET, ORE, PLATE, ROD, - TINY_DUST, RAW_METAL, RAW_METAL_BLOCK); + TINY_DUST, RAW_METAL, RAW_METAL_BLOCK, WIRE); public static final Set TAGGED_PARTS = new HashSet<>(TAGGED_PARTS_LIST); - public static final Map CATEGORY_TAGS = Map.of( - BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks"), - DUST.key(), new CategoryTag(Tags.Items.DUSTS, "Dusts"), - GEAR.key(), new CategoryTag("c:gears", "Gears"), - INGOT.key(), new CategoryTag(Tags.Items.INGOTS, "Ingots"), - NUGGET.key(), new CategoryTag(Tags.Items.NUGGETS, "Nuggets"), - PLATE.key(), new CategoryTag("c:plates", "Plates"), - ROD.key(), new CategoryTag(Tags.Items.RODS, "Rods"), - RAW_METAL.key(), new CategoryTag(Tags.Items.RAW_MATERIALS, "Raw Ores"), - TINY_DUST.key(), new CategoryTag("c:tiny_dusts", "Tiny Dusts"), - RAW_METAL_BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks")); + public static final Map CATEGORY_TAGS; + + static { + Map categoryTags = new HashMap<>(); + categoryTags.put(BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks")); + categoryTags.put(DUST.key(), new CategoryTag(Tags.Items.DUSTS, "Dusts")); + categoryTags.put(GEAR.key(), new CategoryTag("c:gears", "Gears")); + categoryTags.put(INGOT.key(), new CategoryTag(Tags.Items.INGOTS, "Ingots")); + categoryTags.put(NUGGET.key(), new CategoryTag(Tags.Items.NUGGETS, "Nuggets")); + categoryTags.put(PLATE.key(), new CategoryTag("c:plates", "Plates")); + categoryTags.put(ROD.key(), new CategoryTag(Tags.Items.RODS, "Rods")); + categoryTags.put(RAW_METAL.key(), new CategoryTag(Tags.Items.RAW_MATERIALS, "Raw Ores")); + categoryTags.put(TINY_DUST.key(), new CategoryTag("c:tiny_dusts", "Tiny Dusts")); + categoryTags.put(RAW_METAL_BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks")); + categoryTags.put(WIRE.key(), new CategoryTag("c:wires", "Wires")); + CATEGORY_TAGS = Collections.unmodifiableMap(categoryTags); + } public record CategoryTag(String tag, String englishName) { public CategoryTag(TagKey tag, String englishName) {