diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index d652c3ff72..993ded08c4 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -321,6 +321,7 @@ public class FMLClientHandler implements IFMLSidedHandler // Reload resources client.refreshResources(); + RenderingRegistry.loadEntityRenderers(Minecraft.getMinecraft().getRenderManager().entityRenderMap); guiFactories = HashBiMap.create(); for (ModContainer mc : Loader.instance().getActiveModList()) { diff --git a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java index fd45582bc8..736c447aab 100644 --- a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java +++ b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java @@ -24,6 +24,26 @@ public class RenderingRegistry private static final RenderingRegistry INSTANCE = new RenderingRegistry(); private Map, IRenderFactory> entityRenderers = Maps.newHashMap(); + private Map, Render> entityRenderersOld = Maps.newHashMap(); + + /** + * Register an entity rendering handler. This will, after mod initialization, be inserted into the main + * render map for entities. + * Call this during Initialization phase. + * + * @deprecated use the factory version during Preinitialization. + * Will be removed in 1.9. + */ + @Deprecated + public static void registerEntityRenderingHandler(Class entityClass, Render renderer) + { + INSTANCE.entityRenderersOld.put(entityClass, renderer); + } + + public static void loadEntityRenderers(Map, Render> entityRenderMap) + { + entityRenderMap.putAll(INSTANCE.entityRenderersOld); + } /** * Register an entity rendering handler. This will, after mod initialization, be inserted into the main diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 31f70fdef7..70b6348014 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -159,6 +159,8 @@ public net.minecraft.entity.EntityList func_75614_a(Ljava/lang/Class;Ljava/lang/ public net.minecraft.entity.EntityList field_75625_b #nameToClassMap public net.minecraft.entity.EntityList field_75626_c #classToNameMap public net.minecraft.entity.EntityList field_75623_d #idToClassMap +## RenderManager +public net.minecraft.client.renderer.entity.RenderManager field_78729_o #renderers ## TileEntityRendererDispatcher public net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher field_147559_m ## WeightedRandomItem