diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 78f47bfb1..ca34acf31 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -116,15 +116,15 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { - gardenOfGlassLoaded = Loader.isModLoaded("GardenOfGlass"); + gardenOfGlassLoaded = Loader.isModLoaded("gardenofglass"); - thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); + thaumcraftLoaded = Loader.isModLoaded("thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); - bloodMagicLoaded = Loader.isModLoaded("BloodMagic"); // Psh, noob + bloodMagicLoaded = Loader.isModLoaded("bloodmagic"); // Psh, noob coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); - storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); + storageDrawersLoaded = Loader.isModLoaded("storagedrawers"); BotaniaAPI.internalHandler = new InternalMethodHandler(); @@ -197,7 +197,6 @@ public class Botania { } ModBlocks.addDispenserBehaviours(); - ModBlocks.registerMultiparts(); ConfigHandler.loadPostInit(); LexiconData.postInit(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 855bcd171..915cd512c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -478,15 +478,6 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BERGAMUTE, SubTileBergamute.class); } - public static void registerMultiparts() { - if(Loader.isModLoaded("ForgeMultipart")) { - try { - Class clazz = Class.forName("vazkii.botania.common.integration.multipart.MultipartHandler"); - clazz.newInstance(); - } catch(Throwable e) {} - } - } - private static void registerSubTileWithMini(String key, Class clazz) { BotaniaAPI.registerSubTile(key, clazz);