diff --git a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java index a3750ce71b..a0e409a227 100644 --- a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java +++ b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java @@ -228,7 +228,8 @@ public class FMLRelauncher newApplet = appletClass.newInstance(); Object appletContainer = ReflectionHelper.getPrivateValue(ReflectionHelper.getClass(getClass().getClassLoader(), "java.awt.Component"), minecraftApplet, "parent"); - Class launcherClass = ReflectionHelper.getClass(getClass().getClassLoader(), "net.minecraft.Launcher"); + String launcherClassName = System.getProperty("minecraft.applet.WrapperClass", "net.minecraft.Launcher"); + Class launcherClass = ReflectionHelper.getClass(getClass().getClassLoader(), launcherClassName); if (launcherClass.isInstance(appletContainer)) { ReflectionHelper.findMethod(ReflectionHelper.getClass(getClass().getClassLoader(), "java.awt.Container"), minecraftApplet, new String[] { "removeAll" }).invoke(appletContainer); @@ -236,7 +237,7 @@ public class FMLRelauncher } else { - FMLRelaunchLog.severe("Found unknown applet parent %s, unable to inject!\n", launcherClass); + FMLRelaunchLog.severe("Found unknown applet parent %s, unable to inject!\n", appletContainer.getClass().getName()); throw new RuntimeException(); } }