diff --git a/build.properties b/build.properties index 3e88af09..22fedc16 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.6.4 forge_version=9.11.1.964 -mantle_version=02b512 +mantle_version=425894 FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.5_d1 diff --git a/src/main/java/tconstruct/client/event/EventCloakRender.java b/src/main/java/tconstruct/client/event/EventCloakRender.java index 831fd0e9..8347eea5 100644 --- a/src/main/java/tconstruct/client/event/EventCloakRender.java +++ b/src/main/java/tconstruct/client/event/EventCloakRender.java @@ -10,7 +10,7 @@ import javax.swing.ImageIcon; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.event.ForgeSubscribe; -import tconstruct.util.EnvironmentChecks; +import mantle.lib.environment.EnvironmentChecks; public class EventCloakRender { diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index e7f7ff86..e598325d 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -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) {