From afc2a4a75caf48fc56cd6cb055805961157fbe20 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sat, 11 Aug 2012 11:44:55 -0400
Subject: [PATCH] Fix up Package.getPackage(), also fix up loadcontroller
 construction

---
 common/cpw/mods/fml/common/LoadController.java       | 12 +++++++++---
 .../cpw/mods/fml/relauncher/RelaunchClassLoader.java |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/cpw/mods/fml/common/LoadController.java b/common/cpw/mods/fml/common/LoadController.java
index 19ee5a5915..7184b8b4d8 100644
--- a/common/cpw/mods/fml/common/LoadController.java
+++ b/common/cpw/mods/fml/common/LoadController.java
@@ -46,6 +46,8 @@ public class LoadController
         this.masterChannel.register(this);
 
         state = LoaderState.NOINIT;
+
+
     }
 
     @Subscribe
@@ -130,18 +132,22 @@ public class LoadController
                 modStates.put(entry.getKey(), ModState.ERRORED);
             }
         }
+        if (stateEvent instanceof FMLConstructionEvent)
+        {
+            buildModObjectList();
+        }
     }
 
-    @Subscribe
-    public void buildModObjectList(FMLConstructionEvent pre)
+    public void buildModObjectList()
     {
-        com.google.common.collect.ImmutableBiMap.Builder<ModContainer, Object> builder = ImmutableBiMap.<ModContainer, Object>builder();
+        ImmutableBiMap.Builder<ModContainer, Object> builder = ImmutableBiMap.<ModContainer, Object>builder();
         for (ModContainer mc : activeModList)
         {
             builder.put(mc, mc.getMod());
         }
         modObjectList = builder.build();
     }
+
     public void errorOccurred(ModContainer modContainer, Throwable exception)
     {
         errors.put(modContainer.getModId(), exception);
diff --git a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java
index 376ba71977..9f7f44b2d8 100644
--- a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java
+++ b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java
@@ -80,7 +80,7 @@ public class RelaunchClassLoader extends URLClassLoader
         try
         {
             String pkgname = name.substring(0, name.lastIndexOf('.'));
-            if (Package.getPackage(pkgname)==null)
+            if (getPackage(pkgname)==null)
             {
                 definePackage(pkgname, null, null, null, null, null, null, null);
             }