diff --git a/injected_interfaces/interfaces.json b/injected_interfaces/interfaces.json index 01ee4dec99d..c880b3b3115 100644 --- a/injected_interfaces/interfaces.json +++ b/injected_interfaces/interfaces.json @@ -11,5 +11,11 @@ "net/minecraft/world/entity/Entity": [ "com/gregtechceu/gtceu/core/IFireImmuneEntity", "com/gregtechceu/gtceu/core/IBreathingEntity" + ], + "net/minecraft/data/tags/TagsProvider$TagAppender": [ + "com/gregtechceu/gtceu/core/util/extensions/TagAppenderExt" + ], + "net/minecraft/data/tags/IntrinsicHolderTagsProvider$IntrinsicTagAppender": [ + "com/gregtechceu/gtceu/core/util/extensions/IntrinsicTagAppenderExt" ] } diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 84975d6c9ce..ecdf47f17a3 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -4089,7 +4089,6 @@ "gui.gtceu.share_tank.desc.0": "¡ɹǝɟɟnq uıɥʇıʍ suɹǝʇʇɐd ןןɐ ɥʇıʍ ˙ɔʇǝ/sǝssɐb/spınןɟ pǝʇɹǝsuı sǝɹɐɥS", "gui.gtceu.share_tank.title": "ʎɹoʇuǝʌuI ʞuɐ⟘ pǝɹɐɥS", "gui.widget.incrementButton.default_tooltip": "ʇunoɯɐ ǝɥʇ ǝbuɐɥɔ oʇ ɥʇoq ɹo ןɹʇƆ 'ʇɟıɥS pןoH", - "item.glass_lens": ")ǝʇıɥM( suǝꞀ ssɐן⅁", "item.gtceu.activity_detector_cover": "ɹoʇɔǝʇǝᗡ ʎʇıʌıʇɔⱯ", "item.gtceu.activity_detector_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuoʇspǝᴚ sɐ ㄥ§snʇɐʇS ʎʇıʌıʇɔⱯɟ§ ʇno sǝʌı⅁ㄥ§", "item.gtceu.advanced_activity_detector_cover": "ɹoʇɔǝʇǝᗡ ʎʇıʌıʇɔⱯ pǝɔuɐʌpⱯ", @@ -4344,6 +4343,7 @@ "item.gtceu.gelled_toluene": "ǝuǝnןo⟘ pǝןןǝ⅁", "item.gtceu.gelled_toluene.tooltip": "ǝʌısoןdxƎ ʍɐᴚㄥ§", "item.gtceu.glass_gem": "ןɐʇsʎɹƆ ssɐן⅁", + "item.gtceu.glass_lens": ")ǝʇıɥM( suǝꞀ ssɐן⅁", "item.gtceu.glass_plate": "ǝuɐԀ ssɐן⅁", "item.gtceu.glass_tube": "ǝqn⟘ ssɐן⅁", "item.gtceu.glass_vial": "ןɐıΛ ssɐן⅁ %s", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index f94f30531e5..c188a3baf73 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -4089,7 +4089,6 @@ "gui.gtceu.share_tank.desc.0": "Shares inserted fluids/gasses/etc. with all patterns within buffer!", "gui.gtceu.share_tank.title": "Shared Tank Inventory", "gui.widget.incrementButton.default_tooltip": "Hold Shift, Ctrl or both to change the amount", - "item.glass_lens": "Glass Lens (White)", "item.gtceu.activity_detector_cover": "Activity Detector", "item.gtceu.activity_detector_cover.tooltip": "§7Gives out §fActivity Status§7 as Redstone as §fCover§7.", "item.gtceu.advanced_activity_detector_cover": "Advanced Activity Detector", @@ -4344,6 +4343,7 @@ "item.gtceu.gelled_toluene": "Gelled Toluene", "item.gtceu.gelled_toluene.tooltip": "§7Raw Explosive", "item.gtceu.glass_gem": "Glass Crystal", + "item.gtceu.glass_lens": "Glass Lens (White)", "item.gtceu.glass_plate": "Glass Pane", "item.gtceu.glass_tube": "Glass Tube", "item.gtceu.glass_vial": "%s Glass Vial", diff --git a/src/generated/resources/data/forge/tags/items/enchanting_fuels.json b/src/generated/resources/data/forge/tags/items/enchanting_fuels.json index af8573ee689..a3e7c739bca 100644 --- a/src/generated/resources/data/forge/tags/items/enchanting_fuels.json +++ b/src/generated/resources/data/forge/tags/items/enchanting_fuels.json @@ -1,6 +1,12 @@ { "values": [ - "gtceu:lazurite_gem", - "gtceu:sodalite_gem" + { + "id": "gtceu:lazurite_gem", + "required": false + }, + { + "id": "gtceu:sodalite_gem", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/grain/wheat.json b/src/generated/resources/data/forge/tags/items/grain/wheat.json index 89f26fbe7dd..acd33ab8b9b 100644 --- a/src/generated/resources/data/forge/tags/items/grain/wheat.json +++ b/src/generated/resources/data/forge/tags/items/grain/wheat.json @@ -1,5 +1,8 @@ { "values": [ - "gtceu:wheat_dust" + { + "id": "gtceu:wheat_dust", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/blue.json b/src/generated/resources/data/forge/tags/items/lenses/blue.json deleted file mode 100644 index 09d35859a01..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtceu:sapphire_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/green.json b/src/generated/resources/data/forge/tags/items/lenses/green.json deleted file mode 100644 index 5f23e61502c..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtceu:emerald_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/light_blue.json b/src/generated/resources/data/forge/tags/items/lenses/light_blue.json deleted file mode 100644 index d4184a80ded..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtceu:diamond_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/purple.json b/src/generated/resources/data/forge/tags/items/lenses/purple.json deleted file mode 100644 index 69b2a888e34..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtceu:amethyst_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/red.json b/src/generated/resources/data/forge/tags/items/lenses/red.json deleted file mode 100644 index 9b995510ec0..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtceu:ruby_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/lenses/white.json b/src/generated/resources/data/forge/tags/items/lenses/white.json deleted file mode 100644 index 7242ec68170..00000000000 --- a/src/generated/resources/data/forge/tags/items/lenses/white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "gtceu:glass_lens", - "gtceu:nether_star_lens" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/rods/wooden.json b/src/generated/resources/data/forge/tags/items/rods/wooden.json index 8f1bd1515ef..3cadad07865 100644 --- a/src/generated/resources/data/forge/tags/items/rods/wooden.json +++ b/src/generated/resources/data/forge/tags/items/rods/wooden.json @@ -1,5 +1,8 @@ { "values": [ - "gtceu:treated_wood_rod" + { + "id": "gtceu:treated_wood_rod", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools.json b/src/generated/resources/data/forge/tags/items/tools.json new file mode 100644 index 00000000000..3213ad9b22d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools.json @@ -0,0 +1,23 @@ +{ + "values": [ + "#forge:tools/butchery_knives", + "#forge:tools/buzzsaws", + "#forge:tools/chainsaws", + "#forge:tools/crowbars", + "#forge:tools/drills", + "#forge:tools/files", + "#forge:tools/hammers", + "#forge:tools/knives", + "#forge:tools/mallets", + "#forge:tools/mining_hammers", + "#forge:tools/mortars", + "#forge:tools/plungers", + "#forge:tools/saws", + "#forge:tools/screwdrivers", + "#forge:tools/scythes", + "#forge:tools/shears", + "#forge:tools/spades", + "#forge:tools/wire_cutters", + "#forge:tools/wrenches" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/butchery_knives.json b/src/generated/resources/data/forge/tags/items/tools/butchery_knives.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/butchery_knives.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/buzzsaws.json b/src/generated/resources/data/forge/tags/items/tools/buzzsaws.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/buzzsaws.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/chainsaws.json b/src/generated/resources/data/forge/tags/items/tools/chainsaws.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/chainsaws.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/crowbars.json b/src/generated/resources/data/forge/tags/items/tools/crowbars.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/crowbars.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/drills.json b/src/generated/resources/data/forge/tags/items/tools/drills.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/drills.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/files.json b/src/generated/resources/data/forge/tags/items/tools/files.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/files.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/hammers.json b/src/generated/resources/data/forge/tags/items/tools/hammers.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/hammers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/knives.json b/src/generated/resources/data/forge/tags/items/tools/knives.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/knives.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/mallets.json b/src/generated/resources/data/forge/tags/items/tools/mallets.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/mallets.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/mining_hammers.json b/src/generated/resources/data/forge/tags/items/tools/mining_hammers.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/mining_hammers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/mortars.json b/src/generated/resources/data/forge/tags/items/tools/mortars.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/mortars.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/plungers.json b/src/generated/resources/data/forge/tags/items/tools/plungers.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/plungers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/saws.json b/src/generated/resources/data/forge/tags/items/tools/saws.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/saws.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/screwdrivers.json b/src/generated/resources/data/forge/tags/items/tools/screwdrivers.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/screwdrivers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/scythes.json b/src/generated/resources/data/forge/tags/items/tools/scythes.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/scythes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/shears.json b/src/generated/resources/data/forge/tags/items/tools/shears.json new file mode 100644 index 00000000000..5a4850b6f11 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/shears.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:shears" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/spades.json b/src/generated/resources/data/forge/tags/items/tools/spades.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/spades.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/wire_cutters.json b/src/generated/resources/data/forge/tags/items/tools/wire_cutters.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/wire_cutters.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/wrench.json b/src/generated/resources/data/forge/tags/items/tools/wrench.json new file mode 100644 index 00000000000..53eda599e27 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/wrench.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:tools/wrenches" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/wrenches.json b/src/generated/resources/data/forge/tags/items/tools/wrenches.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/tools/wrenches.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/blocks/logs/rubber.json b/src/generated/resources/data/gtceu/tags/blocks/logs/rubber.json new file mode 100644 index 00000000000..0e9a2d08096 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/blocks/logs/rubber.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:rubber_log" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits.json b/src/generated/resources/data/gtceu/tags/items/circuits.json index e97fd572287..fabc26c9e02 100644 --- a/src/generated/resources/data/gtceu/tags/items/circuits.json +++ b/src/generated/resources/data/gtceu/tags/items/circuits.json @@ -10,25 +10,10 @@ "#gtceu:circuits/zpm", "#gtceu:circuits/uv", "#gtceu:circuits/uhv", - { - "id": "#gtceu:circuits/uev", - "required": false - }, - { - "id": "#gtceu:circuits/uiv", - "required": false - }, - { - "id": "#gtceu:circuits/uxv", - "required": false - }, - { - "id": "#gtceu:circuits/opv", - "required": false - }, - { - "id": "#gtceu:circuits/max", - "required": false - } + "#gtceu:circuits/uev", + "#gtceu:circuits/uiv", + "#gtceu:circuits/uxv", + "#gtceu:circuits/opv", + "#gtceu:circuits/max" ] } \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits/max.json b/src/generated/resources/data/gtceu/tags/items/circuits/max.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/circuits/max.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits/opv.json b/src/generated/resources/data/gtceu/tags/items/circuits/opv.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/circuits/opv.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits/uev.json b/src/generated/resources/data/gtceu/tags/items/circuits/uev.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/circuits/uev.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits/uiv.json b/src/generated/resources/data/gtceu/tags/items/circuits/uiv.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/circuits/uiv.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/circuits/uxv.json b/src/generated/resources/data/gtceu/tags/items/circuits/uxv.json new file mode 100644 index 00000000000..f72d209df78 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/circuits/uxv.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses.json b/src/generated/resources/data/gtceu/tags/items/lenses.json new file mode 100644 index 00000000000..a6d0b7820b8 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses.json @@ -0,0 +1,21 @@ +{ + "values": [ + "#gtceu:lenses/white", + "#gtceu:lenses/orange", + "#gtceu:lenses/magenta", + "#gtceu:lenses/light_blue", + "#gtceu:lenses/yellow", + "#gtceu:lenses/lime", + "#gtceu:lenses/pink", + "#gtceu:lenses/gray", + "#gtceu:lenses/light_gray", + "#gtceu:lenses/cyan", + "#gtceu:lenses/purple", + "#gtceu:lenses/blue", + "#gtceu:lenses/brown", + "#gtceu:lenses/green", + "#gtceu:lenses/red", + "#gtceu:lenses/black", + "#gtceu:lenses/glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/black.json b/src/generated/resources/data/gtceu/tags/items/lenses/black.json new file mode 100644 index 00000000000..f2c63085314 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:black_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/blue.json b/src/generated/resources/data/gtceu/tags/items/lenses/blue.json new file mode 100644 index 00000000000..7e970ddd4b0 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:blue_glass_lens", + { + "id": "gtceu:sapphire_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/brown.json b/src/generated/resources/data/gtceu/tags/items/lenses/brown.json new file mode 100644 index 00000000000..aeba7f762cf --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:brown_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/cyan.json b/src/generated/resources/data/gtceu/tags/items/lenses/cyan.json new file mode 100644 index 00000000000..a3aaaf1cd1a --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:cyan_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/glass.json b/src/generated/resources/data/gtceu/tags/items/lenses/glass.json new file mode 100644 index 00000000000..98066efcbad --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/glass.json @@ -0,0 +1,19 @@ +{ + "values": [ + "gtceu:orange_glass_lens", + "gtceu:magenta_glass_lens", + "gtceu:light_blue_glass_lens", + "gtceu:yellow_glass_lens", + "gtceu:lime_glass_lens", + "gtceu:pink_glass_lens", + "gtceu:gray_glass_lens", + "gtceu:light_gray_glass_lens", + "gtceu:cyan_glass_lens", + "gtceu:purple_glass_lens", + "gtceu:blue_glass_lens", + "gtceu:brown_glass_lens", + "gtceu:green_glass_lens", + "gtceu:red_glass_lens", + "gtceu:black_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/gray.json b/src/generated/resources/data/gtceu/tags/items/lenses/gray.json new file mode 100644 index 00000000000..5f06bd705d2 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:gray_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/green.json b/src/generated/resources/data/gtceu/tags/items/lenses/green.json new file mode 100644 index 00000000000..38432bc1e3e --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/green.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:green_glass_lens", + { + "id": "gtceu:emerald_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/light_blue.json b/src/generated/resources/data/gtceu/tags/items/lenses/light_blue.json new file mode 100644 index 00000000000..7c1e7c51489 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/light_blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:light_blue_glass_lens", + { + "id": "gtceu:diamond_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/light_gray.json b/src/generated/resources/data/gtceu/tags/items/lenses/light_gray.json new file mode 100644 index 00000000000..9acf3f60e89 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:light_gray_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/lime.json b/src/generated/resources/data/gtceu/tags/items/lenses/lime.json new file mode 100644 index 00000000000..e0dfda3e834 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:lime_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/magenta.json b/src/generated/resources/data/gtceu/tags/items/lenses/magenta.json new file mode 100644 index 00000000000..39c9fecf6e4 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:magenta_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/orange.json b/src/generated/resources/data/gtceu/tags/items/lenses/orange.json new file mode 100644 index 00000000000..0c1e624add8 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:orange_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/pink.json b/src/generated/resources/data/gtceu/tags/items/lenses/pink.json new file mode 100644 index 00000000000..d54ba54ac8d --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:pink_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/purple.json b/src/generated/resources/data/gtceu/tags/items/lenses/purple.json new file mode 100644 index 00000000000..cf6fd947f89 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/purple.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:purple_glass_lens", + { + "id": "gtceu:amethyst_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/red.json b/src/generated/resources/data/gtceu/tags/items/lenses/red.json new file mode 100644 index 00000000000..0f041e8116e --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/red.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:red_glass_lens", + { + "id": "gtceu:ruby_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/white.json b/src/generated/resources/data/gtceu/tags/items/lenses/white.json new file mode 100644 index 00000000000..56a99aded90 --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/white.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "gtceu:glass_lens", + "required": false + }, + { + "id": "gtceu:nether_star_lens", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/tags/items/lenses/yellow.json b/src/generated/resources/data/gtceu/tags/items/lenses/yellow.json new file mode 100644 index 00000000000..becf9a81bea --- /dev/null +++ b/src/generated/resources/data/gtceu/tags/items/lenses/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:yellow_glass_lens" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json index 19c49ee8bee..df7047bed6a 100644 --- a/src/generated/resources/data/minecraft/tags/items/planks.json +++ b/src/generated/resources/data/minecraft/tags/items/planks.json @@ -1,7 +1,13 @@ { "values": [ "gtceu:rubber_planks", - "gtceu:treated_wood_plate", - "gtceu:wood_plate" + { + "id": "gtceu:treated_wood_plate", + "required": false + }, + { + "id": "gtceu:wood_plate", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/java/com/gregtechceu/gtceu/api/GTValues.java b/src/main/java/com/gregtechceu/gtceu/api/GTValues.java index 9307c1f4d1e..ee1b821f8af 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/GTValues.java +++ b/src/main/java/com/gregtechceu/gtceu/api/GTValues.java @@ -296,11 +296,6 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) { "Ultra High Voltage", "Ultra Excessive Voltage", "Ultra Immense Voltage", "Ultra Extreme Voltage", "Overpowered Voltage", "Maximum Voltage" }; - public static final String[] COLORS = new String[] { - "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", - "purple", "blue", "brown", "green", "red", "black" - }; - /** * Used to tell if any high-tier machine (UHV+) was registered. */ diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java index 2e7a12f3bb7..9ebb1464f32 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.common.item.GTBucketItem; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.network.chat.Component; import net.minecraft.util.StringRepresentable; @@ -117,7 +117,7 @@ public boolean isProtected(LivingEntity livingEntity) { ItemStack armor = livingEntity.getItemBySlot(equipmentType.getSlot()); if (!armor.isEmpty() && ((armor.getItem() instanceof ArmorComponentItem armorItem && armorItem.getArmorLogic().isPPE()) || - armor.getTags().anyMatch(tag -> tag.equals(CustomTags.PPE_ARMOR)))) { + armor.getTags().anyMatch(tag -> tag.equals(GTTags.Items.PPE_ARMOR)))) { correctArmorItems.add(equipmentType); } } @@ -136,7 +136,7 @@ public boolean isProtected(LivingEntity livingEntity) { ItemStack armor = result.stack(); if (!armor.isEmpty() && ((armor.getItem() instanceof ArmorComponentItem armorItem && armorItem.getArmorLogic().isPPE()) || - armor.getTags().anyMatch(tag -> tag.equals(CustomTags.PPE_ARMOR)))) { + armor.getTags().anyMatch(tag -> tag.equals(GTTags.Items.PPE_ARMOR)))) { correctCurios.add(result.slotContext().identifier()); } } @@ -150,7 +150,7 @@ public void damageEquipment(Player player, int amount) { ItemStack armor = player.getItemBySlot(type.getSlot()); if (!armor.isEmpty() && ((armor.getItem() instanceof ArmorComponentItem armorItem && armorItem.getArmorLogic().isPPE()) || - armor.getTags().anyMatch(tag -> tag.equals(CustomTags.PPE_ARMOR)))) { + armor.getTags().anyMatch(tag -> tag.equals(GTTags.Items.PPE_ARMOR)))) { armor.hurtAndBreak(amount, player, p -> p.broadcastBreakEvent(type.getSlot())); } } @@ -166,7 +166,7 @@ public void damageEquipment(Player player, int amount) { ItemStack armor = stackHandler.getStackInSlot(i); if (!armor.isEmpty() && ((armor.getItem() instanceof ArmorComponentItem armorItem && armorItem.getArmorLogic().isPPE()) || - armor.getTags().anyMatch(tag -> tag.equals(CustomTags.PPE_ARMOR)))) { + armor.getTags().anyMatch(tag -> tag.equals(GTTags.Items.PPE_ARMOR)))) { armor.hurtAndBreak(amount, player, p -> {}); } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java index 1a31777c85c..2c3027e5fcf 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java @@ -23,7 +23,7 @@ import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.integration.kjs.GTRegistryInfo; import com.gregtechceu.gtceu.integration.recipeviewer.widgets.GTOreByProduct; import com.gregtechceu.gtceu.utils.FormattingUtil; @@ -620,8 +620,8 @@ public boolean isEmpty() { // 3/4 of a Plate or Gem used to shape a Lens. Normally only used on Transparent Materials. public static final TagPrefix lens = new TagPrefix(GTCEu.id("lens")) - .defaultTagPath("lenses/%s") - .unformattedTagPath("lenses") + .defaultGTCEuTagPath("lenses/%s") + .unformattedGTCEuTagPath("lenses") .materialAmount((GTValues.M * 3) / 4) .materialIconType(MaterialIconType.lens) .unificationEnabled(true) @@ -769,7 +769,7 @@ public boolean isEmpty() { .langValue("%s Frame") .materialAmount(GTValues.M * 2) .materialIconType(MaterialIconType.frameGt) - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .unificationEnabled(true) .enableRecycling() .generateBlock(true) @@ -781,35 +781,35 @@ public boolean isEmpty() { public static final TagPrefix pipeTinyFluid = new TagPrefix(GTCEu.id("pipeTinyFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Tiny %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M / 2) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeSmallFluid = new TagPrefix(GTCEu.id("pipeSmallFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Small %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeNormalFluid = new TagPrefix(GTCEu.id("pipeNormalFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Normal %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 3) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeLargeFluid = new TagPrefix(GTCEu.id("pipeLargeFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Large %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 6) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeHugeFluid = new TagPrefix(GTCEu.id("pipeHugeFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Huge %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 12) .unificationEnabled(true) .enableRecycling(); @@ -817,14 +817,14 @@ public boolean isEmpty() { public static final TagPrefix pipeQuadrupleFluid = new TagPrefix(GTCEu.id("pipeQuadrupleFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Quadruple %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 4) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeNonupleFluid = new TagPrefix(GTCEu.id("pipeNonupleFluid")) .itemTable(() -> GTMaterialBlocks.FLUID_PIPE_BLOCKS) .langValue("Nonuple %s Fluid Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 9) .unificationEnabled(true) .enableRecycling(); @@ -832,28 +832,28 @@ public boolean isEmpty() { public static final TagPrefix pipeSmallItem = new TagPrefix(GTCEu.id("pipeSmallItem")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS) .langValue("Small %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeNormalItem = new TagPrefix(GTCEu.id("pipeNormalItem")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS) .langValue("Normal %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 3) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeLargeItem = new TagPrefix(GTCEu.id("pipeLargeItem")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS) .langValue("Large %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 6) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeHugeItem = new TagPrefix(GTCEu.id("pipeHugeItem")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS) .langValue("Huge %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M * 12) .unificationEnabled(true) .enableRecycling(); @@ -861,23 +861,23 @@ public boolean isEmpty() { public static final TagPrefix pipeSmallRestrictive = new TagPrefix(GTCEu.id("pipeSmallRestrictive")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS) .langValue("Small Restrictive %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .materialAmount(GTValues.M) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeNormalRestrictive = new TagPrefix(GTCEu.id("pipeNormalRestrictive")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS).langValue("Normal Restrictive %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 3) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 3) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeLargeRestrictive = new TagPrefix(GTCEu.id("pipeLargeRestrictive")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS).langValue("Large Restrictive %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 6) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 6) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix pipeHugeRestrictive = new TagPrefix(GTCEu.id("pipeHugeRestrictive")) .itemTable(() -> GTMaterialBlocks.ITEM_PIPE_BLOCKS).langValue("Huge Restrictive %s Item Pipe") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 12) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH).materialAmount(GTValues.M * 12) .unificationEnabled(true) .enableRecycling(); @@ -885,7 +885,7 @@ public boolean isEmpty() { public static final TagPrefix wireGtHex = new TagPrefix(GTCEu.id("wireGtHex")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("16x %s Wire") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 8) .materialIconType(MaterialIconType.wire) .unificationEnabled(true) @@ -893,7 +893,7 @@ public boolean isEmpty() { public static final TagPrefix wireGtOctal = new TagPrefix(GTCEu.id("wireGtOctal")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("8x %s Wire") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 4) .materialIconType(MaterialIconType.wire) .unificationEnabled(true) @@ -901,7 +901,7 @@ public boolean isEmpty() { public static final TagPrefix wireGtQuadruple = new TagPrefix(GTCEu.id("wireGtQuadruple")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("4x %s Wire") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 2) .materialIconType(MaterialIconType.wire) .unificationEnabled(true) @@ -909,7 +909,7 @@ public boolean isEmpty() { public static final TagPrefix wireGtDouble = new TagPrefix(GTCEu.id("wireGtDouble")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("2x %s Wire") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M) .materialIconType(MaterialIconType.wire) .unificationEnabled(true) @@ -917,7 +917,7 @@ public boolean isEmpty() { public static final TagPrefix wireGtSingle = new TagPrefix(GTCEu.id("wireGtSingle")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("1x %s Wire") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M / 2) .materialIconType(MaterialIconType.wire) .unificationEnabled(true) @@ -926,34 +926,34 @@ public boolean isEmpty() { public static final TagPrefix cableGtHex = new TagPrefix(GTCEu.id("cableGtHex")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("16x %s Cable") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 8) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix cableGtOctal = new TagPrefix(GTCEu.id("cableGtOctal")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("8x %s Cable") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 4) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix cableGtQuadruple = new TagPrefix(GTCEu.id("cableGtQuadruple")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS).langValue("4x %s Cable") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M * 2) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix cableGtDouble = new TagPrefix(GTCEu.id("cableGtDouble")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("2x %s Cable") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M) .unificationEnabled(true) .enableRecycling(); public static final TagPrefix cableGtSingle = new TagPrefix(GTCEu.id("cableGtSingle")) .itemTable(() -> GTMaterialBlocks.CABLE_BLOCKS) .langValue("1x %s Cable") - .miningToolTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .miningToolTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .materialAmount(GTValues.M / 2) .unificationEnabled(true) .enableRecycling(); @@ -1146,6 +1146,11 @@ public TagPrefix defaultTagPath(String path, boolean isVanilla) { return this; } + public TagPrefix defaultGTCEuTagPath(String path) { + this.tags.add(TagType.withGTNamespaceDefaultFormatter(path)); + return this; + } + public TagPrefix prefixTagPath(String path) { this.tags.add(TagType.withPrefixFormatter(path)); return this; @@ -1165,6 +1170,11 @@ public TagPrefix unformattedTagPath(String path, boolean isVanilla) { return this; } + public TagPrefix unformattedGTCEuTagPath(String path) { + this.tags.add(TagType.withGTNamespaceNoFormatter(path)); + return this; + } + public TagPrefix customTagPath(String path, BiFunction> formatter) { this.tags.add(TagType.withCustomFormatter(path, formatter)); return this; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java index e0c01fe8ab0..fb26824d2ba 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java @@ -33,6 +33,16 @@ public static TagType withDefaultFormatter(String tagPath, boolean isVanilla) { return type; } + /** + * Create a tag with a specified path, with the "default" formatter, meaning + * that there is 1 "%s" format character in the path, intended for the Material name. + */ + public static TagType withGTNamespaceDefaultFormatter(String tagPath) { + TagType type = new TagType(tagPath); + type.formatter = (prefix, mat) -> TagUtil.createModItemTag(type.tagPath.formatted(mat.getName())); + return type; + } + /** * Create a tag with a specified path, with the "default" formatter, meaning * that there is 2 "%s" format characters in the path, with the first being the @@ -64,6 +74,13 @@ public static TagType withNoFormatter(String tagPath, boolean isVanilla) { return type; } + public static TagType withGTNamespaceNoFormatter(String tagPath) { + TagType type = new TagType(tagPath); + type.formatter = (prefix, material) -> TagUtil.createModItemTag(type.tagPath); + type.isParentTag = true; + return type; + } + public static TagType withCustomFormatter(String tagPath, BiFunction> formatter) { TagType type = new TagType(tagPath); type.formatter = formatter; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java index 5d3bca68002..a4371dd7cc0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGeneratorUtils.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.data.worldgen.generator.IndicatorGenerator; import com.gregtechceu.gtceu.api.data.worldgen.generator.VeinGenerator; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.WeightedEntry; import net.minecraft.core.BlockPos; @@ -33,7 +33,7 @@ public class WorldGeneratorUtils { - public static final RuleTest END_ORE_REPLACEABLES = new TagMatchTest(CustomTags.ENDSTONE_ORE_REPLACEABLES); + public static final RuleTest END_ORE_REPLACEABLES = new TagMatchTest(GTTags.Blocks.ENDSTONE_ORE_REPLACEABLES); private static final Map oreVeinCache = new WeakHashMap<>(); diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java index d6d684f2149..ff3ccc43ccb 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/FluidState.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.fluids; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; @@ -11,9 +11,9 @@ public enum FluidState { - LIQUID("gtceu.fluid.state_liquid", CustomTags.LIQUID_FLUIDS), + LIQUID("gtceu.fluid.state_liquid", GTTags.Fluids.LIQUID), GAS("gtceu.fluid.state_gas", Tags.Fluids.GASEOUS), - PLASMA("gtceu.fluid.state_plasma", CustomTags.PLASMA_FLUIDS), + PLASMA("gtceu.fluid.state_plasma", GTTags.Fluids.PLASMATIC), ; @Getter diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java index 712e56e0672..49ac9dff67e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKeys.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.fluids.FluidState; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import org.jetbrains.annotations.NotNull; @@ -41,7 +41,7 @@ public final class FluidStorageKeys { m -> "gtceu.fluid.plasma", FluidState.PLASMA, -1); - public static final FluidStorageKey MOLTEN = new FluidStorageKey(GTCEu.id("molten"), CustomTags.MOLTEN_FLUIDS, + public static final FluidStorageKey MOLTEN = new FluidStorageKey(GTCEu.id("molten"), GTTags.Fluids.MOLTEN, MaterialIconType.molten, m -> "molten_" + m.getName(), m -> "gtceu.fluid.molten", diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java index b6c2c8b76fa..e328b912836 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.common.data.item.GTToolActions; import com.gregtechceu.gtceu.common.item.tool.behavior.*; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; @@ -95,7 +95,7 @@ public class GTToolType { .build(); public static final GTToolType MINING_HAMMER = GTToolType.builder("mining_hammer") - .toolTag(ToolItemTagType.MATCH, CustomTags.MINING_HAMMERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_MINING_HAMMERS) .harvestTag(BlockTags.MINEABLE_WITH_PICKAXE) .toolStats(b -> b.blockBreaking().aoe(1, 1, 0) .efficiencyMultiplier(0.4F).attackDamage(1.5F).attackSpeed(-3.2F) @@ -106,7 +106,7 @@ public class GTToolType { .materialAmount(6 * GTValues.M) .build(); public static final GTToolType SPADE = GTToolType.builder("spade") - .toolTag(ToolItemTagType.MATCH, CustomTags.SPADES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SPADES) .harvestTag(BlockTags.MINEABLE_WITH_SHOVEL) .toolStats(b -> b.blockBreaking().aoe(1, 1, 0) .efficiencyMultiplier(0.4F).attackDamage(1.5F).attackSpeed(-3.2F) @@ -119,7 +119,7 @@ public class GTToolType { .materialAmount(3 * GTValues.M) .build(); public static final GTToolType SCYTHE = GTToolType.builder("scythe") - .toolTag(ToolItemTagType.MATCH, CustomTags.SCYTHES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SCYTHES) .harvestTag(BlockTags.MINEABLE_WITH_HOE) .toolStats(b -> b.blockBreaking().attacking() .attackDamage(5.0F).attackSpeed(-3.0F).durabilityMultiplier(3.0F) @@ -134,9 +134,9 @@ public class GTToolType { .build(); public static final GTToolType SAW = GTToolType.builder("saw") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SAWS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SAWS) - .harvestTag(CustomTags.MINEABLE_WITH_SAW) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SAWS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_SAW) .toolStats(b -> b.crafting().damagePerCraftingAction(2) .attackDamage(-1.0F).attackSpeed(-2.6F) .behaviors(HarvestIceBehavior.INSTANCE)) @@ -146,9 +146,9 @@ public class GTToolType { .materialAmount(2 * GTValues.M) .build(); public static final GTToolType HARD_HAMMER = GTToolType.builder("hammer") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_HAMMERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.HAMMERS) - .harvestTag(CustomTags.MINEABLE_WITH_HAMMER) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_HAMMERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_HAMMERS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_HAMMER) .harvestTag(BlockTags.MINEABLE_WITH_PICKAXE) .toolStats(b -> b.blockBreaking().crafting().damagePerCraftingAction(2) .attackDamage(1.0F).attackSpeed(-2.8F) @@ -161,8 +161,8 @@ public class GTToolType { .materialAmount(6 * GTValues.M) .build(); public static final GTToolType SOFT_MALLET = GTToolType.builder("mallet") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_MALLETS) - .toolTag(ToolItemTagType.MATCH, CustomTags.MALLETS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_MALLETS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_MALLETS) .toolStats(b -> b.crafting().cannotAttack().attackSpeed(-2.4F).sneakBypassUse() .behaviors(ToolModeSwitchBehavior.INSTANCE)) .sound(GTSoundEntries.SOFT_MALLET_TOOL) @@ -171,10 +171,9 @@ public class GTToolType { .materialAmount(6 * GTValues.M) .build(); public static final GTToolType WRENCH = GTToolType.builder("wrench") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCH) - .harvestTag(CustomTags.MINEABLE_WITH_WRENCH) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WRENCHES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WRENCHES) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WRENCH) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .attackDamage(1.0F).attackSpeed(-2.8F) .behaviors(BlockRotatingBehavior.INSTANCE, new EntityDamageBehavior(3.0F, IronGolem.class), @@ -185,8 +184,8 @@ public class GTToolType { .materialAmount(4 * GTValues.M) .build(); public static final GTToolType FILE = GTToolType.builder("file") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_FILES) - .toolTag(ToolItemTagType.MATCH, CustomTags.FILES) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_FILES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_FILES) .toolStats(b -> b.crafting().damagePerCraftingAction(4) .cannotAttack().attackSpeed(-2.4F)) .sound(GTSoundEntries.FILE_TOOL) @@ -194,9 +193,9 @@ public class GTToolType { .materialAmount(2 * GTValues.M) .build(); public static final GTToolType CROWBAR = GTToolType.builder("crowbar") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_CROWBARS) - .toolTag(ToolItemTagType.MATCH, CustomTags.CROWBARS) - .harvestTag(CustomTags.MINEABLE_WITH_CROWBAR) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_CROWBARS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_CROWBARS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_CROWBAR) .toolStats(b -> b.blockBreaking().crafting() .attackDamage(2.0F).attackSpeed(-2.4F) .sneakBypassUse().behaviors(RotateRailBehavior.INSTANCE)) @@ -206,8 +205,8 @@ public class GTToolType { .materialAmount(3 * GTValues.M / 2) .build(); public static final GTToolType SCREWDRIVER = GTToolType.builder("screwdriver") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SCREWDRIVERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SCREWDRIVERS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SCREWDRIVERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SCREWDRIVERS) .toolStats(b -> b.crafting().damagePerCraftingAction(4).sneakBypassUse() .attackDamage(-1.0F).attackSpeed(3.0F) .behaviors(new EntityDamageBehavior(3.0F, Spider.class))) @@ -217,17 +216,17 @@ public class GTToolType { .materialAmount(GTValues.M) .build(); public static final GTToolType MORTAR = GTToolType.builder("mortar") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_MORTARS) - .toolTag(ToolItemTagType.MATCH, CustomTags.MORTARS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_MORTARS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_MORTARS) .toolStats(b -> b.crafting().damagePerCraftingAction(2).cannotAttack().attackSpeed(-2.4F)) .sound(GTSoundEntries.MORTAR_TOOL) .symbol('m') .materialAmount(2 * GTValues.M) .build(); public static final GTToolType WIRE_CUTTER = GTToolType.builder("wire_cutter") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WIRE_CUTTERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.WIRE_CUTTERS) - .harvestTag(CustomTags.MINEABLE_WITH_WIRE_CUTTER) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WIRE_CUTTERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WIRE_CUTTERS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WIRE_CUTTER) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .damagePerCraftingAction(4).attackDamage(-1.0F).attackSpeed(-2.4F)) .sound(GTSoundEntries.WIRECUTTER_TOOL, true) @@ -236,9 +235,9 @@ public class GTToolType { .materialAmount(4 * GTValues.M) // 3 plates + 2 rods .build(); public static final GTToolType KNIFE = GTToolType.builder("knife") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_KNIVES) - .toolTag(ToolItemTagType.MATCH, CustomTags.KNIVES) - .harvestTag(CustomTags.MINEABLE_WITH_KNIFE) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_KNIVES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_KNIVES) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_KNIFE) .toolStats(b -> b.crafting().attacking().attackSpeed(3.0F)) .constructor(GTSwordItem::new) .symbol('k') @@ -247,7 +246,7 @@ public class GTToolType { .materialAmount(GTValues.M) .build(); public static final GTToolType BUTCHERY_KNIFE = GTToolType.builder("butchery_knife") - .toolTag(ToolItemTagType.MATCH, CustomTags.BUTCHERY_KNIVES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_BUTCHERY_KNIVES) .toolStats(b -> b.attacking().attackDamage(1.5F).attackSpeed(-1.3F) .defaultEnchantment(Enchantments.MOB_LOOTING, 3)) .constructor(GTSwordItem::new) @@ -256,21 +255,21 @@ public class GTToolType { // public static GTToolType GRAFTER = new GTToolType("grafter", 1, 1, GTCEu.id("item/tools/handle_hammer"), // GTCEu.id("item/tools/hammer")); public static final GTToolType PLUNGER = GTToolType.builder("plunger") - .toolTag(ToolItemTagType.MATCH, CustomTags.PLUNGERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_PLUNGERS) .toolStats(b -> b.cannotAttack().attackSpeed(-2.4F).sneakBypassUse() .behaviors(PlungerBehavior.INSTANCE)) .sound(GTSoundEntries.PLUNGER_TOOL) .build(); public static final GTToolType SHEARS = GTToolType.builder("shears") - .toolTag(ToolItemTagType.MATCH, CustomTags.SHEARS) - .harvestTag(CustomTags.MINEABLE_WITH_SHEARS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SHEARS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_SHEARS) .toolStats(b -> b.blockBreaking().attackDamage(1.0F).attackSpeed(-2.8F) .behaviors(ShearBehavior.INSTANCE)) .defaultActions(ToolActions.SHEARS_DIG) .build(); public static final GTToolType DRILL_LV = GTToolType.builder("lv_drill") .idFormat("lv_%s_drill") - .toolTag(ToolItemTagType.MATCH, CustomTags.DRILLS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_DRILLS) .toolTag(ItemTags.PICKAXES) .toolTag(ItemTags.SHOVELS) .toolTag(ItemTags.HOES) @@ -289,7 +288,7 @@ public class GTToolType { .build(); public static final GTToolType DRILL_MV = GTToolType.builder("mv_drill") .idFormat("mv_%s_drill") - .toolTag(ToolItemTagType.MATCH, CustomTags.DRILLS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_DRILLS) .toolTag(ItemTags.PICKAXES) .toolTag(ItemTags.SHOVELS) .toolTag(ItemTags.HOES) @@ -308,7 +307,7 @@ public class GTToolType { .build(); public static final GTToolType DRILL_HV = GTToolType.builder("hv_drill") .idFormat("hv_%s_drill") - .toolTag(ToolItemTagType.MATCH, CustomTags.DRILLS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_DRILLS) .toolTag(ItemTags.PICKAXES) .toolTag(ItemTags.SHOVELS) .toolTag(ItemTags.HOES) @@ -327,7 +326,7 @@ public class GTToolType { .build(); public static final GTToolType DRILL_EV = GTToolType.builder("ev_drill") .idFormat("ev_%s_drill") - .toolTag(ToolItemTagType.MATCH, CustomTags.DRILLS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_DRILLS) .toolTag(ItemTags.PICKAXES) .toolTag(ItemTags.SHOVELS) .toolTag(ItemTags.HOES) @@ -346,7 +345,7 @@ public class GTToolType { .build(); public static final GTToolType DRILL_IV = GTToolType.builder("iv_drill") .idFormat("iv_%s_drill") - .toolTag(ToolItemTagType.MATCH, CustomTags.DRILLS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_DRILLS) .toolTag(ItemTags.PICKAXES) .toolTag(ItemTags.SHOVELS) .toolTag(ItemTags.HOES) @@ -366,7 +365,7 @@ public class GTToolType { public static final GTToolType CHAINSAW_LV = GTToolType.builder("lv_chainsaw") .idFormat("lv_%s_chainsaw") .toolTag(ToolItemTagType.MATCH, ItemTags.AXES) - .toolTag(ToolItemTagType.MATCH, CustomTags.CHAINSAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_CHAINSAWS) .harvestTag(BlockTags.MINEABLE_WITH_AXE) .harvestTag(BlockTags.SWORD_EFFICIENT) .harvestTag(BlockTags.MINEABLE_WITH_HOE) @@ -385,7 +384,7 @@ public class GTToolType { public static final GTToolType CHAINSAW_HV = GTToolType.builder("hv_chainsaw") .idFormat("hv_%s_chainsaw") .toolTag(ToolItemTagType.MATCH, ItemTags.AXES) - .toolTag(ToolItemTagType.MATCH, CustomTags.CHAINSAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_CHAINSAWS) .harvestTag(BlockTags.MINEABLE_WITH_AXE) .harvestTag(BlockTags.SWORD_EFFICIENT) .harvestTag(BlockTags.MINEABLE_WITH_HOE) @@ -404,7 +403,7 @@ public class GTToolType { public static final GTToolType CHAINSAW_IV = GTToolType.builder("iv_chainsaw") .idFormat("iv_%s_chainsaw") .toolTag(ToolItemTagType.MATCH, ItemTags.AXES) - .toolTag(ToolItemTagType.MATCH, CustomTags.CHAINSAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_CHAINSAWS) .harvestTag(BlockTags.MINEABLE_WITH_AXE) .harvestTag(BlockTags.SWORD_EFFICIENT) .harvestTag(BlockTags.MINEABLE_WITH_HOE) @@ -422,10 +421,9 @@ public class GTToolType { .build(); public static final GTToolType WRENCH_LV = GTToolType.builder("lv_wrench") .idFormat("lv_%s_wrench") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCH) - .harvestTag(CustomTags.MINEABLE_WITH_WRENCH) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WRENCHES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WRENCHES) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WRENCH) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .efficiencyMultiplier(2.0F) .attackDamage(1.0F).attackSpeed(-2.8F) @@ -439,10 +437,9 @@ public class GTToolType { .build(); public static final GTToolType WRENCH_HV = GTToolType.builder("hv_wrench") .idFormat("hv_%s_wrench") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCH) - .harvestTag(CustomTags.MINEABLE_WITH_WRENCH) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WRENCHES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WRENCHES) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WRENCH) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .efficiencyMultiplier(3.0F) .attackDamage(1.0F).attackSpeed(-2.8F) @@ -456,10 +453,9 @@ public class GTToolType { .build(); public static final GTToolType WRENCH_IV = GTToolType.builder("iv_wrench") .idFormat("iv_%s_wrench") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCHES) - .toolTag(ToolItemTagType.MATCH, CustomTags.WRENCH) - .harvestTag(CustomTags.MINEABLE_WITH_WRENCH) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WRENCHES) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WRENCHES) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WRENCH) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .efficiencyMultiplier(4.0F) .attackDamage(1.0F).attackSpeed(-2.8F) @@ -474,9 +470,9 @@ public class GTToolType { public static final GTToolType WIRE_CUTTER_LV = GTToolType.builder("lv_wirecutter") .idFormat("lv_%s_wire_cutter") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WIRE_CUTTERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.WIRE_CUTTERS) - .harvestTag(CustomTags.MINEABLE_WITH_WIRE_CUTTER) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WIRE_CUTTERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WIRE_CUTTERS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WIRE_CUTTER) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .damagePerCraftingAction(4).attackDamage(-1.0F).attackSpeed(-2.4F) .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_LV)) @@ -488,9 +484,9 @@ public class GTToolType { public static final GTToolType WIRE_CUTTER_HV = GTToolType.builder("hv_wirecutter") .idFormat("hv_%s_wire_cutter") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WIRE_CUTTERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.WIRE_CUTTERS) - .harvestTag(CustomTags.MINEABLE_WITH_WIRE_CUTTER) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WIRE_CUTTERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WIRE_CUTTERS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WIRE_CUTTER) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .damagePerCraftingAction(4).attackDamage(-1.0F).attackSpeed(-2.4F) .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV)) @@ -502,9 +498,9 @@ public class GTToolType { public static final GTToolType WIRE_CUTTER_IV = GTToolType.builder("iv_wirecutter") .idFormat("iv_%s_wire_cutter") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_WIRE_CUTTERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.WIRE_CUTTERS) - .harvestTag(CustomTags.MINEABLE_WITH_WIRE_CUTTER) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_WIRE_CUTTERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_WIRE_CUTTERS) + .harvestTag(GTTags.Blocks.MINEABLE_WITH_WIRE_CUTTER) .toolStats(b -> b.blockBreaking().crafting().sneakBypassUse() .damagePerCraftingAction(4).attackDamage(-1.0F).attackSpeed(-2.4F) .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV)) @@ -514,9 +510,9 @@ public class GTToolType { .defaultActions(GTToolActions.DEFAULT_WIRE_CUTTER_ACTIONS) .build(); public static final GTToolType BUZZSAW = GTToolType.builder("buzzsaw") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SAWS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SAWS) - .toolTag(ToolItemTagType.MATCH, CustomTags.BUZZSAWS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SAWS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_BUZZSAWS) .toolStats(b -> b.crafting().attackDamage(1.5F).attackSpeed(-3.2F) .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_LV)) .sound(GTSoundEntries.CHAINSAW_TOOL, true) @@ -525,8 +521,8 @@ public class GTToolType { .build(); public static final GTToolType SCREWDRIVER_LV = GTToolType.builder("lv_screwdriver") .idFormat("lv_%s_screwdriver") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SCREWDRIVERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SCREWDRIVERS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SCREWDRIVERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SCREWDRIVERS) .toolStats(b -> b.crafting().sneakBypassUse() .attackDamage(-1.0F).attackSpeed(3.0F) .behaviors(new EntityDamageBehavior(3.0F, Spider.class)) @@ -538,8 +534,8 @@ public class GTToolType { .build(); public static final GTToolType SCREWDRIVER_HV = GTToolType.builder("hv_screwdriver") .idFormat("hv_%s_screwdriver") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SCREWDRIVERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SCREWDRIVERS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SCREWDRIVERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SCREWDRIVERS) .toolStats(b -> b.crafting().sneakBypassUse() .attackDamage(-1.0F).attackSpeed(3.0F) .behaviors(new EntityDamageBehavior(3.0F, Spider.class)) @@ -551,8 +547,8 @@ public class GTToolType { .build(); public static final GTToolType SCREWDRIVER_IV = GTToolType.builder("iv_screwdriver") .idFormat("iv_%s_screwdriver") - .toolTag(ToolItemTagType.CRAFTING, CustomTags.CRAFTING_SCREWDRIVERS) - .toolTag(ToolItemTagType.MATCH, CustomTags.SCREWDRIVERS) + .toolTag(ToolItemTagType.CRAFTING, GTTags.Items.CRAFTING_SCREWDRIVERS) + .toolTag(ToolItemTagType.MATCH, GTTags.Items.TOOLS_SCREWDRIVERS) .toolStats(b -> b.crafting().sneakBypassUse() .attackDamage(-1.0F).attackSpeed(3.0F) .behaviors(new EntityDamageBehavior(3.0F, Spider.class)) diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java index 87a5531a673..1f235cac619 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/tool/MaterialToolTier.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Tier; @@ -60,6 +60,6 @@ public Ingredient getRepairIngredient() { @Override public @Nullable TagKey getTag() { - return CustomTags.TOOL_TIERS[getLevel()]; + return GTTags.Blocks.TOOL_TIERS[getLevel()]; } } diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java index 8a57a75e441..a960fcc4f45 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java @@ -14,7 +14,7 @@ import com.gregtechceu.gtceu.common.commands.GTClientCommands; import com.gregtechceu.gtceu.core.mixins.client.AbstractClientPlayerAccessor; import com.gregtechceu.gtceu.core.mixins.client.PlayerInfoAccessor; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import net.minecraft.ChatFormatting; @@ -112,7 +112,7 @@ public static void updateFOV(ComputeFovModifierEvent event) { float multi = 1; var state = player.level().getBlockState(player.getOnPos()); - if (state.is(CustomTags.VERY_FAST_WALKABLE_BLOCKS)) multi /= 1.2F; + if (state.is(GTTags.Blocks.VERY_FAST_WALKABLE_BLOCKS)) multi /= 1.2F; multi = (float) Mth.lerp(Minecraft.getInstance().options.fovEffectScale().get(), 1.0F, multi); event.setNewFovModifier(event.getNewFovModifier() * multi); diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java index c7cc19ad668..cb188e901db 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/GrowingPlantRender.java @@ -12,7 +12,7 @@ import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.GrowingPlantBlockAccessor; import com.gregtechceu.gtceu.core.mixins.IntegerPropertyAccessor; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; @@ -232,7 +232,7 @@ protected GrowthMode getGrowthModeForBlock(Block block) { if (state.hasProperty(BlockStateProperties.DOUBLE_BLOCK_HALF) || state.hasProperty(BlockStateProperties.HALF) || - state.is(CustomTags.TALL_PLANTS)) { + state.is(GTTags.Blocks.TALL_PLANTS)) { return GrowthMode.DOUBLE_TRANSLATE; } else if (state.is(BlockTags.FLOWERS)) { return GrowthMode.TRANSLATE; diff --git a/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java index bfc74d6e9a3..230bca15d97 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java @@ -47,7 +47,7 @@ import com.gregtechceu.gtceu.data.loader.BedrockFluidLoader; import com.gregtechceu.gtceu.data.loader.BedrockOreLoader; import com.gregtechceu.gtceu.data.loader.GTOreLoader; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import com.gregtechceu.gtceu.integration.map.WaypointManager; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; @@ -357,7 +357,7 @@ public static void onEntityLivingFallEvent(LivingFallEvent event) { ItemStack boots = player.getItemBySlot(EquipmentSlot.FEET); ItemStack chest = player.getItemBySlot(EquipmentSlot.CHEST); - if (boots.is(CustomTags.STEP_BOOTS) && boots.getItem() instanceof ArmorComponentItem armor) { + if (boots.is(GTTags.Items.STEP_BOOTS) && boots.getItem() instanceof ArmorComponentItem armor) { armor.getArmorLogic().damageArmor(player, boots, player.damageSources().fall(), (int) (player.fallDistance - 1.2f), EquipmentSlot.FEET); player.fallDistance = 0; @@ -386,11 +386,11 @@ public static void playerTickEvent(TickEvent.PlayerTickEvent event) { speedBoost = 0.0f; } else { var state = player.level().getBlockState(player.getOnPos()); - if (state.is(CustomTags.VERY_FAST_WALKABLE_BLOCKS)) { + if (state.is(GTTags.Blocks.VERY_FAST_WALKABLE_BLOCKS)) { speedBoost = 0.6f; // value that is added to the base MC speed - } else if (state.is(CustomTags.FAST_WALKABLE_BLOCKS)) { + } else if (state.is(GTTags.Blocks.FAST_WALKABLE_BLOCKS)) { speedBoost = 0.25f; // slower to walk on studs - } else if (state.is(CustomTags.SLOW_WALKABLE_BLOCKS)) { + } else if (state.is(GTTags.Blocks.SLOW_WALKABLE_BLOCKS)) { speedBoost = -0.20f; // slower on frames } } @@ -416,7 +416,7 @@ public static void stepAssistHandler(LivingEvent.LivingTickEvent event) { float MAGIC_STEP_HEIGHT = 1.0023f; if (event.getEntity() == null || !(event.getEntity() instanceof Player player)) return; CompoundTag tag = player.getItemBySlot(EquipmentSlot.FEET).getOrCreateTag(); - if (!player.isCrouching() && player.getItemBySlot(EquipmentSlot.FEET).is(CustomTags.STEP_BOOTS) && + if (!player.isCrouching() && player.getItemBySlot(EquipmentSlot.FEET).is(GTTags.Items.STEP_BOOTS) && (!tag.contains("stepAssist") || tag.getBoolean("stepAssist"))) { if (player.getStepHeight() < MAGIC_STEP_HEIGHT) { player.setMaxUpStep(MAGIC_STEP_HEIGHT); diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/explosive/GTExplosiveBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/explosive/GTExplosiveBlock.java index b9b33f4dd09..9da6c80794a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/explosive/GTExplosiveBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/explosive/GTExplosiveBlock.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.block.explosive; import com.gregtechceu.gtceu.common.entity.GTExplosiveEntity; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -101,7 +101,7 @@ public void wasExploded(Level level, BlockPos pos, Explosion explosion) { public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ItemStack stack = player.getItemInHand(hand); - if (!stack.isEmpty() && stack.is(CustomTags.TOOLS_IGNITER)) { + if (!stack.isEmpty() && stack.is(GTTags.Items.TOOLS_IGNITER)) { this.explode(level, pos, player); level.removeBlock(pos, false); if (stack.isDamageableItem()) { diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java index 65900bc03e6..ab4ea9a5d23 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/detector/ItemDetectorCover.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.cover.CoverDefinition; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.RedstoneUtil; @@ -36,7 +36,7 @@ protected void update() { return; for (int i = 0; i < handler.getSlots(); i++) { - if (handler.getStackInSlot(i).is(CustomTags.SKIP_ITEM_DETECTOR)) continue; + if (handler.getStackInSlot(i).is(GTTags.Items.SKIP_ITEM_DETECTOR)) continue; storedItems += handler.getStackInSlot(i).getCount(); } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java index 8db838f9479..c837a3d7f7f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBedrockFluids.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -32,7 +32,7 @@ public class GTBedrockFluids { .depletionChance(100) .depletedYield(20) .biomes(5, BiomeTags.IS_OCEAN) - .biomes(10, CustomTags.IS_SANDY) + .biomes(10, GTTags.Biomes.IS_SANDY) .dimensions(overworld())); public static BedrockFluidDefinition LIGHT_OIL = create(GTCEu.id("light_oil_deposit"), builder -> builder @@ -61,7 +61,7 @@ public class GTBedrockFluids { .depletionChance(100) .depletedYield(25) .biomes(5, BiomeTags.IS_OCEAN) - .biomes(5, CustomTags.IS_SANDY) + .biomes(5, GTTags.Biomes.IS_SANDY) .dimensions(overworld())); public static BedrockFluidDefinition RAW_OIL = create(GTCEu.id("raw_oil_deposit"), builder -> builder diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 008e1165264..dd604455878 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -30,7 +30,7 @@ import com.gregtechceu.gtceu.common.pipelike.laser.LaserPipeType; import com.gregtechceu.gtceu.common.pipelike.optical.OpticalPipeType; import com.gregtechceu.gtceu.core.mixins.BlockPropertiesAccessor; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.advancements.critereon.StatePropertiesPredicate; @@ -123,7 +123,7 @@ private static void registerLaserPipeBlock(int index) { .properties(p -> p.dynamicShape().noOcclusion().forceSolidOn()) .gtBlockstate(GTModels::createPipeBlockModel) .defaultLoot() - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::translucent) .color(() -> LaserPipeBlock::tintedColor) @@ -153,7 +153,7 @@ private static void registerOpticalPipeBlock(int index) { .properties(p -> p.dynamicShape().noOcclusion().forceSolidOn()) .gtBlockstate(GTModels::createPipeBlockModel) .defaultLoot() - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER) .addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::translucent) .color(() -> OpticalPipeBlock::tintedColor) @@ -181,7 +181,7 @@ private static void registerDuctPipeBlock(int index) { .properties(p -> p.dynamicShape().noOcclusion().forceSolidOn()) .gtBlockstate(GTModels::createPipeBlockModel) .defaultLoot() - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .addLayer(() -> RenderType::cutoutMipped) .addLayer(() -> RenderType::translucent) .item(PipeBlockItem::new) @@ -197,7 +197,7 @@ private static void registerDuctPipeBlock(int index) { properties -> new LongDistancePipeBlock(properties, LDItemPipeType.INSTANCE)) .initialProperties(() -> Blocks.IRON_BLOCK) .exBlockstate(GTModels.cubeAllModel(GTCEu.id("block/pipe/ld_item_pipe/block"))) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, BlockTags.NEEDS_STONE_TOOL) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, BlockTags.NEEDS_STONE_TOOL) .simpleItem() .register(); @@ -207,7 +207,7 @@ private static void registerDuctPipeBlock(int index) { properties -> new LongDistancePipeBlock(properties, LDFluidPipeType.INSTANCE)) .initialProperties(() -> Blocks.IRON_BLOCK) .exBlockstate(GTModels.cubeAllModel(GTCEu.id("block/pipe/ld_fluid_pipe/block"))) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, BlockTags.NEEDS_STONE_TOOL) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, BlockTags.NEEDS_STONE_TOOL) .simpleItem() .register(); @@ -334,7 +334,7 @@ private static void registerDuctPipeBlock(int index) { .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.sound(SoundType.WOOD).mapColor(MapColor.WOOD)) .blockstate(GTModels.createSidedCasingModel(GTCEu.id("block/casings/pump_deck"))) - .tag(CustomTags.MINEABLE_WITH_WRENCH, BlockTags.MINEABLE_WITH_AXE) + .tag(GTTags.Blocks.MINEABLE_WITH_WRENCH, BlockTags.MINEABLE_WITH_AXE) .item(BlockItem::new) .build() .register(); @@ -432,7 +432,7 @@ private static void registerDuctPipeBlock(int index) { .blockstate((ctx, prov) -> { prov.simpleBlock(ctx.getEntry(), prov.models().getExistingFile(GTCEu.id("block/computer_casing"))); }) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -444,7 +444,7 @@ private static void registerDuctPipeBlock(int index) { prov.simpleBlock(ctx.getEntry(), prov.models().getExistingFile(GTCEu.id("block/advanced_computer_casing"))); }) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -457,7 +457,7 @@ private static void registerDuctPipeBlock(int index) { GTCEu.id("block/casings/hpca/computer_heat_vent_side"), GTCEu.id("block/casings/hpca/computer_heat_vent_top_bot"))); }) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -470,7 +470,7 @@ private static BlockEntry createSidedCasingBlock(String name, ResourceLoc .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .blockstate(GTModels.createSidedCasingModel(texture)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -516,7 +516,7 @@ public static BlockEntry createCasingBlock(String name, .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .addLayer(type) .exBlockstate(GTModels.cubeAllModel(texture)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -530,7 +530,7 @@ private static BlockEntry createMachineCasingBlock(int tier) { .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .blockstate(GTModels.createMachineCasingModel(tierName)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -549,7 +549,7 @@ private static BlockEntry createHermeticCasing(int tier) { .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(GTModels.createHermeticCasingModel(tierName)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -563,7 +563,7 @@ private static BlockEntry createSteamCasing(String name, String material) return REGISTRATE.block(name, Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .blockstate(GTModels.createSteamCasingModel(material)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -576,7 +576,7 @@ private static BlockEntry createCoilBlock(ICoilType coilType) { .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(GTModels.createCoilModel(coilType)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -590,7 +590,7 @@ private static BlockEntry createBatteryBlock(IBatteryData batteryD .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.isValidSpawn((state, level, pos, entityType) -> false)) .blockstate(GTModels.createBatteryBlockModel(batteryData)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -606,8 +606,8 @@ private static BlockEntry createFusionCasing(IFusionCasingTyp .properties(properties -> properties.strength(5.0f, 10.0f).sound(SoundType.METAL)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(GTModels.createFusionCasingModel(casingType)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, - CustomTags.TOOL_TIERS[casingType.getHarvestLevel()]) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, + GTTags.Blocks.TOOL_TIERS[casingType.getHarvestLevel()]) .item(BlockItem::new) .build() .register(); @@ -621,7 +621,7 @@ private static BlockEntry createCleanroomFilter(IFilterType filterType) { .properties(properties -> properties.strength(2.0f, 8.0f).sound(SoundType.METAL) .isValidSpawn((blockState, blockGetter, blockPos, entityType) -> false)) .blockstate(GTModels.createCleanroomFilterModel(filterType)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, CustomTags.TOOL_TIERS[1]) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH, GTTags.Blocks.TOOL_TIERS[1]) .item(BlockItem::new) .build() .register(); @@ -634,7 +634,7 @@ protected static BlockEntry createActiveCasing(String name, String .initialProperties(() -> Blocks.IRON_BLOCK) .addLayer(() -> RenderType::cutoutMipped) .blockstate(GTModels.createActiveModel(GTCEu.id(baseModelPath))) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .model((ctx, prov) -> prov.withExistingParent(prov.name(ctx), GTCEu.id(baseModelPath))) .build() @@ -648,7 +648,7 @@ private static BlockEntry createFireboxCasing(BoilerFireboxType typ .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(GTModels.createFireboxModel(type)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .item(BlockItem::new) .build() .register(); @@ -714,10 +714,10 @@ private static BlockEntry createFireboxCasing(BoilerFireboxType typ .hasProperty(RubberLogBlock.NATURAL, true))) .when(LootItemRandomChanceCondition.randomChance(0.85F)))))) .lang("Rubber Log") - .tag(BlockTags.LOGS_THAT_BURN, BlockTags.OVERWORLD_NATURAL_LOGS) + .tag(BlockTags.LOGS_THAT_BURN, GTTags.Blocks.RUBBER_LOGS, BlockTags.OVERWORLD_NATURAL_LOGS) .blockstate((ctx, provider) -> provider.logBlock(ctx.get())) .item() - .tag(ItemTags.LOGS_THAT_BURN, CustomTags.RUBBER_LOGS) + .tag(ItemTags.LOGS_THAT_BURN, GTTags.Items.RUBBER_LOGS) .build() .register(); @@ -769,7 +769,7 @@ public static ItemColor leavesItemColor() { .blockstate((ctx, provider) -> provider.logBlock(ctx.get())) .tag(BlockTags.LOGS_THAT_BURN, BlockTags.MINEABLE_WITH_AXE) .item() - .tag(ItemTags.LOGS_THAT_BURN, CustomTags.RUBBER_LOGS) + .tag(ItemTags.LOGS_THAT_BURN, GTTags.Items.RUBBER_LOGS) .build() .register(); public static final BlockEntry RUBBER_WOOD = REGISTRATE @@ -780,7 +780,7 @@ public static ItemColor leavesItemColor() { provider.blockTexture(GTBlocks.RUBBER_LOG.get()), provider.blockTexture(GTBlocks.RUBBER_LOG.get()))) .tag(BlockTags.LOGS_THAT_BURN, BlockTags.MINEABLE_WITH_AXE) .item() - .tag(ItemTags.LOGS_THAT_BURN, CustomTags.RUBBER_LOGS) + .tag(ItemTags.LOGS_THAT_BURN, GTTags.Items.RUBBER_LOGS) .build() .register(); public static final BlockEntry STRIPPED_RUBBER_WOOD = REGISTRATE @@ -791,7 +791,7 @@ public static ItemColor leavesItemColor() { provider.blockTexture(ctx.get()))) .tag(BlockTags.LOGS_THAT_BURN, BlockTags.MINEABLE_WITH_AXE) .item() - .tag(ItemTags.LOGS_THAT_BURN, CustomTags.RUBBER_LOGS) + .tag(ItemTags.LOGS_THAT_BURN, GTTags.Items.RUBBER_LOGS) .build() .register(); @@ -1213,7 +1213,7 @@ public static void generateStoneBlocks() { .transform(type == StoneBlockType.STONE ? GTBlocks.unificationBlock(strata.getTagPrefix(), strata.getMaterial()) : builder2 -> builder2) - .tag(BlockTags.MINEABLE_WITH_PICKAXE, CustomTags.NEEDS_WOOD_TOOL) + .tag(BlockTags.MINEABLE_WITH_PICKAXE, GTTags.Blocks.NEEDS_WOOD_TOOL) .loot((tables, block) -> { if (type == StoneBlockType.STONE) { tables.add(block, tables.createSingleItemTableWithSilkTouch(block, @@ -1340,7 +1340,7 @@ public static void generateStoneBlocks() { metalsheetBuilder.put(dyeColor, REGISTRATE.block("%s_metal_sheet".formatted(dyeColor.getName()), Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.strength(2.0F, 5.0F).mapColor(dyeColor)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models().cubeAll(ctx.getName(), GTCEu.id("block/decoration/metalsheet_%s".formatted(dyeColor.getName()))))) @@ -1355,7 +1355,7 @@ public static void generateStoneBlocks() { REGISTRATE.block("%s_large_metal_sheet".formatted(dyeColor.getName()), Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.strength(2.0F, 5.0F).mapColor(dyeColor)) - .tag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + .tag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models().cubeAll(ctx.getName(), GTCEu.id("block/decoration/large_metalsheet_%s".formatted(dyeColor.getName()))))) .simpleItem() @@ -1368,7 +1368,7 @@ public static void generateStoneBlocks() { studsBuilder.put(dyeColor, REGISTRATE.block("%s_studs".formatted(dyeColor.getName()), Block::new) .initialProperties(() -> Blocks.WHITE_WOOL) .properties(p -> p.strength(1.5F, 2.5F).mapColor(dyeColor)) - .tag(BlockTags.MINEABLE_WITH_PICKAXE, CustomTags.NEEDS_WOOD_TOOL) + .tag(BlockTags.MINEABLE_WITH_PICKAXE, GTTags.Blocks.NEEDS_WOOD_TOOL) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models().cubeAll(ctx.getName(), GTCEu.id("block/decoration/studs_%s".formatted(dyeColor.getName()))))) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java index e871530b5f2..ca7bb73bace 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTFluids.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; @@ -27,7 +27,7 @@ public class GTFluids { PotionFluid.PotionFluidType::new, PotionFluid::new) .lang("Potion") .source(PotionFluid::new).noBlock().noBucket() - .tag(CustomTags.POTION_FLUIDS) + .tag(GTTags.Fluids.POTION) .register(); public static void init() { diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 3502e691fdf..321272c588e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -32,7 +32,7 @@ import com.gregtechceu.gtceu.common.item.modules.TextModuleBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.lang.LangHandler; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; @@ -417,25 +417,26 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Matches") .setData(ProviderType.ITEM_MODEL, NonNullBiConsumer.noop()) .onRegister(attach(new LighterBehavior(false, false, false))) - .tag(CustomTags.TOOLS_IGNITER) + .tag(GTTags.Items.TOOLS_IGNITER) .register(); public static ItemEntry TOOL_MATCHBOX = REGISTRATE.item("matchbox", ComponentItem::create) .lang("Matchbox") .properties(p -> p.stacksTo(1)) .setData(ProviderType.ITEM_MODEL, NonNullBiConsumer.noop()) .onRegister(attach(new LighterBehavior(false, true, false, () -> new ItemStack(Items.PAPER, 1), 16))) - .tag(CustomTags.TOOLS_IGNITER) + .tag(GTTags.Items.TOOLS_IGNITER) .register(); public static ItemEntry TOOL_LIGHTER_INVAR = REGISTRATE.item("invar_lighter", ComponentItem::create) .lang("Invar Lighter") .properties(p -> p.stacksTo(1)) .setData(ProviderType.ITEM_MODEL, NonNullBiConsumer.noop()) .onRegister(attach(new LighterBehavior(true, true, true))) - .onRegister(attach(new FilteredFluidContainer(100, true, x -> x.getFluid().is(CustomTags.LIGHTER_FLUIDS)), + .onRegister(attach( + new FilteredFluidContainer(100, true, x -> x.getFluid().is(GTTags.Fluids.LIGHTER_FLUIDS)), new ItemFluidContainer())) .onRegister(modelPredicate(GTCEu.id("lighter_open"), (itemStack) -> itemStack.getOrCreateTag().getBoolean(LighterBehavior.LIGHTER_OPEN) ? 1.0f : 0.0f)) - .tag(CustomTags.TOOLS_IGNITER) + .tag(GTTags.Items.TOOLS_IGNITER) .register(); public static ItemEntry TOOL_LIGHTER_PLATINUM = REGISTRATE .item("platinum_lighter", ComponentItem::create) @@ -443,11 +444,12 @@ public static ItemEntry createFluidCell(Material mat, int capacit .properties(p -> p.stacksTo(1).rarity(Rarity.UNCOMMON)) .setData(ProviderType.ITEM_MODEL, NonNullBiConsumer.noop()) .onRegister(attach(new LighterBehavior(true, true, true))) - .onRegister(attach(new FilteredFluidContainer(1000, true, x -> x.getFluid().is(CustomTags.LIGHTER_FLUIDS)), + .onRegister(attach( + new FilteredFluidContainer(1000, true, x -> x.getFluid().is(GTTags.Fluids.LIGHTER_FLUIDS)), new ItemFluidContainer())) .onRegister(modelPredicate(GTCEu.id("lighter_open"), (itemStack) -> itemStack.getOrCreateTag().getBoolean(LighterBehavior.LIGHTER_OPEN) ? 1.0f : 0.0f)) - .tag(CustomTags.TOOLS_IGNITER) + .tag(GTTags.Items.TOOLS_IGNITER) .register(); public static ItemEntry CARBON_FIBERS = REGISTRATE.item("carbon_fibers", Item::new) @@ -510,7 +512,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .item("tantalum_capacitor", ComponentItem::create) .lang("Tantalum Capacitor") .onRegister(attach(ElectricStats.createRechargeableBattery(1000, GTValues.ULV))) - .tag(CustomTags.ULV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_ULV).register(); public static ItemEntry BATTERY_LV_SODIUM = REGISTRATE .item("lv_sodium_battery", ComponentItem::create) @@ -518,21 +520,21 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(80000, GTValues.LV))) - .tag(CustomTags.LV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_LV).register(); public static ItemEntry BATTERY_MV_SODIUM = REGISTRATE .item("mv_sodium_battery", ComponentItem::create) .lang("Medium Sodium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(360000, GTValues.MV))) - .tag(CustomTags.MV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_MV).register(); public static ItemEntry BATTERY_HV_SODIUM = REGISTRATE .item("hv_sodium_battery", ComponentItem::create) .lang("Large Sodium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(1200000, GTValues.HV))) - .tag(CustomTags.HV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_HV).register(); public static ItemEntry BATTERY_LV_LITHIUM = REGISTRATE .item("lv_lithium_battery", ComponentItem::create) @@ -540,21 +542,21 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(120000, GTValues.LV))) - .tag(CustomTags.LV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_LV).register(); public static ItemEntry BATTERY_MV_LITHIUM = REGISTRATE .item("mv_lithium_battery", ComponentItem::create) .lang("Medium Lithium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(420000, GTValues.MV))) - .tag(CustomTags.MV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_MV).register(); public static ItemEntry BATTERY_HV_LITHIUM = REGISTRATE .item("hv_lithium_battery", ComponentItem::create) .lang("Large Lithium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(1800000, GTValues.HV))) - .tag(CustomTags.HV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_HV).register(); public static ItemEntry BATTERY_LV_CADMIUM = REGISTRATE .item("lv_cadmium_battery", ComponentItem::create) @@ -562,33 +564,33 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(100000, GTValues.LV))) - .tag(CustomTags.LV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_LV).register(); public static ItemEntry BATTERY_MV_CADMIUM = REGISTRATE .item("mv_cadmium_battery", ComponentItem::create) .lang("Medium Cadmium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(400000, GTValues.MV))) - .tag(CustomTags.MV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_MV).register(); public static ItemEntry BATTERY_HV_CADMIUM = REGISTRATE .item("hv_cadmium_battery", ComponentItem::create) .lang("Large Cadmium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(1600000, GTValues.HV))) - .tag(CustomTags.HV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_HV).register(); public static ItemEntry ENERGIUM_CRYSTAL = REGISTRATE.item("energy_crystal", ComponentItem::create) .lang("Energium Crystal") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(6_400_000L, GTValues.HV))) - .tag(CustomTags.HV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_HV).register(); public static ItemEntry LAPOTRON_CRYSTAL = REGISTRATE.item("lapotron_crystal", ComponentItem::create) .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(25_000_000L, GTValues.EV))) - .tag(CustomTags.EV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_EV).register(); public static ItemEntry BATTERY_EV_VANADIUM = REGISTRATE .item("ev_vanadium_battery", ComponentItem::create) @@ -596,21 +598,21 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(10_240_000L, GTValues.EV))) - .tag(CustomTags.EV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_EV).register(); public static ItemEntry BATTERY_IV_VANADIUM = REGISTRATE .item("iv_vanadium_battery", ComponentItem::create) .lang("Medium Vanadium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(40_960_000L, GTValues.IV))) - .tag(CustomTags.IV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_IV).register(); public static ItemEntry BATTERY_LuV_VANADIUM = REGISTRATE .item("luv_vanadium_battery", ComponentItem::create) .lang("Large Vanadium Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(163_840_000L, GTValues.LuV))) - .tag(CustomTags.LuV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_LuV).register(); public static ItemEntry BATTERY_ZPM_NAQUADRIA = REGISTRATE .item("zpm_naquadria_battery", ComponentItem::create) @@ -618,14 +620,14 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(655_360_000L, GTValues.ZPM))) - .tag(CustomTags.ZPM_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_ZPM).register(); public static ItemEntry BATTERY_UV_NAQUADRIA = REGISTRATE .item("uv_naquadria_battery", ComponentItem::create) .lang("Large Naquadria Battery") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(2_621_440_000L, GTValues.UV))) - .tag(CustomTags.UV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_UV).register(); public static ItemEntry ENERGY_LAPOTRONIC_ORB = REGISTRATE .item("lapotronic_energy_orb", ComponentItem::create) @@ -633,27 +635,27 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(250_000_000L, GTValues.IV))) - .tag(CustomTags.IV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_IV).register(); public static ItemEntry ENERGY_LAPOTRONIC_ORB_CLUSTER = REGISTRATE .item("lapotronic_energy_orb_cluster", ComponentItem::create) .lang("Lapotronic Energy Orb Cluster") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(1_000_000_000L, GTValues.LuV))) - .tag(CustomTags.LuV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_LuV).register(); public static ItemEntry ENERGY_MODULE = REGISTRATE.item("energy_module", ComponentItem::create) .lang("Energy Module") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(4_000_000_000L, GTValues.ZPM))) - .tag(CustomTags.ZPM_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_ZPM).register(); public static ItemEntry ENERGY_CLUSTER = REGISTRATE.item("energy_cluster", ComponentItem::create) .lang("Energy Cluster") .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(20_000_000_000L, GTValues.UV))) - .tag(CustomTags.UV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_UV).register(); public static ItemEntry ZERO_POINT_MODULE = REGISTRATE .item("zero_point_module", ComponentItem::create) @@ -666,39 +668,39 @@ public static ItemEntry createFluidCell(Material mat, int capacit .model(overrideModel(GTCEu.id("battery"), 8)) .onRegister(modelPredicate(GTCEu.id("battery"), ElectricStats::getStoredPredicate)) .onRegister(attach(ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.UHV))) - .tag(CustomTags.UHV_BATTERIES).register(); + .tag(GTTags.Items.BATTERIES_UHV).register(); public static ItemEntry ELECTRIC_MOTOR_LV = REGISTRATE.item("lv_electric_motor", Item::new) .lang("LV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_MV = REGISTRATE.item("mv_electric_motor", Item::new) .lang("MV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_HV = REGISTRATE.item("hv_electric_motor", Item::new) .lang("HV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_EV = REGISTRATE.item("ev_electric_motor", Item::new) .lang("EV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_IV = REGISTRATE.item("iv_electric_motor", Item::new) .lang("IV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_LuV = REGISTRATE.item("luv_electric_motor", Item::new) .lang("LuV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_ZPM = REGISTRATE.item("zpm_electric_motor", Item::new) .lang("ZPM Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_UV = REGISTRATE.item("uv_electric_motor", Item::new) .lang("UV Electric Motor") - .tag(CustomTags.ELECTRIC_MOTORS) + .tag(GTTags.Items.ELECTRIC_MOTORS) .register(); public static ItemEntry ELECTRIC_MOTOR_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_electric_motor", Item::new).lang("UHV Electric Motor") @@ -729,7 +731,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_MV = REGISTRATE.item("mv_electric_pump", ComponentItem::create) @@ -740,7 +742,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 4 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_HV = REGISTRATE.item("hv_electric_pump", ComponentItem::create) .lang("HV Electric Pump") @@ -750,7 +752,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 16 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_EV = REGISTRATE.item("ev_electric_pump", ComponentItem::create) .lang("EV Electric Pump") @@ -760,7 +762,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 64 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_IV = REGISTRATE.item("iv_electric_pump", ComponentItem::create) .lang("IV Electric Pump") @@ -770,7 +772,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 64 * 4 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_LuV = REGISTRATE .item("luv_electric_pump", ComponentItem::create) @@ -781,7 +783,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 64 * 16 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_ZPM = REGISTRATE .item("zpm_electric_pump", ComponentItem::create) @@ -792,7 +794,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 64 * 64 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_UV = REGISTRATE.item("uv_electric_pump", ComponentItem::create) .lang("UV Electric Pump") @@ -803,7 +805,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", FormattingUtil.formatNumbers(1280 * 64 * 64 * 4 / 20))); }))) - .tag(CustomTags.ELECTRIC_PUMPS) + .tag(GTTags.Items.ELECTRIC_PUMPS) .register(); public static ItemEntry ELECTRIC_PUMP_UHV = GTCEuAPI.isHighTier() ? @@ -874,7 +876,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_MV = REGISTRATE .item("mv_fluid_regulator", ComponentItem::create) @@ -884,7 +886,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 4 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_HV = REGISTRATE .item("hv_fluid_regulator", ComponentItem::create) @@ -894,7 +896,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 16 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_EV = REGISTRATE .item("ev_fluid_regulator", ComponentItem::create) @@ -904,7 +906,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_IV = REGISTRATE .item("iv_fluid_regulator", ComponentItem::create) @@ -914,7 +916,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 4 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_LuV = REGISTRATE .item("luv_fluid_regulator", ComponentItem::create) @@ -924,7 +926,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 16 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_ZPM = REGISTRATE .item("zpm_fluid_regulator", ComponentItem::create) @@ -934,7 +936,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 64 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_UV = REGISTRATE .item("uv_fluid_regulator", ComponentItem::create) @@ -945,7 +947,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add( Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 64 * 4 / 20)); }))) - .tag(CustomTags.FLUID_REGULATORS) + .tag(GTTags.Items.FLUID_REGULATORS) .register(); public static ItemEntry FLUID_REGULATOR_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_fluid_regulator", ComponentItem::create) @@ -1017,7 +1019,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 8)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_MV = REGISTRATE .item("mv_conveyor_module", ComponentItem::create) @@ -1027,7 +1029,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 32)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_HV = REGISTRATE .item("hv_conveyor_module", ComponentItem::create) @@ -1037,7 +1039,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 64)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_EV = REGISTRATE .item("ev_conveyor_module", ComponentItem::create) @@ -1047,7 +1049,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 3)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_IV = REGISTRATE .item("iv_conveyor_module", ComponentItem::create) @@ -1057,7 +1059,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 8)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_LuV = REGISTRATE .item("luv_conveyor_module", ComponentItem::create) @@ -1067,7 +1069,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_ZPM = REGISTRATE .item("zpm_conveyor_module", ComponentItem::create) @@ -1077,7 +1079,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_UV = REGISTRATE .item("uv_conveyor_module", ComponentItem::create) @@ -1087,7 +1089,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.CONVEYOR_MODULES) + .tag(GTTags.Items.CONVEYOR_MODULES) .register(); public static ItemEntry CONVEYOR_MODULE_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_conveyor_module", ComponentItem::create) @@ -1142,35 +1144,35 @@ public static ItemEntry createFluidCell(Material mat, int capacit public static ItemEntry ELECTRIC_PISTON_LV = REGISTRATE.item("lv_electric_piston", Item::new) .lang("LV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_MV = REGISTRATE.item("mv_electric_piston", Item::new) .lang("MV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_HV = REGISTRATE.item("hv_electric_piston", Item::new) .lang("HV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_EV = REGISTRATE.item("ev_electric_piston", Item::new) .lang("EV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_IV = REGISTRATE.item("iv_electric_piston", Item::new) .lang("IV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_LuV = REGISTRATE.item("luv_electric_piston", Item::new) .lang("LuV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_ZPM = REGISTRATE.item("zpm_electric_piston", Item::new) .lang("ZPM Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_UV = REGISTRATE.item("uv_electric_piston", Item::new) .lang("UV Electric Piston") - .tag(CustomTags.ELECTRIC_PISTONS) + .tag(GTTags.Items.ELECTRIC_PISTONS) .register(); public static ItemEntry ELECTRIC_PISTON_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_electric_piston", Item::new).lang("UHV Electric Piston") @@ -1200,7 +1202,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 8)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_MV = REGISTRATE.item("mv_robot_arm", ComponentItem::create) .lang("MV Robot Arm") @@ -1209,7 +1211,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 32)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_HV = REGISTRATE.item("hv_robot_arm", ComponentItem::create) .lang("HV Robot Arm") @@ -1218,7 +1220,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 64)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_EV = REGISTRATE.item("ev_robot_arm", ComponentItem::create) .lang("EV Robot Arm") @@ -1227,7 +1229,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 3)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_IV = REGISTRATE.item("iv_robot_arm", ComponentItem::create) .lang("IV Robot Arm") @@ -1236,7 +1238,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 8)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_LuV = REGISTRATE.item("luv_robot_arm", ComponentItem::create) .lang("LuV Robot Arm") @@ -1245,7 +1247,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_ZPM = REGISTRATE.item("zpm_robot_arm", ComponentItem::create) .lang("ZPM Robot Arm") @@ -1254,7 +1256,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_UV = REGISTRATE.item("uv_robot_arm", ComponentItem::create) .lang("UV Robot Arm") @@ -1263,7 +1265,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); }))) - .tag(CustomTags.ROBOT_ARMS) + .tag(GTTags.Items.ROBOT_ARMS) .register(); public static ItemEntry ROBOT_ARM_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_robot_arm", ComponentItem::create) @@ -1318,35 +1320,35 @@ public static ItemEntry createFluidCell(Material mat, int capacit public static ItemEntry FIELD_GENERATOR_LV = REGISTRATE.item("lv_field_generator", Item::new) .lang("LV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_MV = REGISTRATE.item("mv_field_generator", Item::new) .lang("MV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_HV = REGISTRATE.item("hv_field_generator", Item::new) .lang("HV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_EV = REGISTRATE.item("ev_field_generator", Item::new) .lang("EV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_IV = REGISTRATE.item("iv_field_generator", Item::new) .lang("IV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_LuV = REGISTRATE.item("luv_field_generator", Item::new) .lang("LuV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_ZPM = REGISTRATE.item("zpm_field_generator", Item::new) .lang("ZPM Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_UV = REGISTRATE.item("uv_field_generator", Item::new) .lang("UV Field Generator") - .tag(CustomTags.FIELD_GENERATORS) + .tag(GTTags.Items.FIELD_GENERATORS) .register(); public static ItemEntry FIELD_GENERATOR_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_field_generator", Item::new).lang("UHV Field Generator") @@ -1370,28 +1372,28 @@ public static ItemEntry createFluidCell(Material mat, int capacit null; public static ItemEntry EMITTER_LV = REGISTRATE.item("lv_emitter", Item::new).lang("LV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_MV = REGISTRATE.item("mv_emitter", Item::new).lang("MV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_HV = REGISTRATE.item("hv_emitter", Item::new).lang("HV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_EV = REGISTRATE.item("ev_emitter", Item::new).lang("EV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_IV = REGISTRATE.item("iv_emitter", Item::new).lang("IV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_LuV = REGISTRATE.item("luv_emitter", Item::new).lang("LuV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_ZPM = REGISTRATE.item("zpm_emitter", Item::new).lang("ZPM Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_UV = REGISTRATE.item("uv_emitter", Item::new).lang("UV Emitter") - .tag(CustomTags.EMITTERS) + .tag(GTTags.Items.EMITTERS) .register(); public static ItemEntry EMITTER_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_emitter", Item::new) .lang("UHV Emitter") @@ -1410,28 +1412,28 @@ public static ItemEntry createFluidCell(Material mat, int capacit .register() : null; public static ItemEntry SENSOR_LV = REGISTRATE.item("lv_sensor", Item::new).lang("LV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_MV = REGISTRATE.item("mv_sensor", Item::new).lang("MV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_HV = REGISTRATE.item("hv_sensor", Item::new).lang("HV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_EV = REGISTRATE.item("ev_sensor", Item::new).lang("EV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_IV = REGISTRATE.item("iv_sensor", Item::new).lang("IV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_LuV = REGISTRATE.item("luv_sensor", Item::new).lang("LuV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_ZPM = REGISTRATE.item("zpm_sensor", Item::new).lang("ZPM Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_UV = REGISTRATE.item("uv_sensor", Item::new).lang("UV Sensor") - .tag(CustomTags.SENSORS) + .tag(GTTags.Items.SENSORS) .register(); public static ItemEntry SENSOR_UHV = GTCEuAPI.isHighTier() ? REGISTRATE.item("uhv_sensor", Item::new) .lang("UHV Sensor") @@ -1459,16 +1461,18 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Data Module").onRegister(attach(new DataItemBehavior(true, 256))) .register(); - public static final Map> GLASS_LENSES = new HashMap<>(); + @SuppressWarnings("unchecked") + public static final ItemEntry[] GLASS_LENSES = new ItemEntry[DyeColor.values().length]; static { - for (int i = 0; i < GTValues.COLORS.length; i++) { - String color = GTValues.COLORS[i]; - if (color.equals("white")) continue; - GLASS_LENSES.put(color, REGISTRATE.item(String.format("%s_glass_lens", color), Item::new) + for (DyeColor color : DyeColor.values()) { + if (color == DyeColor.WHITE) continue; + int id = color.getId(); + GLASS_LENSES[id] = REGISTRATE.item(String.format("%s_glass_lens", color), Item::new) .lang("Glass Lens (%s)".formatted(toEnglishName(color))) - .tag(TagUtil.createItemTag("lens/" + color)) - .register()); + .tag(GTTags.Items.LENSES_ARRAY[id]) + .tag(GTTags.Items.LENSES_GLASS) + .register(); } } @@ -1623,34 +1627,34 @@ public static ItemEntry createFluidCell(Material mat, int capacit .register(); public static ItemEntry VACUUM_TUBE = REGISTRATE.item("vacuum_tube", Item::new).lang("Vacuum Tube") - .tag(CustomTags.ULV_CIRCUITS).register(); + .tag(GTTags.Items.CIRCUITS_ULV).register(); public static ItemEntry GLASS_TUBE = REGISTRATE.item("glass_tube", Item::new).lang("Glass Tube") .onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.Glass, GTValues.M)))) .register(); public static ItemEntry TRANSISTOR = REGISTRATE.item("transistor", Item::new).lang("Transistor") - .tag(CustomTags.TRANSISTORS) + .tag(GTTags.Items.TRANSISTORS) .register(); public static ItemEntry RESISTOR = REGISTRATE.item("resistor", Item::new).lang("Resistor") - .tag(CustomTags.RESISTORS) + .tag(GTTags.Items.RESISTORS) .register(); public static ItemEntry CAPACITOR = REGISTRATE.item("capacitor", Item::new).lang("Capacitor") - .tag(CustomTags.CAPACITORS) + .tag(GTTags.Items.CAPACITORS) .register(); - public static ItemEntry DIODE = REGISTRATE.item("diode", Item::new).lang("Diode").tag(CustomTags.DIODES) + public static ItemEntry DIODE = REGISTRATE.item("diode", Item::new).lang("Diode").tag(GTTags.Items.DIODES) .register(); public static ItemEntry INDUCTOR = REGISTRATE.item("inductor", Item::new).lang("Inductor") - .tag(CustomTags.INDUCTORS) + .tag(GTTags.Items.INDUCTORS) .register(); public static ItemEntry SMD_TRANSISTOR = REGISTRATE.item("smd_transistor", Item::new).lang("SMD Transistor") - .tag(CustomTags.TRANSISTORS).register(); + .tag(GTTags.Items.TRANSISTORS).register(); public static ItemEntry SMD_RESISTOR = REGISTRATE.item("smd_resistor", Item::new).lang("SMD Resistor") - .tag(CustomTags.RESISTORS).register(); + .tag(GTTags.Items.RESISTORS).register(); public static ItemEntry SMD_CAPACITOR = REGISTRATE.item("smd_capacitor", Item::new).lang("SMD Capacitor") - .tag(CustomTags.CAPACITORS).register(); + .tag(GTTags.Items.CAPACITORS).register(); public static ItemEntry SMD_DIODE = REGISTRATE.item("smd_diode", Item::new).lang("SMD Diode") - .tag(CustomTags.DIODES).register(); + .tag(GTTags.Items.DIODES).register(); public static ItemEntry SMD_INDUCTOR = REGISTRATE.item("smd_inductor", Item::new).lang("SMD Inductor") - .tag(CustomTags.INDUCTORS).register(); + .tag(GTTags.Items.INDUCTORS).register(); public static ItemEntry ADVANCED_SMD_TRANSISTOR = REGISTRATE.item("advanced_smd_transistor", Item::new) .lang("Advanced SMD Transistor").register(); public static ItemEntry ADVANCED_SMD_RESISTOR = REGISTRATE.item("advanced_smd_resistor", Item::new) @@ -1664,96 +1668,96 @@ public static ItemEntry createFluidCell(Material mat, int capacit // T1: Electronic public static ItemEntry ELECTRONIC_CIRCUIT_LV = REGISTRATE.item("basic_electronic_circuit", Item::new) - .lang("Basic Electronic Circuit").tag(CustomTags.LV_CIRCUITS) + .lang("Basic Electronic Circuit").tag(GTTags.Items.CIRCUITS_LV) .register(); public static ItemEntry ELECTRONIC_CIRCUIT_MV = REGISTRATE.item("good_electronic_circuit", Item::new) - .lang("Good Electronic Circuit").tag(CustomTags.MV_CIRCUITS) + .lang("Good Electronic Circuit").tag(GTTags.Items.CIRCUITS_MV) .register(); // T2: Integrated public static ItemEntry INTEGRATED_CIRCUIT_LV = REGISTRATE.item("basic_integrated_circuit", Item::new) - .lang("Basic Integrated Circuit").tag(CustomTags.LV_CIRCUITS) + .lang("Basic Integrated Circuit").tag(GTTags.Items.CIRCUITS_LV) .register(); public static ItemEntry INTEGRATED_CIRCUIT_MV = REGISTRATE.item("good_integrated_circuit", Item::new) - .lang("Good Integrated Circuit").tag(CustomTags.MV_CIRCUITS) + .lang("Good Integrated Circuit").tag(GTTags.Items.CIRCUITS_MV) .register(); public static ItemEntry INTEGRATED_CIRCUIT_HV = REGISTRATE.item("advanced_integrated_circuit", Item::new) - .lang("Advanced Integrated Circuit").tag(CustomTags.HV_CIRCUITS) + .lang("Advanced Integrated Circuit").tag(GTTags.Items.CIRCUITS_HV) .register(); // ULV/LV easier circuits public static ItemEntry NAND_CHIP_ULV = REGISTRATE.item("nand_chip", Item::new).lang("NAND Chip") - .tag(CustomTags.ULV_CIRCUITS).register(); + .tag(GTTags.Items.CIRCUITS_ULV).register(); public static ItemEntry MICROPROCESSOR_LV = REGISTRATE.item("microchip_processor", Item::new) - .lang("Microchip Processor").tag(CustomTags.LV_CIRCUITS) + .lang("Microchip Processor").tag(GTTags.Items.CIRCUITS_LV) .register(); // T3: Processor public static ItemEntry PROCESSOR_MV = REGISTRATE.item("micro_processor", Item::new).lang("Microprocessor") - .tag(CustomTags.MV_CIRCUITS).register(); + .tag(GTTags.Items.CIRCUITS_MV).register(); public static ItemEntry PROCESSOR_ASSEMBLY_HV = REGISTRATE.item("micro_processor_assembly", Item::new) - .lang("Microprocessor Assembly").tag(CustomTags.HV_CIRCUITS) + .lang("Microprocessor Assembly").tag(GTTags.Items.CIRCUITS_HV) .register(); public static ItemEntry WORKSTATION_EV = REGISTRATE.item("micro_processor_computer", Item::new) - .lang("Microprocessor Supercomputer").tag(CustomTags.EV_CIRCUITS) + .lang("Microprocessor Supercomputer").tag(GTTags.Items.CIRCUITS_EV) .register(); public static ItemEntry MAINFRAME_IV = REGISTRATE.item("micro_processor_mainframe", Item::new) - .lang("Microprocessor Mainframe").tag(CustomTags.IV_CIRCUITS) + .lang("Microprocessor Mainframe").tag(GTTags.Items.CIRCUITS_IV) .register(); // T4: Nano public static ItemEntry NANO_PROCESSOR_HV = REGISTRATE.item("nano_processor", Item::new).lang("Nanoprocessor") - .tag(CustomTags.HV_CIRCUITS).register(); + .tag(GTTags.Items.CIRCUITS_HV).register(); public static ItemEntry NANO_PROCESSOR_ASSEMBLY_EV = REGISTRATE.item("nano_processor_assembly", Item::new) - .lang("Nanoprocessor Assembly").tag(CustomTags.EV_CIRCUITS) + .lang("Nanoprocessor Assembly").tag(GTTags.Items.CIRCUITS_EV) .register(); public static ItemEntry NANO_COMPUTER_IV = REGISTRATE.item("nano_processor_computer", Item::new) - .lang("Nanoprocessor Supercomputer").tag(CustomTags.IV_CIRCUITS) + .lang("Nanoprocessor Supercomputer").tag(GTTags.Items.CIRCUITS_IV) .register(); public static ItemEntry NANO_MAINFRAME_LuV = REGISTRATE.item("nano_processor_mainframe", Item::new) - .lang("Nanoprocessor Mainframe").tag(CustomTags.LuV_CIRCUITS) + .lang("Nanoprocessor Mainframe").tag(GTTags.Items.CIRCUITS_LuV) .register(); // T5: Quantum public static ItemEntry QUANTUM_PROCESSOR_EV = REGISTRATE.item("quantum_processor", Item::new) - .lang("Quantum Processor").tag(CustomTags.EV_CIRCUITS) + .lang("Quantum Processor").tag(GTTags.Items.CIRCUITS_EV) .register(); public static ItemEntry QUANTUM_ASSEMBLY_IV = REGISTRATE.item("quantum_processor_assembly", Item::new) - .lang("Quantum Processor Assembly").tag(CustomTags.IV_CIRCUITS) + .lang("Quantum Processor Assembly").tag(GTTags.Items.CIRCUITS_IV) .register(); public static ItemEntry QUANTUM_COMPUTER_LuV = REGISTRATE.item("quantum_processor_computer", Item::new) - .lang("Quantum Processor Supercomputer").tag(CustomTags.LuV_CIRCUITS) + .lang("Quantum Processor Supercomputer").tag(GTTags.Items.CIRCUITS_LuV) .register(); public static ItemEntry QUANTUM_MAINFRAME_ZPM = REGISTRATE.item("quantum_processor_mainframe", Item::new) - .lang("Quantum Processor Mainframe").tag(CustomTags.ZPM_CIRCUITS) + .lang("Quantum Processor Mainframe").tag(GTTags.Items.CIRCUITS_ZPM) .register(); // T6: Crystal public static ItemEntry CRYSTAL_PROCESSOR_IV = REGISTRATE.item("crystal_processor", Item::new) - .lang("Crystal Processor").tag(CustomTags.IV_CIRCUITS) + .lang("Crystal Processor").tag(GTTags.Items.CIRCUITS_IV) .register(); public static ItemEntry CRYSTAL_ASSEMBLY_LuV = REGISTRATE.item("crystal_processor_assembly", Item::new) - .lang("Crystal Processor Assembly").tag(CustomTags.LuV_CIRCUITS) + .lang("Crystal Processor Assembly").tag(GTTags.Items.CIRCUITS_LuV) .register(); public static ItemEntry CRYSTAL_COMPUTER_ZPM = REGISTRATE.item("crystal_processor_computer", Item::new) - .lang("Crystal Processor Supercomputer").tag(CustomTags.ZPM_CIRCUITS) + .lang("Crystal Processor Supercomputer").tag(GTTags.Items.CIRCUITS_ZPM) .register(); public static ItemEntry CRYSTAL_MAINFRAME_UV = REGISTRATE.item("crystal_processor_mainframe", Item::new) - .lang("Crystal Processor Mainframe").tag(CustomTags.UV_CIRCUITS) + .lang("Crystal Processor Mainframe").tag(GTTags.Items.CIRCUITS_UV) .register(); // T7: Wetware public static ItemEntry WETWARE_PROCESSOR_LuV = REGISTRATE.item("wetware_processor", Item::new) - .lang("Wetware Processor").tag(CustomTags.LuV_CIRCUITS) + .lang("Wetware Processor").tag(GTTags.Items.CIRCUITS_LuV) .register(); public static ItemEntry WETWARE_PROCESSOR_ASSEMBLY_ZPM = REGISTRATE .item("wetware_processor_assembly", Item::new).lang("Wetware Processor Assembly") - .tag(CustomTags.ZPM_CIRCUITS).register(); + .tag(GTTags.Items.CIRCUITS_ZPM).register(); public static ItemEntry WETWARE_SUPER_COMPUTER_UV = REGISTRATE.item("wetware_processor_computer", Item::new) - .lang("Wetware Processor Supercomputer").tag(CustomTags.UV_CIRCUITS) + .lang("Wetware Processor Supercomputer").tag(GTTags.Items.CIRCUITS_UV) .register(); public static ItemEntry WETWARE_MAINFRAME_UHV = REGISTRATE.item("wetware_processor_mainframe", Item::new) - .lang("Wetware Processor Mainframe").tag(CustomTags.UHV_CIRCUITS) + .lang("Wetware Processor Mainframe").tag(GTTags.Items.CIRCUITS_UHV) .register(); public static ItemEntry COMPONENT_GRINDER_DIAMOND = REGISTRATE.item("diamond_grinding_head", Item::new) @@ -2034,7 +2038,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(modelPredicate(GTCEu.id("circuit"), (itemStack) -> IntCircuitBehaviour.getCircuitConfiguration(itemStack) / 100f)) .onRegister(attach(new IntCircuitBehaviour())) - .tag(CustomTags.SKIP_ITEM_DETECTOR) + .tag(GTTags.Items.SKIP_ITEM_DETECTOR) .register(); // public static ItemEntry FOAM_SPRAYER = REGISTRATE.item("foam_sprayer", @@ -2053,7 +2057,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .effect(() -> new MobEffectInstance(MobEffects.HUNGER, 400), .40f) .effect(() -> new MobEffectInstance(MobEffects.POISON, 100), .05f) .build()))) - .tag(CustomTags.WHEAT_DOUGHS) + .tag(GTTags.Items.DOUGHS_WHEAT) .register(); public static ItemEntry PLANT_BALL = REGISTRATE.item("plant_ball", ComponentItem::create) .onRegister(burnTime(75)).register(); @@ -2313,7 +2317,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("NanoMuscle™ Suite Boots") .properties(p -> p.rarity(Rarity.UNCOMMON)) .tag(Tags.Items.ARMORS_BOOTS) - .tag(CustomTags.STEP_BOOTS) + .tag(GTTags.Items.STEP_BOOTS) .register(); public static ItemEntry NANO_HELMET = REGISTRATE .item("nanomuscle_helmet", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.HELMET, p) @@ -2333,7 +2337,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .setArmorLogic(new HazmatSuit(ArmorItem.Type.HELMET, "bad_hazmat"))) .lang("Face Mask") .tag(Tags.Items.ARMORS_HELMETS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .onRegister(attach(new TooltipBehavior(tooltips -> { tooltips.add(Component.translatable("tooltip.gtceu.hazard_trigger.protection")); tooltips.add(Component.translatable("tooltip.gtceu.hazard_trigger.inhalation")); @@ -2345,7 +2349,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .setArmorLogic(new HazmatSuit(ArmorItem.Type.CHESTPLATE, "bad_hazmat"))) .lang("Rubber Gloves") .tag(Tags.Items.ARMORS_CHESTPLATES) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .onRegister(attach(new TooltipBehavior(tooltips -> { tooltips.add(Component.translatable("tooltip.gtceu.hazard_trigger.protection")); tooltips.add(Component.translatable("tooltip.gtceu.hazard_trigger.skin_contact")); @@ -2358,7 +2362,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Hazardous Materials Suit Chestpiece") .properties(p -> p.rarity(Rarity.UNCOMMON)) .tag(Tags.Items.ARMORS_CHESTPLATES) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_LEGGINGS = REGISTRATE .item("hazmat_leggings", @@ -2367,7 +2371,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Hazardous Materials Suit Leggings") .properties(p -> p.rarity(Rarity.UNCOMMON)) .tag(Tags.Items.ARMORS_LEGGINGS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_BOOTS = REGISTRATE .item("hazmat_boots", @@ -2376,7 +2380,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Hazardous Materials Suit Boots") .properties(p -> p.rarity(Rarity.UNCOMMON)) .tag(Tags.Items.ARMORS_BOOTS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_HELMET = REGISTRATE .item("hazmat_headpiece", @@ -2385,7 +2389,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Hazardous Materials Suit Headpiece") .properties(p -> p.rarity(Rarity.UNCOMMON)) .tag(Tags.Items.ARMORS_HELMETS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_CHESTPLATE = REGISTRATE @@ -2400,7 +2404,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .properties(p -> p.rarity(Rarity.RARE)) .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(ItemTags.FREEZE_IMMUNE_WEARABLES) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_LEGGINGS = REGISTRATE .item("quarktech_leggings", @@ -2413,7 +2417,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("QuarkTech™ Suite Leggings") .properties(p -> p.rarity(Rarity.RARE)) .tag(Tags.Items.ARMORS_LEGGINGS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_BOOTS = REGISTRATE .item("quarktech_boots", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.BOOTS, p) @@ -2425,8 +2429,8 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("QuarkTech™ Suite Boots") .properties(p -> p.rarity(Rarity.RARE)) .tag(Tags.Items.ARMORS_BOOTS) - .tag(CustomTags.PPE_ARMOR) - .tag(CustomTags.STEP_BOOTS) + .tag(GTTags.Items.PPE_ARMOR) + .tag(GTTags.Items.STEP_BOOTS) .register(); public static ItemEntry QUANTUM_HELMET = REGISTRATE .item("quarktech_helmet", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.HELMET, p) @@ -2438,7 +2442,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("QuarkTech™ Suite Helmet") .properties(p -> p.rarity(Rarity.RARE)) .tag(Tags.Items.ARMORS_HELMETS) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry LIQUID_FUEL_JETPACK = REGISTRATE @@ -2484,7 +2488,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .lang("Advanced NanoMuscle™ Suite Chestplate") .properties(p -> p.rarity(Rarity.RARE)) .tag(Tags.Items.ARMORS_CHESTPLATES) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_CHESTPLATE_ADVANCED = REGISTRATE .item("advanced_quarktech_chestplate", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, @@ -2498,7 +2502,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .properties(p -> p.rarity(Rarity.EPIC)) .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(ItemTags.FREEZE_IMMUNE_WEARABLES) - .tag(CustomTags.PPE_ARMOR) + .tag(GTTags.Items.PPE_ARMOR) .register(); public static ItemEntry POWER_THRUSTER = REGISTRATE.item("power_thruster", Item::new) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index 22e06f322fc..d2e5daa8413 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -64,14 +64,22 @@ public static void init() { MaterialFlagAddition.register(); CHEMICAL_DYES = new Material[] { - DyeWhite, DyeOrange, - DyeMagenta, DyeLightBlue, - DyeYellow, DyeLime, - DyePink, DyeGray, - DyeLightGray, DyeCyan, - DyePurple, DyeBlue, - DyeBrown, DyeGreen, - DyeRed, DyeBlack + DyeWhite, + DyeOrange, + DyeMagenta, + DyeLightBlue, + DyeYellow, + DyeLime, + DyePink, + DyeGray, + DyeLightGray, + DyeCyan, + DyePurple, + DyeBlue, + DyeBrown, + DyeGreen, + DyeRed, + DyeBlack }; VOLTAGE_COMMON_MATERIALS = new Material[] { diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java index 7de377bf706..359fbf0f29c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTToolTiers.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Tier; @@ -24,13 +24,13 @@ public static void init() { var duranium = GTCEu.id("duranium"); var neutronium = GTCEu.id("neutronium"); DURANIUM = TierSortingRegistry.registerTier( - new ForgeTier(5, 8193, 14.0F, 12.0F, 33, CustomTags.NEEDS_DURANIUM_TOOL, + new ForgeTier(5, 8193, 14.0F, 12.0F, 33, GTTags.Blocks.NEEDS_DURANIUM_TOOL, () -> Ingredient.of(ChemicalHelper.getTag(TagPrefix.ingot, GTMaterials.Duranium))), duranium, List.of(netherite), List.of(neutronium)); NEUTRONIUM = TierSortingRegistry.registerTier( - new ForgeTier(6, 65536, 180.0F, 100.0F, 33, CustomTags.NEEDS_NEUTRONIUM_TOOL, + new ForgeTier(6, 65536, 180.0F, 100.0F, 33, GTTags.Blocks.NEEDS_NEUTRONIUM_TOOL, () -> Ingredient.of(ChemicalHelper.getTag(TagPrefix.ingot, GTMaterials.Neutronium))), neutronium, List.of(duranium), diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java index e118537d9a3..d4855aa18a7 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.data.worldgen; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.*; import net.minecraft.core.registries.Registries; @@ -28,7 +28,7 @@ public static void bootstrap(BootstapContext ctx) { HolderGetter biomeLookup = ctx.lookup(Registries.BIOME); HolderGetter placedFeatureRegistry = ctx.lookup(Registries.PLACED_FEATURE); - HolderSet biomes = biomeLookup.getOrThrow(CustomTags.HAS_RUBBER_TREE); + HolderSet biomes = biomeLookup.getOrThrow(GTTags.Biomes.HAS_RUBBER_TREE); Holder rubberTree = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RUBBER_CHECKED); ctx.register(RUBBER, new ForgeBiomeModifiers.AddFeaturesBiomeModifier( biomes, diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java index 8a6e3a6e3f6..30d3fdb7395 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.worldgen.modifier.BiomeDependentPlacement; import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.Registries; @@ -34,7 +34,7 @@ public static void bootstrap(BootstapContext ctx) { PlacementUtils.register(ctx, RUBBER_CHECKED, featureLookup.getOrThrow(GTConfiguredFeatures.RUBBER), new BiomeDependentPlacement(List.of( - new BiomeWeightModifier(() -> biomeLookup.getOrThrow(CustomTags.IS_SWAMP), 50))), + new BiomeWeightModifier(() -> biomeLookup.getOrThrow(GTTags.Biomes.IS_SWAMP), 50))), RubberTreeChancePlacement.INSTANCE, InSquarePlacement.spread(), SurfaceWaterDepthFilter.forMaxDepth(0), diff --git a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java index 536db05f0d1..ba8dc95c3c2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/common/fluid/potion/BottleItemFluidHandler.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.fluid.potion; import com.gregtechceu.gtceu.api.misc.forge.FilteredFluidHandlerItemStackSimple; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -13,7 +13,7 @@ public class BottleItemFluidHandler extends FilteredFluidHandlerItemStackSimple { public BottleItemFluidHandler(@NotNull ItemStack container) { - super(container, PotionFluidHelper.BOTTLE_AMOUNT, s -> s.getFluid().is(CustomTags.POTION_FLUIDS)); + super(container, PotionFluidHelper.BOTTLE_AMOUNT, s -> s.getFluid().is(GTTags.Fluids.POTION)); } @Override diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java index 5568beff413..e9d225dda6a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.BreadthFirstBlockSearch; import com.gregtechceu.gtceu.utils.GradientUtil; @@ -331,12 +331,12 @@ private boolean tryPaintSpecialBlock(Level world, BlockPos pos, Block block) { return true; } } - if (block.defaultBlockState().is(CustomTags.CONCRETE_BLOCK)) { + if (block.defaultBlockState().is(GTTags.Blocks.CONCRETES)) { if (recolorBlockNoState(CONCRETE_MAP, this.color, world, pos)) { return true; } } - if (block.defaultBlockState().is(CustomTags.CONCRETE_POWDER_BLOCK)) { + if (block.defaultBlockState().is(GTTags.Blocks.CONCRETE_POWDERS)) { if (recolorBlockNoState(CONCRETE_POWDER_MAP, this.color, world, pos)) { return true; } @@ -398,11 +398,11 @@ private static boolean tryStripBlockColor(Level world, BlockPos pos, Block block world.setBlockAndUpdate(pos, Blocks.WHITE_CARPET.defaultBlockState()); return true; } - if (block.defaultBlockState().is(CustomTags.CONCRETE_BLOCK) && block != Blocks.WHITE_CONCRETE) { + if (block.defaultBlockState().is(GTTags.Blocks.CONCRETES) && block != Blocks.WHITE_CONCRETE) { world.setBlockAndUpdate(pos, Blocks.WHITE_CONCRETE.defaultBlockState()); return true; } - if (block.defaultBlockState().is(CustomTags.CONCRETE_POWDER_BLOCK) && block != Blocks.WHITE_CONCRETE_POWDER) { + if (block.defaultBlockState().is(GTTags.Blocks.CONCRETE_POWDERS) && block != Blocks.WHITE_CONCRETE_POWDER) { world.setBlockAndUpdate(pos, Blocks.WHITE_CONCRETE_POWDER.defaultBlockState()); return true; } diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java index 8a235fddcbc..397ef1dba81 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/ToolModeSwitchBehavior.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.common.data.GTSoundEntries; import com.gregtechceu.gtceu.common.data.item.GTToolActions; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -73,7 +73,7 @@ public void addBehaviorNBT(@NotNull ItemStack stack, @NotNull CompoundTag tag) { // Copied and adapted from // https://github.com/Creators-of-Create/Create/blob/mc1.20.1/dev/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java if (toolTypes.contains(GTToolType.WRENCH) && GTCEu.Mods.isCreateLoaded() && - state.is(CustomTags.CREATE_WRENCH_PICKUP)) { + state.is(GTTags.Blocks.CREATE_WRENCH_PICKUP)) { if (!(world instanceof ServerLevel serverLevel)) return InteractionResult.SUCCESS; if (player != null && !player.isCreative()) diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java index 1222f9e0a0e..98350547e73 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java @@ -40,7 +40,7 @@ import com.gregtechceu.gtceu.common.machine.trait.CleanroomProviderTrait; import com.gregtechceu.gtceu.common.machine.trait.CleanroomReceiverTrait; import com.gregtechceu.gtceu.common.mui.GTMultiblockTextUtil; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.ChatFormatting; @@ -300,7 +300,7 @@ private static boolean isAllFloorBlocks(Level level, BlockPos.MutableBlockPos po for (int k = 0; k < 3; k++) { var checkPos = pos.immutable(); var s1 = level.getBlockState(checkPos); - if (s1 != getCasingState() && s1 != getGlassState() && !(s1.is(CustomTags.CLEANROOM_FLOORS))) { + if (s1 != getCasingState() && s1 != getGlassState() && !(s1.is(GTTags.Blocks.CLEANROOM_FLOORS))) { return false; } pos.move(Direction.NORTH); @@ -477,7 +477,7 @@ protected static PatternPredicate doorPredicate() { } private static PatternPredicate getValidFloorBlocks() { - return Predicates.blockTag(CustomTags.CLEANROOM_FLOORS); + return Predicates.blockTag(GTTags.Blocks.CLEANROOM_FLOORS); } protected static PatternPredicate innerPredicate() { diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java index 8526d09b307..01422d4c8ae 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java @@ -61,7 +61,7 @@ import javax.annotation.ParametersAreNonnullByDefault; -import static com.gregtechceu.gtceu.data.recipe.CustomTags.HPCA_COOLANTS; +import static com.gregtechceu.gtceu.data.tags.GTTags.Fluids.HPCA_COOLANTS; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java index 1735221646a..5017dabc829 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection; import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.item.behavior.LighterBehavior; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.ExtendedUseOnContext; import net.minecraft.core.BlockPos; @@ -154,7 +154,7 @@ private static PatternPredicate wallPredicate() { return new PatternPredicate("Wall Blocks", multiblockState -> { BlockPos p = multiblockState.getBlockPos(); - return multiblockState.getBlockState().is(CustomTags.CHARCOAL_PILE_IGNITER_WALLS) ? + return multiblockState.getBlockState().is(GTTags.Blocks.CHARCOAL_PILE_IGNITER_WALLS) ? null : new PatternStringError(Component.translatable("gtceu.predicate_error.charcoal.walls", p.getX(), p.getY(), p.getZ())); }, null); @@ -170,7 +170,7 @@ private static PatternPredicate logPredicate() { private static int findWallPos(Level level, Direction direction, BlockPos.MutableBlockPos pos) { for (int i = 1; i <= MAX_RADIUS; i++) { BlockState state = level.getBlockState(pos.move(direction)); - if (state.is(CustomTags.CHARCOAL_PILE_IGNITER_WALLS)) { + if (state.is(GTTags.Blocks.CHARCOAL_PILE_IGNITER_WALLS)) { return i; } } @@ -230,7 +230,7 @@ public InteractionResult onUse(ExtendedUseOnContext context) { var player = context.getPlayer(); var hand = context.getHand(); - if (!stack.is(CustomTags.TOOLS_IGNITER)) { + if (!stack.is(GTTags.Items.TOOLS_IGNITER)) { return InteractionResult.PASS; } diff --git a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java index 650c5a48ba0..66e6773fbc9 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java +++ b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java @@ -20,7 +20,7 @@ import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.BlockBehaviourAccessor; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; @@ -83,7 +83,7 @@ public static void generateGTDynamicTags(Map new ArrayList<>()).addAll(entries); @@ -150,14 +150,14 @@ public static void generateGTDynamicTags(Map new ArrayList<>()).addAll(entries); if (material.hasProperty(PropertyKey.WOOD)) { // Wood blocks with this tag always allow a Wrench, but only allow an Axe if the config is // not set. Pickaxe is never allowed (special case) if (entry.tagPrefix().miningToolTag() - .contains(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH)) { - tagMap.computeIfAbsent(CustomTags.MINEABLE_WITH_WRENCH.location(), + .contains(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH)) { + tagMap.computeIfAbsent(GTTags.Blocks.MINEABLE_WITH_WRENCH.location(), path -> new ArrayList<>()).addAll(entries); if (!ConfigHolder.INSTANCE.machines.requireGTToolsForBlocks) { tagMap.computeIfAbsent(BlockTags.MINEABLE_WITH_AXE.location(), @@ -182,13 +182,13 @@ public static void generateGTDynamicTags(Map new ArrayList<>()) + tagMap.computeIfAbsent(GTTags.Blocks.SLOW_WALKABLE_BLOCKS.location(), path -> new ArrayList<>()) .addAll(entries); } }); GTRegistries.MACHINES.forEach(machine -> { - tagMap.computeIfAbsent(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH.location(), + tagMap.computeIfAbsent(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH.location(), path -> new ArrayList<>()).add(makeBlockEntry(machine.getBlock())); }); @@ -197,8 +197,8 @@ public static void generateGTDynamicTags(Map new ArrayList<>()); - tagList.add(makeTagEntry(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH)); - tagList.add(makeTagEntry(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER)); + tagList.add(makeTagEntry(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH)); + tagList.add(makeTagEntry(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER)); } } else if (registry == BuiltInRegistries.FLUID) { for (Material material : GTRegistries.MATERIALS) { diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/IntrinsicTagAppenderMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/IntrinsicTagAppenderMixin.java new file mode 100644 index 00000000000..3ac38de59dc --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/IntrinsicTagAppenderMixin.java @@ -0,0 +1,10 @@ +package com.gregtechceu.gtceu.core.mixins; + +import com.gregtechceu.gtceu.core.util.extensions.IntrinsicTagAppenderExt; + +import net.minecraft.data.tags.IntrinsicHolderTagsProvider; + +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(IntrinsicHolderTagsProvider.IntrinsicTagAppender.class) +public abstract class IntrinsicTagAppenderMixin implements IntrinsicTagAppenderExt {} diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/TagAppenderMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/TagAppenderMixin.java new file mode 100644 index 00000000000..7e62aaa6a3f --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/TagAppenderMixin.java @@ -0,0 +1,10 @@ +package com.gregtechceu.gtceu.core.mixins; + +import com.gregtechceu.gtceu.core.util.extensions.TagAppenderExt; + +import net.minecraft.data.tags.TagsProvider; + +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(TagsProvider.TagAppender.class) +public abstract class TagAppenderMixin implements TagAppenderExt {} diff --git a/src/main/java/com/gregtechceu/gtceu/core/util/extensions/IntrinsicTagAppenderExt.java b/src/main/java/com/gregtechceu/gtceu/core/util/extensions/IntrinsicTagAppenderExt.java new file mode 100644 index 00000000000..ba8e7b132d7 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/core/util/extensions/IntrinsicTagAppenderExt.java @@ -0,0 +1,62 @@ +package com.gregtechceu.gtceu.core.util.extensions; + +import net.minecraft.data.tags.IntrinsicHolderTagsProvider; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraftforge.common.extensions.IForgeIntrinsicHolderTagAppender; + +import java.util.function.Supplier; +import java.util.stream.Stream; + +public interface IntrinsicTagAppenderExt extends TagAppenderExt, IForgeIntrinsicHolderTagAppender { + + private IntrinsicHolderTagsProvider.IntrinsicTagAppender self() { + return (IntrinsicHolderTagsProvider.IntrinsicTagAppender) this; + } + + default IntrinsicHolderTagsProvider.IntrinsicTagAppender add(Supplier value) { + return self().add(value.get()); + } + + @SuppressWarnings("unchecked") + default IntrinsicHolderTagsProvider.IntrinsicTagAppender add(Supplier... values) { + Stream.of(values).forEach(this::add); + return self(); + } + + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptional(T value) { + return addOptional(getKey(value)); + } + + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptional(Supplier value) { + return addOptional(value.get()); + } + + @SuppressWarnings("unchecked") + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptional(Supplier... values) { + Stream.of(values).forEach(this::addOptional); + return self(); + } + + @Override + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptional(ResourceKey key) { + TagAppenderExt.super.addOptional(key); + return self(); + } + + @Override + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptionalTag(TagKey value) { + self().addOptionalTag(value.location()); + return self(); + } + + @SuppressWarnings("unchecked") + @Override + default IntrinsicHolderTagsProvider.IntrinsicTagAppender addOptionalTags(TagKey... values) { + IntrinsicHolderTagsProvider.IntrinsicTagAppender builder = self(); + for (TagKey value : values) { + builder.addOptionalTag(value.location()); + } + return builder; + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/core/util/extensions/TagAppenderExt.java b/src/main/java/com/gregtechceu/gtceu/core/util/extensions/TagAppenderExt.java new file mode 100644 index 00000000000..0c0b2a1acfa --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/core/util/extensions/TagAppenderExt.java @@ -0,0 +1,16 @@ +package com.gregtechceu.gtceu.core.util.extensions; + +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.resources.ResourceKey; +import net.minecraftforge.common.extensions.IForgeTagAppender; + +public interface TagAppenderExt extends IForgeTagAppender { + + private TagsProvider.TagAppender self() { + return (TagsProvider.TagAppender) this; + } + + default TagsProvider.TagAppender addOptional(ResourceKey key) { + return self().addOptional(key.location()); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index 3a1969c4ca0..c21029bb12a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -159,7 +159,6 @@ private static void initItemTooltips(RegistrateLangProvider provider) { provider.add("item.gtceu.circuit.integrated.gui", "§7Programmed Circuit Configuration"); // multilineLang(provider, "item.gtceu.circuit.integrated.jei_description", "JEI is only showing recipes for the // given configuration.\n\nYou can select a configuration in the Programmed Circuit configuration tab."); - provider.add("item.glass_lens", "Glass Lens (White)"); // todo move to material overrides provider.add("item.gtceu.silicon_boule.tooltip", "§7Raw Circuit"); provider.add("item.gtceu.phosphorus_boule.tooltip", "§7Raw Circuit"); provider.add("item.gtceu.naquadah_boule.tooltip", "§7Raw Circuit"); diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java index 849fae21701..6f00b1ddc80 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java @@ -689,6 +689,7 @@ public static void init(RegistrateLangProvider provider) { provider.add("item.gtceu.flawless_glass_gem", "Flawless Glass Crystal"); provider.add("item.gtceu.exquisite_glass_gem", "Exquisite Glass Crystal"); provider.add("item.gtceu.glass_plate", "Glass Pane"); + provider.add("item.gtceu.glass_lens", "Glass Lens (White)"); provider.add("item.gtceu.tiny_blaze_dust", "Tiny Pile of Blaze Powder"); provider.add("item.gtceu.small_blaze_dust", "Small Pile of Blaze Powder"); provider.add("item.gtceu.tiny_sugar_dust", "Tiny Pile of Sugar"); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java deleted file mode 100644 index 8777c4d027e..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.gregtechceu.gtceu.data.recipe; - -import com.gregtechceu.gtceu.api.data.tag.TagUtil; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Fluid; - -public class CustomTags { - - // Added Vanilla tags - public static final TagKey PISTONS = TagUtil.createItemTag("pistons"); - public static final TagKey CONCRETE_ITEM = TagUtil.createItemTag("concretes"); - public static final TagKey CONCRETE_POWDER_ITEM = TagUtil.createItemTag("concrete_powders"); - // common/mod compat tags - public static final TagKey DOUGHS = TagUtil.createItemTag("dough"); - public static final TagKey WHEAT_DOUGHS = TagUtil.createItemTag("dough/wheat"); - public static final TagKey GRAINS = TagUtil.createItemTag("grain"); - public static final TagKey WHEAT_GRAINS = TagUtil.createItemTag("grain/wheat"); - - // Why did I put them all here? Why not? Science isn't about why, it's about why NOT! - // Why is so much of our science dangerous? Why don't you marry safe science if you love it so much!? - // IN FACT, WHY NOT INVENT A SAFETY DOOR THAT WON'T HIT YOU ON THE BUTT ON THE WAY OUT BECAUSE YOU'RE FIRED!!! - // Not you test subject, you're doing fine. - // YES, YOU. BOX. YOUR STUFF. OUT THE FRONT DOOR. PARKING LOT. CAR. GOODBYE! - public static final TagKey ALIVE_CORAL_BLOCK_ITEMS = TagUtil.createItemTag("coral_blocks/alive"); - public static final TagKey DEAD_CORAL_BLOCK_ITEMS = TagUtil.createItemTag("coral_blocks/dead"); - public static final TagKey CORAL_BLOCK_ITEMS = TagUtil.createItemTag("coral_blocks"); - public static final TagKey ALIVE_CORAL_PLANT_ITEMS = TagUtil.createItemTag("coral_plants/alive"); - public static final TagKey DEAD_CORAL_PLANT_ITEMS = TagUtil.createItemTag("coral_plants/dead"); - public static final TagKey CORAL_PLANT_ITEMS = TagUtil.createItemTag("coral_plants"); - public static final TagKey ALIVE_CORAL_FAN_ITEMS = TagUtil.createItemTag("coral_fans/alive"); - public static final TagKey DEAD_CORAL_FAN_ITEMS = TagUtil.createItemTag("coral_fans/dead"); - public static final TagKey CORAL_FAN_ITEMS = TagUtil.createItemTag("coral_fans"); - public static final TagKey ALIVE_CORAL_ITEMS = TagUtil.createItemTag("corals/alive"); - public static final TagKey DEAD_CORAL_ITEMS = TagUtil.createItemTag("corals/dead"); - public static final TagKey CORAL_ITEMS = TagUtil.createItemTag("corals"); - - // Added Gregtech tags - public static final TagKey TRANSISTORS = TagUtil.createModItemTag("transistors"); - public static final TagKey RESISTORS = TagUtil.createModItemTag("resistors"); - public static final TagKey CAPACITORS = TagUtil.createModItemTag("capacitors"); - public static final TagKey DIODES = TagUtil.createModItemTag("diodes"); - public static final TagKey INDUCTORS = TagUtil.createModItemTag("inductors"); - - public static final TagKey CIRCUITS = TagUtil.createModItemTag("circuits"); - public static final TagKey ULV_CIRCUITS = TagUtil.createModItemTag("circuits/ulv"); - public static final TagKey LV_CIRCUITS = TagUtil.createModItemTag("circuits/lv"); - public static final TagKey MV_CIRCUITS = TagUtil.createModItemTag("circuits/mv"); - public static final TagKey HV_CIRCUITS = TagUtil.createModItemTag("circuits/hv"); - public static final TagKey EV_CIRCUITS = TagUtil.createModItemTag("circuits/ev"); - public static final TagKey IV_CIRCUITS = TagUtil.createModItemTag("circuits/iv"); - public static final TagKey LuV_CIRCUITS = TagUtil.createModItemTag("circuits/luv"); - public static final TagKey ZPM_CIRCUITS = TagUtil.createModItemTag("circuits/zpm"); - public static final TagKey UV_CIRCUITS = TagUtil.createModItemTag("circuits/uv"); - public static final TagKey UHV_CIRCUITS = TagUtil.createModItemTag("circuits/uhv"); - public static final TagKey UEV_CIRCUITS = TagUtil.createModItemTag("circuits/uev"); - public static final TagKey UIV_CIRCUITS = TagUtil.createModItemTag("circuits/uiv"); - public static final TagKey UXV_CIRCUITS = TagUtil.createModItemTag("circuits/uxv"); - public static final TagKey OpV_CIRCUITS = TagUtil.createModItemTag("circuits/opv"); - public static final TagKey MAX_CIRCUITS = TagUtil.createModItemTag("circuits/max"); - - @SuppressWarnings("unchecked") - public static final TagKey[] CIRCUITS_ARRAY = new TagKey[] { - ULV_CIRCUITS, - LV_CIRCUITS, - MV_CIRCUITS, - HV_CIRCUITS, - EV_CIRCUITS, - IV_CIRCUITS, - LuV_CIRCUITS, - ZPM_CIRCUITS, - UV_CIRCUITS, - UHV_CIRCUITS, - UEV_CIRCUITS, - UIV_CIRCUITS, - UXV_CIRCUITS, - OpV_CIRCUITS, - MAX_CIRCUITS - }; - - public static final TagKey BATTERIES = TagUtil.createModItemTag("batteries"); - public static final TagKey ULV_BATTERIES = TagUtil.createModItemTag("batteries/ulv"); - public static final TagKey LV_BATTERIES = TagUtil.createModItemTag("batteries/lv"); - public static final TagKey MV_BATTERIES = TagUtil.createModItemTag("batteries/mv"); - public static final TagKey HV_BATTERIES = TagUtil.createModItemTag("batteries/hv"); - public static final TagKey EV_BATTERIES = TagUtil.createModItemTag("batteries/ev"); - public static final TagKey IV_BATTERIES = TagUtil.createModItemTag("batteries/iv"); - public static final TagKey LuV_BATTERIES = TagUtil.createModItemTag("batteries/luv"); - public static final TagKey ZPM_BATTERIES = TagUtil.createModItemTag("batteries/zpm"); - public static final TagKey UV_BATTERIES = TagUtil.createModItemTag("batteries/uv"); - public static final TagKey UHV_BATTERIES = TagUtil.createModItemTag("batteries/uhv"); - - @SuppressWarnings("unchecked") - public static final TagKey[] BATTERIES_ARRAY = new TagKey[] { - ULV_BATTERIES, - LV_BATTERIES, - MV_BATTERIES, - HV_BATTERIES, - EV_BATTERIES, - IV_BATTERIES, - LuV_BATTERIES, - ZPM_BATTERIES, - UV_BATTERIES, - UHV_BATTERIES - }; - - public static final TagKey ELECTRIC_MOTORS = TagUtil.createModItemTag("electric_motors"); - public static final TagKey ELECTRIC_PUMPS = TagUtil.createModItemTag("electric_pumps"); - public static final TagKey FLUID_REGULATORS = TagUtil.createModItemTag("fluid_regulators"); - public static final TagKey CONVEYOR_MODULES = TagUtil.createModItemTag("conveyor_modules"); - public static final TagKey ELECTRIC_PISTONS = TagUtil.createModItemTag("electric_pistons"); - public static final TagKey ROBOT_ARMS = TagUtil.createModItemTag("robot_arms"); - public static final TagKey FIELD_GENERATORS = TagUtil.createModItemTag("field_generators"); - public static final TagKey EMITTERS = TagUtil.createModItemTag("emitters"); - public static final TagKey SENSORS = TagUtil.createModItemTag("sensors"); - - public static final TagKey PPE_ARMOR = TagUtil.createModItemTag("ppe_armor"); - public static final TagKey STEP_BOOTS = TagUtil.createModItemTag("step_boots"); - public static final TagKey RUBBER_LOGS = TagUtil.createModItemTag("rubber_logs"); - - public static final TagKey CLEANROOM_DOORS = TagUtil.createModBlockTag("cleanroom_doors"); - - public static final TagKey CHEM_BATH_WASHABLE = TagUtil.createModItemTag("chemical_bath_washable"); - - public static final TagKey SKIP_ITEM_DETECTOR = TagUtil.createModItemTag("skip_item_detector"); - - // Mineability tags - public static final TagKey MINEABLE_WITH_WRENCH = TagUtil.createBlockTag("mineable/wrench"); - public static final TagKey MINEABLE_WITH_WIRE_CUTTER = TagUtil.createBlockTag("mineable/wire_cutter"); - public static final TagKey MINEABLE_WITH_SAW = TagUtil.createBlockTag("mineable/saw"); - public static final TagKey MINEABLE_WITH_HAMMER = TagUtil.createBlockTag("mineable/hammer"); - public static final TagKey MINEABLE_WITH_CROWBAR = TagUtil.createBlockTag("mineable/crowbar"); - public static final TagKey MINEABLE_WITH_KNIFE = TagUtil.createBlockTag("mineable/knife"); - public static final TagKey MINEABLE_WITH_SHEARS = TagUtil.createBlockTag("mineable/shears"); - public static final TagKey MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH = TagUtil - .createModBlockTag("mineable/pickaxe_or_wrench"); - public static final TagKey MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER = TagUtil - .createModBlockTag("mineable/pickaxe_or_wire_cutter"); - - public static final TagKey NEEDS_WOOD_TOOL = TagUtil.createBlockTag("needs_wood_tool"); - public static final TagKey NEEDS_GOLD_TOOL = TagUtil.createBlockTag("needs_gold_tool"); - public static final TagKey NEEDS_NETHERITE_TOOL = TagUtil.createBlockTag("needs_netherite_tool"); - public static final TagKey NEEDS_DURANIUM_TOOL = TagUtil.createBlockTag("needs_duranium_tool"); - public static final TagKey NEEDS_NEUTRONIUM_TOOL = TagUtil.createBlockTag("needs_neutronium_tool"); - - // Tool tags - public static final TagKey TOOLS_IGNITER = TagUtil.createItemTag("tools/igniter"); - - public static final TagKey BUTCHERY_KNIVES = TagUtil.createItemTag("tools/butchery_knives"); - public static final TagKey BUZZSAWS = TagUtil.createItemTag("tools/buzzsaws"); - public static final TagKey CHAINSAWS = TagUtil.createItemTag("tools/chainsaws"); - public static final TagKey CROWBARS = TagUtil.createItemTag("tools/crowbars"); - public static final TagKey DRILLS = TagUtil.createItemTag("tools/drills"); - public static final TagKey FILES = TagUtil.createItemTag("tools/files"); - public static final TagKey HAMMERS = TagUtil.createItemTag("tools/hammers"); - public static final TagKey KNIVES = TagUtil.createItemTag("tools/knives"); - public static final TagKey MALLETS = TagUtil.createItemTag("tools/mallets"); - public static final TagKey MINING_HAMMERS = TagUtil.createItemTag("tools/mining_hammers"); - public static final TagKey MORTARS = TagUtil.createItemTag("tools/mortars"); - public static final TagKey PLUNGERS = TagUtil.createItemTag("tools/plungers"); - public static final TagKey SAWS = TagUtil.createItemTag("tools/saws"); - public static final TagKey SCREWDRIVERS = TagUtil.createItemTag("tools/screwdrivers"); - public static final TagKey SCYTHES = TagUtil.createItemTag("tools/scythes"); - public static final TagKey SHEARS = TagUtil.createItemTag("tools/shears"); - public static final TagKey SPADES = TagUtil.createItemTag("tools/spades"); - public static final TagKey WIRE_CUTTERS = TagUtil.createItemTag("tools/wire_cutters"); - public static final TagKey WRENCHES = TagUtil.createItemTag("tools/wrenches"); - public static final TagKey WRENCH = TagUtil.createItemTag("tools/wrench"); // Compat with other mods - - // Tool Crafting Tags - public static final TagKey CRAFTING_CROWBARS = TagUtil.createModItemTag("tools/crafting_crowbars"); - public static final TagKey CRAFTING_FILES = TagUtil.createModItemTag("tools/crafting_files"); - public static final TagKey CRAFTING_HAMMERS = TagUtil.createModItemTag("tools/crafting_hammers"); - public static final TagKey CRAFTING_KNIVES = TagUtil.createModItemTag("tools/crafting_knives"); - public static final TagKey CRAFTING_MALLETS = TagUtil.createModItemTag("tools/crafting_mallets"); - public static final TagKey CRAFTING_MORTARS = TagUtil.createModItemTag("tools/crafting_mortars"); - public static final TagKey CRAFTING_SAWS = TagUtil.createModItemTag("tools/crafting_saws"); - public static final TagKey CRAFTING_SCREWDRIVERS = TagUtil.createModItemTag("tools/crafting_screwdrivers"); - public static final TagKey CRAFTING_WIRE_CUTTERS = TagUtil.createModItemTag("tools/crafting_wire_cutters"); - public static final TagKey CRAFTING_WRENCHES = TagUtil.createModItemTag("tools/crafting_wrenches"); - - @SuppressWarnings("unchecked") - public static final TagKey[] TOOL_TIERS = new TagKey[] { - NEEDS_WOOD_TOOL, - BlockTags.NEEDS_STONE_TOOL, - BlockTags.NEEDS_IRON_TOOL, - BlockTags.NEEDS_DIAMOND_TOOL, - NEEDS_NETHERITE_TOOL, - NEEDS_DURANIUM_TOOL, - NEEDS_NEUTRONIUM_TOOL, - }; - - public static final TagKey ENDSTONE_ORE_REPLACEABLES = TagUtil.createBlockTag("end_stone_ore_replaceables"); - public static final TagKey CONCRETE_BLOCK = TagUtil.createBlockTag("concretes"); - public static final TagKey VERY_FAST_WALKABLE_BLOCKS = TagUtil.createBlockTag("very_fast_walkable_blocks"); - public static final TagKey FAST_WALKABLE_BLOCKS = TagUtil.createBlockTag("fast_walkable_blocks"); - public static final TagKey SLOW_WALKABLE_BLOCKS = TagUtil.createBlockTag("slow_walkable_blocks"); - public static final TagKey CONCRETE_POWDER_BLOCK = TagUtil.createBlockTag("concrete_powders"); - public static final TagKey CLEANROOM_FLOORS = TagUtil.createModBlockTag("cleanroom_floors"); - public static final TagKey CHARCOAL_PILE_IGNITER_WALLS = TagUtil.createModBlockTag( - "charcoal_pile_igniter_walls"); - public static final TagKey CREATE_WRENCH_PICKUP = TagUtil.optionalTag(BuiltInRegistries.BLOCK, - new ResourceLocation("create", "wrench_pickup")); - - public static final TagKey TALL_PLANTS = TagUtil.createModBlockTag("tall_plants"); - - public static final TagKey IS_SWAMP = TagUtil.createTag(Registries.BIOME, "is_swamp", false); - public static final TagKey IS_SANDY = TagUtil.createModTag(Registries.BIOME, "is_sandy"); - public static final TagKey HAS_RUBBER_TREE = TagUtil.createModTag(Registries.BIOME, "has_rubber_tree"); - - public static final TagKey> HEAT_IMMUNE = TagUtil.createModTag(Registries.ENTITY_TYPE, "heat_immune"); - public static final TagKey> CHEMICAL_IMMUNE = TagUtil.createModTag(Registries.ENTITY_TYPE, - "chemical_immune"); - - public static final TagKey LIGHTER_FLUIDS = TagUtil.createModFluidTag("lighter_fluids"); - public static final TagKey POTION_FLUIDS = TagUtil.createFluidTag("potion"); - - public static final TagKey MOLTEN_FLUIDS = TagUtil.createFluidTag("molten"); - public static final TagKey LIQUID_FLUIDS = TagUtil.createFluidTag("liquid"); - public static final TagKey PLASMA_FLUIDS = TagUtil.createFluidTag("plasmatic"); - - public static final TagKey HPCA_COOLANTS = TagUtil.createModFluidTag("hpca_coolants"); - - public static final TagKey WHITE_LENS = TagUtil.createItemTag("lens/white"); - public static final TagKey ORANGE_LENS = TagUtil.createItemTag("lens/orange"); - public static final TagKey MAGENTA_LENS = TagUtil.createItemTag("lens/magenta"); - public static final TagKey LIGHT_BLUE_LENS = TagUtil.createItemTag("lens/light_blue"); - public static final TagKey YELLOW_LENS = TagUtil.createItemTag("lens/yellow"); - public static final TagKey LIME_LENS = TagUtil.createItemTag("lens/lime"); - public static final TagKey PINK_LENS = TagUtil.createItemTag("lens/pink"); - public static final TagKey GRAY_LENS = TagUtil.createItemTag("lens/gray"); - public static final TagKey LIGHT_GRAY_LENS = TagUtil.createItemTag("lens/light_gray"); - public static final TagKey CYAN_LENS = TagUtil.createItemTag("lens/cyan"); - public static final TagKey PURPLE_LENS = TagUtil.createItemTag("lens/purple"); - public static final TagKey BLUE_LENS = TagUtil.createItemTag("lens/blue"); - public static final TagKey BROWN_LENS = TagUtil.createItemTag("lens/brown"); - public static final TagKey GREEN_LENS = TagUtil.createItemTag("lens/green"); - public static final TagKey RED_LENS = TagUtil.createItemTag("lens/red"); - public static final TagKey BLACK_LENS = TagUtil.createItemTag("lens/black"); - - @SuppressWarnings("unchecked") - public static final TagKey[] LENSES = new TagKey[] { - WHITE_LENS, - ORANGE_LENS, - MAGENTA_LENS, - LIGHT_BLUE_LENS, - YELLOW_LENS, - LIME_LENS, - PINK_LENS, - GRAY_LENS, - LIGHT_GRAY_LENS, - CYAN_LENS, - PURPLE_LENS, - BLUE_LENS, - BROWN_LENS, - GREEN_LENS, - RED_LENS, - BLACK_LENS - }; - - public static final TagKey WHITE_DYE = TagUtil.createItemTag("dyes/white"); - public static final TagKey ORANGE_DYE = TagUtil.createItemTag("dyes/orange"); - public static final TagKey MAGENTA_DYE = TagUtil.createItemTag("dyes/magenta"); - public static final TagKey LIGHT_BLUE_DYE = TagUtil.createItemTag("dyes/light_blue"); - public static final TagKey YELLOW_DYE = TagUtil.createItemTag("dyes/yellow"); - public static final TagKey LIME_DYE = TagUtil.createItemTag("dyes/lime"); - public static final TagKey PINK_DYE = TagUtil.createItemTag("dyes/pink"); - public static final TagKey GRAY_DYE = TagUtil.createItemTag("dyes/gray"); - public static final TagKey LIGHT_GRAY_DYE = TagUtil.createItemTag("dyes/light_gray"); - public static final TagKey CYAN_DYE = TagUtil.createItemTag("dyes/cyan"); - public static final TagKey PURPLE_DYE = TagUtil.createItemTag("dyes/purple"); - public static final TagKey BLUE_DYE = TagUtil.createItemTag("dyes/blue"); - public static final TagKey BROWN_DYE = TagUtil.createItemTag("dyes/brown"); - public static final TagKey GREEN_DYE = TagUtil.createItemTag("dyes/green"); - public static final TagKey RED_DYE = TagUtil.createItemTag("dyes/red"); - public static final TagKey BLACK_DYE = TagUtil.createItemTag("dyes/black"); - - @SuppressWarnings("unchecked") - public static final TagKey[] DYES = new TagKey[] { - WHITE_DYE, - ORANGE_DYE, - MAGENTA_DYE, - LIGHT_BLUE_DYE, - YELLOW_DYE, - LIME_DYE, - PINK_DYE, - GRAY_DYE, - LIGHT_GRAY_DYE, - CYAN_DYE, - PURPLE_DYE, - BLUE_DYE, - BROWN_DYE, - GREEN_DYE, - RED_DYE, - BLACK_DYE - }; -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java index eda2685471d..49ec79209f6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/GTCraftingComponents.java @@ -6,6 +6,7 @@ import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.data.recipe.event.CraftingComponentModificationEvent; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents; import com.gregtechceu.gtceu.integration.kjs.events.CraftingComponentsEventJS; @@ -77,39 +78,39 @@ public static void init() { /* * GTCEu must supply values for at least tiers 1 through 8 (through UV) */ - CIRCUIT = CraftingComponent.of("circuit", CustomTags.ULV_CIRCUITS) - .add(ULV, CustomTags.ULV_CIRCUITS) - .add(LV, CustomTags.LV_CIRCUITS) - .add(MV, CustomTags.MV_CIRCUITS) - .add(HV, CustomTags.HV_CIRCUITS) - .add(EV, CustomTags.EV_CIRCUITS) - .add(IV, CustomTags.IV_CIRCUITS) - .add(LuV, CustomTags.LuV_CIRCUITS) - .add(ZPM, CustomTags.ZPM_CIRCUITS) - .add(UV, CustomTags.UV_CIRCUITS) - .add(UHV, CustomTags.UHV_CIRCUITS) - .add(UEV, CustomTags.UEV_CIRCUITS) - .add(UIV, CustomTags.UIV_CIRCUITS) - .add(UXV, CustomTags.UXV_CIRCUITS) - .add(OpV, CustomTags.OpV_CIRCUITS) - .add(MAX, CustomTags.MAX_CIRCUITS); - - BETTER_CIRCUIT = CraftingComponent.of("better_circuit", CustomTags.ULV_CIRCUITS) - .add(ULV, CustomTags.LV_CIRCUITS) - .add(LV, CustomTags.MV_CIRCUITS) - .add(MV, CustomTags.HV_CIRCUITS) - .add(HV, CustomTags.EV_CIRCUITS) - .add(EV, CustomTags.IV_CIRCUITS) - .add(IV, CustomTags.LuV_CIRCUITS) - .add(LuV, CustomTags.ZPM_CIRCUITS) - .add(ZPM, CustomTags.UV_CIRCUITS) - .add(UV, CustomTags.UHV_CIRCUITS) - .add(UHV, CustomTags.UEV_CIRCUITS) - .add(UEV, CustomTags.UIV_CIRCUITS) - .add(UIV, CustomTags.UXV_CIRCUITS) - .add(UXV, CustomTags.OpV_CIRCUITS) - .add(OpV, CustomTags.MAX_CIRCUITS) - .add(MAX, CustomTags.MAX_CIRCUITS); + CIRCUIT = CraftingComponent.of("circuit", GTTags.Items.CIRCUITS_ULV) + .add(ULV, GTTags.Items.CIRCUITS_ULV) + .add(LV, GTTags.Items.CIRCUITS_LV) + .add(MV, GTTags.Items.CIRCUITS_MV) + .add(HV, GTTags.Items.CIRCUITS_HV) + .add(EV, GTTags.Items.CIRCUITS_EV) + .add(IV, GTTags.Items.CIRCUITS_IV) + .add(LuV, GTTags.Items.CIRCUITS_LuV) + .add(ZPM, GTTags.Items.CIRCUITS_ZPM) + .add(UV, GTTags.Items.CIRCUITS_UV) + .add(UHV, GTTags.Items.CIRCUITS_UHV) + .add(UEV, GTTags.Items.CIRCUITS_UEV) + .add(UIV, GTTags.Items.CIRCUITS_UIV) + .add(UXV, GTTags.Items.CIRCUITS_UXV) + .add(OpV, GTTags.Items.CIRCUITS_OpV) + .add(MAX, GTTags.Items.CIRCUITS_MAX); + + BETTER_CIRCUIT = CraftingComponent.of("better_circuit", GTTags.Items.CIRCUITS_ULV) + .add(ULV, GTTags.Items.CIRCUITS_LV) + .add(LV, GTTags.Items.CIRCUITS_MV) + .add(MV, GTTags.Items.CIRCUITS_HV) + .add(HV, GTTags.Items.CIRCUITS_EV) + .add(EV, GTTags.Items.CIRCUITS_IV) + .add(IV, GTTags.Items.CIRCUITS_LuV) + .add(LuV, GTTags.Items.CIRCUITS_ZPM) + .add(ZPM, GTTags.Items.CIRCUITS_UV) + .add(UV, GTTags.Items.CIRCUITS_UHV) + .add(UHV, GTTags.Items.CIRCUITS_UEV) + .add(UEV, GTTags.Items.CIRCUITS_UIV) + .add(UIV, GTTags.Items.CIRCUITS_UXV) + .add(UXV, GTTags.Items.CIRCUITS_OpV) + .add(OpV, GTTags.Items.CIRCUITS_MAX) + .add(MAX, GTTags.Items.CIRCUITS_MAX); WIRE_ELECTRIC = CraftingComponent.of("wire_single", wireGtSingle, Gold) .add(ULV, wireGtSingle, Gold) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 006e0e68e0b..2c987dc31af 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.data.recipe.configurable; -import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.misc.WoodMachineRecipes; @@ -278,45 +277,46 @@ private static void hardAdvancedIronRecipes(Consumer registry) } private static void hardDyeRecipes(Consumer registry) { - for (String color : GTValues.COLORS) { - registry.accept( - ResourceLocation.withDefaultNamespace(String.format("%s_concrete_powder", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_terracotta", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_stained_glass", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_candle", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_wool", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_carpet", color))); - registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_bed", color))); - - registry.accept(new ResourceLocation("white_dye")); - registry.accept(new ResourceLocation("black_dye")); - registry.accept(new ResourceLocation("black_dye_from_wither_rose")); - registry.accept(new ResourceLocation("blue_dye")); - registry.accept(new ResourceLocation("white_dye_from_lily_of_the_valley")); - registry.accept(new ResourceLocation("light_blue_dye_from_blue_orchid")); - registry.accept(new ResourceLocation("yellow_dye_from_dandelion")); - registry.accept(new ResourceLocation("light_gray_dye_from_white_tulip")); - registry.accept(new ResourceLocation("light_gray_dye_from_azure_bluet")); - registry.accept(new ResourceLocation("red_dye_from_poppy")); - registry.accept(new ResourceLocation("red_dye_from_tulip")); - registry.accept(new ResourceLocation("red_dye_from_rose_bush")); - registry.accept(new ResourceLocation("red_dye_from_beetroot")); - registry.accept(new ResourceLocation("orange_dye_from_orange_tulip")); - registry.accept(new ResourceLocation("orange_dye_from_torchflower")); - registry.accept(new ResourceLocation("yellow_dye_from_dandelion")); - registry.accept(new ResourceLocation("cyan_dye_from_pitcher_plant")); - registry.accept(new ResourceLocation("light_blue_dye_from_blue_orchid")); - registry.accept(new ResourceLocation("blue_dye_from_cornflower")); - registry.accept(new ResourceLocation("magenta_dye_from_allium")); - registry.accept(new ResourceLocation("magenta_dye_from_lilac")); - registry.accept(new ResourceLocation("lime_dye_from_lime")); - registry.accept(new ResourceLocation("pink_dye_from_pink_tulip")); - registry.accept(new ResourceLocation("pink_dye_from_pink_petals")); - registry.accept(new ResourceLocation("pink_dye_from_peony")); - registry.accept(new ResourceLocation("yellow_dye_from_sunflower")); - registry.accept(new ResourceLocation("light_gray_dye_from_oxeye_daisy")); + for (DyeColor color : DyeColor.values()) { + String name = color.getSerializedName(); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_concrete_powder", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_terracotta", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_stained_glass", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("%s_candle", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_wool", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_carpet", name))); + registry.accept(ResourceLocation.withDefaultNamespace(String.format("dye_%s_bed", name))); } - registry.accept(new ResourceLocation("minecraft:dark_prismarine")); + + registry.accept(ResourceLocation.withDefaultNamespace("white_dye")); + registry.accept(ResourceLocation.withDefaultNamespace("black_dye")); + registry.accept(ResourceLocation.withDefaultNamespace("black_dye_from_wither_rose")); + registry.accept(ResourceLocation.withDefaultNamespace("blue_dye")); + registry.accept(ResourceLocation.withDefaultNamespace("white_dye_from_lily_of_the_valley")); + registry.accept(ResourceLocation.withDefaultNamespace("light_blue_dye_from_blue_orchid")); + registry.accept(ResourceLocation.withDefaultNamespace("yellow_dye_from_dandelion")); + registry.accept(ResourceLocation.withDefaultNamespace("light_gray_dye_from_white_tulip")); + registry.accept(ResourceLocation.withDefaultNamespace("light_gray_dye_from_azure_bluet")); + registry.accept(ResourceLocation.withDefaultNamespace("red_dye_from_poppy")); + registry.accept(ResourceLocation.withDefaultNamespace("red_dye_from_tulip")); + registry.accept(ResourceLocation.withDefaultNamespace("red_dye_from_rose_bush")); + registry.accept(ResourceLocation.withDefaultNamespace("red_dye_from_beetroot")); + registry.accept(ResourceLocation.withDefaultNamespace("orange_dye_from_orange_tulip")); + registry.accept(ResourceLocation.withDefaultNamespace("orange_dye_from_torchflower")); + registry.accept(ResourceLocation.withDefaultNamespace("yellow_dye_from_dandelion")); + registry.accept(ResourceLocation.withDefaultNamespace("cyan_dye_from_pitcher_plant")); + registry.accept(ResourceLocation.withDefaultNamespace("light_blue_dye_from_blue_orchid")); + registry.accept(ResourceLocation.withDefaultNamespace("blue_dye_from_cornflower")); + registry.accept(ResourceLocation.withDefaultNamespace("magenta_dye_from_allium")); + registry.accept(ResourceLocation.withDefaultNamespace("magenta_dye_from_lilac")); + registry.accept(ResourceLocation.withDefaultNamespace("lime_dye_from_lime")); + registry.accept(ResourceLocation.withDefaultNamespace("pink_dye_from_pink_tulip")); + registry.accept(ResourceLocation.withDefaultNamespace("pink_dye_from_pink_petals")); + registry.accept(ResourceLocation.withDefaultNamespace("pink_dye_from_peony")); + registry.accept(ResourceLocation.withDefaultNamespace("yellow_dye_from_sunflower")); + registry.accept(ResourceLocation.withDefaultNamespace("light_gray_dye_from_oxeye_daisy")); + + registry.accept(ResourceLocation.withDefaultNamespace("minecraft:dark_prismarine")); } private static void flintAndSteelRequireSteel(Consumer registry) { @@ -402,8 +402,7 @@ private static void removeVanillaBlockRecipes(Consumer registr // Carpet replacement for (DyeColor color : DyeColor.values()) { - registry.accept(new ResourceLocation(String.format("minecraft:%s_carpet", - color.name().toLowerCase(Locale.ROOT)))); + registry.accept(new ResourceLocation(String.format("minecraft:%s_carpet", color.getSerializedName()))); } // Slab replacement diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java index 7db9ecf6711..aa75b0a9b2e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java @@ -10,9 +10,9 @@ import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.common.data.*; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.data.recipes.FinishedRecipe; @@ -474,7 +474,7 @@ private static void processGemConversion(@NotNull Consumer provi "engrave_" + material.getName() + "_" + FormattingUtil.toLowerCaseUnderscore(prefix.name) + "_to_" + FormattingUtil.toLowerCaseUnderscore(lowerPrefix.name)) .inputItems(prevStack) - .notConsumable(CustomTags.WHITE_LENS) + .notConsumable(GTTags.Items.LENSES_WHITE) .outputItems(prefix, material) .duration(300) .EUt(240) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java index db1dd1b840c..da9c7e72622 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/AssemblyLineLoader.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.data.recipe.misc; import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; @@ -20,7 +20,7 @@ public class AssemblyLineLoader { public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("fusion_reactor_mk1") .inputItems(SUPERCONDUCTING_COIL.asStack()) - .inputItems(CustomTags.ZPM_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 4) .inputItems(plateDouble, Plutonium241) .inputItems(plateDouble, Osmiridium) .inputItems(FIELD_GENERATOR_IV, 2) @@ -37,7 +37,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("fusion_reactor_mk2") .inputItems(FUSION_COIL.asStack()) - .inputItems(CustomTags.UV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UV, 4) .inputItems(plateDouble, Naquadria) .inputItems(plateDouble, Europium) .inputItems(FIELD_GENERATOR_LuV, 2) @@ -55,7 +55,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("fusion_reactor_mk3") .inputItems(FUSION_COIL.asStack()) - .inputItems(CustomTags.UHV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UHV, 4) .inputItems(QUANTUM_STAR) .inputItems(plateDouble, Americium) .inputItems(FIELD_GENERATOR_ZPM, 2) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java index ddbb18b67bf..dd000d4d7c1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.common.data.GTBlocks; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; @@ -318,14 +318,14 @@ private static void gemBatteries(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("lapotron_crystal") .inputItems(gem, Lapotron) - .inputItems(CustomTags.HV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_HV, 2) .outputItems(LAPOTRON_CRYSTAL) .duration(600).EUt(VA[EV]).save(provider); // Lapotronic Energy Orb LASER_ENGRAVER_RECIPES.recipeBuilder("engraved_lapotron_chip") .inputItems(LAPOTRON_CRYSTAL) - .notConsumable(CustomTags.BLUE_LENS) + .notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(ENGRAVED_LAPOTRON_CHIP, 3) .cleanroom(CleanroomType.CLEANROOM) .duration(256).EUt(VA[HV]).save(provider); @@ -346,7 +346,7 @@ private static void gemBatteries(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("lapotronic_energy_orb_cluster") .inputItems(EXTREME_CIRCUIT_BOARD) .inputItems(plate, Europium, 8) - .inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(ENERGY_LAPOTRONIC_ORB) .inputItems(FIELD_GENERATOR_IV) .inputItems(HIGH_POWER_INTEGRATED_CIRCUIT, 16) @@ -366,7 +366,7 @@ private static void gemBatteries(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("energy_module") .inputItems(ELITE_CIRCUIT_BOARD) .inputItems(plateDouble, Europium, 8) - .inputItems(CustomTags.ZPM_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 4) .inputItems(ENERGY_LAPOTRONIC_ORB_CLUSTER) .inputItems(FIELD_GENERATOR_LuV) .inputItems(HIGH_POWER_INTEGRATED_CIRCUIT, 32) @@ -388,7 +388,7 @@ private static void gemBatteries(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("energy_cluster") .inputItems(WETWARE_CIRCUIT_BOARD) .inputItems(plate, Americium, 16) - .inputItems(CustomTags.UV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UV, 4) .inputItems(ENERGY_MODULE) .inputItems(FIELD_GENERATOR_ZPM) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 32) @@ -411,7 +411,7 @@ private static void gemBatteries(Consumer provider) { // Ultimate Battery ASSEMBLY_LINE_RECIPES.recipeBuilder("ultimate_battery") .inputItems(plateDouble, Darmstadtium, 16) - .inputItems(CustomTags.UHV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UHV, 4) .inputItems(ENERGY_CLUSTER, 16) .inputItems(FIELD_GENERATOR_UV, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT_WAFER, 64) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java index d94741dfb75..deebbf0fa6a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CircuitRecipes.java @@ -4,8 +4,8 @@ import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.ItemStack; @@ -92,134 +92,139 @@ private static void waferRecipes(Consumer provider) { // Wafer engraving LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ilc_silicon").duration(900).EUt(VA[MV]).inputItems(SILICON_WAFER) - .notConsumable(CustomTags.RED_LENS).outputItems(INTEGRATED_LOGIC_CIRCUIT_WAFER).save(provider); + .notConsumable(GTTags.Items.LENSES_RED).outputItems(INTEGRATED_LOGIC_CIRCUIT_WAFER).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ilc_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.RED_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_RED) .outputItems(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ilc_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.RED_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_RED) .outputItems(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ilc_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.RED_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_RED) .outputItems(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ram_silicon").duration(900).EUt(VA[MV]).inputItems(SILICON_WAFER) - .notConsumable(CustomTags.GREEN_LENS).outputItems(RANDOM_ACCESS_MEMORY_WAFER).save(provider); + .notConsumable(GTTags.Items.LENSES_GREEN).outputItems(RANDOM_ACCESS_MEMORY_WAFER).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ram_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.GREEN_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_GREEN) .outputItems(RANDOM_ACCESS_MEMORY_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ram_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.GREEN_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_GREEN) .outputItems(RANDOM_ACCESS_MEMORY_WAFER, 8) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ram_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.GREEN_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_GREEN) .outputItems(RANDOM_ACCESS_MEMORY_WAFER, 16).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_cpu_silicon").duration(900).EUt(VA[MV]).inputItems(SILICON_WAFER) - .notConsumable(CustomTags.LIGHT_BLUE_LENS).outputItems(CENTRAL_PROCESSING_UNIT_WAFER).save(provider); + .notConsumable(GTTags.Items.LENSES_LIGHT_BLUE).outputItems(CENTRAL_PROCESSING_UNIT_WAFER) + .save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_cpu_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.LIGHT_BLUE_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_LIGHT_BLUE) .outputItems(CENTRAL_PROCESSING_UNIT_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_cpu_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.LIGHT_BLUE_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_LIGHT_BLUE) .outputItems(CENTRAL_PROCESSING_UNIT_WAFER, 8).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_cpu_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.LIGHT_BLUE_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_LIGHT_BLUE) .outputItems(CENTRAL_PROCESSING_UNIT_WAFER, 16).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ulpic_silicon").duration(900).EUt(VA[MV]) - .inputItems(SILICON_WAFER).notConsumable(CustomTags.BLUE_LENS) + .inputItems(SILICON_WAFER).notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ulpic_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.BLUE_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).cleanroom(CleanroomType.CLEANROOM) .save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ulpic_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.BLUE_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 8).cleanroom(CleanroomType.CLEANROOM) .save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ulpic_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.BLUE_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 16).cleanroom(CleanroomType.CLEANROOM) .save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_lpic_silicon").duration(900).EUt(VA[MV]).inputItems(SILICON_WAFER) - .notConsumable(CustomTags.ORANGE_LENS).outputItems(LOW_POWER_INTEGRATED_CIRCUIT_WAFER).save(provider); + .notConsumable(GTTags.Items.LENSES_ORANGE).outputItems(LOW_POWER_INTEGRATED_CIRCUIT_WAFER) + .save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_lpic_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.ORANGE_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_ORANGE) .outputItems(LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_lpic_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.ORANGE_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_ORANGE) .outputItems(LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 8).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_lpic_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.ORANGE_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_ORANGE) .outputItems(LOW_POWER_INTEGRATED_CIRCUIT_WAFER, 16).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ssoc_silicon").duration(900).EUt(VA[MV]).inputItems(SILICON_WAFER) - .notConsumable(CustomTags.CYAN_LENS).outputItems(SIMPLE_SYSTEM_ON_CHIP_WAFER).save(provider); + .notConsumable(GTTags.Items.LENSES_CYAN).outputItems(SIMPLE_SYSTEM_ON_CHIP_WAFER).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ssoc_phosphorus").duration(500).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.CYAN_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_CYAN) .outputItems(SIMPLE_SYSTEM_ON_CHIP_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ssoc_naquadah").duration(200).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.CYAN_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_CYAN) .outputItems(SIMPLE_SYSTEM_ON_CHIP_WAFER, 8) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_ssoc_neutronium").duration(50).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.CYAN_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_CYAN) .outputItems(SIMPLE_SYSTEM_ON_CHIP_WAFER, 16).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nand_phosphorus").duration(900).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.GRAY_LENS).outputItems(NAND_MEMORY_CHIP_WAFER) - .cleanroom(CleanroomType.CLEANROOM).save(provider); + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_GRAY) + .outputItems(NAND_MEMORY_CHIP_WAFER).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nand_naquadah").duration(500).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.GRAY_LENS).outputItems(NAND_MEMORY_CHIP_WAFER, 4) - .cleanroom(CleanroomType.CLEANROOM).save(provider); + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_GRAY) + .outputItems(NAND_MEMORY_CHIP_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nand_neutronium").duration(200).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.GRAY_LENS).outputItems(NAND_MEMORY_CHIP_WAFER, 8) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_GRAY) + .outputItems(NAND_MEMORY_CHIP_WAFER, 8) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nor_phosphorus").duration(900).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.PINK_LENS).outputItems(NOR_MEMORY_CHIP_WAFER) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_PINK).outputItems(NOR_MEMORY_CHIP_WAFER) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nor_naquadah").duration(500).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.PINK_LENS).outputItems(NOR_MEMORY_CHIP_WAFER, 4) - .cleanroom(CleanroomType.CLEANROOM).save(provider); + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_PINK) + .outputItems(NOR_MEMORY_CHIP_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_nor_neutronium").duration(200).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.PINK_LENS).outputItems(NOR_MEMORY_CHIP_WAFER, 8) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_PINK) + .outputItems(NOR_MEMORY_CHIP_WAFER, 8) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_pic_phosphorus").duration(900).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.BROWN_LENS) + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_BROWN) .outputItems(POWER_INTEGRATED_CIRCUIT_WAFER).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_pic_naquadah").duration(500).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.BROWN_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_BROWN) .outputItems(POWER_INTEGRATED_CIRCUIT_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_pic_neutronium").duration(200).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.BROWN_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_BROWN) .outputItems(POWER_INTEGRATED_CIRCUIT_WAFER, 8).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_soc_phosphorus").duration(900).EUt(VA[HV]) - .inputItems(PHOSPHORUS_WAFER).notConsumable(CustomTags.YELLOW_LENS).outputItems(SYSTEM_ON_CHIP_WAFER) - .cleanroom(CleanroomType.CLEANROOM).save(provider); + .inputItems(PHOSPHORUS_WAFER).notConsumable(GTTags.Items.LENSES_YELLOW) + .outputItems(SYSTEM_ON_CHIP_WAFER).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_soc_naquadah").duration(500).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.YELLOW_LENS).outputItems(SYSTEM_ON_CHIP_WAFER, 4) - .cleanroom(CleanroomType.CLEANROOM).save(provider); + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_YELLOW) + .outputItems(SYSTEM_ON_CHIP_WAFER, 4).cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_soc_neutronium").duration(200).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.YELLOW_LENS).outputItems(SYSTEM_ON_CHIP_WAFER, 8) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_YELLOW) + .outputItems(SYSTEM_ON_CHIP_WAFER, 8) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_asoc_naquadah").duration(900).EUt(VA[EV]) - .inputItems(NAQUADAH_WAFER).notConsumable(CustomTags.PURPLE_LENS) + .inputItems(NAQUADAH_WAFER).notConsumable(GTTags.Items.LENSES_PURPLE) .outputItems(ADVANCED_SYSTEM_ON_CHIP_WAFER) .cleanroom(CleanroomType.CLEANROOM).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_asoc_neutronium").duration(500).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.PURPLE_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_PURPLE) .outputItems(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2).cleanroom(CleanroomType.CLEANROOM).save(provider); // Can replace this with a Quantum Star/Eye Lens if desired LASER_ENGRAVER_RECIPES.recipeBuilder("engrave_hasoc_neutronium").duration(900).EUt(VA[IV]) - .inputItems(NEUTRONIUM_WAFER).notConsumable(CustomTags.BLACK_LENS) + .inputItems(NEUTRONIUM_WAFER).notConsumable(GTTags.Items.LENSES_BLACK) .outputItems(HIGHLY_ADVANCED_SOC_WAFER) .cleanroom(CleanroomType.CLEANROOM).save(provider); @@ -680,14 +685,14 @@ private static void componentRecipes(Consumer provider) { // Crystal Circuit Components LASER_ENGRAVER_RECIPES.recipeBuilder("crystal_cpu") .inputItems(ENGRAVED_CRYSTAL_CHIP) - .notConsumable(CustomTags.LIME_LENS) + .notConsumable(GTTags.Items.LENSES_LIME) .outputItems(CRYSTAL_CENTRAL_PROCESSING_UNIT) .cleanroom(CleanroomType.CLEANROOM) .duration(100).EUt(10000).save(provider); LASER_ENGRAVER_RECIPES.recipeBuilder("crystal_soc") .inputItems(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .notConsumable(CustomTags.BLUE_LENS) + .notConsumable(GTTags.Items.LENSES_BLUE) .outputItems(CRYSTAL_SYSTEM_ON_CHIP) .cleanroom(CleanroomType.CLEANROOM) .duration(100).EUt(40000).save(provider); @@ -977,7 +982,7 @@ private static void boardRecipes(Consumer provider) { .inputItems(PETRI_DISH) .inputItems(ELECTRIC_PUMP_LuV) .inputItems(SENSOR_IV) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_IV) .inputItems(foil, NiobiumTitanium, 16) .inputFluids(SterileGrowthMedium.getFluid(4000)) .outputItems(WETWARE_BOARD, 16) @@ -1017,9 +1022,9 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("electronic_circuit_lv").EUt(16).duration(200) .inputItems(BASIC_CIRCUIT_BOARD) - .inputItems(CustomTags.RESISTORS, 2) + .inputItems(GTTags.Items.RESISTORS, 2) .inputItems(wireGtSingle, RedAlloy, 2) - .inputItems(CustomTags.ULV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ULV, 2) .outputItems(ELECTRONIC_CIRCUIT_LV, outputAmount) .save(provider); @@ -1035,7 +1040,7 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("electronic_circuit_mv").EUt(VA[LV]).duration(300) .inputItems(GOOD_CIRCUIT_BOARD) .inputItems(ELECTRONIC_CIRCUIT_LV, 2) - .inputItems(CustomTags.DIODES, 2) + .inputItems(GTTags.Items.DIODES, 2) .inputItems(wireGtSingle, Copper, 2) .outputItems(ELECTRONIC_CIRCUIT_MV) .save(provider); @@ -1046,8 +1051,8 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("integrated_circuit_lv").EUt(16).duration(200) .inputItems(BASIC_CIRCUIT_BOARD) .inputItems(INTEGRATED_LOGIC_CIRCUIT) - .inputItems(CustomTags.RESISTORS, 2) - .inputItems(CustomTags.DIODES, 2) + .inputItems(GTTags.Items.RESISTORS, 2) + .inputItems(GTTags.Items.DIODES, 2) .inputItems(wireFine, Copper, 2) .inputItems(bolt, Tin, 2) .outputItems(INTEGRATED_CIRCUIT_LV, outputAmount) @@ -1057,8 +1062,8 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("integrated_circuit_mv").EUt(24).duration(400) .inputItems(GOOD_CIRCUIT_BOARD) .inputItems(INTEGRATED_CIRCUIT_LV, 2) - .inputItems(CustomTags.RESISTORS, 2) - .inputItems(CustomTags.DIODES, 2) + .inputItems(GTTags.Items.RESISTORS, 2) + .inputItems(GTTags.Items.DIODES, 2) .inputItems(wireFine, Gold, 4) .inputItems(bolt, Silver, 4) .outputItems(INTEGRATED_CIRCUIT_MV, outputAmount) @@ -1070,7 +1075,7 @@ private static void circuitRecipes(Consumer provider) { // enabled .inputItems(INTEGRATED_LOGIC_CIRCUIT, 2) .inputItems(RANDOM_ACCESS_MEMORY, 2) - .inputItems(CustomTags.TRANSISTORS, 4) + .inputItems(GTTags.Items.TRANSISTORS, 4) .inputItems(wireFine, Electrum, 8) .inputItems(bolt, AnnealedCopper, 8) .outputItems(INTEGRATED_CIRCUIT_HV) @@ -1099,9 +1104,9 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("microprocessor_lv").EUt(60).duration(200) .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(CENTRAL_PROCESSING_UNIT) - .inputItems(CustomTags.RESISTORS, 2) - .inputItems(CustomTags.CAPACITORS, 2) - .inputItems(CustomTags.TRANSISTORS, 2) + .inputItems(GTTags.Items.RESISTORS, 2) + .inputItems(GTTags.Items.CAPACITORS, 2) + .inputItems(GTTags.Items.TRANSISTORS, 2) .inputItems(wireFine, Copper, 2) .outputItems(MICROPROCESSOR_LV, ConfigHolder.INSTANCE.recipes.harderCircuitRecipes ? 2 : 3) .save(provider); @@ -1122,9 +1127,9 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("processor_mv").EUt(60).duration(200) .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(CENTRAL_PROCESSING_UNIT) - .inputItems(CustomTags.RESISTORS, 4) - .inputItems(CustomTags.CAPACITORS, 4) - .inputItems(CustomTags.TRANSISTORS, 4) + .inputItems(GTTags.Items.RESISTORS, 4) + .inputItems(GTTags.Items.CAPACITORS, 4) + .inputItems(GTTags.Items.TRANSISTORS, 4) .inputItems(wireFine, RedAlloy, 4) .outputItems(PROCESSOR_MV, outputAmount) .save(provider); @@ -1143,8 +1148,8 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("processor_assembly_hv").EUt(VA[MV]).duration(400) .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(PROCESSOR_MV, 2) - .inputItems(CustomTags.INDUCTORS, 4) - .inputItems(CustomTags.CAPACITORS, 8) + .inputItems(GTTags.Items.INDUCTORS, 4) + .inputItems(GTTags.Items.CAPACITORS, 8) .inputItems(RANDOM_ACCESS_MEMORY, 4) .inputItems(wireFine, RedAlloy, 8) .outputItems(PROCESSOR_ASSEMBLY_HV, 2) @@ -1155,7 +1160,7 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("workstation_ev").EUt(VA[MV]).duration(400) .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(PROCESSOR_ASSEMBLY_HV, 2) - .inputItems(CustomTags.DIODES, 4) + .inputItems(GTTags.Items.DIODES, 4) .inputItems(RANDOM_ACCESS_MEMORY, 4) .inputItems(wireFine, Electrum, 16) .inputItems(bolt, BlueAlloy, 16) @@ -1168,8 +1173,8 @@ private static void circuitRecipes(Consumer provider) { CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("mainframe_iv").EUt(VA[HV]).duration(800) .inputItems(frameGt, Aluminium, 2) .inputItems(WORKSTATION_EV, 2) - .inputItems(CustomTags.INDUCTORS, 8) - .inputItems(CustomTags.CAPACITORS, 16) + .inputItems(GTTags.Items.INDUCTORS, 8) + .inputItems(GTTags.Items.CAPACITORS, 16) .inputItems(RANDOM_ACCESS_MEMORY, 16) .inputItems(wireGtSingle, AnnealedCopper, 16) .outputItems(MAINFRAME_IV) @@ -1583,7 +1588,7 @@ private static void circuitRecipes(Consumer provider) { // Data Orb CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("data_orb") .inputItems(ADVANCED_CIRCUIT_BOARD) - .inputItems(CustomTags.HV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_HV, 2) .inputItems(RANDOM_ACCESS_MEMORY, 4) .inputItems(NOR_MEMORY_CHIP, 32) .inputItems(NAND_MEMORY_CHIP, 64) @@ -1596,7 +1601,7 @@ private static void circuitRecipes(Consumer provider) { // Data Module CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder("data_module") .inputItems(WETWARE_CIRCUIT_BOARD) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) .inputItems(RANDOM_ACCESS_MEMORY, 32) .inputItems(NOR_MEMORY_CHIP, 64) .inputItems(NAND_MEMORY_CHIP, 64) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java index b80d83dccd7..ad28b16f0e3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComponentRecipes.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.Items; @@ -424,7 +424,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_lv") .inputItems(ELECTRIC_PUMP_LV) - .inputItems(CustomTags.LV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_LV) .EUt(VA[LV]) @@ -433,7 +433,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_mv") .inputItems(ELECTRIC_PUMP_MV) - .inputItems(CustomTags.MV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_MV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_MV) .EUt(VA[MV]) @@ -442,7 +442,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_hv") .inputItems(ELECTRIC_PUMP_HV) - .inputItems(CustomTags.HV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_HV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_HV) .EUt(VA[HV]) @@ -451,7 +451,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_ev") .inputItems(ELECTRIC_PUMP_EV) - .inputItems(CustomTags.EV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_EV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_EV) .EUt(VA[EV]) @@ -460,7 +460,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_iv") .inputItems(ELECTRIC_PUMP_IV) - .inputItems(CustomTags.IV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_IV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_IV) .EUt(VA[IV]) @@ -469,7 +469,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_luv") .inputItems(ELECTRIC_PUMP_LuV) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_LuV) .EUt(VA[LuV]) @@ -478,7 +478,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_zpm") .inputItems(ELECTRIC_PUMP_ZPM) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_ZPM) .EUt(VA[ZPM]) @@ -487,7 +487,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("fluid_regulator_uv") .inputItems(ELECTRIC_PUMP_UV) - .inputItems(CustomTags.UV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_UV, 2) .circuitMeta(1) .outputItems(FLUID_REGULATOR_UV) .EUt(VA[UV]) @@ -511,7 +511,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("cover_item_voiding_advanced") .inputItems(COVER_ITEM_VOIDING) - .inputItems(CustomTags.MV_CIRCUITS, 1) + .inputItems(GTTags.Items.CIRCUITS_MV, 1) .outputItems(COVER_ITEM_VOIDING_ADVANCED) .duration(100).EUt(VA[LV]) .addMaterialInfo(true).save(provider); @@ -532,7 +532,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("cover_fluid_voiding_advanced") .inputItems(COVER_FLUID_VOIDING) - .inputItems(CustomTags.MV_CIRCUITS, 1) + .inputItems(GTTags.Items.CIRCUITS_MV, 1) .outputItems(COVER_FLUID_VOIDING_ADVANCED) .duration(100).EUt(VA[LV]) .addMaterialInfo(true).save(provider); @@ -667,26 +667,26 @@ public static void init(Consumer provider) { // --------------------------------------------------------------------------------------------- VanillaRecipeHelper.addShapedRecipe(provider, true, "robot_arm_lv", ROBOT_ARM_LV.asStack(), "CCC", "MRM", "PXR", 'C', new MaterialEntry(cableGtSingle, Tin), 'R', new MaterialEntry(rod, Steel), 'M', - ELECTRIC_MOTOR_LV.asStack(), 'P', ELECTRIC_PISTON_LV.asStack(), 'X', CustomTags.LV_CIRCUITS); + ELECTRIC_MOTOR_LV.asStack(), 'P', ELECTRIC_PISTON_LV.asStack(), 'X', GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, true, "robot_arm_mv", ROBOT_ARM_MV.asStack(), "CCC", "MRM", "PXR", 'C', new MaterialEntry(cableGtSingle, Copper), 'R', new MaterialEntry(rod, Aluminium), 'M', - ELECTRIC_MOTOR_MV.asStack(), 'P', ELECTRIC_PISTON_MV.asStack(), 'X', CustomTags.MV_CIRCUITS); + ELECTRIC_MOTOR_MV.asStack(), 'P', ELECTRIC_PISTON_MV.asStack(), 'X', GTTags.Items.CIRCUITS_MV); VanillaRecipeHelper.addShapedRecipe(provider, true, "robot_arm_hv", ROBOT_ARM_HV.asStack(), "CCC", "MRM", "PXR", 'C', new MaterialEntry(cableGtSingle, Gold), 'R', new MaterialEntry(rod, StainlessSteel), 'M', - ELECTRIC_MOTOR_HV.asStack(), 'P', ELECTRIC_PISTON_HV.asStack(), 'X', CustomTags.HV_CIRCUITS); + ELECTRIC_MOTOR_HV.asStack(), 'P', ELECTRIC_PISTON_HV.asStack(), 'X', GTTags.Items.CIRCUITS_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "robot_arm_ev", ROBOT_ARM_EV.asStack(), "CCC", "MRM", "PXR", 'C', new MaterialEntry(cableGtSingle, Aluminium), 'R', new MaterialEntry(rod, Titanium), 'M', - ELECTRIC_MOTOR_EV.asStack(), 'P', ELECTRIC_PISTON_EV.asStack(), 'X', CustomTags.EV_CIRCUITS); + ELECTRIC_MOTOR_EV.asStack(), 'P', ELECTRIC_PISTON_EV.asStack(), 'X', GTTags.Items.CIRCUITS_EV); VanillaRecipeHelper.addShapedRecipe(provider, true, "robot_arm_iv", ROBOT_ARM_IV.asStack(), "CCC", "MRM", "PXR", 'C', new MaterialEntry(cableGtSingle, Tungsten), 'R', new MaterialEntry(rod, TungstenSteel), 'M', - ELECTRIC_MOTOR_IV.asStack(), 'P', ELECTRIC_PISTON_IV.asStack(), 'X', CustomTags.IV_CIRCUITS); + ELECTRIC_MOTOR_IV.asStack(), 'P', ELECTRIC_PISTON_IV.asStack(), 'X', GTTags.Items.CIRCUITS_IV); ASSEMBLER_RECIPES.recipeBuilder("robot_arm_lv") .inputItems(cableGtSingle, Tin, 3) .inputItems(rod, Steel, 2) .inputItems(ELECTRIC_MOTOR_LV, 2) .inputItems(ELECTRIC_PISTON_LV) - .inputItems(CustomTags.LV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LV) .outputItems(ROBOT_ARM_LV) .duration(100).EUt(VA[LV]).save(provider); @@ -695,7 +695,7 @@ public static void init(Consumer provider) { .inputItems(rod, Aluminium, 2) .inputItems(ELECTRIC_MOTOR_MV, 2) .inputItems(ELECTRIC_PISTON_MV) - .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_MV) .outputItems(ROBOT_ARM_MV) .duration(100).EUt(VA[LV]).save(provider); @@ -704,7 +704,7 @@ public static void init(Consumer provider) { .inputItems(rod, StainlessSteel, 2) .inputItems(ELECTRIC_MOTOR_HV, 2) .inputItems(ELECTRIC_PISTON_HV) - .inputItems(CustomTags.HV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_HV) .outputItems(ROBOT_ARM_HV) .duration(100).EUt(VA[LV]).save(provider); @@ -713,7 +713,7 @@ public static void init(Consumer provider) { .inputItems(rod, Titanium, 2) .inputItems(ELECTRIC_MOTOR_EV, 2) .inputItems(ELECTRIC_PISTON_EV) - .inputItems(CustomTags.EV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_EV) .outputItems(ROBOT_ARM_EV) .duration(100).EUt(VA[LV]).save(provider); @@ -722,7 +722,7 @@ public static void init(Consumer provider) { .inputItems(rod, TungstenSteel, 2) .inputItems(ELECTRIC_MOTOR_IV, 2) .inputItems(ELECTRIC_PISTON_IV) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_IV) .outputItems(ROBOT_ARM_IV) .duration(100).EUt(VA[LV]).save(provider); @@ -732,9 +732,9 @@ public static void init(Consumer provider) { .inputItems(gearSmall, HSSS, 3) .inputItems(ELECTRIC_MOTOR_LuV, 2) .inputItems(ELECTRIC_PISTON_LuV) - .inputItems(CustomTags.LuV_CIRCUITS) - .inputItems(CustomTags.IV_CIRCUITS, 2) - .inputItems(CustomTags.EV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_LuV) + .inputItems(GTTags.Items.CIRCUITS_IV, 2) + .inputItems(GTTags.Items.CIRCUITS_EV, 4) .inputItems(cableGtSingle, NiobiumTitanium, 4) .inputFluids(SolderingAlloy, L * 4) .inputFluids(Lubricant, 250) @@ -752,9 +752,9 @@ public static void init(Consumer provider) { .inputItems(gearSmall, Osmiridium, 3) .inputItems(ELECTRIC_MOTOR_ZPM, 2) .inputItems(ELECTRIC_PISTON_ZPM) - .inputItems(CustomTags.ZPM_CIRCUITS) - .inputItems(CustomTags.LuV_CIRCUITS, 2) - .inputItems(CustomTags.IV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) + .inputItems(GTTags.Items.CIRCUITS_IV, 4) .inputItems(cableGtSingle, VanadiumGallium, 4) .inputFluids(SolderingAlloy, L * 8) .inputFluids(Lubricant, 500) @@ -772,9 +772,9 @@ public static void init(Consumer provider) { .inputItems(gearSmall, Tritanium, 3) .inputItems(ELECTRIC_MOTOR_UV, 2) .inputItems(ELECTRIC_PISTON_UV) - .inputItems(CustomTags.UV_CIRCUITS) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) - .inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UV) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(cableGtSingle, YttriumBariumCuprate, 4) .inputFluids(SolderingAlloy, L * 12) .inputFluids(Lubricant, 1000) @@ -792,27 +792,27 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, true, "field_generator_lv", FIELD_GENERATOR_LV.asStack(), "WPW", "XGX", "WPW", 'W', new MaterialEntry(wireGtQuadruple, ManganesePhosphide), 'P', new MaterialEntry(plate, Steel), 'G', new MaterialEntry(gem, EnderPearl), 'X', - CustomTags.LV_CIRCUITS); + GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, true, "field_generator_mv", FIELD_GENERATOR_MV.asStack(), "WPW", "XGX", "WPW", 'W', new MaterialEntry(wireGtQuadruple, MagnesiumDiboride), 'P', new MaterialEntry(plate, Aluminium), 'G', new MaterialEntry(gem, EnderEye), 'X', - CustomTags.MV_CIRCUITS); + GTTags.Items.CIRCUITS_MV); VanillaRecipeHelper.addShapedRecipe(provider, true, "field_generator_hv", FIELD_GENERATOR_HV.asStack(), "WPW", "XGX", "WPW", 'W', new MaterialEntry(wireGtQuadruple, MercuryBariumCalciumCuprate), 'P', - new MaterialEntry(plate, StainlessSteel), 'G', QUANTUM_EYE.asStack(), 'X', CustomTags.HV_CIRCUITS); + new MaterialEntry(plate, StainlessSteel), 'G', QUANTUM_EYE.asStack(), 'X', GTTags.Items.CIRCUITS_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "field_generator_ev", FIELD_GENERATOR_EV.asStack(), "WPW", "XGX", "WPW", 'W', new MaterialEntry(wireGtQuadruple, UraniumTriplatinum), 'P', new MaterialEntry(plateDouble, Titanium), 'G', new MaterialEntry(gem, NetherStar), 'X', - CustomTags.EV_CIRCUITS); + GTTags.Items.CIRCUITS_EV); VanillaRecipeHelper.addShapedRecipe(provider, true, "field_generator_iv", FIELD_GENERATOR_IV.asStack(), "WPW", "XGX", "WPW", 'W', new MaterialEntry(wireGtQuadruple, SamariumIronArsenicOxide), 'P', new MaterialEntry(plateDouble, TungstenSteel), 'G', QUANTUM_STAR.asStack(), 'X', - CustomTags.IV_CIRCUITS); + GTTags.Items.CIRCUITS_IV); ASSEMBLER_RECIPES.recipeBuilder("field_generator_lv") .inputItems(gem, EnderPearl) .inputItems(plate, Steel, 2) - .inputItems(CustomTags.LV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LV, 2) .inputItems(wireGtQuadruple, ManganesePhosphide, 4) .outputItems(FIELD_GENERATOR_LV) .duration(100).EUt(VA[LV]).save(provider); @@ -820,7 +820,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("field_generator_mv") .inputItems(gem, EnderEye) .inputItems(plate, Aluminium, 2) - .inputItems(CustomTags.MV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_MV, 2) .inputItems(wireGtQuadruple, MagnesiumDiboride, 4) .outputItems(FIELD_GENERATOR_MV) .duration(100).EUt(VA[LV]).save(provider); @@ -828,7 +828,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("field_generator_hv") .inputItems(QUANTUM_EYE) .inputItems(plate, StainlessSteel, 2) - .inputItems(CustomTags.HV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_HV, 2) .inputItems(wireGtQuadruple, MercuryBariumCalciumCuprate, 4) .outputItems(FIELD_GENERATOR_HV) .duration(100).EUt(VA[LV]).save(provider); @@ -836,7 +836,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("field_generator_ev") .inputItems(gem, NetherStar) .inputItems(plateDouble, Titanium, 2) - .inputItems(CustomTags.EV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_EV, 2) .inputItems(wireGtQuadruple, UraniumTriplatinum, 4) .outputItems(FIELD_GENERATOR_EV) .duration(100).EUt(VA[LV]).save(provider); @@ -844,7 +844,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("field_generator_iv") .inputItems(QUANTUM_STAR) .inputItems(plateDouble, TungstenSteel, 2) - .inputItems(CustomTags.IV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_IV, 2) .inputItems(wireGtQuadruple, SamariumIronArsenicOxide, 4) .outputItems(FIELD_GENERATOR_IV) .duration(100).EUt(VA[LV]).save(provider); @@ -854,7 +854,7 @@ public static void init(Consumer provider) { .inputItems(plate, HSSS, 6) .inputItems(QUANTUM_STAR) .inputItems(EMITTER_LuV, 2) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireFine, IndiumTinBariumTitaniumCuprate, 64) .inputItems(wireFine, IndiumTinBariumTitaniumCuprate, 64) .inputItems(cableGtSingle, NiobiumTitanium, 4) @@ -872,7 +872,7 @@ public static void init(Consumer provider) { .inputItems(plate, NaquadahAlloy, 6) .inputItems(QUANTUM_STAR) .inputItems(EMITTER_ZPM, 2) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) .inputItems(wireFine, UraniumRhodiumDinaquadide, 64) .inputItems(wireFine, UraniumRhodiumDinaquadide, 64) .inputItems(cableGtSingle, VanadiumGallium, 4) @@ -889,7 +889,7 @@ public static void init(Consumer provider) { .inputItems(plate, Tritanium, 6) .inputItems(GRAVI_STAR) .inputItems(EMITTER_UV, 2) - .inputItems(CustomTags.UV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_UV, 2) .inputItems(wireFine, EnrichedNaquadahTriniumEuropiumDuranide, 64) .inputItems(wireFine, EnrichedNaquadahTriniumEuropiumDuranide, 64) .inputItems(cableGtSingle, YttriumBariumCuprate, 4) @@ -907,24 +907,24 @@ public static void init(Consumer provider) { // Start------------------------------------------------------------------------------------------------- VanillaRecipeHelper.addShapedRecipe(provider, true, "sensor_lv", SENSOR_LV.asStack(), "P G", "PR ", "XPP", 'P', new MaterialEntry(plate, Steel), 'R', new MaterialEntry(rod, Brass), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV), 'X', CustomTags.LV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV), 'X', GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, true, "sensor_mv", SENSOR_MV.asStack(), "P G", "PR ", "XPP", 'P', new MaterialEntry(plate, Aluminium), 'R', new MaterialEntry(rod, Electrum), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV), 'X', CustomTags.MV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV), 'X', GTTags.Items.CIRCUITS_MV); VanillaRecipeHelper.addShapedRecipe(provider, true, "sensor_hv", SENSOR_HV.asStack(), "P G", "PR ", "XPP", 'P', new MaterialEntry(plate, StainlessSteel), 'R', new MaterialEntry(rod, Chromium), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV), 'X', CustomTags.HV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV), 'X', GTTags.Items.CIRCUITS_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "sensor_ev", SENSOR_EV.asStack(), "P G", "PR ", "XPP", 'P', new MaterialEntry(plate, Titanium), 'R', new MaterialEntry(rod, Platinum), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV), 'X', CustomTags.EV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV), 'X', GTTags.Items.CIRCUITS_EV); VanillaRecipeHelper.addShapedRecipe(provider, true, "sensor_iv", SENSOR_IV.asStack(), "P G", "PR ", "XPP", 'P', new MaterialEntry(plate, TungstenSteel), 'R', new MaterialEntry(rod, Iridium), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV), 'X', CustomTags.IV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV), 'X', GTTags.Items.CIRCUITS_IV); ASSEMBLER_RECIPES.recipeBuilder("sensor_lv") .inputItems(rod, Brass) .inputItems(plate, Steel, 4) - .inputItems(CustomTags.LV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LV) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV)) .outputItems(SENSOR_LV) .duration(100).EUt(VA[LV]).save(provider); @@ -932,7 +932,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("sensor_mv") .inputItems(rod, Electrum) .inputItems(plate, Aluminium, 4) - .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_MV) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV)) .outputItems(SENSOR_MV) .duration(100).EUt(VA[LV]).save(provider); @@ -940,7 +940,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("sensor_hv") .inputItems(rod, Chromium) .inputItems(plate, StainlessSteel, 4) - .inputItems(CustomTags.HV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_HV) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV)) .outputItems(SENSOR_HV) .duration(100).EUt(VA[LV]).save(provider); @@ -948,7 +948,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("sensor_ev") .inputItems(rod, Platinum) .inputItems(plate, Titanium, 4) - .inputItems(CustomTags.EV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_EV) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV)) .outputItems(SENSOR_EV) .duration(100).EUt(VA[LV]).save(provider); @@ -956,7 +956,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("sensor_iv") .inputItems(rod, Iridium) .inputItems(plate, TungstenSteel, 4) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_IV) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV)) .outputItems(SENSOR_IV) .duration(100).EUt(VA[LV]).save(provider); @@ -966,7 +966,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_LuV) .inputItems(plate, Ruridit, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(LuV)) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(foil, Palladium, 64) .inputItems(foil, Palladium, 32) .inputItems(cableGtSingle, NiobiumTitanium, 4) @@ -984,7 +984,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_ZPM) .inputItems(plate, Osmiridium, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(ZPM), 2) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) .inputItems(foil, Trinium, 64) .inputItems(foil, Trinium, 32) .inputItems(cableGtSingle, VanadiumGallium, 4) @@ -1001,7 +1001,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_UV) .inputItems(plate, Tritanium, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(UV)) - .inputItems(CustomTags.UV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_UV, 2) .inputItems(foil, Naquadria, 64) .inputItems(foil, Naquadria, 32) .inputItems(cableGtSingle, YttriumBariumCuprate, 4) @@ -1019,24 +1019,24 @@ public static void init(Consumer provider) { // Start------------------------------------------------------------------------------------------------ VanillaRecipeHelper.addShapedRecipe(provider, true, "emitter_lv", EMITTER_LV.asStack(), "CRX", "RGR", "XRC", 'R', new MaterialEntry(rod, Brass), 'C', new MaterialEntry(cableGtSingle, Tin), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV), 'X', CustomTags.LV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV), 'X', GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, true, "emitter_mv", EMITTER_MV.asStack(), "CRX", "RGR", "XRC", 'R', new MaterialEntry(rod, Electrum), 'C', new MaterialEntry(cableGtSingle, Copper), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV), 'X', CustomTags.MV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV), 'X', GTTags.Items.CIRCUITS_MV); VanillaRecipeHelper.addShapedRecipe(provider, true, "emitter_hv", EMITTER_HV.asStack(), "CRX", "RGR", "XRC", 'R', new MaterialEntry(rod, Chromium), 'C', new MaterialEntry(cableGtSingle, Gold), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV), 'X', CustomTags.HV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV), 'X', GTTags.Items.CIRCUITS_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "emitter_ev", EMITTER_EV.asStack(), "CRX", "RGR", "XRC", 'R', new MaterialEntry(rod, Platinum), 'C', new MaterialEntry(cableGtSingle, Aluminium), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV), 'X', CustomTags.EV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV), 'X', GTTags.Items.CIRCUITS_EV); VanillaRecipeHelper.addShapedRecipe(provider, true, "emitter_iv", EMITTER_IV.asStack(), "CRX", "RGR", "XRC", 'R', new MaterialEntry(rod, Iridium), 'C', new MaterialEntry(cableGtSingle, Tungsten), 'G', - GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV), 'X', CustomTags.IV_CIRCUITS); + GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV), 'X', GTTags.Items.CIRCUITS_IV); ASSEMBLER_RECIPES.recipeBuilder("emitter_lv") .inputItems(rod, Brass, 4) .inputItems(cableGtSingle, Tin, 2) - .inputItems(CustomTags.LV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LV, 2) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(LV)) .circuitMeta(1) .outputItems(EMITTER_LV) @@ -1045,7 +1045,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("emitter_mv") .inputItems(rod, Electrum, 4) .inputItems(cableGtSingle, Copper, 2) - .inputItems(CustomTags.MV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_MV, 2) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(MV)) .circuitMeta(1) .outputItems(EMITTER_MV) @@ -1054,7 +1054,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("emitter_hv") .inputItems(rod, Chromium, 4) .inputItems(cableGtSingle, Gold, 2) - .inputItems(CustomTags.HV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_HV, 2) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(HV)) .circuitMeta(1) .outputItems(EMITTER_HV) @@ -1063,7 +1063,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("emitter_ev") .inputItems(rod, Platinum, 4) .inputItems(cableGtSingle, Aluminium, 2) - .inputItems(CustomTags.EV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_EV, 2) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(EV)) .circuitMeta(1) .outputItems(EMITTER_EV) @@ -1072,7 +1072,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("emitter_iv") .inputItems(rod, Iridium, 4) .inputItems(cableGtSingle, Tungsten, 2) - .inputItems(CustomTags.IV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_IV, 2) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(IV)) .circuitMeta(1) .outputItems(EMITTER_IV) @@ -1083,7 +1083,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_LuV) .inputItems(rodLong, Ruridit, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(LuV)) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(foil, Palladium, 64) .inputItems(foil, Palladium, 32) .inputItems(cableGtSingle, NiobiumTitanium, 4) @@ -1101,7 +1101,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_ZPM) .inputItems(rodLong, Osmiridium, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(ZPM), 2) - .inputItems(CustomTags.ZPM_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 2) .inputItems(foil, Trinium, 64) .inputItems(foil, Trinium, 32) .inputItems(cableGtSingle, VanadiumGallium, 4) @@ -1118,7 +1118,7 @@ public static void init(Consumer provider) { .inputItems(ELECTRIC_MOTOR_UV) .inputItems(rodLong, Tritanium, 4) .inputItems(GTCraftingComponents.SENSOR_EMITTER_GEM.get(UV)) - .inputItems(CustomTags.UV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_UV, 2) .inputItems(foil, Naquadria, 64) .inputItems(foil, Naquadria, 32) .inputItems(cableGtSingle, YttriumBariumCuprate, 4) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java index 6e5e2d70806..5985bc8a589 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.ItemStack; @@ -25,7 +25,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("basic_data_access_hatch") .inputItems(ITEM_IMPORT_BUS[HV]) .inputItems(TOOL_DATA_STICK, 4) - .inputItems(CustomTags.HV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_HV, 4) .outputItems(BASIC_DATA_ACCESS_HATCH) .inputFluids(Polyethylene, L * 2) .cleanroom(CleanroomType.CLEANROOM) @@ -35,7 +35,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("data_access_hatch") .inputItems(ITEM_IMPORT_BUS[EV]) .inputItems(TOOL_DATA_STICK, 4) - .inputItems(CustomTags.EV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_EV, 4) .outputItems(DATA_ACCESS_HATCH) .inputFluids(Polytetrafluoroethylene, L * 2) .cleanroom(CleanroomType.CLEANROOM) @@ -45,7 +45,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("advanced_data_access_hatch") .inputItems(ITEM_IMPORT_BUS[LuV]) .inputItems(TOOL_DATA_ORB, 4) - .inputItems(CustomTags.ZPM_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 4) .outputItems(ADVANCED_DATA_ACCESS_HATCH) .inputFluids(SolderingAlloy, L * 4) .inputFluids(Polybenzimidazole, L * 4) @@ -67,7 +67,7 @@ public static void init(Consumer provider) { .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(foil, Steel, 4) .inputItems(wireFine, RedAlloy, 4) - .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_MV) .inputFluids(SolderingAlloy, L) .outputItems(TEXT_MODULE) .duration(1000).EUt(VA[MV]) @@ -77,7 +77,7 @@ public static void init(Consumer provider) { .inputItems(PLASTIC_CIRCUIT_BOARD) .inputItems(foil, Electrum, 4) .inputItems(wireFine, Silver, 4) - .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_MV) .inputFluids(SolderingAlloy, L) .outputItems(IMAGE_MODULE) .duration(1000).EUt(VA[MV]) @@ -94,7 +94,7 @@ public static void init(Consumer provider) { .addMaterialInfo(true).save(provider); ASSEMBLER_RECIPES.recipeBuilder("advanced_monitor_casing") .inputItems(MONITOR) - .inputItems(CustomTags.HV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_HV) .inputItems(plate, StainlessSteel, 4) .inputFluids(SolderingAlloy, L) .outputItems(ADVANCED_MONITOR, 1) @@ -104,7 +104,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("high_power_casing") .inputItems(frameGt, Iridium) .inputItems(plate, Iridium, 6) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_IV) .inputItems(wireFine, Cobalt, 16) .inputItems(wireFine, Copper, 16) .inputItems(wireGtSingle, NiobiumTitanium, 2) @@ -116,7 +116,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("computer_casing") .inputItems(frameGt, Iridium) .inputItems(plate, Iridium, 6) - .inputItems(CustomTags.LuV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LuV) .inputItems(wireFine, Cobalt, 32) .inputItems(wireFine, Copper, 32) .inputItems(wireGtSingle, VanadiumGallium, 2) @@ -127,7 +127,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("advanced_computer_casing") .inputItems(COMPUTER_CASING.asStack()) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(wireFine, Cobalt, 64) .inputItems(wireFine, Electrum, 64) .inputItems(wireGtSingle, IndiumTinBariumTitaniumCuprate, 4) @@ -158,7 +158,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("data_bank") .inputItems(COMPUTER_CASING.asStack()) - .inputItems(CustomTags.LuV_CIRCUITS, 8) + .inputItems(GTTags.Items.CIRCUITS_LuV, 8) .inputItems(TOOL_DATA_ORB) .inputItems(wireFine, Cobalt, 64) .inputItems(wireFine, Copper, 64) @@ -177,7 +177,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("research_station") .inputItems(DATA_BANK) .inputItems(SENSOR_LuV, 8) - .inputItems(CustomTags.ZPM_CIRCUITS, 8) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 8) .inputItems(FIELD_GENERATOR_LuV, 2) .inputItems(ELECTRIC_MOTOR_ZPM, 2) .inputItems(wireGtDouble, UraniumRhodiumDinaquadide, 32) @@ -196,7 +196,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("object_holder") .inputItems(ITEM_IMPORT_BUS[ZPM]) .inputItems(EMITTER_LuV, 8) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(ROBOT_ARM_ZPM, 2) .inputItems(ELECTRIC_MOTOR_ZPM, 2) .inputItems(wireGtDouble, UraniumRhodiumDinaquadide, 16) @@ -215,7 +215,7 @@ public static void init(Consumer provider) { .inputItems(COMPUTER_CASING.asStack()) .inputItems(EMITTER_ZPM, 4) .inputItems(SENSOR_ZPM, 4) - .inputItems(CustomTags.UV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UV, 4) .inputItems(wireGtDouble, EnrichedNaquadahTriniumEuropiumDuranide, 32) .inputItems(foil, Tritanium, 64) .inputItems(foil, Tritanium, 64) @@ -232,7 +232,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("high_performance_computing_array") .inputItems(DATA_BANK) - .inputItems(CustomTags.ZPM_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 4) .inputItems(FIELD_GENERATOR_LuV, 8) .inputItems(TOOL_DATA_ORB) .inputItems(COVER_SCREEN) @@ -251,7 +251,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hpca_empty_component") .inputItems(COMPUTER_CASING.asStack()) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_IV) .inputItems(TOOL_DATA_STICK) .outputItems(HPCA_EMPTY_COMPONENT) .inputFluids(PCBCoolant, 1000) @@ -282,7 +282,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hpca_bridge_component") .inputItems(ADVANCED_COMPUTER_CASING.asStack()) - .inputItems(CustomTags.UV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_UV) .inputItems(EMITTER_ZPM) .inputItems(OPTICAL_PIPES[0].asStack(2)) .outputItems(HPCA_BRIDGE_COMPONENT) @@ -293,7 +293,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hpca_computation_component") .inputItems(HPCA_EMPTY_COMPONENT) - .inputItems(CustomTags.ZPM_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_ZPM, 4) .inputItems(FIELD_GENERATOR_LuV) .outputItems(HPCA_COMPUTATION_COMPONENT) .inputFluids(PCBCoolant, 1000) @@ -303,7 +303,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hpca_advanced_computation_component") .inputItems(HPCA_COMPUTATION_COMPONENT) - .inputItems(CustomTags.UV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_UV, 4) .inputItems(FIELD_GENERATOR_ZPM) .outputItems(HPCA_ADVANCED_COMPUTATION_COMPONENT) .inputFluids(PCBCoolant, 1000) @@ -314,7 +314,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("data_receiver_hatch") .inputItems(COMPUTER_CASING.asStack()) .inputItems(ITEM_IMPORT_BUS[LuV]) - .inputItems(CustomTags.LuV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LuV) .inputItems(SENSOR_IV) .inputItems(OPTICAL_PIPES[0].asStack(2)) .inputFluids(Polybenzimidazole, L * 2) @@ -326,7 +326,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("data_transmitter_hatch") .inputItems(COMPUTER_CASING.asStack()) .inputItems(ITEM_EXPORT_BUS[LuV]) - .inputItems(CustomTags.LuV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LuV) .inputItems(EMITTER_IV) .inputItems(OPTICAL_PIPES[0].asStack(2)) .inputFluids(Polybenzimidazole, L * 2) @@ -337,7 +337,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("computation_receiver_hatch") .inputItems(DATA_HATCH_RECEIVER) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(SENSOR_LuV) .inputFluids(Polybenzimidazole, L * 2) .outputItems(COMPUTATION_HATCH_RECEIVER) @@ -347,7 +347,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("computation_transmitter_hatch") .inputItems(DATA_HATCH_TRANSMITTER) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(EMITTER_LuV) .inputFluids(Polybenzimidazole, L * 2) .outputItems(COMPUTATION_HATCH_TRANSMITTER) @@ -357,7 +357,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("active_transformer") .inputItems(POWER_TRANSFORMER[LuV]) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireGtSingle, IndiumTinBariumTitaniumCuprate, 8) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) .inputFluids(PCBCoolant, 1000) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index 1d2936362ba..5cd0e4da8d1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -8,8 +8,8 @@ import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.SpecialRecipeBuilder; @@ -54,7 +54,7 @@ public static void init(Consumer provider) { addDuctRecipes(provider, TungstenSteel, 8); VanillaRecipeHelper.addShapelessRecipe(provider, "programmed_circuit", PROGRAMMED_CIRCUIT.asStack(), - CustomTags.LV_CIRCUITS); + GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, "item_filter", ITEM_FILTER.asStack(), "XXX", "XYX", "XXX", 'X', new MaterialEntry(foil, Zinc), 'Y', new MaterialEntry(plate, Steel)); @@ -73,7 +73,7 @@ public static void init(Consumer provider) { "XXX", "XYX", "XXX", 'X', new MaterialEntry(foil, Zinc), 'Y', new MaterialEntry(plate, Amethyst)); VanillaRecipeHelper.addShapedRecipe(provider, "item_smart_filter_olivine", SMART_ITEM_FILTER.asStack(), "XEX", - "XCX", "XEX", 'X', new MaterialEntry(foil, Zinc), 'C', CustomTags.LV_CIRCUITS, 'E', + "XCX", "XEX", 'X', new MaterialEntry(foil, Zinc), 'C', GTTags.Items.CIRCUITS_LV, 'E', new MaterialEntry(plate, Ruby)); VanillaRecipeHelper.addShapedRecipe(provider, "plank_to_wooden_shape", WOODEN_FORM_EMPTY.asStack(), " ", @@ -133,17 +133,17 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "nano_saber", NANO_SABER.asStack(), "PIC", "PIC", "XEX", 'P', new MaterialEntry(plate, Platinum), 'I', new MaterialEntry(plate, Ruridit), 'C', - CARBON_FIBER_PLATE.asStack(), 'X', CustomTags.EV_CIRCUITS, 'E', ENERGIUM_CRYSTAL.asStack()); + CARBON_FIBER_PLATE.asStack(), 'X', GTTags.Items.CIRCUITS_EV, 'E', ENERGIUM_CRYSTAL.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, "solar_panel_basic", COVER_SOLAR_PANEL.asStack(), "WGW", "CPC", - 'W', SILICON_WAFER.asStack(), 'G', new ItemStack(Blocks.GLASS_PANE), 'C', CustomTags.LV_CIRCUITS, 'P', + 'W', SILICON_WAFER.asStack(), 'G', new ItemStack(Blocks.GLASS_PANE), 'C', GTTags.Items.CIRCUITS_LV, 'P', CARBON_FIBER_PLATE.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, "solar_panel_ulv", COVER_SOLAR_PANEL_ULV.asStack(), "WGW", "CAC", - "P P", 'W', PHOSPHORUS_WAFER.asStack(), 'G', Tags.Items.GLASS_PANES, 'C', CustomTags.HV_CIRCUITS, 'P', + "P P", 'W', PHOSPHORUS_WAFER.asStack(), 'G', Tags.Items.GLASS_PANES, 'C', GTTags.Items.CIRCUITS_HV, 'P', ChemicalHelper.get(plate, GalliumArsenide), 'A', ChemicalHelper.get(wireGtQuadruple, Graphene)); VanillaRecipeHelper.addShapedRecipe(provider, "solar_panel_lv", COVER_SOLAR_PANEL_LV.asStack(), "WGW", "CAC", "P P", 'W', NAQUADAH_WAFER.asStack(), 'G', GTBlocks.CASING_TEMPERED_GLASS.asStack(), 'C', - CustomTags.LuV_CIRCUITS, 'P', ChemicalHelper.get(plate, IndiumGalliumPhosphide), 'A', + GTTags.Items.CIRCUITS_LuV, 'P', ChemicalHelper.get(plate, IndiumGalliumPhosphide), 'A', ChemicalHelper.get(wireGtHex, Graphene)); VanillaRecipeHelper.addShapedRecipe(provider, "universal_fluid_cell", FLUID_CELL_UNIVERSAL.asStack(), "C ", @@ -154,7 +154,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "blacklight", BLACKLIGHT.asStack(), "SPS", "GRG", "CPK", 'S', new MaterialEntry(screw, TungstenCarbide), 'P', new MaterialEntry(plate, TungstenCarbide), 'G', GTBlocks.CASING_LAMINATED_GLASS.asStack(), 'R', new MaterialEntry(spring, Europium), 'C', - CustomTags.IV_CIRCUITS, 'K', new MaterialEntry(cableGtSingle, Platinum)); + GTTags.Items.CIRCUITS_IV, 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "filter_casing", GTBlocks.FILTER_CASING.asStack(), "BBB", "III", "MFR", 'B', new ItemStack(Blocks.IRON_BARS), 'I', ITEM_FILTER.asStack(), 'M', @@ -250,21 +250,21 @@ public static void init(Consumer provider) { // Armors // /////////////////////////////////////////////////// VanillaRecipeHelper.addShapedRecipe(provider, "nightvision_goggles", GTItems.NIGHTVISION_GOGGLES.asStack(), - "CSC", "RBR", "LdL", 'C', CustomTags.ULV_CIRCUITS, 'S', new MaterialEntry(screw, Steel), 'R', + "CSC", "RBR", "LdL", 'C', GTTags.Items.CIRCUITS_ULV, 'S', new MaterialEntry(screw, Steel), 'R', new MaterialEntry(ring, Rubber), 'B', GTItems.BATTERY_LV_SODIUM, 'L', new MaterialEntry(lens, Glass)); VanillaRecipeHelper.addShapedRecipe(provider, "fluid_jetpack", GTItems.LIQUID_FUEL_JETPACK.asStack(), "xCw", - "SUS", "RIR", 'C', CustomTags.LV_CIRCUITS, 'S', GTItems.FLUID_CELL_LARGE_STEEL.asStack(), 'U', + "SUS", "RIR", 'C', GTTags.Items.CIRCUITS_LV, 'S', GTItems.FLUID_CELL_LARGE_STEEL.asStack(), 'U', GTItems.ELECTRIC_PUMP_LV.asStack(), 'R', new MaterialEntry(rotor, Lead), 'I', new MaterialEntry(pipeSmallFluid, Potin)); VanillaRecipeHelper.addShapedRecipe(provider, "electric_jetpack", GTItems.ELECTRIC_JETPACK.asStack(), "xCd", - "TBT", "I I", 'C', CustomTags.MV_CIRCUITS, 'T', GTItems.POWER_THRUSTER.asStack(), 'B', + "TBT", "I I", 'C', GTTags.Items.CIRCUITS_MV, 'T', GTItems.POWER_THRUSTER.asStack(), 'B', GTItems.BATTERY_MV_LITHIUM.asStack(), 'I', new MaterialEntry(wireGtDouble, AnnealedCopper)); VanillaRecipeHelper.addShapedRecipe(provider, "electric_jetpack_advanced", GTItems.ELECTRIC_JETPACK_ADVANCED.asStack(), "xJd", "TBT", "WCW", 'J', GTItems.ELECTRIC_JETPACK.asStack(), 'T', GTItems.POWER_THRUSTER_ADVANCED.asStack(), 'B', ENERGIUM_CRYSTAL.asStack(), 'W', new MaterialEntry(wireGtQuadruple, Gold), 'C', - CustomTags.HV_CIRCUITS); + GTTags.Items.CIRCUITS_HV); VanillaRecipeHelper.addShapedRecipe(provider, "nano_helmet", GTItems.NANO_HELMET.asStack(), "PPP", "PNP", "xEd", 'P', GTItems.CARBON_FIBER_PLATE.asStack(), 'N', GTItems.NIGHTVISION_GOGGLES.asStack(), 'E', GTItems.ENERGIUM_CRYSTAL.asStack()); @@ -278,7 +278,7 @@ public static void init(Consumer provider) { GTItems.NANO_CHESTPLATE_ADVANCED.asStack(), "xJd", "PNP", "WCW", 'J', GTItems.ELECTRIC_JETPACK_ADVANCED.asStack(), 'P', GTItems.LOW_POWER_INTEGRATED_CIRCUIT.asStack(), 'N', GTItems.NANO_CHESTPLATE.asStack(), 'W', new MaterialEntry(wireGtQuadruple, Platinum), 'C', - CustomTags.IV_CIRCUITS); + GTTags.Items.CIRCUITS_IV); VanillaRecipeHelper.addShapedRecipe(provider, "gravitation_engine", GTItems.GRAVITATION_ENGINE.asStack(), "ESE", "POP", "ESE", 'E', GTItems.EMITTER_LuV.asStack(), 'S', new MaterialEntry(wireGtQuadruple, Osmium), 'P', new MaterialEntry(plateDouble, Iridium), 'O', GTItems.ENERGY_LAPOTRONIC_ORB.asStack()); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java index e654851a7cd..541da90210e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java @@ -14,8 +14,8 @@ import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.item.behavior.ItemMagnetBehavior; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.utils.ToolItemHelper; import net.minecraft.core.registries.BuiltInRegistries; @@ -216,7 +216,7 @@ private static void registerElectricRecipes(@NotNull Consumer pr 'P', new MaterialEntry(plate, GTMaterials.Steel), 'S', GTItems.SENSOR_LV.asStack(), 'D', new MaterialEntry(plate, GTMaterials.Glass), - 'C', CustomTags.LV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_LV, 'B', batteryItem.asStack()); { @@ -246,7 +246,7 @@ private static void registerElectricRecipes(@NotNull Consumer pr 'P', new MaterialEntry(plate, GTMaterials.Aluminium), 'S', GTItems.SENSOR_MV.asStack(), 'D', GTItems.COVER_SCREEN.asStack(), - 'C', CustomTags.MV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_MV, 'B', batteryItem.asStack()); } @@ -259,7 +259,7 @@ private static void registerElectricRecipes(@NotNull Consumer pr 'P', new MaterialEntry(plate, GTMaterials.StainlessSteel), 'S', GTItems.SENSOR_HV.asStack(), 'D', GTItems.COVER_SCREEN.asStack(), - 'C', CustomTags.HV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_HV, 'B', batteryItem.asStack()); { @@ -289,7 +289,7 @@ private static void registerElectricRecipes(@NotNull Consumer pr 'P', new MaterialEntry(plate, GTMaterials.RhodiumPlatedPalladium), 'S', GTItems.SENSOR_LuV.asStack(), 'D', GTItems.COVER_SCREEN.asStack(), - 'C', CustomTags.LuV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_LuV, 'B', batteryItem.asStack()); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java index 654faa45daf..ced5a0b8fb4 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java @@ -8,7 +8,6 @@ import com.gregtechceu.gtceu.common.data.*; import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import net.minecraft.data.recipes.FinishedRecipe; @@ -27,7 +26,7 @@ import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES; import static com.gregtechceu.gtceu.common.data.machines.GCYMMachines.*; -import static com.gregtechceu.gtceu.data.recipe.CustomTags.*; +import static com.gregtechceu.gtceu.data.tags.GTTags.*; public class GCYMRecipes { @@ -56,99 +55,99 @@ private static void registerManualRecipes(Consumer provider) { private static void registerMultiblockControllerRecipes(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, true, "large_macerator", LARGE_MACERATION_TOWER.asStack(), "PCP", - "BXB", "MKM", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plate, TungstenCarbide), 'B', + "BXB", "MKM", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plate, TungstenCarbide), 'B', ELECTRIC_PISTON_IV.asStack(), 'M', ELECTRIC_MOTOR_IV.asStack(), 'X', MACERATOR[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_arc_smelter", LARGE_ARC_SMELTER.asStack(), "KDK", - "CXC", "PPP", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plate, TantalumCarbide), 'X', + "CXC", "PPP", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plate, TantalumCarbide), 'X', GTMachines.ARC_FURNACE[IV].asStack(), 'D', new MaterialEntry(dust, Graphite), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_ore_washer", LARGE_CHEMICAL_BATH.asStack(), "PGP", - "CXC", "MKM", 'C', CustomTags.IV_CIRCUITS, 'G', CASING_TEMPERED_GLASS.asStack(), 'P', + "CXC", "MKM", 'C', Items.CIRCUITS_IV, 'G', CASING_TEMPERED_GLASS.asStack(), 'P', ELECTRIC_PUMP_IV.asStack(), 'M', CONVEYOR_MODULE_IV.asStack(), 'X', ORE_WASHER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_sifter", LARGE_SIFTING_FUNNEL.asStack(), "PCP", - "EXE", "PKP", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plate, HSLASteel), 'E', + "EXE", "PKP", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plate, HSLASteel), 'E', ELECTRIC_PISTON_IV.asStack(), 'X', SIFTER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_engraver", LARGE_ENGRAVING_LASER.asStack(), "ICI", - "EXE", "PKP", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plateDouble, TantalumCarbide), 'I', + "EXE", "PKP", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plateDouble, TantalumCarbide), 'I', EMITTER_IV.asStack(), 'E', ELECTRIC_PISTON_IV.asStack(), 'X', LASER_ENGRAVER[IV].asStack(), 'K', new MaterialEntry(TagPrefix.cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_packer", LARGE_PACKER.asStack(), "RCR", "PXP", "KPK", - 'C', CustomTags.EV_CIRCUITS, 'P', new MaterialEntry(plate, HSLASteel), 'R', ROBOT_ARM_HV.asStack(), + 'C', Items.CIRCUITS_EV, 'P', new MaterialEntry(plate, HSLASteel), 'R', ROBOT_ARM_HV.asStack(), 'K', CONVEYOR_MODULE_HV.asStack(), 'X', PACKER[HV].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_mixer", LARGE_MIXER.asStack(), "FCF", "RXR", "MKM", - 'C', CustomTags.IV_CIRCUITS, 'F', ChemicalHelper.get(pipeNormalFluid, Polybenzimidazole), 'R', + 'C', Items.CIRCUITS_IV, 'F', ChemicalHelper.get(pipeNormalFluid, Polybenzimidazole), 'R', ChemicalHelper.get(rotor, Osmiridium), 'M', ELECTRIC_MOTOR_IV.asStack(), 'X', MIXER[IV].asStack(), 'K', new MaterialEntry(TagPrefix.cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_centrifuge", LARGE_CENTRIFUGE.asStack(), "SFS", - "CXC", "MKM", 'C', CustomTags.IV_CIRCUITS, 'F', ChemicalHelper.get(pipeHugeFluid, StainlessSteel), + "CXC", "MKM", 'C', Items.CIRCUITS_IV, 'F', ChemicalHelper.get(pipeHugeFluid, StainlessSteel), 'S', ChemicalHelper.get(spring, MolybdenumDisilicide), 'M', ELECTRIC_MOTOR_IV.asStack(), 'X', CENTRIFUGE[IV].asStack(), 'K', new MaterialEntry(TagPrefix.cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_assembler", LARGE_ASSEMBLER.asStack(), "RKR", "CXC", - "MKM", 'C', CustomTags.IV_CIRCUITS, 'R', ROBOT_ARM_IV.asStack(), 'M', CONVEYOR_MODULE_IV.asStack(), 'X', + "MKM", 'C', Items.CIRCUITS_IV, 'R', ROBOT_ARM_IV.asStack(), 'M', CONVEYOR_MODULE_IV.asStack(), 'X', ASSEMBLER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_circuit_assembler", - LARGE_CIRCUIT_ASSEMBLER.asStack(), "RKR", "CXC", "MKM", 'C', CustomTags.IV_CIRCUITS, 'R', + LARGE_CIRCUIT_ASSEMBLER.asStack(), "RKR", "CXC", "MKM", 'C', Items.CIRCUITS_IV, 'R', ROBOT_ARM_IV.asStack(), 'M', CONVEYOR_MODULE_IV.asStack(), 'X', CIRCUIT_ASSEMBLER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_electrolyzer", LARGE_ELECTROLYZER.asStack(), "PCP", - "WXW", "PKP", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plate, BlackSteel), 'W', + "WXW", "PKP", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plate, BlackSteel), 'W', new MaterialEntry(cableGtSingle, Platinum), 'X', ELECTROLYZER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_electromagnet", LARGE_ELECTROMAGNET.asStack(), "PWP", - "CXC", "PKP", 'C', CustomTags.IV_CIRCUITS, 'P', new MaterialEntry(plate, BlueSteel), 'W', + "CXC", "PKP", 'C', Items.CIRCUITS_IV, 'P', new MaterialEntry(plate, BlueSteel), 'W', new MaterialEntry(wireGtQuadruple, Osmium), 'X', ELECTROMAGNETIC_SEPARATOR[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "blast_alloy_smelter", BLAST_ALLOY_SMELTER.asStack(), "TCT", - "WXW", "TCT", 'C', CustomTags.EV_CIRCUITS, 'T', new MaterialEntry(plate, TantalumCarbide), 'W', + "WXW", "TCT", 'C', Items.CIRCUITS_EV, 'T', new MaterialEntry(plate, TantalumCarbide), 'W', new MaterialEntry(cableGtSingle, Aluminium), 'X', ALLOY_SMELTER[EV].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "mega_blast_furnace", MEGA_BLAST_FURNACE.asStack(), "PCP", - "FSF", "DWD", 'C', ZPM_CIRCUITS, 'S', GTMultiMachines.ELECTRIC_BLAST_FURNACE.asStack(), 'F', + "FSF", "DWD", 'C', Items.CIRCUITS_ZPM, 'S', GTMultiMachines.ELECTRIC_BLAST_FURNACE.asStack(), 'F', FIELD_GENERATOR_ZPM.asStack(), 'P', new MaterialEntry(spring, Naquadah), 'D', new MaterialEntry(plateDense, NaquadahAlloy), 'W', new MaterialEntry(wireGtQuadruple, RutheniumTriniumAmericiumNeutronate)); VanillaRecipeHelper.addShapedRecipe(provider, true, "mega_vacuum_freezer", MEGA_VACUUM_FREEZER.asStack(), "PCP", - "FSF", "DWD", 'C', ZPM_CIRCUITS, 'S', GTMultiMachines.VACUUM_FREEZER.asStack(), 'F', + "FSF", "DWD", 'C', Items.CIRCUITS_ZPM, 'S', GTMultiMachines.VACUUM_FREEZER.asStack(), 'F', FIELD_GENERATOR_ZPM.asStack(), 'P', new MaterialEntry(pipeNormalFluid, NiobiumTitanium), 'D', new MaterialEntry(plateDense, RhodiumPlatedPalladium), 'W', new MaterialEntry(wireGtQuadruple, RutheniumTriniumAmericiumNeutronate)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_autoclave", LARGE_AUTOCLAVE.asStack(), "PCP", "PAP", - "BKB", 'C', CustomTags.IV_CIRCUITS, 'A', AUTOCLAVE[IV].asStack(), 'P', + "BKB", 'C', Items.CIRCUITS_IV, 'A', AUTOCLAVE[IV].asStack(), 'P', new MaterialEntry(plateDouble, HSLASteel), 'B', ELECTRIC_PUMP_IV.asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_material_press", LARGE_MATERIAL_PRESS.asStack(), - "PKP", "BZG", "FKH", 'Z', CustomTags.IV_CIRCUITS, 'B', BENDER[IV].asStack(), 'P', + "PKP", "BZG", "FKH", 'Z', Items.CIRCUITS_IV, 'B', BENDER[IV].asStack(), 'P', ELECTRIC_PISTON_IV.asStack(), 'G', COMPRESSOR[IV].asStack(), 'F', FORMING_PRESS[IV].asStack(), 'H', FORGE_HAMMER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_brewer", LARGE_BREWER.asStack(), "SZS", "FBH", "EKE", - 'Z', CustomTags.IV_CIRCUITS, 'S', new MaterialEntry(spring, MolybdenumDisilicide), 'F', + 'Z', Items.CIRCUITS_IV, 'S', new MaterialEntry(spring, MolybdenumDisilicide), 'F', FERMENTER[IV].asStack(), 'E', ELECTRIC_PUMP_IV.asStack(), 'B', BREWERY[IV].asStack(), 'H', FLUID_HEATER[IV].asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_cutter", LARGE_CUTTER.asStack(), "SMS", "CZL", "EKE", - 'Z', CustomTags.IV_CIRCUITS, 'L', LATHE[IV].asStack(), 'E', ELECTRIC_MOTOR_IV.asStack(), 'C', + 'Z', Items.CIRCUITS_IV, 'L', LATHE[IV].asStack(), 'E', ELECTRIC_MOTOR_IV.asStack(), 'C', CUTTER[IV].asStack(), 'M', CONVEYOR_MODULE_IV.asStack(), 'S', new MaterialEntry(toolHeadBuzzSaw, TungstenCarbide), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_distillery", LARGE_DISTILLERY.asStack(), "PZP", - "EDE", "PZP", 'Z', CustomTags.IV_CIRCUITS, 'D', GTMultiMachines.DISTILLATION_TOWER.asStack(), 'E', + "EDE", "PZP", 'Z', Items.CIRCUITS_IV, 'D', GTMultiMachines.DISTILLATION_TOWER.asStack(), 'E', ELECTRIC_PUMP_IV.asStack(), 'P', ChemicalHelper.get(pipeLargeFluid, Iridium)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_extractor", LARGE_EXTRACTOR.asStack(), "PTP", "EZC", - "BKB", 'Z', CustomTags.IV_CIRCUITS, 'B', ELECTRIC_PISTON_IV.asStack(), 'P', ELECTRIC_PUMP_IV.asStack(), + "BKB", 'Z', Items.CIRCUITS_IV, 'B', ELECTRIC_PISTON_IV.asStack(), 'P', ELECTRIC_PUMP_IV.asStack(), 'E', EXTRACTOR[IV].asStack(), 'C', CANNER[IV].asStack(), 'T', CASING_TEMPERED_GLASS.asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_extruder", LARGE_EXTRUDER.asStack(), "PZP", "SES", - "PKP", 'Z', CustomTags.IV_CIRCUITS, 'E', EXTRUDER[IV].asStack(), 'P', ELECTRIC_PISTON_IV.asStack(), 'S', + "PKP", 'Z', Items.CIRCUITS_IV, 'E', EXTRUDER[IV].asStack(), 'P', ELECTRIC_PISTON_IV.asStack(), 'S', new MaterialEntry(spring, MolybdenumDisilicide), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_solidifier", LARGE_SOLIDIFIER.asStack(), "PZP", - "ESE", "PKP", 'Z', CustomTags.IV_CIRCUITS, 'S', FLUID_SOLIDIFIER[IV].asStack(), 'E', + "ESE", "PKP", 'Z', Items.CIRCUITS_IV, 'S', FLUID_SOLIDIFIER[IV].asStack(), 'E', ELECTRIC_PUMP_IV.asStack(), 'P', ChemicalHelper.get(pipeNormalFluid, Polyethylene), 'K', new MaterialEntry(cableGtSingle, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_wiremill", LARGE_WIREMILL.asStack(), "PZP", "SWS", - "MKM", 'Z', CustomTags.IV_CIRCUITS, 'W', WIREMILL[IV].asStack(), 'P', + "MKM", 'Z', Items.CIRCUITS_IV, 'W', WIREMILL[IV].asStack(), 'P', new MaterialEntry(plate, HSLASteel), 'S', new MaterialEntry(spring, HSLASteel), 'M', ELECTRIC_MOTOR_IV.asStack(), 'K', new MaterialEntry(cableGtSingle, Platinum)); } @@ -161,24 +160,24 @@ private static void registerPartsRecipes(Consumer provider) { 'P', new MaterialEntry(plate, TungstenCarbide), 'U', ChemicalHelper.get(gear, Ultimet), 'C', CASING_SHOCK_PROOF.asStack(), 'M', ELECTRIC_MOTOR_IV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, "electrolytic_cell", ELECTROLYTIC_CELL.asStack(2), "WWW", "WCW", - "ZKZ", 'W', new MaterialEntry(wireGtDouble, Platinum), 'Z', CustomTags.IV_CIRCUITS, 'C', + "ZKZ", 'W', new MaterialEntry(wireGtDouble, Platinum), 'Z', Items.CIRCUITS_IV, 'C', CASING_NONCONDUCTING.asStack(), 'K', ChemicalHelper.get(cableGtSingle, Tungsten)); VanillaRecipeHelper.addShapedRecipe(provider, "heat_vent", HEAT_VENT.asStack(2), "PDP", "RLR", "PDP", 'P', new MaterialEntry(plate, TantalumCarbide), 'D', ChemicalHelper.get(plateDouble, MolybdenumDisilicide), 'R', ChemicalHelper.get(rotor, Titanium), 'L', ChemicalHelper.get(rodLong, MolybdenumDisilicide)); VanillaRecipeHelper.addShapedRecipe(provider, "parallel_hatch_mk1", PARALLEL_HATCH[IV].asStack(1), "SZE", "ZHZ", - "CZC", 'S', SENSOR_IV.asStack(), 'E', EMITTER_IV.asStack(), 'Z', LuV_CIRCUITS, 'H', HULL[IV].asStack(), - 'C', new MaterialEntry(cableGtDouble, Platinum)); + "CZC", 'S', SENSOR_IV.asStack(), 'E', EMITTER_IV.asStack(), 'Z', Items.CIRCUITS_LuV, + 'H', HULL[IV].asStack(), 'C', new MaterialEntry(cableGtDouble, Platinum)); VanillaRecipeHelper.addShapedRecipe(provider, "parallel_hatch_mk2", PARALLEL_HATCH[LuV].asStack(1), "SZE", - "ZHZ", "CZC", 'S', SENSOR_LuV.asStack(), 'E', EMITTER_LuV.asStack(), 'Z', ZPM_CIRCUITS, 'H', + "ZHZ", "CZC", 'S', SENSOR_LuV.asStack(), 'E', EMITTER_LuV.asStack(), 'Z', Items.CIRCUITS_ZPM, 'H', HULL[LuV].asStack(), 'C', new MaterialEntry(cableGtDouble, NiobiumTitanium)); VanillaRecipeHelper.addShapedRecipe(provider, "parallel_hatch_mk3", PARALLEL_HATCH[ZPM].asStack(1), "SZE", - "ZHZ", "CZC", 'S', SENSOR_ZPM.asStack(), 'E', EMITTER_ZPM.asStack(), 'Z', UV_CIRCUITS, 'H', + "ZHZ", "CZC", 'S', SENSOR_ZPM.asStack(), 'E', EMITTER_ZPM.asStack(), 'Z', Items.CIRCUITS_UV, 'H', HULL[ZPM].asStack(), 'C', new MaterialEntry(cableGtDouble, VanadiumGallium)); VanillaRecipeHelper.addShapedRecipe(provider, "parallel_hatch_mk4", PARALLEL_HATCH[UV].asStack(1), "SZE", "ZHZ", - "CZC", 'S', SENSOR_UV.asStack(), 'E', EMITTER_UV.asStack(), 'Z', UHV_CIRCUITS, 'H', HULL[UV].asStack(), - 'C', new MaterialEntry(cableGtDouble, YttriumBariumCuprate)); + "CZC", 'S', SENSOR_UV.asStack(), 'E', EMITTER_UV.asStack(), 'Z', Items.CIRCUITS_UHV, + 'H', HULL[UV].asStack(), 'C', new MaterialEntry(cableGtDouble, YttriumBariumCuprate)); } private static void registerMachineRecipes(Consumer provider) { @@ -209,7 +208,7 @@ private static void registerAssemblerRecipes(Consumer provider) .inputItems(wireGtDouble, Platinum, 4) .inputItems(cableGtSingle, Tungsten, 1) .inputItems(CASING_NONCONDUCTING.asStack()) - .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(Items.CIRCUITS_IV) .outputItems(ELECTROLYTIC_CELL.asStack(ConfigHolder.INSTANCE.recipes.casingsPerCraft)) .duration(50).EUt(16) .addMaterialInfo(true).save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java index 20b8e269eba..c1d80066b08 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java @@ -18,8 +18,8 @@ import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.FinishedRecipe; @@ -293,16 +293,16 @@ private static void registerStoneBricksRecipes(Consumer provider registerCobbleRecipe(provider, stones, cobbles); registerMossRecipe(provider, cobbles, mossCobbles); registerSmoothRecipe(provider, stones, polisheds); - registerBricksRecipe(provider, polisheds, bricks, CustomTags.LIGHT_BLUE_LENS); + registerBricksRecipe(provider, polisheds, bricks, GTTags.Items.LENSES_LIGHT_BLUE); registerCobbleRecipe(provider, bricks, crackedBricks); registerMossRecipe(provider, bricks, mossBricks); - registerBricksRecipe(provider, polisheds, chiseledBricks, CustomTags.WHITE_LENS); - registerBricksRecipe(provider, polisheds, tiledBricks, CustomTags.RED_LENS); - registerBricksRecipe(provider, tiledBricks, smallTiledBricks, CustomTags.RED_LENS); - registerBricksRecipe(provider, polisheds, windmillA, CustomTags.BLUE_LENS); - registerBricksRecipe(provider, polisheds, windmillB, CustomTags.YELLOW_LENS); - registerBricksRecipe(provider, polisheds, squareBricks, CustomTags.GREEN_LENS); - registerBricksRecipe(provider, polisheds, smallBricks, CustomTags.PINK_LENS); + registerBricksRecipe(provider, polisheds, chiseledBricks, GTTags.Items.LENSES_WHITE); + registerBricksRecipe(provider, polisheds, tiledBricks, GTTags.Items.LENSES_RED); + registerBricksRecipe(provider, tiledBricks, smallTiledBricks, GTTags.Items.LENSES_RED); + registerBricksRecipe(provider, polisheds, windmillA, GTTags.Items.LENSES_BLUE); + registerBricksRecipe(provider, polisheds, windmillB, GTTags.Items.LENSES_YELLOW); + registerBricksRecipe(provider, polisheds, squareBricks, GTTags.Items.LENSES_GREEN); + registerBricksRecipe(provider, polisheds, smallBricks, GTTags.Items.LENSES_PINK); for (int i = 0; i < stones.size(); i++) { ResourceLocation bricksId = BuiltInRegistries.ITEM.getKey(bricks.get(i).getItem()); @@ -512,7 +512,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("cover_energy_detector") .inputItems(cableGtSingle, Copper, 4) - .inputItems(CustomTags.LV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LV) .inputItems(plate, Iron) .inputFluids(SolderingAlloy, L / 2) .outputItems(COVER_ENERGY_DETECTOR) @@ -540,7 +540,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("cover_advanced_activity_cover") .inputItems(wireFine, Gold, 4) - .inputItems(CustomTags.HV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_HV) .inputItems(plate, Aluminium) .inputFluids(SolderingAlloy, L / 2) .outputItems(COVER_ACTIVITY_DETECTOR_ADVANCED) @@ -596,7 +596,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("cover_screen") .inputItems(plate, Glass) .inputItems(foil, Aluminium, 4) - .inputItems(CustomTags.LV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LV) .inputItems(wireFine, Copper, 4) .outputItems(COVER_SCREEN) .EUt(16).duration(50) @@ -606,7 +606,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("cover_infinite_water") .inputItems(ELECTRIC_PUMP_HV, 2) .inputItems(new ItemStack(Items.CAULDRON)) - .inputItems(CustomTags.HV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_HV) .outputItems(COVER_INFINITE_WATER) .EUt(VA[HV]).duration(100) .addMaterialInfo(true) @@ -641,7 +641,7 @@ private static void registerAssemblerRecipes(Consumer provider) .inputItems(plateDouble, Aluminium) .inputItems(SENSOR_MV) .inputItems(EMITTER_MV) - .inputItems(CustomTags.MV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_MV) .inputFluids(SolderingAlloy, L * 2) .outputItems(COVER_ENDER_REDSTONE_LINK) .EUt(VA[MV]).duration(320) @@ -829,7 +829,7 @@ private static void registerAssemblerRecipes(Consumer provider) .outputItems(GTBlocks.SUPERCONDUCTING_COIL.asStack()).duration(100).save(provider); ASSEMBLER_RECIPES.recipeBuilder("fusion_coil").EUt(VA[ZPM]).inputItems(GTBlocks.SUPERCONDUCTING_COIL.asStack()) .inputItems(FIELD_GENERATOR_IV.asStack(2)).inputItems(ELECTRIC_PUMP_IV) - .inputItems(NEUTRON_REFLECTOR.asStack(2)).inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(NEUTRON_REFLECTOR.asStack(2)).inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(pipeSmallFluid, Naquadah, 4).inputItems(plate, Europium, 4) .inputFluids(VanadiumGallium, GTValues.L * 4).outputItems(GTBlocks.FUSION_COIL.asStack()) .duration(100).cleanroom(CleanroomType.CLEANROOM).addMaterialInfo(true, true) @@ -905,7 +905,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("assembly_control_casing") .inputItems(HIGH_POWER_INTEGRATED_CIRCUIT) - .inputItems(CustomTags.EV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_EV, 4) .inputItems(SENSOR_IV) .inputItems(EMITTER_IV) .inputItems(ELECTRIC_MOTOR_IV) @@ -1335,13 +1335,13 @@ private static void registerRecyclingRecipes(Consumer provider) .save(provider); MACERATOR_RECIPES.recipeBuilder("macerate_coral_block") - .inputItems(CustomTags.CORAL_BLOCK_ITEMS) + .inputItems(GTTags.Items.CORAL_BLOCKS) .outputItems(dust, Calcite) .duration(150).EUt(2) .save(provider); MACERATOR_RECIPES.recipeBuilder("macerate_coral") - .inputItems(CustomTags.CORAL_ITEMS) + .inputItems(GTTags.Items.CORALS) .outputItems(dustTiny, Calcite) .duration(25).EUt(2) .save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java index 2825e6ddee7..6e22d9c902c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java @@ -11,8 +11,8 @@ import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.CraftingComponent; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.ItemTags; @@ -194,7 +194,7 @@ public static void init(Consumer provider) { 'M', GTItems.ELECTRIC_MOTOR_MV, 'V', new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "casing_assembly_control", GTBlocks.CASING_ASSEMBLY_CONTROL.asStack(ConfigHolder.INSTANCE.recipes.casingsPerCraft), "CPC", "SFE", - "CMC", 'C', CustomTags.EV_CIRCUITS, 'P', GTItems.HIGH_POWER_INTEGRATED_CIRCUIT, 'S', + "CMC", 'C', GTTags.Items.CIRCUITS_EV, 'P', GTItems.HIGH_POWER_INTEGRATED_CIRCUIT, 'S', GTItems.SENSOR_IV.asStack(), 'F', new MaterialEntry(TagPrefix.frameGt, GTMaterials.TungstenSteel), 'E', GTItems.EMITTER_IV.asStack(), 'M', GTItems.ELECTRIC_MOTOR_IV); VanillaRecipeHelper.addShapedRecipe(provider, true, "casing_assembly_line", @@ -473,7 +473,7 @@ public static void init(Consumer provider) { new MaterialEntry(TagPrefix.plate, GTMaterials.WroughtIron)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_macerator_bronze", GTMachines.STEAM_MACERATOR.left().asStack(), "DXD", "XMX", "PXP", 'M', GTBlocks.BRONZE_HULL.asStack(), - 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', CustomTags.PISTONS, + 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', GTTags.Items.PISTONS, 'D', new MaterialEntry(TagPrefix.gem, GTMaterials.Diamond)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_macerator_steel", GTMachines.STEAM_MACERATOR.right().asStack(), "WSW", "PMP", "WWW", 'M', @@ -483,7 +483,7 @@ public static void init(Consumer provider) { new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_extractor_bronze", GTMachines.STEAM_EXTRACTOR.left().asStack(), "XXX", "PMG", "XXX", 'M', GTBlocks.BRONZE_HULL.asStack(), - 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', CustomTags.PISTONS, + 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', GTTags.Items.PISTONS, 'G', new ItemStack(Blocks.GLASS)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_extractor_steel", GTMachines.STEAM_EXTRACTOR.right().asStack(), "PSP", "WMW", "PPP", 'M', @@ -493,7 +493,7 @@ public static void init(Consumer provider) { new MaterialEntry(TagPrefix.plate, GTMaterials.WroughtIron)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_hammer_bronze", GTMachines.STEAM_HAMMER.left().asStack(), "XPX", "XMX", "XAX", 'M', GTBlocks.BRONZE_HULL.asStack(), 'X', - new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', CustomTags.PISTONS, 'A', + new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', GTTags.Items.PISTONS, 'A', Blocks.ANVIL); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_hammer_steel", GTMachines.STEAM_HAMMER.right().asStack(), "WSW", "PMP", "WWW", 'M', @@ -502,7 +502,7 @@ public static void init(Consumer provider) { new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_compressor_bronze", GTMachines.STEAM_COMPRESSOR.left().asStack(), "XXX", "PMP", "XXX", 'M', GTBlocks.BRONZE_HULL.asStack(), - 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', CustomTags.PISTONS); + 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), 'P', GTTags.Items.PISTONS); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_compressor_steel", GTMachines.STEAM_COMPRESSOR.right().asStack(), "PSP", "WMW", "PPP", 'M', GTMachines.STEAM_COMPRESSOR.left().asStack(), 'S', @@ -522,7 +522,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_rock_breaker_bronze", GTMachines.STEAM_ROCK_CRUSHER.left().asStack(), "PXP", "XMX", "DXD", 'M', GTBlocks.BRONZE_HULL.asStack(), 'X', new MaterialEntry(TagPrefix.pipeSmallFluid, GTMaterials.Bronze), - 'P', CustomTags.PISTONS, 'D', new MaterialEntry(TagPrefix.gem, GTMaterials.Diamond)); + 'P', GTTags.Items.PISTONS, 'D', new MaterialEntry(TagPrefix.gem, GTMaterials.Diamond)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_rock_breaker_steel", GTMachines.STEAM_ROCK_CRUSHER.right().asStack(), "WSW", "PMP", "WWW", 'M', GTMachines.STEAM_ROCK_CRUSHER.left().asStack(), 'W', @@ -570,7 +570,7 @@ public static void init(Consumer provider) { "FFF", "CMC", "WCW", 'M', GTBlocks.CASING_INVAR_HEATPROOF.asStack(), 'F', Blocks.BLAST_FURNACE.asItem(), - 'C', CustomTags.LV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_LV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin)); } else { VanillaRecipeHelper.addShapedRecipe(provider, true, "electric_blast_furnace", @@ -578,42 +578,42 @@ public static void init(Consumer provider) { "FFF", "CMC", "WCW", 'M', GTBlocks.CASING_INVAR_HEATPROOF.asStack(), 'F', GTMachines.ELECTRIC_FURNACE[LV].asStack(), - 'C', CustomTags.LV_CIRCUITS, + 'C', GTTags.Items.CIRCUITS_LV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin)); } VanillaRecipeHelper.addShapedRecipe(provider, true, "vacuum_freezer", GTMultiMachines.VACUUM_FREEZER.asStack(), "PPP", "CMC", "WCW", 'M', GTBlocks.CASING_ALUMINIUM_FROSTPROOF.asStack(), 'P', GTItems.ELECTRIC_PUMP_HV, - 'C', CustomTags.EV_CIRCUITS, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); + 'C', GTTags.Items.CIRCUITS_EV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); VanillaRecipeHelper.addShapedRecipe(provider, true, "implosion_compressor", GTMultiMachines.IMPLOSION_COMPRESSOR.asStack(), "OOO", "CMC", "WCW", 'M', GTBlocks.CASING_STEEL_SOLID.asStack(), 'O', new MaterialEntry(TagPrefix.rock, GTMaterials.Obsidian), - 'C', CustomTags.HV_CIRCUITS, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); + 'C', GTTags.Items.CIRCUITS_HV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); VanillaRecipeHelper.addShapedRecipe(provider, true, "distillation_tower", GTMultiMachines.DISTILLATION_TOWER.asStack(), "CBC", "FMF", "CBC", 'M', GTMachines.HULL[HV].asStack(), 'B', - new MaterialEntry(TagPrefix.pipeLargeFluid, GTMaterials.StainlessSteel), 'C', CustomTags.EV_CIRCUITS, + new MaterialEntry(TagPrefix.pipeLargeFluid, GTMaterials.StainlessSteel), 'C', GTTags.Items.CIRCUITS_EV, 'F', GTItems.ELECTRIC_PUMP_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "cracking_unit", GTMultiMachines.CRACKER.asStack(), "CEC", "PHP", "CEC", 'C', GTBlocks.COIL_CUPRONICKEL.asStack(), 'E', GTItems.ELECTRIC_PUMP_HV.asStack(), 'P', - CustomTags.HV_CIRCUITS, 'H', GTMachines.HULL[HV].asStack()); + GTTags.Items.CIRCUITS_HV, 'H', GTMachines.HULL[HV].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "pyrolyse_oven", GTMultiMachines.PYROLYSE_OVEN.asStack(), "WEP", "EME", "WCP", 'M', GTMachines.HULL[GTValues.MV].asStack(), 'W', GTItems.ELECTRIC_PISTON_MV.asStack(), 'P', new MaterialEntry(TagPrefix.wireGtQuadruple, GTMaterials.Cupronickel), 'E', - CustomTags.MV_CIRCUITS, 'C', GTItems.ELECTRIC_PUMP_MV); + GTTags.Items.CIRCUITS_MV, 'C', GTItems.ELECTRIC_PUMP_MV); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_combustion_engine", GTMultiMachines.LARGE_COMBUSTION_ENGINE.asStack(), "PCP", "EME", "GWG", 'M', GTMachines.HULL[GTValues.EV].asStack(), 'P', GTItems.ELECTRIC_PISTON_EV.asStack(), 'E', - GTItems.ELECTRIC_MOTOR_EV.asStack(), 'C', CustomTags.IV_CIRCUITS, 'W', + GTItems.ELECTRIC_MOTOR_EV.asStack(), 'C', GTTags.Items.CIRCUITS_IV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Aluminium), 'G', new MaterialEntry(TagPrefix.gear, GTMaterials.Titanium)); VanillaRecipeHelper.addShapedRecipe(provider, true, "extreme_combustion_engine", GTMultiMachines.EXTREME_COMBUSTION_ENGINE.asStack(), "PCP", "EME", "GWG", 'M', GTMachines.HULL[GTValues.IV].asStack(), 'P', GTItems.ELECTRIC_PISTON_IV.asStack(), 'E', - GTItems.ELECTRIC_MOTOR_IV.asStack(), 'C', CustomTags.LuV_CIRCUITS, 'W', + GTItems.ELECTRIC_MOTOR_IV.asStack(), 'C', GTTags.Items.CIRCUITS_LuV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.HSSG), 'G', new MaterialEntry(TagPrefix.gear, GTMaterials.TungstenSteel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "engine_intake_casing", @@ -628,106 +628,106 @@ public static void init(Consumer provider) { new MaterialEntry(TagPrefix.pipeNormalFluid, GTMaterials.TungstenSteel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "multi_furnace", GTMultiMachines.MULTI_SMELTER.asStack(), "PPP", - "ASA", "CAC", 'P', Blocks.FURNACE, 'A', CustomTags.HV_CIRCUITS, 'S', + "ASA", "CAC", 'P', Blocks.FURNACE, 'A', GTTags.Items.CIRCUITS_HV, 'S', GTBlocks.CASING_INVAR_HEATPROOF.asStack(), 'C', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_steam_turbine", GTMultiMachines.LARGE_STEAM_TURBINE.asStack(), "PSP", "SAS", "CSC", 'S', - new MaterialEntry(TagPrefix.gear, GTMaterials.Steel), 'P', CustomTags.HV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.gear, GTMaterials.Steel), 'P', GTTags.Items.CIRCUITS_HV, 'A', GTMachines.HULL[HV].asStack(), 'C', new MaterialEntry(TagPrefix.pipeLargeFluid, GTMaterials.Steel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_gas_turbine", GTMultiMachines.LARGE_GAS_TURBINE.asStack(), "PSP", "SAS", "CSC", 'S', new MaterialEntry(TagPrefix.gear, GTMaterials.StainlessSteel), 'P', - CustomTags.EV_CIRCUITS, 'A', GTMachines.HULL[GTValues.EV].asStack(), 'C', + GTTags.Items.CIRCUITS_EV, 'A', GTMachines.HULL[GTValues.EV].asStack(), 'C', new MaterialEntry(TagPrefix.pipeLargeFluid, GTMaterials.StainlessSteel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_plasma_turbine", GTMultiMachines.LARGE_PLASMA_TURBINE.asStack(), "PSP", "SAS", "CSC", 'S', - new MaterialEntry(TagPrefix.gear, GTMaterials.TungstenSteel), 'P', CustomTags.LuV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.gear, GTMaterials.TungstenSteel), 'P', GTTags.Items.CIRCUITS_LuV, 'A', GTMachines.HULL[GTValues.LuV].asStack(), 'C', new MaterialEntry(TagPrefix.pipeLargeFluid, GTMaterials.TungstenSteel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "central_monitor", GTMultiMachines.CENTRAL_MONITOR.asStack(), "CMC", "SAE", "FFF", 'C', - CustomTags.MV_CIRCUITS, 'M', GTItems.COVER_SCREEN, 'S', GTItems.SENSOR_MV, + GTTags.Items.CIRCUITS_MV, 'M', GTItems.COVER_SCREEN, 'S', GTItems.SENSOR_MV, 'A', GTMachines.HULL[GTValues.MV].asStack(), 'E', GTItems.EMITTER_MV, 'F', GTBlocks.CASING_ALUMINIUM_FROSTPROOF.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_bronze_boiler", GTMultiMachines.LARGE_BOILER_BRONZE.asStack(), "PSP", "SAS", "PSP", 'P', - new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin), 'S', CustomTags.LV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin), 'S', GTTags.Items.CIRCUITS_LV, 'A', GTBlocks.FIREBOX_BRONZE.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_steel_boiler", GTMultiMachines.LARGE_BOILER_STEEL.asStack(), "PSP", "SAS", "PSP", 'P', - new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper), 'S', CustomTags.HV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper), 'S', GTTags.Items.CIRCUITS_HV, 'A', GTBlocks.FIREBOX_STEEL.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_titanium_boiler", GTMultiMachines.LARGE_BOILER_TITANIUM.asStack(), "PSP", "SAS", "PSP", 'P', - new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold), 'S', CustomTags.EV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold), 'S', GTTags.Items.CIRCUITS_EV, 'A', GTBlocks.FIREBOX_TITANIUM.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_tungstensteel_boiler", GTMultiMachines.LARGE_BOILER_TUNGSTENSTEEL.asStack(), "PSP", "SAS", "PSP", 'P', - new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Aluminium), 'S', CustomTags.IV_CIRCUITS, 'A', + new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Aluminium), 'S', GTTags.Items.CIRCUITS_IV, 'A', GTBlocks.FIREBOX_TUNGSTENSTEEL.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "assembly_line", GTMultiMachines.ASSEMBLY_LINE.asStack(), "CRC", "SAS", "CRC", 'A', GTMachines.HULL[GTValues.IV].asStack(), 'R', GTItems.ROBOT_ARM_IV, 'C', - GTBlocks.CASING_ASSEMBLY_CONTROL.asStack(), 'S', CustomTags.IV_CIRCUITS); + GTBlocks.CASING_ASSEMBLY_CONTROL.asStack(), 'S', GTTags.Items.CIRCUITS_IV); VanillaRecipeHelper.addShapedRecipe(provider, true, "large_chemical_reactor", - GTMultiMachines.LARGE_CHEMICAL_REACTOR.asStack(), "CRC", "PMP", "CHC", 'C', CustomTags.HV_CIRCUITS, 'R', - ChemicalHelper.get(TagPrefix.rotor, GTMaterials.StainlessSteel), 'P', - ChemicalHelper.get(TagPrefix.pipeLargeFluid, GTMaterials.Polytetrafluoroethylene), 'M', - GTItems.ELECTRIC_MOTOR_HV.asStack(), 'H', GTMachines.HULL[HV].asStack()); + GTMultiMachines.LARGE_CHEMICAL_REACTOR.asStack(), "CRC", "PMP", "CHC", 'C', GTTags.Items.CIRCUITS_HV, + 'R', ChemicalHelper.get(TagPrefix.rotor, GTMaterials.StainlessSteel), + 'P', ChemicalHelper.get(TagPrefix.pipeLargeFluid, GTMaterials.Polytetrafluoroethylene), + 'M', GTItems.ELECTRIC_MOTOR_HV.asStack(), 'H', GTMachines.HULL[HV].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "power_substation", GTMultiMachines.POWER_SUBSTATION.asStack(), "LPL", "CBC", "LPL", 'L', GTItems.LAPOTRON_CRYSTAL, 'P', GTItems.POWER_INTEGRATED_CIRCUIT, 'C', - CustomTags.LuV_CIRCUITS, 'B', GTBlocks.CASING_PALLADIUM_SUBSTATION.asStack()); + GTTags.Items.CIRCUITS_LuV, 'B', GTBlocks.CASING_PALLADIUM_SUBSTATION.asStack()); // GENERATORS VanillaRecipeHelper.addShapedRecipe(provider, true, "diesel_generator_lv", GTMachines.COMBUSTION[LV].asStack(), "PCP", "EME", "GWG", 'M', GTMachines.HULL[GTValues.LV].asStack(), 'P', GTItems.ELECTRIC_PISTON_LV, 'E', - GTItems.ELECTRIC_MOTOR_LV, 'C', CustomTags.LV_CIRCUITS, 'W', + GTItems.ELECTRIC_MOTOR_LV, 'C', GTTags.Items.CIRCUITS_LV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin), 'G', new MaterialEntry(TagPrefix.gear, GTMaterials.Steel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "diesel_generator_mv", GTMachines.COMBUSTION[MV].asStack(), "PCP", "EME", "GWG", 'M', GTMachines.HULL[GTValues.MV].asStack(), 'P', GTItems.ELECTRIC_PISTON_MV, 'E', - GTItems.ELECTRIC_MOTOR_MV, 'C', CustomTags.MV_CIRCUITS, 'W', + GTItems.ELECTRIC_MOTOR_MV, 'C', GTTags.Items.CIRCUITS_MV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper), 'G', new MaterialEntry(TagPrefix.gear, GTMaterials.Aluminium)); VanillaRecipeHelper.addShapedRecipe(provider, true, "diesel_generator_hv", GTMachines.COMBUSTION[HV].asStack(), "PCP", "EME", "GWG", 'M', GTMachines.HULL[HV].asStack(), 'P', GTItems.ELECTRIC_PISTON_HV, 'E', - GTItems.ELECTRIC_MOTOR_HV, 'C', CustomTags.HV_CIRCUITS, 'W', + GTItems.ELECTRIC_MOTOR_HV, 'C', GTTags.Items.CIRCUITS_HV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold), 'G', new MaterialEntry(TagPrefix.gear, GTMaterials.StainlessSteel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "gas_turbine_lv", GTMachines.GAS_TURBINE[LV].asStack(), "CRC", "RMR", "EWE", 'M', GTMachines.HULL[GTValues.LV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_LV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Tin), 'C', CustomTags.LV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Tin), 'C', GTTags.Items.CIRCUITS_LV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin)); VanillaRecipeHelper.addShapedRecipe(provider, true, "gas_turbine_mv", GTMachines.GAS_TURBINE[MV].asStack(), "CRC", "RMR", "EWE", 'M', GTMachines.HULL[GTValues.MV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_MV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Bronze), 'C', CustomTags.MV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Bronze), 'C', GTTags.Items.CIRCUITS_MV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper)); VanillaRecipeHelper.addShapedRecipe(provider, true, "gas_turbine_hv", GTMachines.GAS_TURBINE[HV].asStack(), "CRC", "RMR", "EWE", 'M', GTMachines.HULL[HV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_HV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel), 'C', CustomTags.HV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel), 'C', GTTags.Items.CIRCUITS_HV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_turbine_lv", GTMachines.STEAM_TURBINE[LV].asStack(), "PCP", "RMR", "EWE", 'M', GTMachines.HULL[GTValues.LV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_LV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Tin), 'C', CustomTags.LV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Tin), 'C', GTTags.Items.CIRCUITS_LV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Tin), 'P', new MaterialEntry(TagPrefix.pipeNormalFluid, GTMaterials.Bronze)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_turbine_mv", GTMachines.STEAM_TURBINE[MV].asStack(), "PCP", "RMR", "EWE", 'M', GTMachines.HULL[GTValues.MV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_MV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Bronze), 'C', CustomTags.MV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Bronze), 'C', GTTags.Items.CIRCUITS_MV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Copper), 'P', new MaterialEntry(TagPrefix.pipeNormalFluid, GTMaterials.Steel)); VanillaRecipeHelper.addShapedRecipe(provider, true, "steam_turbine_hv", GTMachines.STEAM_TURBINE[HV].asStack(), "PCP", "RMR", "EWE", 'M', GTMachines.HULL[HV].asStack(), 'E', GTItems.ELECTRIC_MOTOR_HV, 'R', - new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel), 'C', CustomTags.HV_CIRCUITS, 'W', + new MaterialEntry(TagPrefix.rotor, GTMaterials.Steel), 'C', GTTags.Items.CIRCUITS_HV, 'W', new MaterialEntry(TagPrefix.cableGtSingle, GTMaterials.Gold), 'P', new MaterialEntry(TagPrefix.pipeNormalFluid, GTMaterials.StainlessSteel)); @@ -880,7 +880,7 @@ public static void init(Consumer provider) { 'R', ROTOR); registerMachineRecipe(provider, ArrayUtils.subarray(GTMachines.DIODE, GTValues.ULV, HV), "CDC", "DHD", "PDP", - 'H', HULL, 'D', CustomTags.DIODES, 'P', PLATE, 'C', CABLE_QUAD); + 'H', HULL, 'D', GTTags.Items.DIODES, 'P', PLATE, 'C', CABLE_QUAD); registerMachineRecipe(provider, ArrayUtils.subarray(GTMachines.DIODE, HV, GTValues.LuV), "CDC", "DHD", "PDP", 'H', HULL, 'D', GTItems.SMD_DIODE, 'P', PLATE, 'C', CABLE_QUAD); registerMachineRecipe(provider, ArrayUtils.subarray(GTMachines.DIODE, GTValues.LuV, GTMachines.DIODE.length), @@ -1105,94 +1105,94 @@ public static void init(Consumer provider) { // Super / Quantum Chests VanillaRecipeHelper.addShapedRecipe(provider, true, "super_chest_lv", GTMachines.SUPER_CHEST[LV].asStack(), - "CPC", "PFP", "CPC", 'C', CustomTags.LV_CIRCUITS, 'P', + "CPC", "PFP", "CPC", 'C', GTTags.Items.CIRCUITS_LV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Steel), 'F', GTMachines.STEEL_CRATE.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_chest_mv", GTMachines.SUPER_CHEST[MV].asStack(), - "CPC", "PFP", "CPC", 'C', CustomTags.MV_CIRCUITS, 'P', + "CPC", "PFP", "CPC", 'C', GTTags.Items.CIRCUITS_MV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Aluminium), 'F', GTMachines.ALUMINIUM_CRATE.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_chest_hv", GTMachines.SUPER_CHEST[HV].asStack(), - "CPC", "PFP", "CGC", 'C', CustomTags.HV_CIRCUITS, 'P', + "CPC", "PFP", "CGC", 'C', GTTags.Items.CIRCUITS_HV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.StainlessSteel), 'F', GTMachines.STAINLESS_STEEL_CRATE.asStack(), 'G', GTItems.FIELD_GENERATOR_LV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_chest_ev", GTMachines.SUPER_CHEST[EV].asStack(), - "CPC", "PFP", "CGC", 'C', CustomTags.EV_CIRCUITS, 'P', + "CPC", "PFP", "CGC", 'C', GTTags.Items.CIRCUITS_EV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Titanium), 'F', GTMachines.TITANIUM_CRATE.asStack(), 'G', GTItems.FIELD_GENERATOR_MV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_chest_iv", GTMachines.QUANTUM_CHEST[IV].asStack(), - "CPC", "PHP", "CFC", 'C', CustomTags.IV_CIRCUITS, 'P', + "CPC", "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_IV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.TungstenSteel), 'F', GTItems.FIELD_GENERATOR_HV.asStack(), 'H', GTMachines.HULL[5].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_chest_luv", - GTMachines.QUANTUM_CHEST[LuV].asStack(), "CPC", "PHP", "CFC", 'C', CustomTags.LuV_CIRCUITS, 'P', + GTMachines.QUANTUM_CHEST[LuV].asStack(), "CPC", "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_LuV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.RhodiumPlatedPalladium), 'F', GTItems.FIELD_GENERATOR_EV.asStack(), 'H', GTMachines.HULL[6].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_chest_zpm", - GTMachines.QUANTUM_CHEST[ZPM].asStack(), "CPC", "PHP", "CFC", 'C', CustomTags.ZPM_CIRCUITS, 'P', + GTMachines.QUANTUM_CHEST[ZPM].asStack(), "CPC", "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_ZPM, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.NaquadahAlloy), 'F', GTItems.FIELD_GENERATOR_IV.asStack(), 'H', GTMachines.HULL[7].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_chest_uv", GTMachines.QUANTUM_CHEST[UV].asStack(), - "CPC", "PHP", "CFC", 'C', CustomTags.UV_CIRCUITS, 'P', + "CPC", "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_UV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.Darmstadtium), 'F', GTItems.FIELD_GENERATOR_LuV.asStack(), 'H', GTMachines.HULL[8].asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_chest_uhv", - GTMachines.QUANTUM_CHEST[UHV].asStack(), "CPC", "PHP", "CFC", 'C', CustomTags.UHV_CIRCUITS, 'P', + GTMachines.QUANTUM_CHEST[UHV].asStack(), "CPC", "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_UHV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Neutronium), 'F', GTItems.FIELD_GENERATOR_ZPM.asStack(), 'H', GTMachines.HULL[9].asStack()); // Super / Quantum Tanks VanillaRecipeHelper.addShapedRecipe(provider, true, "super_tank_lv", GTMachines.SUPER_TANK[LV].asStack(), "CPC", - "PHP", "CFC", 'C', CustomTags.LV_CIRCUITS, 'P', + "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_LV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Steel), 'F', GTItems.ELECTRIC_PUMP_LV.asStack(), 'H', GTBlocks.HERMETIC_CASING_LV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_tank_mv", GTMachines.SUPER_TANK[MV].asStack(), "CPC", - "PHP", "CFC", 'C', CustomTags.MV_CIRCUITS, 'P', + "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_MV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Aluminium), 'F', GTItems.ELECTRIC_PUMP_MV.asStack(), 'H', GTBlocks.HERMETIC_CASING_MV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_tank_hv", GTMachines.SUPER_TANK[HV].asStack(), "CGC", - "PHP", "CFC", 'C', CustomTags.HV_CIRCUITS, 'P', + "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_HV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.StainlessSteel), 'F', GTItems.ELECTRIC_PUMP_HV.asStack(), 'H', GTBlocks.HERMETIC_CASING_HV.asStack(), 'G', GTItems.FIELD_GENERATOR_LV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "super_tank_ev", GTMachines.SUPER_TANK[EV].asStack(), "CGC", - "PHP", "CFC", 'C', CustomTags.EV_CIRCUITS, 'P', + "PHP", "CFC", 'C', GTTags.Items.CIRCUITS_EV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Titanium), 'F', GTItems.ELECTRIC_PUMP_EV.asStack(), 'H', GTBlocks.HERMETIC_CASING_EV.asStack(), 'G', GTItems.FIELD_GENERATOR_MV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_tank_iv", GTMachines.QUANTUM_TANK[IV].asStack(), - "CGC", "PHP", "CUC", 'C', CustomTags.IV_CIRCUITS, 'P', + "CGC", "PHP", "CUC", 'C', GTTags.Items.CIRCUITS_IV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.TungstenSteel), 'U', GTItems.ELECTRIC_PUMP_IV.asStack(), 'G', GTItems.FIELD_GENERATOR_HV.asStack(), 'H', GTBlocks.HERMETIC_CASING_IV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_tank_luv", GTMachines.QUANTUM_TANK[LuV].asStack(), - "CGC", "PHP", "CUC", 'C', CustomTags.LuV_CIRCUITS, 'P', + "CGC", "PHP", "CUC", 'C', GTTags.Items.CIRCUITS_LuV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.RhodiumPlatedPalladium), 'U', GTItems.ELECTRIC_PUMP_LuV.asStack(), 'G', GTItems.FIELD_GENERATOR_EV.asStack(), 'H', GTBlocks.HERMETIC_CASING_LuV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_tank_zpm", GTMachines.QUANTUM_TANK[ZPM].asStack(), - "CGC", "PHP", "CUC", 'C', CustomTags.ZPM_CIRCUITS, 'P', + "CGC", "PHP", "CUC", 'C', GTTags.Items.CIRCUITS_ZPM, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.NaquadahAlloy), 'U', GTItems.ELECTRIC_PUMP_ZPM.asStack(), 'G', GTItems.FIELD_GENERATOR_IV.asStack(), 'H', GTBlocks.HERMETIC_CASING_ZPM.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_tank_uv", GTMachines.QUANTUM_TANK[UV].asStack(), - "CGC", "PHP", "CUC", 'C', CustomTags.UV_CIRCUITS, 'P', + "CGC", "PHP", "CUC", 'C', GTTags.Items.CIRCUITS_UV, 'P', new MaterialEntry(TagPrefix.plateDense, GTMaterials.Darmstadtium), 'U', GTItems.ELECTRIC_PUMP_UV.asStack(), 'G', GTItems.FIELD_GENERATOR_LuV.asStack(), 'H', GTBlocks.HERMETIC_CASING_UV.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "quantum_tank_uhv", GTMachines.QUANTUM_TANK[UHV].asStack(), - "CGC", "PHP", "CUC", 'C', CustomTags.UHV_CIRCUITS, 'P', + "CGC", "PHP", "CUC", 'C', GTTags.Items.CIRCUITS_UHV, 'P', new MaterialEntry(TagPrefix.plate, GTMaterials.Neutronium), 'U', GTItems.ELECTRIC_PUMP_UV.asStack(), 'G', GTItems.FIELD_GENERATOR_ZPM.asStack(), 'H', GTBlocks.HERMETIC_CASING_UHV.asStack()); registerMachineRecipe(provider, true, GTMachines.BUFFER, "HP", "CV", - 'H', HULL, 'P', PUMP, 'V', CONVEYOR, 'C', CustomTags.LV_CIRCUITS); + 'H', HULL, 'P', PUMP, 'V', CONVEYOR, 'C', GTTags.Items.CIRCUITS_LV); VanillaRecipeHelper.addShapedRecipe(provider, true, "cleanroom", GTMultiMachines.CLEANROOM.asStack(), "FFF", "RHR", "MCM", 'F', GTItems.ITEM_FILTER.asStack(), 'R', new MaterialEntry(TagPrefix.rotor, GTMaterials.StainlessSteel), 'H', HULL.get(HV), 'M', - GTItems.ELECTRIC_MOTOR_HV.asStack(), 'C', CustomTags.HV_CIRCUITS); + GTItems.ELECTRIC_MOTOR_HV.asStack(), 'C', GTTags.Items.CIRCUITS_HV); if (ConfigHolder.INSTANCE.compat.energy.enableFEConverters) { registerMachineRecipe(provider, true, GTMachines.ENERGY_CONVERTER_1A, " WW", "RMC", " WW", 'C', CIRCUIT, diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java index c364c53af52..300c1771766 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java @@ -7,10 +7,10 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.ItemStack; @@ -126,7 +126,7 @@ public static void init(Consumer provider) { .inputItems(HULL[LuV]) .inputItems(spring, NiobiumTitanium, 4) .inputItems(HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.LuV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LuV) .inputItems(VOLTAGE_COIL_LuV, 2) .inputFluids(SodiumPotassium, 6000) .inputFluids(SolderingAlloy, 5 * L) @@ -138,7 +138,7 @@ public static void init(Consumer provider) { .inputItems(HULL[ZPM]) .inputItems(spring, VanadiumGallium, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(VOLTAGE_COIL_ZPM, 2) .inputFluids(SodiumPotassium, 8000) .inputFluids(SolderingAlloy, 10 * L) @@ -152,7 +152,7 @@ public static void init(Consumer provider) { .inputItems(HULL[UV]) .inputItems(spring, YttriumBariumCuprate, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.UV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_UV) .inputItems(VOLTAGE_COIL_UV, 2) .inputFluids(SodiumPotassium, 10000) .inputFluids(SolderingAlloy, 20 * L) @@ -167,7 +167,7 @@ public static void init(Consumer provider) { .inputItems(HULL[UHV]) .inputItems(spring, Europium, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.UHV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_UHV) .inputItems(wireGtDouble, RutheniumTriniumAmericiumNeutronate, 2) .inputFluids(SodiumPotassium, 12000) .inputFluids(SolderingAlloy, 40 * L) @@ -258,7 +258,7 @@ public static void init(Consumer provider) { .inputItems(HULL[LuV]) .inputItems(cableGtSingle, NiobiumTitanium, 4) .inputItems(HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.LuV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_LuV) .inputItems(VOLTAGE_COIL_LuV, 2) .inputFluids(SodiumPotassium, 6000) .inputFluids(SolderingAlloy, 5 * L) @@ -272,7 +272,7 @@ public static void init(Consumer provider) { .inputItems(HULL[ZPM]) .inputItems(cableGtSingle, VanadiumGallium, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(VOLTAGE_COIL_ZPM, 2) .inputFluids(SodiumPotassium, 8000) .inputFluids(SolderingAlloy, 10 * L) @@ -286,7 +286,7 @@ public static void init(Consumer provider) { .inputItems(HULL[UV]) .inputItems(cableGtSingle, YttriumBariumCuprate, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.UV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_UV) .inputItems(VOLTAGE_COIL_UV, 2) .inputFluids(SodiumPotassium, 10000) .inputFluids(SolderingAlloy, 20 * L) @@ -301,7 +301,7 @@ public static void init(Consumer provider) { .inputItems(HULL[UHV]) .inputItems(cableGtSingle, Europium, 4) .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) - .inputItems(CustomTags.UHV_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_UHV) .inputItems(wireGtDouble, RutheniumTriniumAmericiumNeutronate, 2) .inputFluids(SodiumPotassium, 12000) .inputFluids(SolderingAlloy, 40 * L) @@ -527,7 +527,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("ev_large_miner") .inputItems(HULL[EV]) .inputItems(frameGt, Titanium, 4) - .inputItems(CustomTags.IV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_IV, 4) .inputItems(ELECTRIC_MOTOR_EV, 4) .inputItems(ELECTRIC_PUMP_EV, 4) .inputItems(CONVEYOR_MODULE_EV, 4) @@ -539,7 +539,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("iv_large_miner") .inputItems(HULL[IV]) .inputItems(frameGt, TungstenSteel, 4) - .inputItems(CustomTags.IV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_IV, 4) .inputItems(ELECTRIC_MOTOR_IV, 4) .inputItems(ELECTRIC_PUMP_IV, 4) .inputItems(CONVEYOR_MODULE_IV, 4) @@ -551,7 +551,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("luv_large_miner") .inputItems(HULL[LuV]) .inputItems(frameGt, HSSS, 4) - .inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(ELECTRIC_MOTOR_LuV, 4) .inputItems(ELECTRIC_PUMP_LuV, 4) .inputItems(CONVEYOR_MODULE_LuV, 4) @@ -565,7 +565,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("mv_fluid_drilling_rig") .inputItems(HULL[MV]) .inputItems(frameGt, Steel, 4) - .inputItems(CustomTags.MV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_MV, 4) .inputItems(ELECTRIC_MOTOR_MV, 4) .inputItems(ELECTRIC_PUMP_MV, 4) .inputItems(gear, VanadiumSteel, 4) @@ -577,7 +577,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hv_fluid_drilling_rig") .inputItems(HULL[EV]) .inputItems(frameGt, Titanium, 4) - .inputItems(CustomTags.EV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_EV, 4) .inputItems(ELECTRIC_MOTOR_EV, 4) .inputItems(ELECTRIC_PUMP_EV, 4) .inputItems(gear, TungstenCarbide, 4) @@ -589,7 +589,7 @@ public static void init(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("ev_fluid_drilling_rig") .inputItems(HULL[LuV]) .inputItems(frameGt, TungstenSteel, 4) - .inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(ELECTRIC_MOTOR_LuV, 4) .inputItems(ELECTRIC_PUMP_LuV, 4) .inputItems(gear, Osmiridium, 4) @@ -699,7 +699,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("me_pattern_buffer") .inputItems(DUAL_IMPORT_HATCH[LuV], 1) .inputItems(EMITTER_LuV, 1) - .inputItems(CustomTags.LuV_CIRCUITS, 4) + .inputItems(GTTags.Items.CIRCUITS_LuV, 4) .inputItems(AEBlocks.PATTERN_PROVIDER.asItem(), 3) .inputItems(AEBlocks.INTERFACE.asItem(), 3) .inputItems(AEItems.SPEED_CARD.asItem(), 4) @@ -717,7 +717,7 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("me_pattern_buffer_proxy") .inputItems(HULL[LuV], 1) .inputItems(SENSOR_LuV, 2) - .inputItems(CustomTags.LuV_CIRCUITS, 1) + .inputItems(GTTags.Items.CIRCUITS_LuV, 1) .inputItems(AEBlocks.QUANTUM_LINK.asItem(), 1) .inputItems(AEBlocks.QUANTUM_RING.asItem(), 2) .inputItems(wireFine, Europium, 32) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index af2ac21f8bd..5320e280d0d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -6,9 +6,9 @@ import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.FluidTags; @@ -40,7 +40,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, true, "machine_memory_card", MACHINE_MEMORY_CARD.asStack(), "PWP", "SLS", "PPP", 'P', new MaterialEntry(plate, Steel), 'W', new MaterialEntry(wireGtSingle, Copper), 'S', new MaterialEntry(screw, RedAlloy), 'L', - CustomTags.LV_CIRCUITS); + GTTags.Items.CIRCUITS_LV); // Potin Recipe VanillaRecipeHelper.addShapelessRecipe(provider, "potin_dust", ChemicalHelper.get(dust, Potin, 8), new MaterialEntry(dust, Copper), @@ -204,7 +204,7 @@ public static void init(Consumer provider) { // QuarkTech Suite ASSEMBLER_RECIPES.recipeBuilder("quantum_helmet").duration(1500).EUt(VA[IV]) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireGtQuadruple, Tungsten, 5) .inputItems(ENERGY_LAPOTRONIC_ORB) .inputItems(SENSOR_IV) @@ -219,7 +219,7 @@ public static void init(Consumer provider) { .save(provider); ASSEMBLER_RECIPES.recipeBuilder("quantum_chestplate").duration(1500).EUt(VA[IV]) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireGtQuadruple, Tungsten, 8) .inputItems(ENERGY_LAPOTRONIC_ORB) .inputItems(EMITTER_IV.asStack(2)) @@ -234,7 +234,7 @@ public static void init(Consumer provider) { .save(provider); ASSEMBLER_RECIPES.recipeBuilder("quantum_leggings").duration(1500).EUt(VA[IV]) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireGtQuadruple, Tungsten, 7) .inputItems(ENERGY_LAPOTRONIC_ORB) .inputItems(ELECTRIC_MOTOR_IV, 4) @@ -249,7 +249,7 @@ public static void init(Consumer provider) { .save(provider); ASSEMBLER_RECIPES.recipeBuilder("quantum_boots").duration(1500).EUt(VA[IV]) - .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(GTTags.Items.CIRCUITS_LuV, 2) .inputItems(wireGtQuadruple, Tungsten, 4) .inputItems(ENERGY_LAPOTRONIC_ORB) .inputItems(ELECTRIC_PISTON_IV, 2) @@ -270,7 +270,7 @@ public static void init(Consumer provider) { .inputItems(wireGtQuadruple, Osmium, 6) .inputItems(plateDouble, Iridium, 4) .inputItems(GRAVITATION_ENGINE, 2) - .inputItems(CustomTags.ZPM_CIRCUITS) + .inputItems(GTTags.Items.CIRCUITS_ZPM) .inputItems(plateDense, RhodiumPlatedPalladium, 2) .inputItems(ENERGY_LAPOTRONIC_ORB_CLUSTER) .inputItems(FIELD_GENERATOR_LuV, 2) @@ -289,7 +289,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(GTMachines.MONITOR_SCREEN) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("central_monitor").duration(100).EUt(VA[HV]) * .inputItems(COVER_SCREEN) * .inputItems(CraftingComponent.HULL.getIngredient(3)) @@ -302,13 +302,13 @@ public static void init(Consumer provider) { * ASSEMBLER_RECIPES.recipeBuilder("cover_digital_interface").duration(100).EUt(VA[HV]) * .inputItems(COVER_SCREEN) * .inputItems(plate, Aluminium) - * .inputItems(CustomTags.MV_CIRCUITS) + * .inputItems(CustomTags.CIRCUITS_MV) * .inputItems(screw, StainlessSteel, 4) * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(COVER_DIGITAL_INTERFACE) * .save(provider); * \ - * + * */ // todo digital interface cover /* @@ -318,7 +318,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(COVER_DIGITAL_INTERFACE_WIRELESS) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("plugin_text").duration(80).EUt(400) * .inputItems(COVER_SCREEN) * .inputItems(circuit, Tier.LV) @@ -326,7 +326,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(PLUGIN_TEXT) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("plugin_online_pic").duration(80).EUt(400) * .inputItems(COVER_SCREEN) * .inputItems(circuit, Tier.LV) @@ -334,7 +334,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(PLUGIN_ONLINE_PIC) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("plugin_fake_gui").duration(80).EUt(400) * .inputItems(COVER_SCREEN) * .inputItems(circuit, Tier.LV) @@ -342,7 +342,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(PLUGIN_FAKE_GUI) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("plugin_advanced_monitor").duration(80).EUt(400) * .inputItems(COVER_SCREEN) * .inputItems(circuit, Tier.HV) @@ -362,7 +362,7 @@ public static void init(Consumer provider) { * .inputFluids(Polyethylene.getFluid(L)) * .outputItems(WIRELESS) * .save(provider); - * + * * ASSEMBLER_RECIPES.recipeBuilder("camera_upgrade").duration(100).EUt(VA[LV]) * .inputItems(ELECTRIC_PISTON_LV, 2) * .inputItems(EMITTER_LV) @@ -381,7 +381,7 @@ public static void init(Consumer provider) { .save(provider); // Dyed Lens Decomposition - for (ItemEntry item : GLASS_LENSES.values()) { + for (ItemEntry item : GLASS_LENSES) { EXTRACTOR_RECIPES.recipeBuilder("extract_" + item.get()).EUt(VA[LV]).duration(15) .inputItems(item) .outputFluids(Glass.getFluid(108)) @@ -404,19 +404,28 @@ public static void init(Consumer provider) { .duration(40).EUt(6).save(provider); // Dyed Lens Recipes - GTRecipeBuilder builder = CHEMICAL_BATH_RECIPES.recipeBuilder("").EUt(VA[HV]).duration(200).inputItems(lens, - Glass).category(GTRecipeCategories.CHEM_DYES); - final int dyeAmount = 288; - - // skip white lens - for (int i = 1; i < CHEMICAL_DYES.length; i++) { - builder.copy(CHEMICAL_DYES[i].getName() + "_lens").inputFluids(CHEMICAL_DYES[i].getFluid(dyeAmount)) - .outputItems(GLASS_LENSES.get(COLORS[i])) + // add a block here so people don't accidentally use this temporary builder for other recipes + { + GTRecipeBuilder builder = CHEMICAL_BATH_RECIPES.recipeBuilder("") + .inputItems(GTTags.Items.LENSES_GLASS) + .category(GTRecipeCategories.CHEM_DYES) + .duration(200).EUt(VA[HV]); + final int dyeAmount = 288; + + // skip white lens + for (int i = 1; i < CHEMICAL_DYES.length; i++) { + builder.copy(CHEMICAL_DYES[i].getName() + "_lens") + .inputFluids(CHEMICAL_DYES[i].getFluid(dyeAmount)) + .outputItems(GLASS_LENSES[i]) + .save(provider); + } + + builder.copy("colorless_lens") + .inputFluids(DyeWhite.getFluid(dyeAmount)) + .outputItems(lens, Glass) .save(provider); } - builder.copy("colorless_lens").inputFluids(DyeWhite.getFluid(dyeAmount)).outputItems(lens, Glass) - .save(provider); VanillaRecipeHelper.addShapelessRecipe(provider, "brown_dye_from_metal_mixture", new ItemStack(Items.BROWN_DYE), new MaterialEntry(dust, MetalMixture)); @@ -490,11 +499,11 @@ public static void init(Consumer provider) { if (!ConfigHolder.INSTANCE.recipes.hardMiscRecipes) { VanillaRecipeHelper.addShapedRecipe(provider, "flour_to_dough", new ItemStack(DOUGH, 8), "FFF", "FWF", "FFF", - 'F', CustomTags.WHEAT_GRAINS, + 'F', GTTags.Items.GRAINS_WHEAT, 'W', Water.getBucket()); MIXER_RECIPES.recipeBuilder("flour_to_dough") - .inputItems(CustomTags.WHEAT_GRAINS, 2) + .inputItems(GTTags.Items.GRAINS_WHEAT, 2) .inputFluids(Water.getFluid(250)) .outputItems(DOUGH, 3) .EUt(VA[ULV]) @@ -502,14 +511,14 @@ public static void init(Consumer provider) { .save(provider); VanillaRecipeHelper.addShapelessRecipe(provider, "pumpkin_pie_from_dough", new ItemStack(Items.PUMPKIN_PIE), - new ItemStack(Blocks.PUMPKIN), new ItemStack(Items.SUGAR), CustomTags.DOUGHS); + new ItemStack(Blocks.PUMPKIN), new ItemStack(Items.SUGAR), GTTags.Items.DOUGHS); VanillaRecipeHelper.addShapelessRecipe(provider, "cookie_from_dough", new ItemStack(Items.COOKIE, 8), - CustomTags.DOUGHS, new ItemStack(Items.COCOA_BEANS)); + GTTags.Items.DOUGHS, new ItemStack(Items.COCOA_BEANS)); FORMING_PRESS_RECIPES.recipeBuilder("cookie") .notConsumable(SHAPE_MOLD_CYLINDER) - .inputItems(CustomTags.DOUGHS) + .inputItems(GTTags.Items.DOUGHS) .inputItems(Items.COCOA_BEANS, 2) .outputItems(Items.COOKIE, 12) .EUt(VA[LV]) @@ -521,15 +530,15 @@ public static void init(Consumer provider) { 'E', Items.EGG, 'S', Items.SUGAR, 'M', new FluidContainerIngredient(Milk.getFluidTag(), 1000), - 'D', CustomTags.DOUGHS); + 'D', GTTags.Items.DOUGHS); } else { VanillaRecipeHelper.addShapedRecipe(provider, "flour_to_dough", new ItemStack(DOUGH, 4), "FFF", "FWF", "FFF", - 'F', CustomTags.WHEAT_GRAINS, + 'F', GTTags.Items.GRAINS_WHEAT, 'W', Water.getBucket()); MIXER_RECIPES.recipeBuilder("flour_to_dough") - .inputItems(CustomTags.WHEAT_GRAINS, 4) + .inputItems(GTTags.Items.GRAINS_WHEAT, 4) .inputItems(Items.EGG, 2) .inputFluids(Milk.getFluid(250)) // 1 bucket = 1000mB, hence 250mb. Also its infinitely renewable .outputItems(DOUGH, 7) @@ -538,14 +547,14 @@ public static void init(Consumer provider) { .save(provider); VanillaRecipeHelper.addShapelessRecipe(provider, "pumpkin_pie_from_dough", new ItemStack(Items.PUMPKIN_PIE), - new ItemStack(Blocks.PUMPKIN), CustomTags.DOUGHS, new ItemStack(Items.SUGAR), 'r', 'k'); + new ItemStack(Blocks.PUMPKIN), GTTags.Items.DOUGHS, new ItemStack(Items.SUGAR), 'r', 'k'); VanillaRecipeHelper.addShapelessRecipe(provider, "cookie", new ItemStack(Items.COOKIE, 4), - new ItemStack(Items.COCOA_BEANS), CustomTags.DOUGHS, new ItemStack(Items.SUGAR), 'r'); + new ItemStack(Items.COCOA_BEANS), GTTags.Items.DOUGHS, new ItemStack(Items.SUGAR), 'r'); FORMING_PRESS_RECIPES.recipeBuilder("cookie") .notConsumable(SHAPE_MOLD_CYLINDER) - .inputItems(CustomTags.DOUGHS) + .inputItems(GTTags.Items.DOUGHS) .inputItems(Items.COCOA_BEANS, 2) .inputItems(Items.SUGAR) .outputItems(Items.COOKIE, 8) @@ -558,12 +567,12 @@ public static void init(Consumer provider) { 'B', Items.SWEET_BERRIES, 'S', Items.SUGAR, 'M', new FluidContainerIngredient(Milk.getFluidTag(), 1000), - 'D', CustomTags.DOUGHS); + 'D', GTTags.Items.DOUGHS); } FORMING_PRESS_RECIPES.recipeBuilder("pumpkin_pie") .notConsumable(SHAPE_MOLD_CYLINDER) - .inputItems(CustomTags.DOUGHS, 2) + .inputItems(GTTags.Items.DOUGHS, 2) .inputItems(Items.PUMPKIN) .inputItems(Items.SUGAR) .outputItems(Items.PUMPKIN_PIE, 2) @@ -572,12 +581,12 @@ public static void init(Consumer provider) { .save(provider); // XP set to 0.35, similar to vanilla food smelting - VanillaRecipeHelper.addSmeltingRecipe(provider, "dough_to_bread", CustomTags.DOUGHS, new ItemStack(Items.BREAD), - 0.35f); - VanillaRecipeHelper.addCampfireRecipe(provider, "dough_to_bread", CustomTags.DOUGHS, new ItemStack(Items.BREAD), - 0.35f); - VanillaRecipeHelper.addSmokingRecipe(provider, "dough_to_bread", CustomTags.DOUGHS, new ItemStack(Items.BREAD), - 0.35f); + VanillaRecipeHelper.addSmeltingRecipe(provider, "dough_to_bread", GTTags.Items.DOUGHS, + new ItemStack(Items.BREAD), 0.35f); + VanillaRecipeHelper.addCampfireRecipe(provider, "dough_to_bread", GTTags.Items.DOUGHS, + new ItemStack(Items.BREAD), 0.35f); + VanillaRecipeHelper.addSmokingRecipe(provider, "dough_to_bread", GTTags.Items.DOUGHS, + new ItemStack(Items.BREAD), 0.35f); FORMING_PRESS_RECIPES.recipeBuilder("laminated_glass") .inputItems(GTBlocks.CASING_TEMPERED_GLASS.asStack(2)) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 8240fa9d09a..9c88e9b78eb 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -7,8 +7,8 @@ import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.data.GTRecipeCategories; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.FinishedRecipe; @@ -36,7 +36,7 @@ public static void init(Consumer provider) { smashingRecipes(provider); woodRecipes(provider); cuttingRecipes(provider); - dyingCleaningRecipes(provider); + dyeingCleaningRecipes(provider); redstoneRecipes(provider); metalRecipes(provider); miscRecipes(provider); @@ -523,17 +523,18 @@ private static void cuttingRecipes(Consumer provider) { } /** - * + Adds dying and cleaning recipes for vanilla blocks + * + Adds dyeing and cleaning recipes for vanilla blocks */ - private static void dyingCleaningRecipes(Consumer provider) { + private static void dyeingCleaningRecipes(Consumer provider) { for (DyeColor color : DyeColor.values()) { String dyeName = color.getName(); MIXER_RECIPES.recipeBuilder(dyeName + "_concrete_powder").duration(200).EUt(VA[ULV]) .inputItems(Tags.Items.SAND, 4) .inputItems(Tags.Items.GRAVEL, 4) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L)) .outputItems(new ItemStack( BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_concrete_powder")), 8)) + .category(GTRecipeCategories.CHEM_DYES) .save(provider); CHEMICAL_BATH_RECIPES.recipeBuilder(dyeName + "_concrete").duration(20).EUt(VA[ULV]) @@ -546,8 +547,8 @@ private static void dyingCleaningRecipes(Consumer provider) { if (color != DyeColor.WHITE) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_concrete_to_" + dyeName).duration(20).EUt(VA[ULV]) - .inputItems(CustomTags.CONCRETE_ITEM) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8)) + .inputItems(GTTags.Items.CONCRETES) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L / 8)) .outputItems( new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_concrete")))) .category(GTRecipeCategories.CHEM_DYES) @@ -556,7 +557,7 @@ private static void dyingCleaningRecipes(Consumer provider) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_terracotta_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.TERRACOTTA)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L / 8)) .outputItems( new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_terracotta")))) .category(GTRecipeCategories.CHEM_DYES) @@ -564,7 +565,7 @@ private static void dyingCleaningRecipes(Consumer provider) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_glass_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.GLASS)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L / 8)) .outputItems( new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass")))) .category(GTRecipeCategories.CHEM_DYES) @@ -572,7 +573,7 @@ private static void dyingCleaningRecipes(Consumer provider) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_glass_pane_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.GLASS_PANE)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L / 8)) .outputItems(new ItemStack( BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass_pane")))) .category(GTRecipeCategories.CHEM_DYES) @@ -585,7 +586,7 @@ private static void dyingCleaningRecipes(Consumer provider) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_candle_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Items.CANDLE)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L / 8)) .outputItems(new ItemStack( BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_candle")))) .category(GTRecipeCategories.CHEM_DYES) @@ -594,14 +595,14 @@ private static void dyingCleaningRecipes(Consumer provider) { if (color != DyeColor.WHITE) { CHEMICAL_BATH_RECIPES.recipeBuilder("dye_wool_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.WHITE_WOOL)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L)) .outputItems(new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_wool")))) .category(GTRecipeCategories.CHEM_DYES) .save(provider); CHEMICAL_BATH_RECIPES.recipeBuilder("dye_bed_to_" + dyeName).duration(20).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.WHITE_BED)) - .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L)) + .inputFluids(CHEMICAL_DYES[color.getId()].getFluid(L)) .outputItems(new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_bed")))) .category(GTRecipeCategories.CHEM_DYES) .save(provider); @@ -658,7 +659,7 @@ private static void dyingCleaningRecipes(Consumer provider) { .duration(400).EUt(2).save(provider); CHEMICAL_BATH_RECIPES.recipeBuilder("decolor_concrete") - .inputItems(CustomTags.CONCRETE_ITEM) + .inputItems(GTTags.Items.CONCRETES) .inputFluids(Chlorine.getFluid(20)) .outputItems(Items.WHITE_CONCRETE) .category(GTRecipeCategories.CHEM_DYES) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java index 5f120347994..e496ffa9d85 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java @@ -1,9 +1,8 @@ package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTItems; -import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.ItemStack; @@ -640,12 +639,12 @@ public static void init(Consumer provider) { .duration(200).EUt(VA[HV]).save(provider); // Dyes - for (int i = 0; i < GTMaterials.CHEMICAL_DYES.length; i++) { - CHEMICAL_RECIPES.recipeBuilder("chemical_dye_" + COLORS[i]) - .inputItems(TagUtil.createItemTag("dyes" + COLORS[i])) + for (int i = 0; i < CHEMICAL_DYES.length; i++) { + CHEMICAL_RECIPES.recipeBuilder("chemical_" + CHEMICAL_DYES[i].getName()) + .inputItems(GTTags.Items.DYES_ARRAY[i]) .inputItems(dust, Salt, 2) .inputFluids(SulfuricAcid.getFluid(250)) - .outputFluids(GTMaterials.CHEMICAL_DYES[i].getFluid(288)) + .outputFluids(CHEMICAL_DYES[i].getFluid(288)) .duration(600).EUt(24).save(provider); } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java index 7630ee0ba63..da7f85b2cb1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/BiomeTagsLoader.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -24,10 +23,10 @@ public BiomeTagsLoader(PackOutput arg, CompletableFuture @Override protected void addTags(HolderLookup.Provider provider) { - tag(CustomTags.IS_SWAMP).add(Biomes.SWAMP).add(Biomes.MANGROVE_SWAMP); - tag(CustomTags.HAS_RUBBER_TREE).addTag(CustomTags.IS_SWAMP).addTag(BiomeTags.IS_FOREST) + tag(GTTags.Biomes.IS_SWAMP).add(Biomes.SWAMP).add(Biomes.MANGROVE_SWAMP); + tag(GTTags.Biomes.HAS_RUBBER_TREE).addTag(GTTags.Biomes.IS_SWAMP).addTag(BiomeTags.IS_FOREST) .addTag(BiomeTags.IS_JUNGLE); - tag(CustomTags.IS_SANDY).addTag(Tags.Biomes.IS_SANDY).add(Biomes.DESERT).add(Biomes.BEACH).add(Biomes.BADLANDS) - .add(Biomes.WOODED_BADLANDS); + tag(GTTags.Biomes.IS_SANDY).addTag(Tags.Biomes.IS_SANDY).add(Biomes.DESERT).add(Biomes.BEACH) + .add(Biomes.BADLANDS).add(Biomes.WOODED_BADLANDS); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java index 97059fa874f..dea7099fc65 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java @@ -4,7 +4,6 @@ import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; @@ -17,12 +16,12 @@ public class BlockTagLoader { public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { - provider.addTag(CustomTags.CONCRETE_BLOCK) + provider.addTag(GTTags.Blocks.CONCRETES) .add(Blocks.WHITE_CONCRETE, Blocks.ORANGE_CONCRETE, Blocks.MAGENTA_CONCRETE, Blocks.LIGHT_BLUE_CONCRETE, Blocks.YELLOW_CONCRETE, Blocks.LIME_CONCRETE, Blocks.PINK_CONCRETE, Blocks.GRAY_CONCRETE, Blocks.LIGHT_GRAY_CONCRETE, Blocks.CYAN_CONCRETE, Blocks.PURPLE_CONCRETE, Blocks.BLUE_CONCRETE, Blocks.BROWN_CONCRETE, Blocks.GREEN_CONCRETE, Blocks.RED_CONCRETE, Blocks.BLACK_CONCRETE); - provider.addTag(CustomTags.CONCRETE_POWDER_BLOCK) + provider.addTag(GTTags.Blocks.CONCRETE_POWDERS) .add(Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, @@ -30,7 +29,7 @@ public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER); - var speedConcretes = provider.addTag(CustomTags.VERY_FAST_WALKABLE_BLOCKS); + var speedConcretes = provider.addTag(GTTags.Blocks.VERY_FAST_WALKABLE_BLOCKS); speedConcretes.add(GTBlocks.LIGHT_CONCRETE.get(), GTBlocks.DARK_CONCRETE.get()); GTBlocks.STONE_BLOCKS.column(StoneTypes.CONCRETE_LIGHT) @@ -38,12 +37,12 @@ public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { GTBlocks.STONE_BLOCKS.column(StoneTypes.CONCRETE_DARK) .forEach((type, block) -> speedConcretes.add(block.get())); - var studs = provider.addTag(CustomTags.FAST_WALKABLE_BLOCKS); + var studs = provider.addTag(GTTags.Blocks.FAST_WALKABLE_BLOCKS); GTBlocks.STUDS.forEach((color, block) -> studs.add(block.get())); - provider.addTag(CustomTags.ENDSTONE_ORE_REPLACEABLES).add(Blocks.END_STONE); + provider.addTag(GTTags.Blocks.ENDSTONE_ORE_REPLACEABLES).add(Blocks.END_STONE); - provider.addTag(CustomTags.TALL_PLANTS) + provider.addTag(GTTags.Blocks.TALL_PLANTS) .add(Blocks.SUGAR_CANE, Blocks.CACTUS) .add(Blocks.TALL_GRASS, Blocks.LARGE_FERN) .add(Blocks.BAMBOO, Blocks.BAMBOO_SAPLING) @@ -71,17 +70,17 @@ public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { .add(GTMachines.WOODEN_CRATE.getBlock()); // always add the wrench/pickaxe tag as a valid tag to mineable/wrench etc. - provider.addTag(CustomTags.MINEABLE_WITH_WRENCH) - .addTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) + provider.addTag(GTTags.Blocks.MINEABLE_WITH_WRENCH) + .addTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH) .add(Blocks.PISTON, Blocks.PISTON_HEAD, Blocks.STICKY_PISTON, Blocks.OBSERVER, Blocks.REDSTONE_LAMP, Blocks.REDSTONE_BLOCK, Blocks.IRON_DOOR, Blocks.IRON_TRAPDOOR, Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, Blocks.HOPPER, Blocks.DISPENSER, Blocks.DROPPER, Blocks.LIGHTNING_ROD, Blocks.DAYLIGHT_DETECTOR, Blocks.BELL); - provider.addTag(CustomTags.MINEABLE_WITH_WIRE_CUTTER) - .addTag(CustomTags.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER); + provider.addTag(GTTags.Blocks.MINEABLE_WITH_WIRE_CUTTER) + .addTag(GTTags.Blocks.MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER); - provider.addTag(CustomTags.MINEABLE_WITH_SHEARS) + provider.addTag(GTTags.Blocks.MINEABLE_WITH_SHEARS) .addTag(BlockTags.LEAVES) .addTag(BlockTags.WOOL) .add(Blocks.COBWEB, Blocks.DEAD_BUSH, Blocks.FERN, Blocks.GLOW_LICHEN, Blocks.HANGING_ROOTS, @@ -89,7 +88,7 @@ public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { Blocks.TALL_GRASS, Blocks.TALL_SEAGRASS, Blocks.TRIPWIRE, Blocks.TWISTING_VINES, Blocks.VINE, Blocks.WEEPING_VINES); - provider.addTag(CustomTags.CLEANROOM_FLOORS) + provider.addTag(GTTags.Blocks.CLEANROOM_FLOORS) .addOptionalTag(new ResourceLocation("elevatorid:elevators")) .addOptional(new ResourceLocation("enderio:travel_anchor")) .addOptional(new ResourceLocation("rftoolsutility:matter_transmitter")) @@ -97,13 +96,13 @@ public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { .addOptional(new ResourceLocation("rftoolsutility:dialing_device")) .addOptional(new ResourceLocation("travelanchors:travel_anchor")); - provider.addTag(CustomTags.CHARCOAL_PILE_IGNITER_WALLS) + provider.addTag(GTTags.Blocks.CHARCOAL_PILE_IGNITER_WALLS) .addTag(BlockTags.DIRT) // any dirt blocks .remove(Blocks.MOSS_BLOCK, Blocks.MUD, Blocks.MUDDY_MANGROVE_ROOTS) // except moss and mud .add(Blocks.DIRT_PATH) // path blocks .addTag(Tags.Blocks.SAND).addTag(BlockTags.SAND) // any sand blocks .addTag(BlockTags.TERRACOTTA); // any terracotta - provider.addTag(CustomTags.CLEANROOM_DOORS).add(Blocks.IRON_DOOR).addTag(BlockTags.WOODEN_DOORS); + provider.addTag(GTTags.Blocks.CLEANROOM_DOORS).add(Blocks.IRON_DOOR).addTag(BlockTags.WOODEN_DOORS); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java index 0241dbae579..a4d07f5ece3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/EntityTypeTagLoader.java @@ -1,7 +1,5 @@ package com.gregtechceu.gtceu.data.tags; -import com.gregtechceu.gtceu.data.recipe.CustomTags; - import net.minecraft.world.entity.EntityType; import com.tterrag.registrate.providers.RegistrateTagsProvider; @@ -9,10 +7,10 @@ public class EntityTypeTagLoader { public static void init(RegistrateTagsProvider.IntrinsicImpl> provider) { - provider.addTag(CustomTags.HEAT_IMMUNE) + provider.addTag(GTTags.EntityTypes.HEAT_IMMUNE) .add(EntityType.BLAZE, EntityType.MAGMA_CUBE) .add(EntityType.WITHER_SKELETON, EntityType.WITHER); - provider.addTag(CustomTags.CHEMICAL_IMMUNE) + provider.addTag(GTTags.EntityTypes.CHEMICAL_IMMUNE) .add(EntityType.SKELETON, EntityType.STRAY); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java index 4924d3bd74e..b08b96bcaba 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.world.level.material.Fluid; @@ -10,7 +9,8 @@ public class FluidTagLoader { public static void init(RegistrateTagsProvider.IntrinsicImpl provider) { - provider.addTag(CustomTags.LIGHTER_FLUIDS).add(GTMaterials.Butane.getFluid(), GTMaterials.Propane.getFluid()); - provider.addTag(CustomTags.HPCA_COOLANTS).add(GTMaterials.PCBCoolant.getFluid()); + provider.addTag(GTTags.Fluids.LIGHTER_FLUIDS) + .add(GTMaterials.Butane.getFluid(), GTMaterials.Propane.getFluid()); + provider.addTag(GTTags.Fluids.HPCA_COOLANTS).add(GTMaterials.PCBCoolant.getFluid()); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/GTTags.java b/src/main/java/com/gregtechceu/gtceu/data/tags/GTTags.java new file mode 100644 index 00000000000..ec77806815a --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/GTTags.java @@ -0,0 +1,350 @@ +package com.gregtechceu.gtceu.data.tags; + +import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.tag.TagUtil; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.common.Tags; + +import lombok.experimental.UtilityClass; + +@SuppressWarnings("deprecation") +@UtilityClass +public class GTTags { + // spotless:off + + // region blocks + @UtilityClass + public static class Blocks { + + // region misc + public static final TagKey RUBBER_LOGS = TagUtil.createModBlockTag("logs/rubber"); + public static final TagKey CONCRETES = TagUtil.createBlockTag("concretes"); + public static final TagKey CONCRETE_POWDERS = TagUtil.createBlockTag("concrete_powders"); + public static final TagKey TALL_PLANTS = TagUtil.createModBlockTag("tall_plants"); + // endregion misc + + // region block groups + public static final TagKey SLOW_WALKABLE_BLOCKS = TagUtil.createBlockTag("slow_walkable_blocks"); + public static final TagKey FAST_WALKABLE_BLOCKS = TagUtil.createBlockTag("fast_walkable_blocks"); + public static final TagKey VERY_FAST_WALKABLE_BLOCKS = TagUtil.createBlockTag("very_fast_walkable_blocks"); + + public static final TagKey CLEANROOM_DOORS = TagUtil.createModBlockTag("cleanroom_doors"); + public static final TagKey CLEANROOM_FLOORS = TagUtil.createModBlockTag("cleanroom_floors"); + public static final TagKey CHARCOAL_PILE_IGNITER_WALLS = TagUtil.createModBlockTag("charcoal_pile_igniter_walls"); + // endregion block groups + + // region Mineability tags + public static final TagKey MINEABLE_WITH_WRENCH = TagUtil.createBlockTag("mineable/wrench"); + public static final TagKey MINEABLE_WITH_WIRE_CUTTER = TagUtil.createBlockTag("mineable/wire_cutter"); + public static final TagKey MINEABLE_WITH_SAW = TagUtil.createBlockTag("mineable/saw"); + public static final TagKey MINEABLE_WITH_HAMMER = TagUtil.createBlockTag("mineable/hammer"); + public static final TagKey MINEABLE_WITH_CROWBAR = TagUtil.createBlockTag("mineable/crowbar"); + public static final TagKey MINEABLE_WITH_KNIFE = TagUtil.createBlockTag("mineable/knife"); + public static final TagKey MINEABLE_WITH_SHEARS = TagUtil.createBlockTag("mineable/shears"); + public static final TagKey MINEABLE_WITH_CONFIG_VALID_PICKAXE_WRENCH = TagUtil.createModBlockTag("mineable/pickaxe_or_wrench"); + public static final TagKey MINEABLE_WITH_CONFIG_VALID_PICKAXE_WIRE_CUTTER = TagUtil.createModBlockTag("mineable/pickaxe_or_wire_cutter"); + + public static final TagKey NEEDS_WOOD_TOOL = TagUtil.createBlockTag("needs_wood_tool"); + public static final TagKey NEEDS_GOLD_TOOL = TagUtil.createBlockTag("needs_gold_tool"); + public static final TagKey NEEDS_NETHERITE_TOOL = TagUtil.createBlockTag("needs_netherite_tool"); + public static final TagKey NEEDS_DURANIUM_TOOL = TagUtil.createBlockTag("needs_duranium_tool"); + public static final TagKey NEEDS_NEUTRONIUM_TOOL = TagUtil.createBlockTag("needs_neutronium_tool"); + + @SuppressWarnings("unchecked") + public static final TagKey[] TOOL_TIERS = new TagKey[] { + NEEDS_WOOD_TOOL, + BlockTags.NEEDS_STONE_TOOL, + BlockTags.NEEDS_IRON_TOOL, + BlockTags.NEEDS_DIAMOND_TOOL, + NEEDS_NETHERITE_TOOL, + NEEDS_DURANIUM_TOOL, + NEEDS_NEUTRONIUM_TOOL, + }; + // endregion Mineability tags + + public static final TagKey ENDSTONE_ORE_REPLACEABLES = TagUtil.createBlockTag("end_stone_ore_replaceables"); + + public static final TagKey CREATE_WRENCH_PICKUP = TagUtil.optionalTag(BuiltInRegistries.BLOCK, ResourceLocation.fromNamespaceAndPath(GTValues.MODID_CREATE, "wrench_pickup")); + } + // endregion blocks + + // region entity types + @UtilityClass + public static class EntityTypes { + + public static final TagKey> HEAT_IMMUNE = TagUtil.createModTag(Registries.ENTITY_TYPE, "heat_immune"); + public static final TagKey> CHEMICAL_IMMUNE = TagUtil.createModTag(Registries.ENTITY_TYPE, "chemical_immune"); + } + // endregion entity types + + // region items + @UtilityClass + public static class Items { + // region mirrors of block tags + public static final TagKey RUBBER_LOGS = TagUtil.createModItemTag("rubber_logs"); + public static final TagKey CONCRETES = TagUtil.createItemTag("concretes"); + public static final TagKey CONCRETE_POWDERS = TagUtil.createItemTag("concrete_powders"); + // endregion mirrors of block tags + + // region misc + public static final TagKey PISTONS = TagUtil.createItemTag("pistons"); + + public static final TagKey PPE_ARMOR = TagUtil.createModItemTag("ppe_armor"); + public static final TagKey STEP_BOOTS = TagUtil.createModItemTag("step_boots"); + + public static final TagKey CHEM_BATH_WASHABLE = TagUtil.createModItemTag("chemical_bath_washable"); + public static final TagKey SKIP_ITEM_DETECTOR = TagUtil.createModItemTag("skip_item_detector"); + // endregion misc + + // region common/mod compat tags + public static final TagKey DOUGHS = TagUtil.createItemTag("dough"); + public static final TagKey DOUGHS_WHEAT = TagUtil.createItemTag("dough/wheat"); + public static final TagKey GRAINS = TagUtil.createItemTag("grain"); + public static final TagKey GRAINS_WHEAT = TagUtil.createItemTag("grain/wheat"); + public static final TagKey TOOLS_WRENCH = TagUtil.createItemTag("tools/wrench"); + // endregion common/mod compat tags + + // region corals + + // Why did I put them all here? Why not? Science isn't about why, it's about why NOT! + // Why is so much of our science dangerous? Why don't you marry safe science if you love it so much!? + // IN FACT, WHY NOT INVENT A SAFETY DOOR THAT WON'T HIT YOU ON THE BUTT ON THE WAY OUT BECAUSE YOU'RE FIRED!!! + // Not you test subject, you're doing fine. + // YES, YOU. BOX. YOUR STUFF. OUT THE FRONT DOOR. PARKING LOT. CAR. GOODBYE! + public static final TagKey CORAL_BLOCKS_ALIVE = TagUtil.createItemTag("coral_blocks/alive"); + public static final TagKey CORAL_BLOCKS_DEAD = TagUtil.createItemTag("coral_blocks/dead"); + public static final TagKey CORAL_BLOCKS = TagUtil.createItemTag("coral_blocks"); + public static final TagKey CORAL_PLANTS_ALIVE = TagUtil.createItemTag("coral_plants/alive"); + public static final TagKey CORAL_PLANTS_DEAD = TagUtil.createItemTag("coral_plants/dead"); + public static final TagKey CORAL_PLANTS = TagUtil.createItemTag("coral_plants"); + public static final TagKey CORAL_FANS_ALIVE = TagUtil.createItemTag("coral_fans/alive"); + public static final TagKey CORAL_FANS_DEAD = TagUtil.createItemTag("coral_fans/dead"); + public static final TagKey CORAL_FANS = TagUtil.createItemTag("coral_fans"); + public static final TagKey CORALS_ALIVE = TagUtil.createItemTag("corals/alive"); + public static final TagKey CORALS_DEAD = TagUtil.createItemTag("corals/dead"); + public static final TagKey CORALS = TagUtil.createItemTag("corals"); + // endregion corals + + // region GT 'parts' + public static final TagKey TRANSISTORS = TagUtil.createModItemTag("transistors"); + public static final TagKey RESISTORS = TagUtil.createModItemTag("resistors"); + public static final TagKey CAPACITORS = TagUtil.createModItemTag("capacitors"); + public static final TagKey DIODES = TagUtil.createModItemTag("diodes"); + public static final TagKey INDUCTORS = TagUtil.createModItemTag("inductors"); + + public static final TagKey CIRCUITS = TagUtil.createModItemTag("circuits"); + + public static final TagKey CIRCUITS_ULV = TagUtil.createModItemTag("circuits/ulv"); + public static final TagKey CIRCUITS_LV = TagUtil.createModItemTag("circuits/lv"); + public static final TagKey CIRCUITS_MV = TagUtil.createModItemTag("circuits/mv"); + public static final TagKey CIRCUITS_HV = TagUtil.createModItemTag("circuits/hv"); + public static final TagKey CIRCUITS_EV = TagUtil.createModItemTag("circuits/ev"); + public static final TagKey CIRCUITS_IV = TagUtil.createModItemTag("circuits/iv"); + public static final TagKey CIRCUITS_LuV = TagUtil.createModItemTag("circuits/luv"); + public static final TagKey CIRCUITS_ZPM = TagUtil.createModItemTag("circuits/zpm"); + public static final TagKey CIRCUITS_UV = TagUtil.createModItemTag("circuits/uv"); + public static final TagKey CIRCUITS_UHV = TagUtil.createModItemTag("circuits/uhv"); + public static final TagKey CIRCUITS_UEV = TagUtil.createModItemTag("circuits/uev"); + public static final TagKey CIRCUITS_UIV = TagUtil.createModItemTag("circuits/uiv"); + public static final TagKey CIRCUITS_UXV = TagUtil.createModItemTag("circuits/uxv"); + public static final TagKey CIRCUITS_OpV = TagUtil.createModItemTag("circuits/opv"); + public static final TagKey CIRCUITS_MAX = TagUtil.createModItemTag("circuits/max"); + @SuppressWarnings("unchecked") + public static final TagKey[] CIRCUITS_ARRAY = new TagKey[] { + CIRCUITS_ULV, + CIRCUITS_LV, + CIRCUITS_MV, + CIRCUITS_HV, + CIRCUITS_EV, + CIRCUITS_IV, + CIRCUITS_LuV, + CIRCUITS_ZPM, + CIRCUITS_UV, + CIRCUITS_UHV, + CIRCUITS_UEV, + CIRCUITS_UIV, + CIRCUITS_UXV, + CIRCUITS_OpV, + CIRCUITS_MAX + }; + + public static final TagKey BATTERIES = TagUtil.createModItemTag("batteries"); + + public static final TagKey BATTERIES_ULV = TagUtil.createModItemTag("batteries/ulv"); + public static final TagKey BATTERIES_LV = TagUtil.createModItemTag("batteries/lv"); + public static final TagKey BATTERIES_MV = TagUtil.createModItemTag("batteries/mv"); + public static final TagKey BATTERIES_HV = TagUtil.createModItemTag("batteries/hv"); + public static final TagKey BATTERIES_EV = TagUtil.createModItemTag("batteries/ev"); + public static final TagKey BATTERIES_IV = TagUtil.createModItemTag("batteries/iv"); + public static final TagKey BATTERIES_LuV = TagUtil.createModItemTag("batteries/luv"); + public static final TagKey BATTERIES_ZPM = TagUtil.createModItemTag("batteries/zpm"); + public static final TagKey BATTERIES_UV = TagUtil.createModItemTag("batteries/uv"); + public static final TagKey BATTERIES_UHV = TagUtil.createModItemTag("batteries/uhv"); + + @SuppressWarnings("unchecked") + public static final TagKey[] BATTERIES_ARRAY = new TagKey[] { + BATTERIES_ULV, + BATTERIES_LV, + BATTERIES_MV, + BATTERIES_HV, + BATTERIES_EV, + BATTERIES_IV, + BATTERIES_LuV, + BATTERIES_ZPM, + BATTERIES_UV, + BATTERIES_UHV + }; + + public static final TagKey ELECTRIC_MOTORS = TagUtil.createModItemTag("electric_motors"); + public static final TagKey ELECTRIC_PUMPS = TagUtil.createModItemTag("electric_pumps"); + public static final TagKey FLUID_REGULATORS = TagUtil.createModItemTag("fluid_regulators"); + public static final TagKey CONVEYOR_MODULES = TagUtil.createModItemTag("conveyor_modules"); + public static final TagKey ELECTRIC_PISTONS = TagUtil.createModItemTag("electric_pistons"); + public static final TagKey ROBOT_ARMS = TagUtil.createModItemTag("robot_arms"); + public static final TagKey FIELD_GENERATORS = TagUtil.createModItemTag("field_generators"); + public static final TagKey EMITTERS = TagUtil.createModItemTag("emitters"); + public static final TagKey SENSORS = TagUtil.createModItemTag("sensors"); + // endregion GT 'parts' + + // region Tools + public static final TagKey TOOLS_IGNITER = TagUtil.createItemTag("tools/igniter"); + public static final TagKey TOOLS_BUTCHERY_KNIVES = TagUtil.createItemTag("tools/butchery_knives"); + public static final TagKey TOOLS_BUZZSAWS = TagUtil.createItemTag("tools/buzzsaws"); + public static final TagKey TOOLS_CHAINSAWS = TagUtil.createItemTag("tools/chainsaws"); + public static final TagKey TOOLS_CROWBARS = TagUtil.createItemTag("tools/crowbars"); + public static final TagKey TOOLS_DRILLS = TagUtil.createItemTag("tools/drills"); + public static final TagKey TOOLS_FILES = TagUtil.createItemTag("tools/files"); + public static final TagKey TOOLS_HAMMERS = TagUtil.createItemTag("tools/hammers"); + public static final TagKey TOOLS_KNIVES = TagUtil.createItemTag("tools/knives"); + public static final TagKey TOOLS_MALLETS = TagUtil.createItemTag("tools/mallets"); + public static final TagKey TOOLS_MINING_HAMMERS = TagUtil.createItemTag("tools/mining_hammers"); + public static final TagKey TOOLS_MORTARS = TagUtil.createItemTag("tools/mortars"); + public static final TagKey TOOLS_PLUNGERS = TagUtil.createItemTag("tools/plungers"); + public static final TagKey TOOLS_SAWS = TagUtil.createItemTag("tools/saws"); + public static final TagKey TOOLS_SCREWDRIVERS = TagUtil.createItemTag("tools/screwdrivers"); + public static final TagKey TOOLS_SCYTHES = TagUtil.createItemTag("tools/scythes"); + public static final TagKey TOOLS_SHEARS = TagUtil.createItemTag("tools/shears"); + public static final TagKey TOOLS_SPADES = TagUtil.createItemTag("tools/spades"); + public static final TagKey TOOLS_WIRE_CUTTERS = TagUtil.createItemTag("tools/wire_cutters"); + public static final TagKey TOOLS_WRENCHES = TagUtil.createItemTag("tools/wrenches"); + + // region Crafting Tools + public static final TagKey CRAFTING_CROWBARS = TagUtil.createModItemTag("crafting_tools/crowbars"); + public static final TagKey CRAFTING_FILES = TagUtil.createModItemTag("crafting_tools/files"); + public static final TagKey CRAFTING_HAMMERS = TagUtil.createModItemTag("crafting_tools/hammers"); + public static final TagKey CRAFTING_KNIVES = TagUtil.createModItemTag("crafting_tools/knives"); + public static final TagKey CRAFTING_MALLETS = TagUtil.createModItemTag("crafting_tools/mallets"); + public static final TagKey CRAFTING_MORTARS = TagUtil.createModItemTag("crafting_tools/mortars"); + public static final TagKey CRAFTING_SAWS = TagUtil.createModItemTag("crafting_tools/saws"); + public static final TagKey CRAFTING_SCREWDRIVERS = TagUtil.createModItemTag("crafting_tools/screwdrivers"); + public static final TagKey CRAFTING_WIRE_CUTTERS = TagUtil.createModItemTag("crafting_tools/wire_cutters"); + public static final TagKey CRAFTING_WRENCHES = TagUtil.createModItemTag("crafting_tools/wrenches"); + // endregion Crafting Tools + // endregion Tools + + // region lenses + public static final TagKey LENSES = TagUtil.createModItemTag("lenses"); + public static final TagKey LENSES_GLASS = TagUtil.createModItemTag("lenses/glass"); + + public static final TagKey LENSES_WHITE = TagUtil.createModItemTag("lenses/white"); + public static final TagKey LENSES_ORANGE = TagUtil.createModItemTag("lenses/orange"); + public static final TagKey LENSES_MAGENTA = TagUtil.createModItemTag("lenses/magenta"); + public static final TagKey LENSES_LIGHT_BLUE = TagUtil.createModItemTag("lenses/light_blue"); + public static final TagKey LENSES_YELLOW = TagUtil.createModItemTag("lenses/yellow"); + public static final TagKey LENSES_LIME = TagUtil.createModItemTag("lenses/lime"); + public static final TagKey LENSES_PINK = TagUtil.createModItemTag("lenses/pink"); + public static final TagKey LENSES_GRAY = TagUtil.createModItemTag("lenses/gray"); + public static final TagKey LENSES_LIGHT_GRAY = TagUtil.createModItemTag("lenses/light_gray"); + public static final TagKey LENSES_CYAN = TagUtil.createModItemTag("lenses/cyan"); + public static final TagKey LENSES_PURPLE = TagUtil.createModItemTag("lenses/purple"); + public static final TagKey LENSES_BLUE = TagUtil.createModItemTag("lenses/blue"); + public static final TagKey LENSES_BROWN = TagUtil.createModItemTag("lenses/brown"); + public static final TagKey LENSES_GREEN = TagUtil.createModItemTag("lenses/green"); + public static final TagKey LENSES_RED = TagUtil.createModItemTag("lenses/red"); + public static final TagKey LENSES_BLACK = TagUtil.createModItemTag("lenses/black"); + + @SuppressWarnings("unchecked") + public static final TagKey[] LENSES_ARRAY = new TagKey[] { + LENSES_WHITE, + LENSES_ORANGE, + LENSES_MAGENTA, + LENSES_LIGHT_BLUE, + LENSES_YELLOW, + LENSES_LIME, + LENSES_PINK, + LENSES_GRAY, + LENSES_LIGHT_GRAY, + LENSES_CYAN, + LENSES_PURPLE, + LENSES_BLUE, + LENSES_BROWN, + LENSES_GREEN, + LENSES_RED, + LENSES_BLACK + }; + // endregion lenses + + // region dyes + @SuppressWarnings("unchecked") + public static final TagKey[] DYES_ARRAY = new TagKey[] { + Tags.Items.DYES_WHITE, + Tags.Items.DYES_ORANGE, + Tags.Items.DYES_MAGENTA, + Tags.Items.DYES_LIGHT_BLUE, + Tags.Items.DYES_YELLOW, + Tags.Items.DYES_LIME, + Tags.Items.DYES_PINK, + Tags.Items.DYES_GRAY, + Tags.Items.DYES_LIGHT_GRAY, + Tags.Items.DYES_CYAN, + Tags.Items.DYES_PURPLE, + Tags.Items.DYES_BLUE, + Tags.Items.DYES_BROWN, + Tags.Items.DYES_GREEN, + Tags.Items.DYES_RED, + Tags.Items.DYES_BLACK + }; + // endregion dyes + } + // endregion items + + // region fluids + @UtilityClass + public static class Fluids { + + // region misc + public static final TagKey LIGHTER_FLUIDS = TagUtil.createModFluidTag("lighter_fluids"); + public static final TagKey HPCA_COOLANTS = TagUtil.createModFluidTag("hpca_coolants"); + public static final TagKey POTION = TagUtil.createFluidTag("potion"); + // endregion misc + + // region state + public static final TagKey MOLTEN = TagUtil.createFluidTag("molten"); + public static final TagKey LIQUID = TagUtil.createFluidTag("liquid"); + public static final TagKey PLASMATIC = TagUtil.createFluidTag("plasmatic"); + // endregion state + } + // endregion fluids + + // region biomes + @UtilityClass + public static class Biomes { + + public static final TagKey IS_SWAMP = TagUtil.createTag(Registries.BIOME, "is_swamp", false); + public static final TagKey IS_SANDY = TagUtil.createModTag(Registries.BIOME, "is_sandy"); + public static final TagKey HAS_RUBBER_TREE = TagUtil.createModTag(Registries.BIOME, "has_rubber_tree"); + } + // endregion biomes + +// spotless:on +} diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java index a72e482d410..577484c5742 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java @@ -3,10 +3,8 @@ import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterialItems; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagEntry; import net.minecraft.world.item.Items; import net.minecraftforge.common.Tags; @@ -17,180 +15,192 @@ public class ItemTagLoader { - @SuppressWarnings("DataFlowIssue") + @SuppressWarnings({ "DataFlowIssue", "unchecked" }) public static void init(RegistrateItemTagsProvider provider) { - provider.addTag(CustomTags.DOUGHS).addTag(CustomTags.WHEAT_DOUGHS); - provider.addTag(CustomTags.WHEAT_GRAINS).add(GTMaterialItems.MATERIAL_ITEMS.get(dust, Wheat).get()); - provider.addTag(CustomTags.GRAINS).addTag(CustomTags.WHEAT_GRAINS); + provider.addTag(GTTags.Items.DOUGHS).addTag(GTTags.Items.DOUGHS_WHEAT); + provider.addTag(GTTags.Items.GRAINS_WHEAT).addOptional(GTMaterialItems.MATERIAL_ITEMS.get(dust, Wheat)); + provider.addTag(GTTags.Items.GRAINS).addTag(GTTags.Items.GRAINS_WHEAT); - provider.copy(CustomTags.CONCRETE_BLOCK, CustomTags.CONCRETE_ITEM); - provider.copy(CustomTags.CONCRETE_POWDER_BLOCK, CustomTags.CONCRETE_POWDER_ITEM); + provider.copy(GTTags.Blocks.CONCRETES, GTTags.Items.CONCRETES); + provider.copy(GTTags.Blocks.CONCRETE_POWDERS, GTTags.Items.CONCRETE_POWDERS); // spotless:off // the coral blocks: alive, dead, both - provider.addTag(CustomTags.ALIVE_CORAL_BLOCK_ITEMS) + provider.addTag(GTTags.Items.CORAL_BLOCKS_ALIVE) .add(Items.BRAIN_CORAL_BLOCK, Items.BUBBLE_CORAL_BLOCK, Items.FIRE_CORAL_BLOCK, Items.TUBE_CORAL_BLOCK, Items.HORN_CORAL_BLOCK); - provider.addTag(CustomTags.DEAD_CORAL_BLOCK_ITEMS) + provider.addTag(GTTags.Items.CORAL_BLOCKS_DEAD) .add(Items.DEAD_BRAIN_CORAL_BLOCK, Items.DEAD_BUBBLE_CORAL_BLOCK, Items.DEAD_FIRE_CORAL_BLOCK, Items.DEAD_TUBE_CORAL_BLOCK, Items.DEAD_HORN_CORAL_BLOCK); - provider.addTag(CustomTags.CORAL_BLOCK_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_BLOCK_ITEMS) - .addTag(CustomTags.DEAD_CORAL_BLOCK_ITEMS); + provider.addTag(GTTags.Items.CORAL_BLOCKS) + .addTag(GTTags.Items.CORAL_BLOCKS_ALIVE) + .addTag(GTTags.Items.CORAL_BLOCKS_DEAD); // the coral plants (the V-shaped pointy ones) - provider.addTag(CustomTags.ALIVE_CORAL_PLANT_ITEMS) + provider.addTag(GTTags.Items.CORAL_PLANTS_ALIVE) .add(Items.BRAIN_CORAL, Items.BUBBLE_CORAL, Items.FIRE_CORAL, Items.TUBE_CORAL, Items.HORN_CORAL); - provider.addTag(CustomTags.DEAD_CORAL_PLANT_ITEMS) + provider.addTag(GTTags.Items.CORAL_PLANTS_DEAD) .add(Items.DEAD_BRAIN_CORAL, Items.DEAD_BUBBLE_CORAL, Items.DEAD_FIRE_CORAL, Items.DEAD_TUBE_CORAL, Items.DEAD_HORN_CORAL); - provider.addTag(CustomTags.CORAL_PLANT_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_PLANT_ITEMS) - .addTag(CustomTags.DEAD_CORAL_PLANT_ITEMS); + provider.addTag(GTTags.Items.CORAL_PLANTS) + .addTag(GTTags.Items.CORAL_PLANTS_ALIVE) + .addTag(GTTags.Items.CORAL_PLANTS_DEAD); // the coral fans (the flat circular ones) - provider.addTag(CustomTags.ALIVE_CORAL_FAN_ITEMS) + provider.addTag(GTTags.Items.CORAL_FANS_ALIVE) .add(Items.BRAIN_CORAL_FAN, Items.BUBBLE_CORAL_FAN, Items.FIRE_CORAL_FAN, Items.TUBE_CORAL_FAN, Items.HORN_CORAL_FAN); - provider.addTag(CustomTags.DEAD_CORAL_FAN_ITEMS) + provider.addTag(GTTags.Items.CORAL_FANS_DEAD) .add(Items.DEAD_BRAIN_CORAL_FAN, Items.DEAD_BUBBLE_CORAL_FAN, Items.DEAD_FIRE_CORAL_FAN, Items.DEAD_TUBE_CORAL_FAN, Items.DEAD_HORN_CORAL_FAN); - provider.addTag(CustomTags.CORAL_FAN_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_FAN_ITEMS) - .addTag(CustomTags.DEAD_CORAL_FAN_ITEMS); + provider.addTag(GTTags.Items.CORAL_FANS) + .addTag(GTTags.Items.CORAL_FANS_ALIVE) + .addTag(GTTags.Items.CORAL_FANS_DEAD); // all the coral items (except the blocks) - provider.addTag(CustomTags.ALIVE_CORAL_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_PLANT_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_FAN_ITEMS); - provider.addTag(CustomTags.DEAD_CORAL_ITEMS) - .addTag(CustomTags.DEAD_CORAL_PLANT_ITEMS) - .addTag(CustomTags.DEAD_CORAL_FAN_ITEMS); - provider.addTag(CustomTags.CORAL_ITEMS) - .addTag(CustomTags.ALIVE_CORAL_ITEMS) - .addTag(CustomTags.DEAD_CORAL_ITEMS); + provider.addTag(GTTags.Items.CORALS_ALIVE) + .addTag(GTTags.Items.CORAL_PLANTS_ALIVE) + .addTag(GTTags.Items.CORAL_FANS_ALIVE); + provider.addTag(GTTags.Items.CORALS_DEAD) + .addTag(GTTags.Items.CORAL_PLANTS_DEAD) + .addTag(GTTags.Items.CORAL_FANS_DEAD); + provider.addTag(GTTags.Items.CORALS) + .addTag(GTTags.Items.CORALS_ALIVE) + .addTag(GTTags.Items.CORALS_DEAD); // spotless:on - provider.addTag(CustomTags.WHITE_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Glass).get()) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, NetherStar).get()); - provider.addTag(CustomTags.LIGHT_BLUE_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Diamond).get()); - provider.addTag(CustomTags.RED_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Ruby).get()); - provider.addTag(CustomTags.GREEN_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Emerald).get()); - provider.addTag(CustomTags.BLUE_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Sapphire).get()); - provider.addTag(CustomTags.PURPLE_LENS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(lens, Amethyst).get()); - - provider.addTag(CustomTags.PISTONS).add(Items.PISTON, Items.STICKY_PISTON); + provider.addTag(GTTags.Items.LENSES).addTags(GTTags.Items.LENSES_ARRAY) + .addTag(GTTags.Items.LENSES_GLASS); + + provider.addTag(GTTags.Items.LENSES_WHITE) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Glass)) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, NetherStar)); + provider.addTag(GTTags.Items.LENSES_LIGHT_BLUE) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Diamond)); + provider.addTag(GTTags.Items.LENSES_RED) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Ruby)); + provider.addTag(GTTags.Items.LENSES_GREEN) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Emerald)); + provider.addTag(GTTags.Items.LENSES_BLUE) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Sapphire)); + provider.addTag(GTTags.Items.LENSES_PURPLE) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(lens, Amethyst)); + + provider.addTag(GTTags.Items.PISTONS).add(Items.PISTON, Items.STICKY_PISTON); // add treated wood stick to vanilla sticks tag // noinspection DataFlowIssue ChemicalHelper#getTag can't return null with treated wood rod provider.addTag(Tags.Items.RODS_WOODEN) - .add(GTMaterialItems.MATERIAL_ITEMS.get(TagPrefix.rod, TreatedWood).get()); + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(TagPrefix.rod, TreatedWood)); // add treated and untreated wood plates to vanilla planks tag provider.addTag(ItemTags.PLANKS) - .add(TagEntry.element(GTMaterialItems.MATERIAL_ITEMS.get(plate, TreatedWood).getId())) - .add(TagEntry.element(GTMaterialItems.MATERIAL_ITEMS.get(plate, Wood).getId())); - - provider.addTag(CustomTags.CIRCUITS) - .addTag(CustomTags.ULV_CIRCUITS) - .addTag(CustomTags.LV_CIRCUITS) - .addTag(CustomTags.MV_CIRCUITS) - .addTag(CustomTags.HV_CIRCUITS) - .addTag(CustomTags.EV_CIRCUITS) - .addTag(CustomTags.IV_CIRCUITS) - .addTag(CustomTags.LuV_CIRCUITS) - .addTag(CustomTags.ZPM_CIRCUITS) - .addTag(CustomTags.UV_CIRCUITS) - .addTag(CustomTags.UHV_CIRCUITS) - .addOptionalTag(CustomTags.UEV_CIRCUITS.location()) - .addOptionalTag(CustomTags.UIV_CIRCUITS.location()) - .addOptionalTag(CustomTags.UXV_CIRCUITS.location()) - .addOptionalTag(CustomTags.OpV_CIRCUITS.location()) - .addOptionalTag(CustomTags.MAX_CIRCUITS.location()); - - provider.addTag(CustomTags.BATTERIES) - .addTag(CustomTags.ULV_BATTERIES) - .addTag(CustomTags.LV_BATTERIES) - .addTag(CustomTags.MV_BATTERIES) - .addTag(CustomTags.HV_BATTERIES) - .addTag(CustomTags.EV_BATTERIES) - .addTag(CustomTags.IV_BATTERIES) - .addTag(CustomTags.LuV_BATTERIES) - .addTag(CustomTags.ZPM_BATTERIES) - .addTag(CustomTags.UV_BATTERIES) - .addTag(CustomTags.UHV_BATTERIES); + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(plate, TreatedWood)) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(plate, Wood)); + + // add (likely empty) tags for the high tier circuits so we can add them to the `gtceu:circuits` tag easily + provider.addTag(GTTags.Items.CIRCUITS_UEV); + provider.addTag(GTTags.Items.CIRCUITS_UIV); + provider.addTag(GTTags.Items.CIRCUITS_UXV); + provider.addTag(GTTags.Items.CIRCUITS_OpV); + provider.addTag(GTTags.Items.CIRCUITS_MAX); + provider.addTag(GTTags.Items.CIRCUITS).addTags(GTTags.Items.CIRCUITS_ARRAY); + + provider.addTag(GTTags.Items.BATTERIES).addTags(GTTags.Items.BATTERIES_ARRAY); // Add highTierContent items as optional entries so it doesn't error - provider.addTag(CustomTags.ELECTRIC_MOTORS) - .addOptional(GTItems.ELECTRIC_MOTOR_UHV.getId()) - .addOptional(GTItems.ELECTRIC_MOTOR_UEV.getId()) - .addOptional(GTItems.ELECTRIC_MOTOR_UIV.getId()) - .addOptional(GTItems.ELECTRIC_MOTOR_UXV.getId()) - .addOptional(GTItems.ELECTRIC_MOTOR_OpV.getId()); - - provider.addTag(CustomTags.ELECTRIC_PUMPS) - .addOptional(GTItems.ELECTRIC_PUMP_UHV.getId()) - .addOptional(GTItems.ELECTRIC_PUMP_UEV.getId()) - .addOptional(GTItems.ELECTRIC_PUMP_UIV.getId()) - .addOptional(GTItems.ELECTRIC_PUMP_UXV.getId()) - .addOptional(GTItems.ELECTRIC_PUMP_OpV.getId()); - - provider.addTag(CustomTags.FLUID_REGULATORS) - .addOptional(GTItems.FLUID_REGULATOR_UHV.getId()) - .addOptional(GTItems.FLUID_REGULATOR_UEV.getId()) - .addOptional(GTItems.FLUID_REGULATOR_UIV.getId()) - .addOptional(GTItems.FLUID_REGULATOR_UXV.getId()) - .addOptional(GTItems.FLUID_REGULATOR_OpV.getId()); - - provider.addTag(CustomTags.CONVEYOR_MODULES) - .addOptional(GTItems.CONVEYOR_MODULE_UHV.getId()) - .addOptional(GTItems.CONVEYOR_MODULE_UEV.getId()) - .addOptional(GTItems.CONVEYOR_MODULE_UIV.getId()) - .addOptional(GTItems.CONVEYOR_MODULE_UXV.getId()) - .addOptional(GTItems.CONVEYOR_MODULE_OpV.getId()); - - provider.addTag(CustomTags.ELECTRIC_PISTONS) - .addOptional(GTItems.ELECTRIC_PISTON_UHV.getId()) - .addOptional(GTItems.ELECTRIC_PISTON_UEV.getId()) - .addOptional(GTItems.ELECTRIC_PISTON_UIV.getId()) - .addOptional(GTItems.ELECTRIC_PISTON_UXV.getId()) - .addOptional(GTItems.ELECTRIC_PISTON_OpV.getId()); - - provider.addTag(CustomTags.ROBOT_ARMS) - .addOptional(GTItems.ROBOT_ARM_UHV.getId()) - .addOptional(GTItems.ROBOT_ARM_UEV.getId()) - .addOptional(GTItems.ROBOT_ARM_UIV.getId()) - .addOptional(GTItems.ROBOT_ARM_UXV.getId()) - .addOptional(GTItems.ROBOT_ARM_OpV.getId()); - - provider.addTag(CustomTags.FIELD_GENERATORS) - .addOptional(GTItems.FIELD_GENERATOR_UHV.getId()) - .addOptional(GTItems.FIELD_GENERATOR_UEV.getId()) - .addOptional(GTItems.FIELD_GENERATOR_UIV.getId()) - .addOptional(GTItems.FIELD_GENERATOR_UXV.getId()) - .addOptional(GTItems.FIELD_GENERATOR_OpV.getId()); - - provider.addTag(CustomTags.EMITTERS) - .addOptional(GTItems.EMITTER_UHV.getId()) - .addOptional(GTItems.EMITTER_UEV.getId()) - .addOptional(GTItems.EMITTER_UIV.getId()) - .addOptional(GTItems.EMITTER_UXV.getId()) - .addOptional(GTItems.EMITTER_OpV.getId()); - - provider.addTag(CustomTags.SENSORS) - .addOptional(GTItems.SENSOR_UHV.getId()) - .addOptional(GTItems.SENSOR_UEV.getId()) - .addOptional(GTItems.SENSOR_UIV.getId()) - .addOptional(GTItems.SENSOR_UXV.getId()) - .addOptional(GTItems.SENSOR_OpV.getId()); - - provider.addTag(CustomTags.TOOLS_IGNITER) + provider.addTag(GTTags.Items.ELECTRIC_MOTORS) + .addOptional(GTItems.ELECTRIC_MOTOR_UHV) + .addOptional(GTItems.ELECTRIC_MOTOR_UEV) + .addOptional(GTItems.ELECTRIC_MOTOR_UIV) + .addOptional(GTItems.ELECTRIC_MOTOR_UXV) + .addOptional(GTItems.ELECTRIC_MOTOR_OpV); + + provider.addTag(GTTags.Items.ELECTRIC_PUMPS) + .addOptional(GTItems.ELECTRIC_PUMP_UHV) + .addOptional(GTItems.ELECTRIC_PUMP_UEV) + .addOptional(GTItems.ELECTRIC_PUMP_UIV) + .addOptional(GTItems.ELECTRIC_PUMP_UXV) + .addOptional(GTItems.ELECTRIC_PUMP_OpV); + + provider.addTag(GTTags.Items.FLUID_REGULATORS) + .addOptional(GTItems.FLUID_REGULATOR_UHV) + .addOptional(GTItems.FLUID_REGULATOR_UEV) + .addOptional(GTItems.FLUID_REGULATOR_UIV) + .addOptional(GTItems.FLUID_REGULATOR_UXV) + .addOptional(GTItems.FLUID_REGULATOR_OpV); + + provider.addTag(GTTags.Items.CONVEYOR_MODULES) + .addOptional(GTItems.CONVEYOR_MODULE_UHV) + .addOptional(GTItems.CONVEYOR_MODULE_UEV) + .addOptional(GTItems.CONVEYOR_MODULE_UIV) + .addOptional(GTItems.CONVEYOR_MODULE_UXV) + .addOptional(GTItems.CONVEYOR_MODULE_OpV); + + provider.addTag(GTTags.Items.ELECTRIC_PISTONS) + .addOptional(GTItems.ELECTRIC_PISTON_UHV) + .addOptional(GTItems.ELECTRIC_PISTON_UEV) + .addOptional(GTItems.ELECTRIC_PISTON_UIV) + .addOptional(GTItems.ELECTRIC_PISTON_UXV) + .addOptional(GTItems.ELECTRIC_PISTON_OpV); + + provider.addTag(GTTags.Items.ROBOT_ARMS) + .addOptional(GTItems.ROBOT_ARM_UHV) + .addOptional(GTItems.ROBOT_ARM_UEV) + .addOptional(GTItems.ROBOT_ARM_UIV) + .addOptional(GTItems.ROBOT_ARM_UXV) + .addOptional(GTItems.ROBOT_ARM_OpV); + + provider.addTag(GTTags.Items.FIELD_GENERATORS) + .addOptional(GTItems.FIELD_GENERATOR_UHV) + .addOptional(GTItems.FIELD_GENERATOR_UEV) + .addOptional(GTItems.FIELD_GENERATOR_UIV) + .addOptional(GTItems.FIELD_GENERATOR_UXV) + .addOptional(GTItems.FIELD_GENERATOR_OpV); + + provider.addTag(GTTags.Items.EMITTERS) + .addOptional(GTItems.EMITTER_UHV) + .addOptional(GTItems.EMITTER_UEV) + .addOptional(GTItems.EMITTER_UIV) + .addOptional(GTItems.EMITTER_UXV) + .addOptional(GTItems.EMITTER_OpV); + + provider.addTag(GTTags.Items.SENSORS) + .addOptional(GTItems.SENSOR_UHV) + .addOptional(GTItems.SENSOR_UEV) + .addOptional(GTItems.SENSOR_UIV) + .addOptional(GTItems.SENSOR_UXV) + .addOptional(GTItems.SENSOR_OpV); + + provider.addTag(GTTags.Items.TOOLS_IGNITER) .addTag(ItemTags.CREEPER_IGNITERS); + // add these as "empty" tags so we can add them to `#forge:tools` easily + provider.addTag(GTTags.Items.TOOLS_BUTCHERY_KNIVES); + provider.addTag(GTTags.Items.TOOLS_BUZZSAWS); + provider.addTag(GTTags.Items.TOOLS_CHAINSAWS); + provider.addTag(GTTags.Items.TOOLS_CROWBARS); + provider.addTag(GTTags.Items.TOOLS_DRILLS); + provider.addTag(GTTags.Items.TOOLS_FILES); + provider.addTag(GTTags.Items.TOOLS_HAMMERS); + provider.addTag(GTTags.Items.TOOLS_KNIVES); + provider.addTag(GTTags.Items.TOOLS_MALLETS); + provider.addTag(GTTags.Items.TOOLS_MINING_HAMMERS); + provider.addTag(GTTags.Items.TOOLS_MORTARS); + provider.addTag(GTTags.Items.TOOLS_PLUNGERS); + provider.addTag(GTTags.Items.TOOLS_SAWS); + provider.addTag(GTTags.Items.TOOLS_SCREWDRIVERS); + provider.addTag(GTTags.Items.TOOLS_SCYTHES); + provider.addTag(GTTags.Items.TOOLS_SHEARS).addTag(Tags.Items.SHEARS); + provider.addTag(GTTags.Items.TOOLS_SPADES); + provider.addTag(GTTags.Items.TOOLS_WIRE_CUTTERS); + provider.addTag(GTTags.Items.TOOLS_WRENCHES); + // mod compat + provider.addTag(GTTags.Items.TOOLS_WRENCH).addTag(GTTags.Items.TOOLS_WRENCHES); + provider.addTag(Tags.Items.TOOLS) + .addTags(GTTags.Items.TOOLS_BUTCHERY_KNIVES, GTTags.Items.TOOLS_BUZZSAWS, GTTags.Items.TOOLS_CHAINSAWS, + GTTags.Items.TOOLS_CROWBARS, GTTags.Items.TOOLS_DRILLS, GTTags.Items.TOOLS_FILES, GTTags.Items.TOOLS_HAMMERS, + GTTags.Items.TOOLS_KNIVES, GTTags.Items.TOOLS_MALLETS, GTTags.Items.TOOLS_MINING_HAMMERS, GTTags.Items.TOOLS_MORTARS, + GTTags.Items.TOOLS_PLUNGERS, GTTags.Items.TOOLS_SAWS, GTTags.Items.TOOLS_SCREWDRIVERS, GTTags.Items.TOOLS_SCYTHES, + GTTags.Items.TOOLS_SHEARS, GTTags.Items.TOOLS_SPADES, GTTags.Items.TOOLS_WIRE_CUTTERS, GTTags.Items.TOOLS_WRENCHES); // Add sodalite and lazurite as enchanting fuels provider.addTag(Tags.Items.ENCHANTING_FUELS) - .add(GTMaterialItems.MATERIAL_ITEMS.get(gem, Lazurite).get()) - .add(GTMaterialItems.MATERIAL_ITEMS.get(gem, Sodalite).get()); + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(gem, Lazurite)) + .addOptional(GTMaterialItems.MATERIAL_ITEMS.get(gem, Sodalite)); } } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java index 366cb107eee..c3480c17876 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java @@ -100,6 +100,11 @@ public TagPrefixBuilder defaultTagPath(String path) { return this; } + public TagPrefixBuilder defaultGTCEuTagPath(String path) { + base.defaultGTCEuTagPath(path); + return this; + } + public TagPrefixBuilder prefixTagPath(String path) { base.prefixTagPath(path); return this; @@ -115,6 +120,11 @@ public TagPrefixBuilder unformattedTagPath(String path) { return this; } + public TagPrefixBuilder unformattedGTCEuTagPath(String path) { + base.unformattedGTCEuTagPath(path); + return this; + } + public TagPrefixBuilder customTagPath(String path, BiFunction> formatter) { base.customTagPath(path, formatter); return this; diff --git a/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java index ee251651222..bd1d2d50ce2 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/EntityDamageUtil.java @@ -1,14 +1,13 @@ package com.gregtechceu.gtceu.utils; import com.gregtechceu.gtceu.common.data.GTDamageTypes; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import net.minecraft.tags.EntityTypeTags; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.monster.*; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantments; @@ -48,7 +47,7 @@ public static void applyHeatDamage(@NotNull LivingEntity entity, int damage) { if (damage <= 0) return; if (!entity.isAlive()) return; // fire/lava mobs cannot be burned - if (entity.getType().is(CustomTags.HEAT_IMMUNE)) + if (entity.getType().is(GTTags.EntityTypes.HEAT_IMMUNE)) return; // fire resistance entities cannot be burned if (entity.getEffect(MobEffects.FIRE_RESISTANCE) != null) return; @@ -96,7 +95,7 @@ public static void applyChemicalDamage(@NotNull LivingEntity entity, int damage) if (damage <= 0) return; if (!entity.isAlive()) return; // skeletons cannot breathe in the toxins - if (entity.getType().is(CustomTags.CHEMICAL_IMMUNE)) + if (entity.getType().is(GTTags.EntityTypes.CHEMICAL_IMMUNE)) return; entity.hurt(GTDamageTypes.CHEMICAL.source(entity.level()), damage); diff --git a/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java index 72fe4b221e5..618c42ce59a 100644 --- a/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.emi.EmiApiAccessor; -import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.tags.GTTags; import com.gregtechceu.gtceu.integration.recipeviewer.emi.recipe.GTRecipeEMICategory; import com.gregtechceu.gtceu.integration.recipeviewer.jei.GTJEIPlugin; import com.gregtechceu.gtceu.integration.recipeviewer.jei.recipe.GTRecipeJEICategory; @@ -452,7 +452,7 @@ public static int getPumpBiomeModifier(Holder biome) { return FluidType.BUCKET_VOLUME / 4; } else if (biome.is(Tags.Biomes.IS_COLD)) { return FluidType.BUCKET_VOLUME * 175 / 1000; - } else if (biome.is(CustomTags.IS_SANDY)) { + } else if (biome.is(GTTags.Biomes.IS_SANDY)) { return FluidType.BUCKET_VOLUME * 170 / 1000; } return FluidType.BUCKET_VOLUME / 10; diff --git a/src/main/resources/assets/gtceu/lang/de_de.json b/src/main/resources/assets/gtceu/lang/de_de.json index 2dd3554a5ea..d7a1d2f5b94 100644 --- a/src/main/resources/assets/gtceu/lang/de_de.json +++ b/src/main/resources/assets/gtceu/lang/de_de.json @@ -3999,7 +3999,7 @@ "gui.gtceu.share_tank.title": "Gemeinsames Tankinventar", "gui.widget.incrementButton.default_tooltip": "Halte Shift-, Strg- oder beide Tasten gedrückt, um die Menge zu ändern", "gui.widget.recipeProgressWidget.default_tooltip": "Rezepte anzeigen", - "item.glass_lens": "Glaslinse (weiß)", + "item.gtceu.glass_lens": "Glaslinse (weiß)", "item.gtceu.activity_detector_cover": "Aktivitätsdetektor", "item.gtceu.activity_detector_cover.tooltip": "§7Gibt §fAktivitätsstatus§7 als Redstone als §fAbdeckung§7 aus.", "item.gtceu.advanced_activity_detector_cover": "Erweiterter Aktivitätsdetektor", diff --git a/src/main/resources/assets/gtceu/lang/ja_jp.json b/src/main/resources/assets/gtceu/lang/ja_jp.json index b13bab7d1af..4d433a2af50 100644 --- a/src/main/resources/assets/gtceu/lang/ja_jp.json +++ b/src/main/resources/assets/gtceu/lang/ja_jp.json @@ -3921,7 +3921,7 @@ "gui.gtceu.share_tank.title": "共有タンク在庫", "gui.widget.incrementButton.default_tooltip": "Shift、Ctrlまたはその両方で量を変更", "gui.widget.recipeProgressWidget.default_tooltip": "レシピを表示", - "item.glass_lens": "白いガラスレンズ", + "item.gtceu.glass_lens": "白いガラスレンズ", "item.gtceu.activity_detector_cover": "動作検出器", "item.gtceu.activity_detector_cover.tooltip": "§7レッドストーン信号として§f動作状態§7を検出する§fカバー§7", "item.gtceu.advanced_activity_detector_cover": "発展型動作検出器", diff --git a/src/main/resources/assets/gtceu/lang/pt_br.json b/src/main/resources/assets/gtceu/lang/pt_br.json index a659a61fe59..5ab5fd0e289 100644 --- a/src/main/resources/assets/gtceu/lang/pt_br.json +++ b/src/main/resources/assets/gtceu/lang/pt_br.json @@ -3998,7 +3998,7 @@ "gui.gtceu.share_tank.title": "Inventário de Tanque Compartilhado", "gui.widget.incrementButton.default_tooltip": "Segure Shift, Ctrl ou ambos para alterar a quantidade", "gui.widget.recipeProgressWidget.default_tooltip": "Mostrar Receitas", - "item.glass_lens": "Lente de Vidro (Branca)", + "item.gtceu.glass_lens": "Lente de Vidro (Branca)", "item.gtceu.activity_detector_cover": "Detector de Atividade", "item.gtceu.activity_detector_cover.tooltip": "§7Emite §fStatus de Atividade§7 como Redstone como §fCobertura§7.", "item.gtceu.advanced_activity_detector_cover": "Detector de Atividade Avançado", diff --git a/src/main/resources/assets/gtceu/lang/ru_ru.json b/src/main/resources/assets/gtceu/lang/ru_ru.json index 19a7e531bc4..5d5690f5f75 100644 --- a/src/main/resources/assets/gtceu/lang/ru_ru.json +++ b/src/main/resources/assets/gtceu/lang/ru_ru.json @@ -3389,7 +3389,7 @@ "gtceu.tool.class.saw": "Пила", "gtceu.tool.class.screwdriver": "Отвертка", "gtceu.tool.class.shovel": "Лопата", - "item.glass_lens": "Стеклянная линза (Белый)", + "item.gtceu.glass_lens": "Стеклянная линза (Белый)", "item.gtceu.activity_detector_cover.tooltip": "§7Выдает §fПрогресс Работы§7 Сигналом Красного камня как §fУлучшение механизма§7.", "item.gtceu.advanced_activity_detector_cover.tooltip": "§7Выдает §fСтатус прогресса§7 Сигналом Красного камня как §fУлучшение механизма§7.", "item.gtceu.advanced_energy_detector_cover.tooltip": "§7Даёт §fRS-триггеру контроль§7 за §fУровнем энергии§7 Сигналом Красного камня как §fУлучшение механизма§7.", diff --git a/src/main/resources/assets/gtceu/lang/uk_ua.json b/src/main/resources/assets/gtceu/lang/uk_ua.json index 58d62ab4b4a..c6715c546f9 100644 --- a/src/main/resources/assets/gtceu/lang/uk_ua.json +++ b/src/main/resources/assets/gtceu/lang/uk_ua.json @@ -3951,7 +3951,7 @@ "gui.gtceu.share_tank.title": "Інвентар спільного резервуара", "gui.widget.incrementButton.default_tooltip": "Утримуйте Shift, Ctrl чи обидва, щоб змінити кількість", "gui.widget.recipeProgressWidget.default_tooltip": "Показати рецепти", - "item.glass_lens": "Скляна лінза (Біла)", + "item.gtceu.glass_lens": "Скляна лінза (Біла)", "item.gtceu.activity_detector_cover": "Детектор активності", "item.gtceu.activity_detector_cover.tooltip": "§7Видає§f статус активності§7 як редстоун та§f кришка§7.", "item.gtceu.advanced_activity_detector_cover": "Вдосконалений детектор активності", diff --git a/src/main/resources/assets/gtceu/lang/zh_cn.json b/src/main/resources/assets/gtceu/lang/zh_cn.json index 3d375b7b9a6..9898a06c9d2 100644 --- a/src/main/resources/assets/gtceu/lang/zh_cn.json +++ b/src/main/resources/assets/gtceu/lang/zh_cn.json @@ -3983,7 +3983,7 @@ "gui.gtceu.share_tank.title": "共享流体库存", "gui.widget.incrementButton.default_tooltip": "按住Shift，Ctrl键或同时按住这两个键来改变数量", "gui.widget.recipeProgressWidget.default_tooltip": "查看配方", - "item.glass_lens": "玻璃透镜（白色）", + "item.gtceu.glass_lens": "玻璃透镜（白色）", "item.gtceu.activity_detector_cover": "活跃探测覆盖板", "item.gtceu.activity_detector_cover.tooltip": "§7作§f覆盖板§7时依照§f机器活跃状态§7发出红石信号。", "item.gtceu.advanced_activity_detector_cover": "进阶活跃状态探测覆盖板", diff --git a/src/main/resources/assets/gtceu/lang/zh_tw.json b/src/main/resources/assets/gtceu/lang/zh_tw.json index 527ecd8c330..1c9ca3a8f72 100644 --- a/src/main/resources/assets/gtceu/lang/zh_tw.json +++ b/src/main/resources/assets/gtceu/lang/zh_tw.json @@ -3638,7 +3638,7 @@ "gui.gtceu.share_tank.title": "共享流體庫存", "gui.widget.incrementButton.default_tooltip": "按住Shift，Ctrl鍵或同時按住這兩個鍵來改變數量", "gui.widget.recipeProgressWidget.default_tooltip": "檢視配方", - "item.glass_lens": "玻璃透鏡（白色）", + "item.gtceu.glass_lens": "玻璃透鏡（白色）", "item.gtceu.activity_detector_cover": "活躍探測覆蓋板", "item.gtceu.activity_detector_cover.tooltip": "§7作§f覆蓋板§7時依照§f機器活躍狀態§7發出紅石訊號。", "item.gtceu.advanced_activity_detector_cover": "進階活躍狀態探測器", diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json index 08b6986a125..28d7dfaaefa 100644 --- a/src/main/resources/gtceu.mixins.json +++ b/src/main/resources/gtceu.mixins.json @@ -66,6 +66,7 @@ "GrowingPlantBlockAccessor", "IngredientAccessor", "IntegerPropertyAccessor", + "IntrinsicTagAppenderMixin", "InventoryMixin", "ItemValueAccessor", "LevelMixin", @@ -82,6 +83,7 @@ "ShapedRecipeAccessor", "SidedRedstoneConnectivityMixin", "SmithingTransformRecipeMixin", + "TagAppenderMixin", "TagLoaderMixin", "TagManagerMixin", "TagValueAccessor",