From 46c55055652dc1a9c13cb176b22ecfab5f4c34b9 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 25 Apr 2015 15:05:28 -0400 Subject: [PATCH] Splash progress screen will not load in the presence of optifine anymore. --- .../cpw/mods/fml/client/FMLClientHandler.java | 31 +++++++++++-------- .../cpw/mods/fml/client/SplashProgress.java | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index 42a2027b1d..5a41a7245c 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -187,6 +187,7 @@ public class FMLClientHandler implements IFMLSidedHandler @SuppressWarnings("unchecked") public void beginMinecraftLoading(Minecraft minecraft, @SuppressWarnings("rawtypes") List resourcePackList, IReloadableResourceManager resourceManager) { + detectOptifine(); SplashProgress.start(); client = minecraft; this.resourcePackList = resourcePackList; @@ -201,19 +202,6 @@ public class FMLClientHandler implements IFMLSidedHandler FMLCommonHandler.instance().beginLoading(this); try - { - Class optifineConfig = Class.forName("Config", false, Loader.instance().getModClassLoader()); - String optifineVersion = (String) optifineConfig.getField("VERSION").get(null); - Map dummyOptifineMeta = ImmutableMap.builder().put("name", "Optifine").put("version", optifineVersion).build(); - ModMetadata optifineMetadata = MetadataCollection.from(getClass().getResourceAsStream("optifinemod.info"),"optifine").getMetadataForId("optifine", dummyOptifineMeta); - optifineContainer = new DummyModContainer(optifineMetadata); - FMLLog.info("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion()); - } - catch (Exception e) - { - optifineContainer = null; - } - try { Loader.instance().loadMods(); } @@ -279,6 +267,23 @@ public class FMLClientHandler implements IFMLSidedHandler } } + private void detectOptifine() + { + try + { + Class optifineConfig = Class.forName("Config", false, Loader.instance().getModClassLoader()); + String optifineVersion = (String) optifineConfig.getField("VERSION").get(null); + Map dummyOptifineMeta = ImmutableMap.builder().put("name", "Optifine").put("version", optifineVersion).build(); + ModMetadata optifineMetadata = MetadataCollection.from(getClass().getResourceAsStream("optifinemod.info"),"optifine").getMetadataForId("optifine", dummyOptifineMeta); + optifineContainer = new DummyModContainer(optifineMetadata); + FMLLog.info("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion()); + } + catch (Exception e) + { + optifineContainer = null; + } + } + @Override public void haltGame(String message, Throwable t) { diff --git a/fml/src/main/java/cpw/mods/fml/client/SplashProgress.java b/fml/src/main/java/cpw/mods/fml/client/SplashProgress.java index 2d4354a447..defb8dfe75 100644 --- a/fml/src/main/java/cpw/mods/fml/client/SplashProgress.java +++ b/fml/src/main/java/cpw/mods/fml/client/SplashProgress.java @@ -68,7 +68,7 @@ public class SplashProgress private static ResourceLocation configLocation = new ResourceLocation("fml", "splash.properties"); private static final Properties config = loadConfig(); - private static final boolean enabled = Boolean.parseBoolean(config.getProperty("enabled")); + private static final boolean enabled = Boolean.parseBoolean(config.getProperty("enabled")) && ! FMLClientHandler.instance().hasOptifine(); private static final boolean rotate = Boolean.parseBoolean(config.getProperty("rotate")); private static final int logoOffset = getInt("logoOffset"); private static final int backgroundColor = getInt("background");