From c9731ed7e332e348e4dbaf7f851d0368a072dcdc Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Fri, 1 Jun 2012 23:23:50 -0400 Subject: [PATCH] Fix up optifine detection properly --- .../cpw/mods/fml/client/FMLClientHandler.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index b7be7f0e0..338a95ff4 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -192,15 +192,26 @@ public class FMLClientHandler implements IFMLSidedHandler { Class optifineConfig = Class.forName("Config", false, Loader.instance().getModClassLoader()); optifineContainer = new OptifineModContainer(optifineConfig); - ModMetadata optifineMetadata = readMetadataFrom(Loader.instance().getModClassLoader().getResourceAsStream("optifinemod.info"), optifineContainer); - optifineContainer.setMetadata(optifineMetadata); - FMLCommonHandler.instance().getFMLLogger().info(String.format("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion())); } catch (Exception e) { // OPTIFINE not found optifineContainer = null; } + if (optifineContainer != null) + { + ModMetadata optifineMetadata; + try + { + optifineMetadata = readMetadataFrom(Loader.instance().getModClassLoader().getResourceAsStream("optifinemod.info"), optifineContainer); + optifineContainer.setMetadata(optifineMetadata); + } + catch (Exception e) + { + //not available + } + FMLCommonHandler.instance().getFMLLogger().info(String.format("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion())); + } Loader.instance().loadMods(); }