Split loadmods into loadmods and preinitmods, to allow resource loading to occur *always* between the two phases. This should fix

mods not being able to access resources during preinit.

PS: I'm still not modding.
This commit is contained in:
Christian committed 2014-05-08 10:23:05 -04:00
1 parent 738ce1d7cd
commit b0eb1ef7c6
6 files changed
+30 -25

No files matched your search

+10 -5
View File
@@ -148,6 +148,7 @@ public class Loader
private static List<String> injectedContainers;
private ImmutableMap<String, String> fmlBrandingProperties;
private File forcedModFile;
private ModDiscoverer discoverer;
public static Loader instance()
{
@@ -462,15 +463,15 @@ public class Loader
namedMods = Maps.newHashMap();
modController = new LoadController(this);
modController.transition(LoaderState.LOADING, false);
ModDiscoverer disc = identifyMods();
ModAPIManager.INSTANCE.manageAPI(modClassLoader, disc);
discoverer = identifyMods();
ModAPIManager.INSTANCE.manageAPI(modClassLoader, discoverer);
disableRequestedMods();
modController.distributeStateMessage(FMLLoadEvent.class);
sortModList();
ModAPIManager.INSTANCE.cleanupAPIContainers(modController.getActiveModList());
ModAPIManager.INSTANCE.cleanupAPIContainers(mods);
mods = ImmutableList.copyOf(mods);
for (File nonMod : disc.getNonModLibs())
for (File nonMod : discoverer.getNonModLibs())
{
if (nonMod.isFile())
{
@@ -486,7 +487,7 @@ public class Loader
}
}
modController.transition(LoaderState.CONSTRUCTING, false);
modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable(), reverseDependencies);
modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, discoverer.getASMTable(), reverseDependencies);
FMLLog.fine("Mod signature data");
for (ModContainer mod : getActiveModList())
{
@@ -497,7 +498,11 @@ public class Loader
FMLLog.fine("No user mod signature data found");
}
modController.transition(LoaderState.PREINITIALIZATION, false);
modController.distributeStateMessage(LoaderState.PREINITIALIZATION, disc.getASMTable(), canonicalConfigDir);
}
public void preinitializeMods()
{
modController.distributeStateMessage(LoaderState.PREINITIALIZATION, discoverer.getASMTable(), canonicalConfigDir);
modController.transition(LoaderState.INITIALIZATION, false);
}