1 files changed, 18 insertions, 12 deletions
diff --git a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
index 1ccadc9485..fcc02ca942 100644
--- a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
+++ b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java
@@ -1,10 +1,11 @@
 package crazypants.enderio.conduit.gas;
 
-import com.enderio.core.common.util.BlockCoord;
-import cpw.mods.fml.common.ModAPIManager;
-import cpw.mods.fml.common.Optional.Method;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.ModContainer;
 import crazypants.enderio.conduit.IConduitBundle;
 import crazypants.enderio.config.Config;
+import crazypants.util.BlockCoord;
+import java.util.Map;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.IGasHandler;
@@ -15,15 +16,25 @@ public final class GasUtil
 {
   private static boolean useCheckPerformed = false;
   private static boolean isGasConduitEnabled = false;
-  public static final String API_NAME = "MekanismAPI|gas";
   
   public static boolean isGasConduitEnabled()
   {
     if (!useCheckPerformed)
     {
-      if (Config.isGasConduitEnabled) {
-        isGasConduitEnabled = ModAPIManager.INSTANCE.hasAPI("MekanismAPI|gas");
-      } else {
+      String configOption = Config.isGasConduitEnabled;
+      if (configOption.equalsIgnoreCase("auto"))
+      {
+        isGasConduitEnabled = Loader.isModLoaded("Mekanism");
+        if (isGasConduitEnabled) {
+          isGasConduitEnabled = ((ModContainer)Loader.instance().getIndexedModList().get("Mekanism")).getVersion().startsWith("7");
+        }
+      }
+      else if (configOption.equalsIgnoreCase("true"))
+      {
+        isGasConduitEnabled = true;
+      }
+      else
+      {
         isGasConduitEnabled = false;
       }
       useCheckPerformed = true;
@@ -31,27 +42,23 @@ public final class GasUtil
     return isGasConduitEnabled;
   }
   
-  @Optional.Method(modid="MekanismAPI|gas")
   public static IGasHandler getExternalGasHandler(IBlockAccess world, BlockCoord bc)
   {
     IGasHandler con = getGasHandler(world, bc);
     return (con != null) && (!(con instanceof IConduitBundle)) ? con : null;
   }
   
-  @Optional.Method(modid="MekanismAPI|gas")
   public static IGasHandler getGasHandler(IBlockAccess world, BlockCoord bc)
   {
     return getGasHandler(world, bc.x, bc.y, bc.z);
   }
   
-  @Optional.Method(modid="MekanismAPI|gas")
   public static IGasHandler getGasHandler(IBlockAccess world, int x, int y, int z)
   {
     TileEntity te = world.getTileEntity(x, y, z);
     return getGasHandler(te);
   }
   
-  @Optional.Method(modid="MekanismAPI|gas")
   public static IGasHandler getGasHandler(TileEntity te)
   {
     if ((te instanceof IGasHandler)) {
@@ -60,7 +67,6 @@ public final class GasUtil
     return null;
   }
   
-  @Optional.Method(modid="MekanismAPI|gas")
   public static boolean isGasValid(GasStack gas)
   {
     if (gas != null)