Update Mantle, further thin TCon env checks, move optifine detection out to Mantle.

This commit is contained in:
Sunstrike committed 2013-12-06 16:57:33 +00:00
1 parent 7f57b8b30b
commit d19d4d4a0c
3 files changed
+3 -16

No files matched your search

@@ -1,10 +1,8 @@
package tconstruct.util;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.ICrashCallable;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import java.util.ArrayList;
import java.util.List;
@@ -16,9 +14,6 @@ import mantle.crash.CallableUnsuppConfig;
public class EnvironmentChecks
{
// Used for aborting cloak renders with Optifine present (it misbehaves)
public static boolean hasOptifine = false;
private EnvironmentChecks()
{
} // Singleton
@@ -37,15 +32,7 @@ public class EnvironmentChecks
modIds.add("gregtech_addon");
}
// We keep this despite Mantle reporting it because we explicitly need Optifine marking for cloaks.
if (FMLCommonHandler.instance().getSide() == Side.CLIENT && FMLClientHandler.instance().hasOptifine() || Loader.isModLoaded("optifine"))
{
TConstruct.logger.severe("[Environment Checks] Optifine detected. This is a Bad Thing(tm) and can crash Minecraft due to an Optifine bug during TCon armor renders! Capes have been disabled.");
//modIds.add("optifine");
hasOptifine = true;
}
// Bukkit/Magic Launcher are caught by Mantle, so we no longer check for those.
// Bukkit/Magic Launcher/Optifine are caught by Mantle, so we no longer check for those.
if (modIds.size() == 0)
{