mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 18:45:09 +00:00
Only active mods should have dependencies checked, and be sorted
This commit is contained in:
1 parent
26302a6ff2
commit
9fcc452ed3
1 file changed
+5
-5
@@ -178,12 +178,12 @@ public class Loader
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
BiMap<String, ArtifactVersion> modVersions = HashBiMap.create();
|
BiMap<String, ArtifactVersion> modVersions = HashBiMap.create();
|
||||||
for (ModContainer mod : mods)
|
for (ModContainer mod : getActiveModList())
|
||||||
{
|
{
|
||||||
modVersions.put(mod.getModId(), mod.getProcessedVersion());
|
modVersions.put(mod.getModId(), mod.getProcessedVersion());
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ModContainer mod : mods)
|
for (ModContainer mod : getActiveModList())
|
||||||
{
|
{
|
||||||
Set<ArtifactVersion> missingMods = Sets.difference(mod.getRequirements(), modVersions.values());
|
Set<ArtifactVersion> missingMods = Sets.difference(mod.getRequirements(), modVersions.values());
|
||||||
if (!missingMods.isEmpty())
|
if (!missingMods.isEmpty())
|
||||||
@@ -212,7 +212,7 @@ public class Loader
|
|||||||
|
|
||||||
FMLLog.fine("All mod requirements are satisfied");
|
FMLLog.fine("All mod requirements are satisfied");
|
||||||
|
|
||||||
ModSorter sorter = new ModSorter(mods, namedMods);
|
ModSorter sorter = new ModSorter(getActiveModList(), namedMods);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -232,7 +232,7 @@ public class Loader
|
|||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
FMLLog.fine("Mod sorting data:");
|
FMLLog.fine("Mod sorting data:");
|
||||||
for (ModContainer mod : mods)
|
for (ModContainer mod : getActiveModList())
|
||||||
{
|
{
|
||||||
if (!mod.isImmutable())
|
if (!mod.isImmutable())
|
||||||
{
|
{
|
||||||
@@ -416,9 +416,9 @@ public class Loader
|
|||||||
modController.transition(LoaderState.LOADING);
|
modController.transition(LoaderState.LOADING);
|
||||||
ModDiscoverer disc = identifyMods();
|
ModDiscoverer disc = identifyMods();
|
||||||
disableRequestedMods();
|
disableRequestedMods();
|
||||||
|
modController.distributeStateMessage(FMLLoadEvent.class);
|
||||||
sortModList();
|
sortModList();
|
||||||
mods = ImmutableList.copyOf(mods);
|
mods = ImmutableList.copyOf(mods);
|
||||||
modController.distributeStateMessage(FMLLoadEvent.class);
|
|
||||||
modController.transition(LoaderState.CONSTRUCTING);
|
modController.transition(LoaderState.CONSTRUCTING);
|
||||||
modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable());
|
modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable());
|
||||||
modController.transition(LoaderState.PREINITIALIZATION);
|
modController.transition(LoaderState.PREINITIALIZATION);
|
||||||
|
|||||||
Reference in new issue
Block a user