From 87e6c2902882fa7a31931a374f9d6c2a80d72749 Mon Sep 17 00:00:00 2001 From: cpw Date: Wed, 22 Apr 2015 08:31:25 -0400 Subject: [PATCH] Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645 --- fml/src/main/java/cpw/mods/fml/common/Loader.java | 4 +++- .../java/cpw/mods/fml/common/discovery/ModDiscoverer.java | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/Loader.java b/fml/src/main/java/cpw/mods/fml/common/Loader.java index d54e8a518c..206574fa87 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Loader.java +++ b/fml/src/main/java/cpw/mods/fml/common/Loader.java @@ -71,6 +71,7 @@ import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData; import cpw.mods.fml.common.toposort.TopologicalSort; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.VersionParser; +import cpw.mods.fml.relauncher.ModListHelper; import cpw.mods.fml.relauncher.Side; /** @@ -337,8 +338,9 @@ public class Loader discoverer.findClasspathMods(modClassLoader); FMLLog.fine("Minecraft jar mods loaded successfully"); + FMLLog.getLogger().log(Level.INFO, "Found {} mods from the command line. Injecting into mod discoverer",ModListHelper.additionalMods.size()); FMLLog.info("Searching %s for mods", canonicalModsDir.getAbsolutePath()); - discoverer.findModDirMods(canonicalModsDir); + discoverer.findModDirMods(canonicalModsDir, ModListHelper.additionalMods.values().toArray(new File[0])); File versionSpecificModsDir = new File(canonicalModsDir,mccversion); if (versionSpecificModsDir.isDirectory()) { diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java b/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java index a1fb9812d0..38a0ae9cfc 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java @@ -84,9 +84,13 @@ public class ModDiscoverer public void findModDirMods(File modsDir) { - File[] modList = FileListHelper.sortFileList(modsDir, null); - modList = FileListHelper.sortFileList(ObjectArrays.concat(modList, ModListHelper.additionalMods.values().toArray(new File[0]), File.class)); + findModDirMods(modsDir, new File[0]); + } + public void findModDirMods(File modsDir, File[] supplementalModFileCandidates) + { + File[] modList = FileListHelper.sortFileList(modsDir, null); + modList = FileListHelper.sortFileList(ObjectArrays.concat(modList, supplementalModFileCandidates, File.class)); for (File modFile : modList) { // skip loaded coremods