keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file!

This commit is contained in:
cpw 2014-08-30 17:45:35 -04:00
parent 0c50d7b92d
commit 981ffe362d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fml/src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
View File

@ -299,7 +299,14 @@ public class CoreModManager {
loadedCoremods.add(coreMod.getName());
continue;
}
List<String> modTypes = mfAttributes.containsKey(MODTYPE) ? Arrays.asList(mfAttributes.getValue(MODTYPE).split(",")) : Collections.<String>emptyList();
if (!modTypes.contains("FML"))
{
FMLRelaunchLog.fine("Adding %s to the list of things to skip. It is not an FML mod, it has types %s", coreMod.getName(), modTypes);
loadedCoremods.add(coreMod.getName());
continue;
}
String fmlCorePlugin = mfAttributes.getValue("FMLCorePlugin");
if (fmlCorePlugin == null)
{
@ -308,11 +315,6 @@ public class CoreModManager {
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());