mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
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:
1 parent
738ce1d7cd
commit
b0eb1ef7c6
6 files changed
+30
-25
No files matched your search
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user