Fix client reference in CommonUtils

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;
-    }
 }