diff options
3 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 763741adbf..0103ca25ce 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.HashMap; @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" - + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore") + + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;") public class TecTech { @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) @@ -38,7 +38,7 @@ public class TecTech { public static CreativeTabs mainTab = null; private static boolean oneTimeFix = false; - public static boolean hasCOFH = false; + public static boolean hasCOFH = false, hasThaumcraft = false; public static void AddLoginError(String pMessage) { if (Module_AdminErrorLogs != null) @@ -63,6 +63,9 @@ public class TecTech { @EventHandler public void Load(FMLInitializationEvent event) { + hasCOFH = Loader.isModLoaded(Reference.COFHCORE); + hasThaumcraft = Loader.isModLoaded(Reference.THAUMCRAFT); + GTCustomLoader = new MainLoader(); GTCustomLoader.load(); @@ -71,7 +74,6 @@ public class TecTech { @EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { - hasCOFH = Loader.isModLoaded(Reference.COFHCORE); GTCustomLoader.postLoad(); } diff --git a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java index 7c858dafc8..4363d8ca88 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java @@ -8,4 +8,5 @@ public class Reference { public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; public static final String COFHCORE = "CoFHCore"; + public static final String THAUMCRAFT = "Thaumcraft"; } diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index d12636e86d..7e31dba782 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import java.util.List; +import static com.github.technus.tectech.TecTech.hasThaumcraft; import static com.github.technus.tectech.TecTech.mainTab; import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat; import static com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat; @@ -35,7 +36,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft TecTech.Logger.info("Elemental Init Done"); progressBarLoad.step("Thaumcraft Compatibility"); - if (Loader.isModLoaded("Thaumcraft")) { + if (hasThaumcraft) { essentiaContainerCompat = new EssentiaCompatEnabled(); essentiaContainerCompat.run(); } else { @@ -57,7 +58,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4); progressBarPostLoad.step("Thaumcraft Compatibility"); - if (Loader.isModLoaded("Thaumcraft")) { + if (hasThaumcraft) { aspectDefinitionCompat = new AspectDefinitionCompatEnabled(); aspectDefinitionCompat.run(); } else { |