diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index 6f30f66b..601c1dd6 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -91,6 +91,7 @@ public class MixinTweaker implements ITweaker { /** * Attempts to initialise the FML coremod (if specified in the jar metadata) */ + @SuppressWarnings("unchecked") private ITweaker initFMLCoreMod() { try { String coreModName = this.getManifestAttribute("FMLCorePlugin"); @@ -100,7 +101,17 @@ public class MixinTweaker implements ITweaker { Class coreModManager = Class.forName("net.minecraftforge.fml.relauncher.CoreModManager"); Method mdLoadCoreMod = coreModManager.getDeclaredMethod("loadCoreMod", LaunchClassLoader.class, String.class, File.class); mdLoadCoreMod.setAccessible(true); - return (ITweaker)mdLoadCoreMod.invoke(null, Launch.classLoader, coreModName, this.container); + ITweaker wrapper = (ITweaker)mdLoadCoreMod.invoke(null, Launch.classLoader, coreModName, this.container); + if (wrapper != null && "true".equalsIgnoreCase(this.getManifestAttribute("ForceLoadAsMod"))) { + try { + Method mdGetLoadedCoremods = coreModManager.getDeclaredMethod("getLoadedCoremods"); + List loadedCoremods = (List)mdGetLoadedCoremods.invoke(null); + loadedCoremods.remove(this.container.getName()); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + return wrapper; } catch (Exception ex) { // ex.printStackTrace(); }