From 19780e5a07d63ab56e4e892c8470c63495006a83 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sat, 8 Apr 2017 11:22:00 +0200 Subject: [PATCH] Fix mcmp startup crash and missing import --- src/main/java/mekanism/common/Mekanism.java | 4 ++-- src/main/java/mekanism/common/util/MekanismUtils.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7b560130e..9c3a08cf4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1305,10 +1305,10 @@ public class Mekanism MekanismItems.register(); MekanismBlocks.register(); - try { + if(Loader.isModLoaded("mcmultipart")) { //Set up multiparts new MultipartMekanism(); - } catch(Exception e) { + } else { logger.info("Didn't detect MCMP, ignoring compatibility package"); } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 262a2baf9..47397ee49 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -27,6 +27,7 @@ import mekanism.api.util.UnitDisplayUtils.ElectricUnit; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismFluids; import mekanism.common.MekanismItems; import mekanism.common.OreDictCache; import mekanism.common.Tier.BaseTier;