diff --git a/src/main/java/net/minecraftforge/fml/common/LoadController.java b/src/main/java/net/minecraftforge/fml/common/LoadController.java index be68ff40e0..b72f0a3b2f 100644 --- a/src/main/java/net/minecraftforge/fml/common/LoadController.java +++ b/src/main/java/net/minecraftforge/fml/common/LoadController.java @@ -53,6 +53,7 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; @@ -64,7 +65,7 @@ public class LoadController private EventBus masterChannel; private ImmutableMap eventChannels; private LoaderState state; - private Multimap modStates = ArrayListMultimap.create(); + private Multimap modStates = MultimapBuilder.hashKeys().enumSetValues(ModState.class).build(); private List activeModList = Lists.newArrayList(); private ModContainer activeContainer; private BiMap modObjectList; @@ -113,7 +114,7 @@ public class LoadController if (isActive) { activeModList.add(mod); - modStates.put(mod.getModId(), ModState.UNLOADED); + modStates.put(mod.getModId(), ModState.LOADED); eventBus.put(mod.getModId(), bus); FMLCommonHandler.instance().addModToResourcePack(mod); }