From 258a5a4dc8d230d2ea93d726b6db9e1db9282ecd Mon Sep 17 00:00:00 2001
From: Chicken-Bomes <mehvids@gmail.com>
Date: Thu, 10 Jul 2014 21:31:43 +1000
Subject: [PATCH] Fix client reference in CommonUtils

---
 src/codechicken/core/CommonUtils.java | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/codechicken/core/CommonUtils.java b/src/codechicken/core/CommonUtils.java
index c7086c9..5fd19e1 100644
--- a/src/codechicken/core/CommonUtils.java
+++ b/src/codechicken/core/CommonUtils.java
@@ -1,18 +1,9 @@
 package codechicken.core;
 
 import java.io.File;
-import java.lang.reflect.Array;
-import java.util.LinkedList;
-import java.util.List;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatAllowedCharacters;
-import net.minecraft.util.ChatComponentText;
+import cpw.mods.fml.relauncher.FMLInjectionData;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
@@ -38,12 +29,8 @@ public class CommonUtils
         return world.provider.dimensionId;
     }
 
-    public static File getModsFolder() {
-        return new File(getMinecraftDir(), "mods");
-    }
-
     public static File getMinecraftDir() {
-        return Minecraft.getMinecraft().mcDataDir;
+        return (File) FMLInjectionData.data()[6];
     }
 
     public static String getRelativePath(File parent, File child) {
@@ -52,12 +39,4 @@ public class CommonUtils
 
         return child.getPath().substring(parent.getPath().length() + 1);
     }
-
-    public static ModContainer findModContainer(String modID) {
-        for (ModContainer mc : Loader.instance().getModList())
-            if (modID.equals(mc.getModId()))
-                return mc;
-
-        return null;
-    }
 }