mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-21 04:32:33 +00:00
Look for CoreModManager in both old and new namespaces, closes #17
This commit is contained in:
1 parent
e82c269128
commit
5bc3b41d9d
1 file changed
+13
-1
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user