Fix isModLoaded for "disabled" mods, and the toposort as well

This commit is contained in:
Christian committed 2012-08-23 17:08:18 -04:00
1 parent 3bde961dc7
commit f6a8cd556e
2 files changed
+10 -7

No files matched your search

+1 -1
View File
@@ -496,7 +496,7 @@ public class Loader
*/ */
public static boolean isModLoaded(String modname) public static boolean isModLoaded(String modname)
{ {
return instance().namedMods.containsKey(modname); return instance().namedMods.containsKey(modname) && instance().modController.getModState(instance.namedMods.get(modname))!=ModState.DISABLED;
} }
/** /**
@@ -19,6 +19,7 @@ import java.util.Map;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph; import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph;
import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.ArtifactVersion;
@@ -78,7 +79,8 @@ public class ModSorter
{ {
preDepAdded = true; preDepAdded = true;
if (dep.getLabel().equals("*")) String modid = dep.getLabel();
if (modid.equals("*"))
{ {
// We are "after" everything // We are "after" everything
modGraph.addEdge(mod, afterAll); modGraph.addEdge(mod, afterAll);
@@ -88,8 +90,8 @@ public class ModSorter
else else
{ {
modGraph.addEdge(before, mod); modGraph.addEdge(before, mod);
if (nameLookup.containsKey(dep.getLabel())) { if (Loader.isModLoaded(modid)) {
modGraph.addEdge(nameLookup.get(dep.getLabel()), mod); modGraph.addEdge(nameLookup.get(modid), mod);
} }
} }
} }
@@ -98,7 +100,8 @@ public class ModSorter
{ {
postDepAdded = true; postDepAdded = true;
if (dep.getLabel().equals("*")) String modid = dep.getLabel();
if (modid.equals("*"))
{ {
// We are "before" everything // We are "before" everything
modGraph.addEdge(beforeAll, mod); modGraph.addEdge(beforeAll, mod);
@@ -108,8 +111,8 @@ public class ModSorter
else else
{ {
modGraph.addEdge(mod, after); modGraph.addEdge(mod, after);
if (nameLookup.containsKey(dep.getLabel())) { if (Loader.isModLoaded(modid)) {
modGraph.addEdge(mod, nameLookup.get(dep.getLabel())); modGraph.addEdge(mod, nameLookup.get(modid));
} }
} }
} }