From 0c50d7b92d1bb609a66f9fa5e9c82c88e93e440d Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 30 Aug 2014 17:39:43 -0400 Subject: [PATCH] Add in ModType to the jar manifest. If it's present, and doesn't have value "FML" it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension. --- .../main/java/cpw/mods/fml/relauncher/CoreModManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java b/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java index fa3c7f61d4..096cb2f5cf 100644 --- a/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java +++ b/fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java @@ -51,6 +51,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; public class CoreModManager { private static final Attributes.Name COREMODCONTAINSFMLMOD = new Attributes.Name("FMLCorePluginContainsFMLMod"); + private static final Attributes.Name MODTYPE = new Attributes.Name("ModType"); private static String[] rootPlugins = { "cpw.mods.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin" }; private static List loadedCoremods = Lists.newArrayList(); private static List loadPlugins; @@ -306,7 +307,12 @@ public class CoreModManager { FMLRelaunchLog.fine("Not found coremod data in %s", coreMod.getName()); continue; } - + // Support things that are mod jars, but not FML mod jars + else if (mfAttributes.containsKey(MODTYPE) && !"FML".equals(mfAttributes.getValue(MODTYPE))) + { + FMLRelaunchLog.fine("Adding %s to the list of things to skip. It is not an FML mod, it is type %s", coreMod.getName(), mfAttributes.getValue(MODTYPE)); + loadedCoremods.add(coreMod.getName()); + } try { classLoader.addURL(coreMod.toURI().toURL());