upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

And more mod sorting fixes.

Browse Source
This commit is contained in:
Christian committed 2012-08-24 12:10:43 -04:00
1 parent 93d5934ea7
commit 2d9b88bd52
1 file changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files
common/cpw/mods/fml/common/LoadController.java
+14 -14
View File
@@ -32,7 +32,7 @@ public class LoadController
private Multimap<String, Throwable> errors = ArrayListMultimap.create();
private Map<String, ModContainer> modList;
private List<ModContainer> activeModList = Lists.newArrayList();
private String activeContainer;
private ModContainer activeContainer;
private BiMap<ModContainer, Object> modObjectList;
public LoadController(Loader loader)
@@ -105,7 +105,7 @@ public class LoadController
public ModContainer activeContainer()
{
return activeContainer!=null ? modList.get(activeContainer) : null;
return activeContainer;
}
@Subscribe
@@ -115,21 +115,22 @@ public class LoadController
{
modObjectList = buildModObjectList();
}
for (Map.Entry<String,EventBus> entry : eventChannels.entrySet())
for (ModContainer mc : activeModList)
{
activeContainer = entry.getKey();
activeContainer = mc;
String modId = mc.getModId();
stateEvent.applyModContainer(activeContainer());
FMLLog.finer("Posting state event %s to mod %s", stateEvent, entry.getKey());
entry.getValue().post(stateEvent);
FMLLog.finer("State event %s delivered to mod %s", stateEvent, entry.getKey());
FMLLog.finer("Posting state event %s to mod %s", stateEvent, modId);
eventChannels.get(modId).post(stateEvent);
FMLLog.finer("State event %s delivered to mod %s", stateEvent, modId);
activeContainer = null;
if (!errors.containsKey(entry.getKey()))
if (!errors.containsKey(modId))
{
modStates.put(entry.getKey(), stateEvent.getModState());
modStates.put(modId, stateEvent.getModState());
}
else
{
modStates.put(entry.getKey(), ModState.ERRORED);
modStates.put(modId, ModState.ERRORED);
}
}
}
@@ -162,11 +163,10 @@ public class LoadController
public void printModStates(StringBuilder ret)
{
for (String modId : modStates.keySet())
for (ModContainer mc : loader.getModList())
{
ModContainer mod = modList.get(modId);
ret.append("\n\t").append(mod.getName()).append(" (").append(mod.getSource().getName()).append(") ");
Joiner.on("->"). appendTo(ret, modStates.get(modId));
ret.append("\n\t").append(mc.getModId()).append(" [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
Joiner.on("->"). appendTo(ret, modStates.get(mc.getModId()));
}
}