From c90a853377cddbc310b04bcf1c0a7edd19425ab7 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Fri, 31 Aug 2012 11:16:16 -0400
Subject: [PATCH] Fix up addRenderer to catch exceptions from the basemod,
 also, addrenderer now supplies a list of the default renderers from MC for
 editing and will note the changes made.

---
 .../modloader/ModLoaderClientHelper.java      | 42 +++++++++++++++++--
 client/net/minecraft/src/BaseMod.java         |  2 +-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
index 6a0c109ce3..6027af4baf 100644
--- a/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
+++ b/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.logging.Level;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.BaseMod;
@@ -13,11 +14,15 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.KeyBinding;
 import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.Render;
+import net.minecraft.src.RenderManager;
 
+import com.google.common.base.Equivalences;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.MapDifference.ValueDifference;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
@@ -56,17 +61,46 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
         FMLLog.finer("Handling post startup activities for ModLoader mod %s", mc.getModId());
         BaseMod mod = (BaseMod) mc.getMod();
 
-        Map<Class<? extends Entity>, Render> renderers = Maps.newHashMap();
+        Map<Class<? extends Entity>, Render> renderers = Maps.newHashMap(RenderManager.field_78727_a.field_78729_o);
 
-        mod.addRenderer(renderers);
+        try
+        {
+            FMLLog.finest("Requesting renderers from basemod %s", mc.getModId());
+            mod.addRenderer(renderers);
+            FMLLog.finest("Received %d renderers from basemod %s", renderers.size(), mc.getModId());
+        }
+        catch (Exception e)
+        {
+            FMLLog.log(Level.SEVERE, e, "A severe problem was detected with the mod %s during the addRenderer call. Continuing, but expect odd results", mc.getModId());
+        }
 
-        for (Entry<Class<? extends Entity>, Render> e : renderers.entrySet())
+        MapDifference<Class<? extends Entity>, Render> difference = Maps.difference(RenderManager.field_78727_a.field_78729_o, renderers, Equivalences.identity());
+
+        for ( Entry<Class<? extends Entity>, Render> e : difference.entriesOnlyOnLeft().entrySet())
+        {
+            FMLLog.warning("The mod %s attempted to remove an entity renderer %s from the entity map. This will be ignored.", mc.getModId(), e.getKey().getName());
+        }
+
+        for (Entry<Class<? extends Entity>, Render> e : difference.entriesOnlyOnRight().entrySet())
         {
             FMLLog.finest("Registering ModLoader entity renderer %s as instance of %s", e.getKey().getName(), e.getValue().getClass().getName());
             RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue());
         }
 
-        mod.registerAnimation(game);
+        for (Entry<Class<? extends Entity>, ValueDifference<Render>> e : difference.entriesDiffering().entrySet())
+        {
+            FMLLog.finest("Registering ModLoader entity rendering override for %s as instance of %s", e.getKey().getName(), e.getValue().rightValue().getClass().getName());
+            RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue().rightValue());
+        }
+
+        try
+        {
+            mod.registerAnimation(game);
+        }
+        catch (Exception e)
+        {
+            FMLLog.log(Level.SEVERE, e, "A severe problem was detected with the mod %s during the registerAnimation call. Continuing, but expect odd results", mc.getModId());
+        }
     }
 
     public ModLoaderClientHelper(Minecraft client)
diff --git a/client/net/minecraft/src/BaseMod.java b/client/net/minecraft/src/BaseMod.java
index 35d90432e9..a7993c290f 100644
--- a/client/net/minecraft/src/BaseMod.java
+++ b/client/net/minecraft/src/BaseMod.java
@@ -20,6 +20,7 @@ import java.util.Random;
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
 import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.asm.SideOnly;
 
@@ -180,7 +181,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
     @SideOnly(CLIENT)
     public void addRenderer(Map<Class<? extends Entity>, Render> renderers)
     {
-
     }
 
     /**