diff --git a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index a4cc51347..a5f39e9e8 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -40,9 +40,11 @@ import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.network.OldServerPinger; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourcePack; import net.minecraft.crash.CrashReport; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.launchwrapper.Launch; import net.minecraft.nbt.CompressedStreamTools; @@ -55,6 +57,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.WorldSettings; import net.minecraft.world.storage.SaveFormatOld; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.DuplicateModsFoundException; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -293,7 +296,7 @@ public class FMLClientHandler implements IFMLSidedHandler // Reload resources client.refreshResources(); - //RenderingRegistry.instance().loadEntityRenderers((Map, Render>)Minecraft.getMinecraft().func_175598_ae().entityRenderMap); + RenderingRegistry.loadEntityRenderers((Map, Render>)Minecraft.getMinecraft().getRenderManager().entityRenderMap); guiFactories = HashBiMap.create(); for (ModContainer mc : Loader.instance().getActiveModList()) { diff --git a/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java b/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java index 31e03260a..607d7362f 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java @@ -9,23 +9,15 @@ * Contributors: * cpw - implementation */ - package net.minecraftforge.fml.client.registry; import java.util.List; import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderBiped; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.world.IBlockAccess; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.ObjectArrays; /** * @author cpw @@ -60,13 +52,11 @@ public class RenderingRegistry private Render renderer; } - /* - public void loadEntityRenderers(Map, Render> rendererMap) + public static void loadEntityRenderers(Map, Render> rendererMap) { - for (EntityRendererInfo info : entityRenderers) + for (EntityRendererInfo info : INSTANCE.entityRenderers) { rendererMap.put(info.target, info.renderer); - info.renderer.setRenderManager(Minecraft.getMinecraft().func_175598_ae()); } - }*/ + } }