From 0a18fe901d246e8e5adeb343d32b854e7d8479e9 Mon Sep 17 00:00:00 2001 From: Karthi Suresh <75553966+JuiceyBeans@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:53:32 +0400 Subject: [PATCH 1/4] Add #forge:armors/ to GT armors --- .../data/forge/tags/items/armors/boots.json | 6 ++++++ .../forge/tags/items/armors/chestplates.json | 13 ++++++++++++ .../data/forge/tags/items/armors/helmets.json | 9 ++++++++ .../forge/tags/items/armors/leggings.json | 8 +++++++ .../gtceu/common/data/GTItems.java | 21 +++++++++++++++++++ 5 files changed, 57 insertions(+) create mode 100644 src/generated/resources/data/forge/tags/items/armors/boots.json create mode 100644 src/generated/resources/data/forge/tags/items/armors/chestplates.json create mode 100644 src/generated/resources/data/forge/tags/items/armors/helmets.json create mode 100644 src/generated/resources/data/forge/tags/items/armors/leggings.json diff --git a/src/generated/resources/data/forge/tags/items/armors/boots.json b/src/generated/resources/data/forge/tags/items/armors/boots.json new file mode 100644 index 0000000000..326f9c2f91 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/armors/boots.json @@ -0,0 +1,6 @@ +{ + "values": [ + "gtceu:hazmat_boots", + "gtceu:quarktech_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/armors/chestplates.json b/src/generated/resources/data/forge/tags/items/armors/chestplates.json new file mode 100644 index 0000000000..aad91e93fd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/armors/chestplates.json @@ -0,0 +1,13 @@ +{ + "values": [ + "gtceu:nanomuscle_chestplate", + "gtceu:rubber_gloves", + "gtceu:hazmat_chestpiece", + "gtceu:quarktech_chestplate", + "gtceu:liquid_fuel_jetpack", + "gtceu:electric_jetpack", + "gtceu:advanced_electric_jetpack", + "gtceu:avanced_nanomuscle_chestplate", + "gtceu:advanced_quarktech_chestplate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/armors/helmets.json b/src/generated/resources/data/forge/tags/items/armors/helmets.json new file mode 100644 index 0000000000..32ae8b4611 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/armors/helmets.json @@ -0,0 +1,9 @@ +{ + "values": [ + "gtceu:nightvision_goggles", + "gtceu:nanomuscle_helmet", + "gtceu:face_mask", + "gtceu:hazmat_headpiece", + "gtceu:quarktech_helmet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/armors/leggings.json b/src/generated/resources/data/forge/tags/items/armors/leggings.json new file mode 100644 index 0000000000..36bd746943 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/armors/leggings.json @@ -0,0 +1,8 @@ +{ + "values": [ + "gtceu:nanomuscle_leggings", + "gtceu:nanomuscle_boots", + "gtceu:hazmat_leggings", + "gtceu:quarktech_leggings" + ] +} \ No newline at end of file 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 4bf5b55217..101dba763c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -60,6 +60,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.TierSortingRegistry; import com.google.common.collect.ArrayTable; @@ -2465,6 +2466,7 @@ public Component getItemName(ItemStack stack) { Math.pow(1, ConfigHolder.INSTANCE.tools.voltageTierNightVision - 1)), ConfigHolder.INSTANCE.tools.voltageTierNightVision, ArmorItem.Type.HELMET))) .lang("Nightvision Goggles") + .tag(Tags.Items.ARMORS_HELMETS) .register(); public static ItemEntry NANO_CHESTPLATE = REGISTRATE @@ -2477,6 +2479,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierNanoSuit))) .lang("NanoMuscle™ Suite Chestplate") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .register(); public static ItemEntry NANO_LEGGINGS = REGISTRATE .item("nanomuscle_leggings", @@ -2488,6 +2491,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierNanoSuit))) .lang("NanoMuscle™ Suite Leggings") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_LEGGINGS) .register(); public static ItemEntry NANO_BOOTS = REGISTRATE .item("nanomuscle_boots", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.BOOTS, p) @@ -2498,6 +2502,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierNanoSuit))) .lang("NanoMuscle™ Suite Boots") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_LEGGINGS) .register(); public static ItemEntry NANO_HELMET = REGISTRATE .item("nanomuscle_helmet", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.HELMET, p) @@ -2507,6 +2512,7 @@ public Component getItemName(ItemStack stack) { Math.pow(4, ConfigHolder.INSTANCE.tools.voltageTierNanoSuit - 3)), ConfigHolder.INSTANCE.tools.voltageTierNanoSuit))) .lang("NanoMuscle™ Suite Helmet") + .tag(Tags.Items.ARMORS_HELMETS) .properties(p -> p.rarity(Rarity.UNCOMMON)) .register(); @@ -2515,6 +2521,7 @@ public Component getItemName(ItemStack stack) { (p) -> new ArmorComponentItem(GTArmorMaterials.BAD_PPE_EQUIPMENT, ArmorItem.Type.HELMET, p) .setArmorLogic(new HazmatSuit(ArmorItem.Type.HELMET, "bad_hazmat"))) .lang("Face Mask") + .tag(Tags.Items.ARMORS_HELMETS) .tag(CustomTags.PPE_ARMOR) .onRegister(attach(new TooltipBehavior(tooltips -> { tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description")); @@ -2526,6 +2533,7 @@ public Component getItemName(ItemStack stack) { (p) -> new ArmorComponentItem(GTArmorMaterials.BAD_PPE_EQUIPMENT, ArmorItem.Type.HELMET, p) .setArmorLogic(new HazmatSuit(ArmorItem.Type.CHESTPLATE, "bad_hazmat"))) .lang("Rubber Gloves") + .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(CustomTags.PPE_ARMOR) .onRegister(attach(new TooltipBehavior(tooltips -> { tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description")); @@ -2538,6 +2546,7 @@ public Component getItemName(ItemStack stack) { .setArmorLogic(new HazmatSuit(ArmorItem.Type.CHESTPLATE, "hazmat"))) .lang("Hazardous Materials Suit Chestpiece") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_LEGGINGS = REGISTRATE @@ -2546,6 +2555,7 @@ public Component getItemName(ItemStack stack) { .setArmorLogic(new HazmatSuit(ArmorItem.Type.LEGGINGS, "hazmat"))) .lang("Hazardous Materials Suit Leggings") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_LEGGINGS) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_BOOTS = REGISTRATE @@ -2554,6 +2564,7 @@ public Component getItemName(ItemStack stack) { .setArmorLogic(new HazmatSuit(ArmorItem.Type.BOOTS, "hazmat"))) .lang("Hazardous Materials Suit Boots") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_BOOTS) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry HAZMAT_HELMET = REGISTRATE @@ -2562,6 +2573,7 @@ public Component getItemName(ItemStack stack) { .setArmorLogic(new HazmatSuit(ArmorItem.Type.HELMET, "hazmat"))) .lang("Hazardous Materials Suit Headpiece") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_HELMETS) .tag(CustomTags.PPE_ARMOR) .register(); @@ -2575,6 +2587,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierQuarkTech))) .lang("QuarkTech™ Suite Chestplate") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_LEGGINGS = REGISTRATE @@ -2587,6 +2600,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierQuarkTech))) .lang("QuarkTech™ Suite Leggings") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_LEGGINGS) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_BOOTS = REGISTRATE @@ -2598,6 +2612,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierQuarkTech))) .lang("QuarkTech™ Suite Boots") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_BOOTS) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_HELMET = REGISTRATE @@ -2609,6 +2624,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierQuarkTech))) .lang("QuarkTech™ Suite Helmet") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_HELMETS) .tag(CustomTags.PPE_ARMOR) .register(); @@ -2617,6 +2633,7 @@ public Component getItemName(ItemStack stack) { (p) -> new ArmorComponentItem(GTArmorMaterials.JETPACK, ArmorItem.Type.CHESTPLATE, p) .setArmorLogic(new PowerlessJetpack())) .lang("Liquid Fuel Jetpack") + .tag(Tags.Items.ARMORS_CHESTPLATES) .setData(ProviderType.ITEM_MODEL, NonNullBiConsumer.noop()) .register(); public static ItemEntry ELECTRIC_JETPACK = REGISTRATE @@ -2628,6 +2645,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierImpeller))) .lang("Electric Jetpack") .properties(p -> p.rarity(Rarity.UNCOMMON)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .model(overrideModel(GTCEu.id("electric_jetpack"), 8)) .onRegister(modelPredicate(GTCEu.id("electric_jetpack"), ElectricStats::getStoredPredicate)) .register(); @@ -2641,6 +2659,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierAdvImpeller))) .lang("Advanced Electric Jetpack") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .register(); public static ItemEntry NANO_CHESTPLATE_ADVANCED = REGISTRATE .item("avanced_nanomuscle_chestplate", @@ -2651,6 +2670,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierAdvNanoSuit))) .lang("Advanced NanoMuscle™ Suite Chestplate") .properties(p -> p.rarity(Rarity.RARE)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(CustomTags.PPE_ARMOR) .register(); public static ItemEntry QUANTUM_CHESTPLATE_ADVANCED = REGISTRATE @@ -2663,6 +2683,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierAdvQuarkTech))) .lang("Advanced QuarkTech™ Suite Chestplate") .properties(p -> p.rarity(Rarity.EPIC)) + .tag(Tags.Items.ARMORS_CHESTPLATES) .tag(CustomTags.PPE_ARMOR) .register(); From 80aa7793d0f1de9222a80b57ba29a065c38f50a3 Mon Sep 17 00:00:00 2001 From: Karthi Suresh <75553966+JuiceyBeans@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:57:00 +0400 Subject: [PATCH 2/4] Oops, fixed nanomuscle boots tag --- src/generated/resources/data/forge/tags/items/armors/boots.json | 1 + .../resources/data/forge/tags/items/armors/leggings.json | 1 - src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/data/forge/tags/items/armors/boots.json b/src/generated/resources/data/forge/tags/items/armors/boots.json index 326f9c2f91..5f8ba87a67 100644 --- a/src/generated/resources/data/forge/tags/items/armors/boots.json +++ b/src/generated/resources/data/forge/tags/items/armors/boots.json @@ -1,5 +1,6 @@ { "values": [ + "gtceu:nanomuscle_boots", "gtceu:hazmat_boots", "gtceu:quarktech_boots" ] diff --git a/src/generated/resources/data/forge/tags/items/armors/leggings.json b/src/generated/resources/data/forge/tags/items/armors/leggings.json index 36bd746943..2f5aa323aa 100644 --- a/src/generated/resources/data/forge/tags/items/armors/leggings.json +++ b/src/generated/resources/data/forge/tags/items/armors/leggings.json @@ -1,7 +1,6 @@ { "values": [ "gtceu:nanomuscle_leggings", - "gtceu:nanomuscle_boots", "gtceu:hazmat_leggings", "gtceu:quarktech_leggings" ] 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 101dba763c..5f1f4d465a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -2502,7 +2502,7 @@ public Component getItemName(ItemStack stack) { ConfigHolder.INSTANCE.tools.voltageTierNanoSuit))) .lang("NanoMuscle™ Suite Boots") .properties(p -> p.rarity(Rarity.UNCOMMON)) - .tag(Tags.Items.ARMORS_LEGGINGS) + .tag(Tags.Items.ARMORS_BOOTS) .register(); public static ItemEntry NANO_HELMET = REGISTRATE .item("nanomuscle_helmet", (p) -> new ArmorComponentItem(GTArmorMaterials.ARMOR, ArmorItem.Type.HELMET, p) From 9b05f7929f66ca84d445313d2fe687548e059cbb Mon Sep 17 00:00:00 2001 From: Karthi Suresh <75553966+JuiceyBeans@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:43:21 +0400 Subject: [PATCH 3/4] Add rubber log to #minecraft:overworld_natural_logs --- .../data/minecraft/tags/blocks/overworld_natural_logs.json | 5 +++++ .../java/com/gregtechceu/gtceu/common/data/GTBlocks.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/overworld_natural_logs.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/overworld_natural_logs.json b/src/generated/resources/data/minecraft/tags/blocks/overworld_natural_logs.json new file mode 100644 index 0000000000..0e9a2d0809 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/overworld_natural_logs.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gtceu:rubber_log" + ] +} \ No newline at end of file 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 8514b5b4da..b9c4389bbe 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -1110,7 +1110,7 @@ private static BlockEntry createFireboxCasing(BoilerFireboxType typ .hasProperty(RubberLogBlock.NATURAL, true))) .when(LootItemRandomChanceCondition.randomChance(0.85F)))))) .lang("Rubber Log") - .tag(BlockTags.LOGS_THAT_BURN) + .tag(BlockTags.LOGS_THAT_BURN, BlockTags.OVERWORLD_NATURAL_LOGS) .blockstate((ctx, provider) -> provider.logBlock(ctx.get())) .item() .tag(ItemTags.LOGS_THAT_BURN) From 2ed34e1b941d5ac88dbdae84df27342b595ac933 Mon Sep 17 00:00:00 2001 From: Karthi Suresh <75553966+JuiceyBeans@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:43:51 +0400 Subject: [PATCH 4/4] Add GT fluid buckets to #ae2:p2p_attunements/fluid_p2p_tunnel --- .../p2p_attunements/fluid_p2p_tunnel.json | 441 ++++++++++++++++++ .../registrate/forge/GTFluidBuilder.java | 12 +- 2 files changed, 451 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json diff --git a/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json b/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json new file mode 100644 index 0000000000..81bdd899b1 --- /dev/null +++ b/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json @@ -0,0 +1,441 @@ +{ + "values": [ + "gtceu:aluminium_bucket", + "gtceu:americium_bucket", + "gtceu:antimony_bucket", + "gtceu:argon_bucket", + "gtceu:argon_plasma_bucket", + "gtceu:arsenic_bucket", + "gtceu:beryllium_bucket", + "gtceu:bismuth_bucket", + "gtceu:bromine_bucket", + "gtceu:carbon_bucket", + "gtceu:cerium_bucket", + "gtceu:chlorine_bucket", + "gtceu:chromium_bucket", + "gtceu:cobalt_bucket", + "gtceu:copper_bucket", + "gtceu:darmstadtium_bucket", + "gtceu:deuterium_bucket", + "gtceu:europium_bucket", + "gtceu:fluorine_bucket", + "gtceu:gallium_bucket", + "gtceu:gold_bucket", + "gtceu:hydrogen_bucket", + "gtceu:helium_bucket", + "gtceu:liquid_helium_bucket", + "gtceu:helium_plasma_bucket", + "gtceu:helium_3_bucket", + "gtceu:indium_bucket", + "gtceu:iridium_bucket", + "gtceu:iron_bucket", + "gtceu:iron_plasma_bucket", + "gtceu:krypton_bucket", + "gtceu:lanthanum_bucket", + "gtceu:lead_bucket", + "gtceu:lithium_bucket", + "gtceu:lutetium_bucket", + "gtceu:magnesium_bucket", + "gtceu:manganese_bucket", + "gtceu:mercury_bucket", + "gtceu:molybdenum_bucket", + "gtceu:neodymium_bucket", + "gtceu:neon_bucket", + "gtceu:nickel_bucket", + "gtceu:nickel_plasma_bucket", + "gtceu:niobium_bucket", + "gtceu:nitrogen_bucket", + "gtceu:nitrogen_plasma_bucket", + "gtceu:osmium_bucket", + "gtceu:oxygen_bucket", + "gtceu:liquid_oxygen_bucket", + "gtceu:oxygen_plasma_bucket", + "gtceu:palladium_bucket", + "gtceu:platinum_bucket", + "gtceu:plutonium_bucket", + "gtceu:plutonium_241_bucket", + "gtceu:potassium_bucket", + "gtceu:radon_bucket", + "gtceu:rhodium_bucket", + "gtceu:ruthenium_bucket", + "gtceu:samarium_bucket", + "gtceu:silicon_bucket", + "gtceu:silver_bucket", + "gtceu:tantalum_bucket", + "gtceu:thorium_bucket", + "gtceu:tin_bucket", + "gtceu:titanium_bucket", + "gtceu:tritium_bucket", + "gtceu:tungsten_bucket", + "gtceu:uranium_bucket", + "gtceu:uranium_235_bucket", + "gtceu:vanadium_bucket", + "gtceu:xenon_bucket", + "gtceu:yttrium_bucket", + "gtceu:zinc_bucket", + "gtceu:naquadah_bucket", + "gtceu:enriched_naquadah_bucket", + "gtceu:naquadria_bucket", + "gtceu:neutronium_bucket", + "gtceu:tritanium_bucket", + "gtceu:duranium_bucket", + "gtceu:trinium_bucket", + "gtceu:annealed_copper_bucket", + "gtceu:battery_alloy_bucket", + "gtceu:brass_bucket", + "gtceu:bronze_bucket", + "gtceu:cupronickel_bucket", + "gtceu:electrum_bucket", + "gtceu:ice_bucket", + "gtceu:invar_bucket", + "gtceu:kanthal_bucket", + "gtceu:molten_kanthal_bucket", + "gtceu:magnalium_bucket", + "gtceu:nichrome_bucket", + "gtceu:molten_nichrome_bucket", + "gtceu:niobium_nitride_bucket", + "gtceu:molten_niobium_nitride_bucket", + "gtceu:niobium_titanium_bucket", + "gtceu:molten_niobium_titanium_bucket", + "gtceu:sterling_silver_bucket", + "gtceu:molten_sterling_silver_bucket", + "gtceu:rose_gold_bucket", + "gtceu:molten_rose_gold_bucket", + "gtceu:black_bronze_bucket", + "gtceu:molten_black_bronze_bucket", + "gtceu:bismuth_bronze_bucket", + "gtceu:molten_bismuth_bronze_bucket", + "gtceu:rtm_alloy_bucket", + "gtceu:molten_rtm_alloy_bucket", + "gtceu:soldering_alloy_bucket", + "gtceu:stainless_steel_bucket", + "gtceu:molten_stainless_steel_bucket", + "gtceu:steel_bucket", + "gtceu:tin_alloy_bucket", + "gtceu:ultimet_bucket", + "gtceu:molten_ultimet_bucket", + "gtceu:vanadium_gallium_bucket", + "gtceu:molten_vanadium_gallium_bucket", + "gtceu:wrought_iron_bucket", + "gtceu:yttrium_barium_cuprate_bucket", + "gtceu:molten_yttrium_barium_cuprate_bucket", + "gtceu:osmiridium_bucket", + "gtceu:molten_osmiridium_bucket", + "gtceu:gallium_arsenide_bucket", + "gtceu:molten_gallium_arsenide_bucket", + "gtceu:indium_gallium_phosphide_bucket", + "gtceu:nickel_zinc_ferrite_bucket", + "gtceu:sodium_persulfate_bucket", + "gtceu:tungsten_carbide_bucket", + "gtceu:molten_tungsten_carbide_bucket", + "gtceu:carbon_dioxide_bucket", + "gtceu:titanium_tetrachloride_bucket", + "gtceu:nitrogen_dioxide_bucket", + "gtceu:hydrogen_sulfide_bucket", + "gtceu:nitric_acid_bucket", + "gtceu:sulfuric_acid_bucket", + "gtceu:phosphoric_acid_bucket", + "gtceu:sulfur_trioxide_bucket", + "gtceu:sulfur_dioxide_bucket", + "gtceu:carbon_monoxide_bucket", + "gtceu:hypochlorous_acid_bucket", + "gtceu:ammonia_bucket", + "gtceu:hydrofluoric_acid_bucket", + "gtceu:nitric_oxide_bucket", + "gtceu:iron_iii_chloride_bucket", + "gtceu:iron_ii_chloride_bucket", + "gtceu:uranium_hexafluoride_bucket", + "gtceu:enriched_uranium_hexafluoride_bucket", + "gtceu:depleted_uranium_hexafluoride_bucket", + "gtceu:nitrous_oxide_bucket", + "gtceu:hydrochloric_acid_bucket", + "gtceu:steam_bucket", + "gtceu:distilled_water_bucket", + "gtceu:sodium_potassium_bucket", + "gtceu:manganese_phosphide_bucket", + "gtceu:molten_manganese_phosphide_bucket", + "gtceu:magnesium_diboride_bucket", + "gtceu:molten_magnesium_diboride_bucket", + "gtceu:mercury_barium_calcium_cuprate_bucket", + "gtceu:molten_mercury_barium_calcium_cuprate_bucket", + "gtceu:uranium_triplatinum_bucket", + "gtceu:molten_uranium_triplatinum_bucket", + "gtceu:samarium_iron_arsenic_oxide_bucket", + "gtceu:molten_samarium_iron_arsenic_oxide_bucket", + "gtceu:indium_tin_barium_titanium_cuprate_bucket", + "gtceu:molten_indium_tin_barium_titanium_cuprate_bucket", + "gtceu:uranium_rhodium_dinaquadide_bucket", + "gtceu:molten_uranium_rhodium_dinaquadide_bucket", + "gtceu:enriched_naquadah_trinium_europium_duranide_bucket", + "gtceu:molten_enriched_naquadah_trinium_europium_duranide_bucket", + "gtceu:ruthenium_trinium_americium_neutronate_bucket", + "gtceu:molten_ruthenium_trinium_americium_neutronate_bucket", + "gtceu:rhodium_sulfate_bucket", + "gtceu:fluoroantimonic_acid_bucket", + "gtceu:hydrogen_cyanide_bucket", + "gtceu:formic_acid_bucket", + "gtceu:formaldehyde_bucket", + "gtceu:glycolonitrile_bucket", + "gtceu:acidic_bromine_solution_bucket", + "gtceu:concentrated_bromine_solution_bucket", + "gtceu:hydrogen_iodide_bucket", + "gtceu:diethylenetriamine_pentaacetonitrile_bucket", + "gtceu:silicone_rubber_bucket", + "gtceu:nitrobenzene_bucket", + "gtceu:styrene_butadiene_rubber_bucket", + "gtceu:polyvinyl_acetate_bucket", + "gtceu:reinforced_epoxy_resin_bucket", + "gtceu:polyvinyl_chloride_bucket", + "gtceu:polyphenylene_sulfide_bucket", + "gtceu:glyceryl_trinitrate_bucket", + "gtceu:polybenzimidazole_bucket", + "gtceu:polyethylene_bucket", + "gtceu:epoxy_bucket", + "gtceu:polycaprolactam_bucket", + "gtceu:polytetrafluoroethylene_bucket", + "gtceu:methane_bucket", + "gtceu:epichlorohydrin_bucket", + "gtceu:monochloramine_bucket", + "gtceu:chloroform_bucket", + "gtceu:cumene_bucket", + "gtceu:tetrafluoroethylene_bucket", + "gtceu:chloromethane_bucket", + "gtceu:allyl_chloride_bucket", + "gtceu:isoprene_bucket", + "gtceu:propane_bucket", + "gtceu:propene_bucket", + "gtceu:ethane_bucket", + "gtceu:butene_bucket", + "gtceu:butane_bucket", + "gtceu:dissolved_calcium_acetate_bucket", + "gtceu:vinyl_acetate_bucket", + "gtceu:methyl_acetate_bucket", + "gtceu:ethenone_bucket", + "gtceu:tetranitromethane_bucket", + "gtceu:dimethylamine_bucket", + "gtceu:dimethylhydrazine_bucket", + "gtceu:dinitrogen_tetroxide_bucket", + "gtceu:dimethyldichlorosilane_bucket", + "gtceu:styrene_bucket", + "gtceu:butadiene_bucket", + "gtceu:dichlorobenzene_bucket", + "gtceu:acetic_acid_bucket", + "gtceu:phenol_bucket", + "gtceu:bisphenol_a_bucket", + "gtceu:vinyl_chloride_bucket", + "gtceu:ethylene_bucket", + "gtceu:benzene_bucket", + "gtceu:acetone_bucket", + "gtceu:glycerol_bucket", + "gtceu:methanol_bucket", + "gtceu:ethanol_bucket", + "gtceu:toluene_bucket", + "gtceu:diphenyl_isophthalate_bucket", + "gtceu:phthalic_acid_bucket", + "gtceu:dimethylbenzene_bucket", + "gtceu:diaminobenzidine_bucket", + "gtceu:dichlorobenzidine_bucket", + "gtceu:nitrochlorobenzene_bucket", + "gtceu:chlorobenzene_bucket", + "gtceu:octane_bucket", + "gtceu:ethyl_tertbutyl_ether_bucket", + "gtceu:ethylbenzene_bucket", + "gtceu:naphthalene_bucket", + "gtceu:rubber_bucket", + "gtceu:cyclohexane_bucket", + "gtceu:nitrosyl_chloride_bucket", + "gtceu:butyraldehyde_bucket", + "gtceu:polyvinyl_butyral_bucket", + "gtceu:polychlorinated_biphenyl_bucket", + "gtceu:acetic_anhydride_bucket", + "gtceu:aminophenol_bucket", + "gtceu:ammonium_formate_bucket", + "gtceu:formamide_bucket", + "gtceu:wood_gas_bucket", + "gtceu:wood_vinegar_bucket", + "gtceu:wood_tar_bucket", + "gtceu:charcoal_byproducts_bucket", + "gtceu:biomass_bucket", + "gtceu:bio_diesel_bucket", + "gtceu:fermented_biomass_bucket", + "gtceu:creosote_bucket", + "gtceu:diesel_bucket", + "gtceu:rocket_fuel_bucket", + "gtceu:glue_bucket", + "gtceu:lubricant_bucket", + "gtceu:mc_guffium_239_bucket", + "gtceu:indium_concentrate_bucket", + "gtceu:seed_oil_bucket", + "gtceu:drilling_fluid_bucket", + "gtceu:construction_foam_bucket", + "gtceu:sulfuric_heavy_fuel_bucket", + "gtceu:heavy_fuel_bucket", + "gtceu:lightly_hydro_cracked_heavy_fuel_bucket", + "gtceu:severely_hydro_cracked_heavy_fuel_bucket", + "gtceu:lightly_steam_cracked_heavy_fuel_bucket", + "gtceu:severely_steam_cracked_heavy_fuel_bucket", + "gtceu:sulfuric_light_fuel_bucket", + "gtceu:light_fuel_bucket", + "gtceu:lightly_hydro_cracked_light_fuel_bucket", + "gtceu:severely_hydro_cracked_light_fuel_bucket", + "gtceu:lightly_steam_cracked_light_fuel_bucket", + "gtceu:severely_steam_cracked_light_fuel_bucket", + "gtceu:sulfuric_naphtha_bucket", + "gtceu:naphtha_bucket", + "gtceu:lightly_hydro_cracked_naphtha_bucket", + "gtceu:severely_hydro_cracked_naphtha_bucket", + "gtceu:lightly_steam_cracked_naphtha_bucket", + "gtceu:severely_steam_cracked_naphtha_bucket", + "gtceu:sulfuric_gas_bucket", + "gtceu:refinery_gas_bucket", + "gtceu:lightly_hydro_cracked_gas_bucket", + "gtceu:severely_hydro_cracked_gas_bucket", + "gtceu:lightly_steam_cracked_gas_bucket", + "gtceu:severely_steam_cracked_gas_bucket", + "gtceu:hydro_cracked_ethane_bucket", + "gtceu:hydro_cracked_ethylene_bucket", + "gtceu:hydro_cracked_propene_bucket", + "gtceu:hydro_cracked_propane_bucket", + "gtceu:hydro_cracked_butane_bucket", + "gtceu:hydro_cracked_butene_bucket", + "gtceu:hydro_cracked_butadiene_bucket", + "gtceu:steam_cracked_ethane_bucket", + "gtceu:steam_cracked_ethylene_bucket", + "gtceu:steam_cracked_propene_bucket", + "gtceu:steam_cracked_propane_bucket", + "gtceu:steam_cracked_butane_bucket", + "gtceu:steam_cracked_butene_bucket", + "gtceu:steam_cracked_butadiene_bucket", + "gtceu:lpg_bucket", + "gtceu:raw_growth_medium_bucket", + "gtceu:sterilized_growth_medium_bucket", + "gtceu:oil_bucket", + "gtceu:oil_heavy_bucket", + "gtceu:oil_medium_bucket", + "gtceu:oil_light_bucket", + "gtceu:natural_gas_bucket", + "gtceu:bacteria_bucket", + "gtceu:bacterial_sludge_bucket", + "gtceu:enriched_bacterial_sludge_bucket", + "gtceu:mutagen_bucket", + "gtceu:gelatin_mixture_bucket", + "gtceu:raw_gasoline_bucket", + "gtceu:gasoline_bucket", + "gtceu:high_octane_gasoline_bucket", + "gtceu:coal_gas_bucket", + "gtceu:coal_tar_bucket", + "gtceu:glowstone_bucket", + "gtceu:cetane_boosted_diesel_bucket", + "gtceu:milk_bucket", + "gtceu:fish_oil_bucket", + "gtceu:ruby_slurry_bucket", + "gtceu:sapphire_slurry_bucket", + "gtceu:green_sapphire_slurry_bucket", + "gtceu:black_dye_bucket", + "gtceu:red_dye_bucket", + "gtceu:green_dye_bucket", + "gtceu:brown_dye_bucket", + "gtceu:blue_dye_bucket", + "gtceu:purple_dye_bucket", + "gtceu:cyan_dye_bucket", + "gtceu:light_gray_dye_bucket", + "gtceu:gray_dye_bucket", + "gtceu:pink_dye_bucket", + "gtceu:lime_dye_bucket", + "gtceu:yellow_dye_bucket", + "gtceu:light_blue_dye_bucket", + "gtceu:magenta_dye_bucket", + "gtceu:orange_dye_bucket", + "gtceu:white_dye_bucket", + "gtceu:impure_enriched_naquadah_solution_bucket", + "gtceu:enriched_naquadah_solution_bucket", + "gtceu:acidic_enriched_naquadah_solution_bucket", + "gtceu:enriched_naquadah_waste_bucket", + "gtceu:impure_naquadria_solution_bucket", + "gtceu:naquadria_solution_bucket", + "gtceu:acidic_naquadria_solution_bucket", + "gtceu:naquadria_waste_bucket", + "gtceu:uu_matter_bucket", + "gtceu:pcb_coolant_bucket", + "gtceu:wax_bucket", + "gtceu:glass_bucket", + "gtceu:salt_water_bucket", + "gtceu:blaze_bucket", + "gtceu:black_steel_bucket", + "gtceu:molten_black_steel_bucket", + "gtceu:damascus_steel_bucket", + "gtceu:tungsten_steel_bucket", + "gtceu:molten_tungsten_steel_bucket", + "gtceu:cobalt_brass_bucket", + "gtceu:concrete_bucket", + "gtceu:vanadium_steel_bucket", + "gtceu:molten_vanadium_steel_bucket", + "gtceu:potin_bucket", + "gtceu:borosilicate_glass_bucket", + "gtceu:naquadah_alloy_bucket", + "gtceu:molten_naquadah_alloy_bucket", + "gtceu:sulfuric_nickel_solution_bucket", + "gtceu:sulfuric_copper_solution_bucket", + "gtceu:lead_zinc_solution_bucket", + "gtceu:nitration_mixture_bucket", + "gtceu:diluted_sulfuric_acid_bucket", + "gtceu:diluted_hydrochloric_acid_bucket", + "gtceu:air_bucket", + "gtceu:liquid_air_bucket", + "gtceu:nether_air_bucket", + "gtceu:liquid_nether_air_bucket", + "gtceu:ender_air_bucket", + "gtceu:liquid_ender_air_bucket", + "gtceu:aqua_regia_bucket", + "gtceu:acidic_osmium_solution_bucket", + "gtceu:rhodium_plated_palladium_bucket", + "gtceu:molten_rhodium_plated_palladium_bucket", + "gtceu:redstone_bucket", + "gtceu:dichloroethane_bucket", + "gtceu:diethylenetriamine_bucket", + "gtceu:raw_brine_bucket", + "gtceu:debrominated_brine_bucket", + "gtceu:brominated_chlorine_vapor_bucket", + "gtceu:acidic_bromine_exhaust_bucket", + "gtceu:red_steel_bucket", + "gtceu:molten_red_steel_bucket", + "gtceu:blue_steel_bucket", + "gtceu:molten_blue_steel_bucket", + "gtceu:hssg_bucket", + "gtceu:molten_hssg_bucket", + "gtceu:red_alloy_bucket", + "gtceu:hsse_bucket", + "gtceu:molten_hsse_bucket", + "gtceu:hsss_bucket", + "gtceu:molten_hsss_bucket", + "gtceu:hot_brine_bucket", + "gtceu:hot_chlorinated_brominated_brine_bucket", + "gtceu:hot_debrominated_brine_bucket", + "gtceu:hot_alkaline_debrominated_brine_bucket", + "gtceu:blue_alloy_bucket", + "gtceu:tantalum_carbide_bucket", + "gtceu:molten_tantalum_carbide_bucket", + "gtceu:hsla_steel_bucket", + "gtceu:molten_hsla_steel_bucket", + "gtceu:molybdenum_disilicide_bucket", + "gtceu:molten_molybdenum_disilicide_bucket", + "gtceu:zeron_100_bucket", + "gtceu:molten_zeron_100_bucket", + "gtceu:watertight_steel_bucket", + "gtceu:molten_watertight_steel_bucket", + "gtceu:incoloy_ma_956_bucket", + "gtceu:molten_incoloy_ma_956_bucket", + "gtceu:maraging_steel_300_bucket", + "gtceu:molten_maraging_steel_300_bucket", + "gtceu:hastelloy_x_bucket", + "gtceu:molten_hastelloy_x_bucket", + "gtceu:stellite_100_bucket", + "gtceu:molten_stellite_100_bucket", + "gtceu:titanium_carbide_bucket", + "gtceu:molten_titanium_carbide_bucket", + "gtceu:titanium_tungsten_carbide_bucket", + "gtceu:molten_titanium_tungsten_carbide_bucket", + "gtceu:hastelloy_c_276_bucket", + "gtceu:molten_hastelloy_c_276_bucket" + ] +} \ No newline at end of file diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java index b07da00038..3de95d64af 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java @@ -13,6 +13,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Items; @@ -32,12 +33,18 @@ import com.google.common.base.Preconditions; import com.tterrag.registrate.AbstractRegistrate; -import com.tterrag.registrate.builders.*; +import com.tterrag.registrate.builders.AbstractBuilder; +import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.builders.BuilderCallback; +import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.ProviderType; import com.tterrag.registrate.providers.RegistrateTagsProvider; import com.tterrag.registrate.util.OneTimeEventReceiver; import com.tterrag.registrate.util.entry.RegistryEntry; -import com.tterrag.registrate.util.nullness.*; +import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import com.tterrag.registrate.util.nullness.NonNullBiFunction; +import com.tterrag.registrate.util.nullness.NonNullConsumer; +import com.tterrag.registrate.util.nullness.NonNullSupplier; import lombok.Setter; import lombok.experimental.Accessors; import org.jetbrains.annotations.Nullable; @@ -232,6 +239,7 @@ public ItemBuilder> bucket() { return getOwner().item(this, bucketName, p -> new GTBucketItem(this.source, p, this.material, this.langKey)) .properties(p -> p.craftRemainder(Items.BUCKET).stacksTo(1)) + .tag(ItemTags.create(new ResourceLocation("ae2", "p2p_attunements/fluid_p2p_tunnel"))) .color(() -> () -> GTBucketItem::color) .setData(ProviderType.LANG, NonNullBiConsumer.noop()) .model(NonNullBiConsumer.noop())