Put the FMLModContainer back in it's cage. Delete the ClasspathLocator.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>

src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java

@@ -105,11 +105,11 @@ public enum LifecycleEventProvider
             this.progression = p;
         }
 
-        public Event getOrBuildEvent(FMLModContainer fmlModContainer)
+        public Event getOrBuildEvent(ModContainer modContainer)
         {
             if (customEventSupplier!=null) return customEventSupplier.get();
 
-            return stage.getModEvent(fmlModContainer);
+            return stage.getModEvent(modContainer);
         }
 
         @Override

src/main/java/net/minecraftforge/fml/ModLoadingStage.java

@@ -44,8 +44,8 @@ public enum ModLoadingStage
         this.modLifecycleEventFunction = modLifecycleEventFunction;
     }
 
-    public ModLifecycleEvent getModEvent(ModContainer fmlModContainer)
+    public ModLifecycleEvent getModEvent(ModContainer modContainer)
     {
-        return modLifecycleEventFunction.get().apply(fmlModContainer);
+        return modLifecycleEventFunction.get().apply(modContainer);
     }
 }