From 10b35f1a6dde66c51906a7059a780cc8ffd56f1d Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:44:49 -0700 Subject: [PATCH] fix the gem lens decomposing into dust using color tags, also give voltage to macerating the colored lens --- .../resources/assets/gtceu/lang/en_ud.json | 2 +- .../resources/assets/gtceu/lang/en_us.json | 2 +- .../gtceu/data/recipe/misc/MiscRecipeLoader.java | 2 +- .../gtceu/data/tags/ItemTagLoader.java | 4 ++-- .../gregtechceu/gtceu/data/tags/TagsHandler.java | 15 --------------- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index da655a604b..f94e8bad55 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -5999,4 +5999,4 @@ "tile.gtceu.reinforced_foam.name": "ɯɐoℲ pǝɔɹoɟuıǝᴚ", "tile.gtceu.reinforced_stone.name": "ǝuoʇS pǝɔɹoɟuıǝᴚ", "tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS" -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index f7b32e4d6b..1409f27bb3 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -5999,4 +5999,4 @@ "tile.gtceu.reinforced_foam.name": "Reinforced Foam", "tile.gtceu.reinforced_stone.name": "Reinforced Stone", "tile.gtceu.seal.name": "Sealed Block" -} +} \ No newline at end of file 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 45c34e99eb..a795de95f8 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 @@ -386,7 +386,7 @@ public static void init(Consumer provider) { .outputFluids(Glass.getFluid(108)) .save(provider); - MACERATOR_RECIPES.recipeBuilder("macerate_" + item.get()).duration(15) + MACERATOR_RECIPES.recipeBuilder("macerate_" + item.get()).EUt(VA[LV]).duration(15) .inputItems(item) .outputItems(dustSmall, Glass, 3) .save(provider); 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 ea03bc5ae0..e6b5a01bd1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/ItemTagLoader.java @@ -35,8 +35,8 @@ public static void init(RegistrateTagsProvider provider) { Items.LIGHT_GRAY_CONCRETE_POWDER, Items.CYAN_CONCRETE_POWDER, Items.PURPLE_CONCRETE_POWDER, Items.BLUE_CONCRETE_POWDER, Items.BROWN_CONCRETE_POWDER, Items.GREEN_CONCRETE_POWDER, Items.RED_CONCRETE_POWDER, Items.BLACK_CONCRETE_POWDER); - create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, Glass).get(), - GTItems.MATERIAL_ITEMS.get(lens, NetherStar).get()); + create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, Glass).get()); + create(provider, lens, Color.White, GTItems.MATERIAL_ITEMS.get(lens, NetherStar).get()); create(provider, lens, Color.LightBlue, GTItems.MATERIAL_ITEMS.get(lens, Diamond).get()); create(provider, lens, Color.Red, GTItems.MATERIAL_ITEMS.get(lens, Ruby).get()); create(provider, lens, Color.Green, GTItems.MATERIAL_ITEMS.get(lens, Emerald).get()); diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java b/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java index 529b900d5c..f32e8442aa 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/TagsHandler.java @@ -1,19 +1,15 @@ package com.gregtechceu.gtceu.data.tags; import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials.Color; -import com.gregtechceu.gtceu.common.data.GTItems; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; -import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Fluid; import com.tterrag.registrate.providers.RegistrateTagsProvider; -import java.util.function.Supplier; - import static com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper.registerUnificationItems; import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @@ -44,17 +40,6 @@ public static void initEntity(RegistrateTagsProvider> provider) { public static void initExtraUnificationEntries() { registerUnificationItems(ingot, Clay, Items.CLAY_BALL); - registerUnificationItems(lens, Color.White, new Supplier[] { GTItems.MATERIAL_ITEMS.get(lens, Glass), - GTItems.MATERIAL_ITEMS.get(lens, NetherStar) }); - registerUnificationItems(lens, Color.LightBlue, - (Supplier) GTItems.MATERIAL_ITEMS.get(lens, Diamond)); - registerUnificationItems(lens, Color.Red, - (Supplier) GTItems.MATERIAL_ITEMS.get(lens, Ruby)); - registerUnificationItems(lens, Color.Green, - (Supplier) GTItems.MATERIAL_ITEMS.get(lens, Emerald)); - registerUnificationItems(lens, Color.Blue, - (Supplier) GTItems.MATERIAL_ITEMS.get(lens, Sapphire)); - registerUnificationItems(dye, Color.Black, Items.BLACK_DYE); registerUnificationItems(dye, Color.Red, Items.RED_DYE); registerUnificationItems(dye, Color.Green, Items.GREEN_DYE);