From b15d4db81efc5fc0f79f185436dafdb59970cc4a Mon Sep 17 00:00:00 2001 From: LazyFlesh <40587985+LazyFlesh@users.noreply.github.com> Date: Sun, 21 Jun 2026 15:17:50 -0700 Subject: [PATCH] move aspect registry after a isModLoaded check for gt5 (#120) --- .../java/emt/gthandler/common/loader/EMT_GT_Loader.java | 8 ++++++++ src/main/java/emt/init/EMTBlocks.java | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 822efb3..fdd05fe 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -3,16 +3,20 @@ package emt.gthandler.common.loader; import static emt.command.CommandOutputs.mkbook; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static thaumcraft.api.ThaumcraftApi.registerObjectTag; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigItems; public class EMT_GT_Loader { @@ -24,5 +28,9 @@ public class EMT_GT_Loader { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)) .itemOutputs(mkbook()).duration(6 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(assemblerRecipes); + + registerObjectTag( + ItemList.FenceIron.get(1L), + new AspectList().add(Aspect.ENERGY, 1).add(Aspect.METAL, 2).add(Aspect.WEATHER, 1)); } } diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index 73bde7c..afd9192 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -14,7 +14,6 @@ import emt.item.block.ItemBlockElectricCloud; import emt.item.block.ItemBlockEssentiaGenerators; import emt.item.block.ItemBlockMachines; import emt.tile.solar.Solars; -import gregtech.api.enums.ItemList; import ic2.api.item.IC2Items; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -49,9 +48,6 @@ public class EMTBlocks { public static void addAspects() { registerObjectTag(IC2Items.getItem("rubberTrampoline"), new AspectList().add(Aspect.AIR, 5)); - registerObjectTag( - ItemList.FenceIron.get(1L), - new AspectList().add(Aspect.ENERGY, 1).add(Aspect.METAL, 2).add(Aspect.WEATHER, 1)); registerObjectTag( IC2Items.getItem("reinforcedGlass"), new AspectList().add(Aspect.METAL, 2).add(Aspect.COLD, 2));