keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Handle the case where a mod tries to do something stateful during constructor phase, and log a big

Browse source 
fat message about it. Don't do it!
This commit is contained in:
Christian 2012-08-15 20:05:12 -04:00
parent 81512c3458
commit e1fd0b1d7b
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fml/common/cpw/mods/fml/common/LoadController.java
View file

@ -117,7 +117,7 @@ public class LoadController
{
if (stateEvent instanceof FMLPreInitializationEvent)
{
buildModObjectList();
modObjectList = buildModObjectList();
}
for (Map.Entry<String,EventBus> entry : eventChannels.entrySet())
{
@ -138,17 +138,25 @@ public class LoadController
}
}
public void buildModObjectList()
public ImmutableBiMap<ModContainer, Object> buildModObjectList()
{
ImmutableBiMap.Builder<ModContainer, Object> builder = ImmutableBiMap.<ModContainer, Object>builder();
for (ModContainer mc : activeModList)
{
if (!mc.isImmutable())
if (!mc.isImmutable() && mc.getMod()!=null)
{
builder.put(mc, mc.getMod());
}
if (mc.getMod()==null)
{
FMLLog.severe("There is a severe problem with %s - it appears not to have constructed correctly", mc.getModId());
if (state != LoaderState.CONSTRUCTING)
{
this.errorOccurred(mc, new RuntimeException());
}
}
}
modObjectList = builder.build();
return builder.build();
}
public void errorOccurred(ModContainer modContainer, Throwable exception)
@ -191,6 +199,11 @@ public class LoadController
public BiMap<ModContainer, Object> getModObjectList()
{
if (modObjectList == null)
{
FMLLog.severe("Detected an attempt by a mod %s to perform game activity during mod construction. This is a serious programming error.", activeContainer);
return buildModObjectList();
}
return ImmutableBiMap.copyOf(modObjectList);
}