diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 6928e83fa..900b06960 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -144,11 +144,12 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "9.10.5", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.10.6", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism { + public static boolean isThorfusionLoaded; /** Mekanism Packet Pipeline */ public static PacketHandler packetHandler = new PacketHandler(); @@ -170,7 +171,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 10, 5); + public static Version versionNumber = new Version(9, 10, 6); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); @@ -1207,19 +1208,12 @@ public class Mekanism { new IMCHandler().onIMCEvent(FMLInterModComms.fetchRuntimeMessages(this)); } - - @EventHandler - public void klar(FMLInitializationEvent event) - { - //proxy, tilentity - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { - DevCapes.getInstance().registerConfig("https://technic-solder.eu-central-1.linodeobjects.com/cape.json"); - } - } @EventHandler public void preInit(FMLPreInitializationEvent event) { + isThorfusionLoaded = Loader.isModLoaded("thorfusion"); + File config = event.getSuggestedConfigurationFile(); //Set the mod's configuration @@ -1285,6 +1279,12 @@ public class Mekanism @EventHandler public void init(FMLInitializationEvent event) { + if(!isThorfusionLoaded) { + //proxy, tilentity + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + DevCapes.getInstance().registerConfig("https://technic-solder.eu-central-1.linodeobjects.com/cape.json"); + } + } //Register the mod's world generators GameRegistry.registerWorldGenerator(genHandler, 1);