diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index b3bc881c..58a98767 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -103,7 +103,7 @@ public class MixinTweaker implements ITweaker { if (coreModName == null) { return null; } - Class coreModManager = Class.forName("net.minecraftforge.fml.relauncher.CoreModManager"); + Class coreModManager = this.getCoreModManagerClass(); Method mdLoadCoreMod = coreModManager.getDeclaredMethod("loadCoreMod", LaunchClassLoader.class, String.class, File.class); mdLoadCoreMod.setAccessible(true); ITweaker wrapper = (ITweaker)mdLoadCoreMod.invoke(null, Launch.classLoader, coreModName, this.container); @@ -123,6 +123,18 @@ public class MixinTweaker implements ITweaker { return null; } + /** + * Attempt to get the FML CoreModManager, tries the post-1.8 namespace first + * and falls back to 1.7.10 if class lookup fails + */ + private Class getCoreModManagerClass() throws ClassNotFoundException { + try { + return Class.forName("net.minecraftforge.fml.relauncher.CoreModManager"); + } catch (ClassNotFoundException ex) { + return Class.forName("cpw.mods.fml.relauncher.CoreModManager"); + } + } + /* (non-Javadoc) * @see net.minecraft.launchwrapper.ITweaker#acceptOptions(java.util.List, * java.io.File, java.io.File, java.lang.String)