From ae6621bfdd6fd2e53650f162a73f4db027247e03 Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Thu, 31 May 2012 22:42:23 -0400
Subject: [PATCH] More tweaks for proper API

---
 fml/client/net/minecraft/src/ModLoader.java                | 4 ++--
 .../mods/fml/common/modloader/ModLoaderModContainer.java   | 7 ++++---
 fml/server/net/minecraft/src/ModLoader.java                | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java
index 53c1eae6ea..4b25c9d6d7 100644
--- a/fml/client/net/minecraft/src/ModLoader.java
+++ b/fml/client/net/minecraft/src/ModLoader.java
@@ -343,9 +343,9 @@ public class ModLoader
      *
      * @return
      */
-    public static List<cpw.mods.fml.common.modloader.BaseMod> getLoadedMods()
+    public static List<BaseMod> getLoadedMods()
     {
-        return ModLoaderModContainer.findAll();
+        return ModLoaderModContainer.findAll(BaseMod.class);
     }
 
     /**
diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
index 05e10d1aff..2a81a5cb71 100644
--- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
+++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
@@ -387,17 +387,18 @@ public class ModLoaderModContainer implements ModContainer
 
     /**
      * Find all the BaseMods in the system 
+     * @param <A>
      * @return
      */
-    public static List<BaseMod> findAll()
+    public static <A extends BaseMod> List<A> findAll(Class<A> clazz)
     {
-        ArrayList<BaseMod> modList = new ArrayList<BaseMod>();
+        ArrayList<A> modList = new ArrayList<A>();
 
         for (ModContainer mc : Loader.getModList())
         {
             if (mc instanceof ModLoaderModContainer && mc.getMod()!=null)
             {
-                modList.add(((ModLoaderModContainer)mc).mod);
+                modList.add((A)((ModLoaderModContainer)mc).mod);
             }
         }
 
diff --git a/fml/server/net/minecraft/src/ModLoader.java b/fml/server/net/minecraft/src/ModLoader.java
index 87d72da661..9190e9407a 100644
--- a/fml/server/net/minecraft/src/ModLoader.java
+++ b/fml/server/net/minecraft/src/ModLoader.java
@@ -329,9 +329,9 @@ public class ModLoader
      *
      * @return
      */
-    public static List<cpw.mods.fml.common.modloader.BaseMod> getLoadedMods()
+    public static List<BaseMod> getLoadedMods()
     {
-        return ModLoaderModContainer.findAll();
+        return ModLoaderModContainer.findAll(BaseMod.class);
     }
 
     /**