keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #547 from Parker8283/1.8 

Re-enabled Entity-Render registration
This commit is contained in:
LexManos 2014-10-19 18:09:12 -07:00
parent a300935cbc 2544df8e44
commit 27e1b65755
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View File

@ -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<Class<? extends Entity>, Render>)Minecraft.getMinecraft().func_175598_ae().entityRenderMap);
RenderingRegistry.loadEntityRenderers((Map<Class<? extends Entity>, Render>)Minecraft.getMinecraft().getRenderManager().entityRenderMap);
guiFactories = HashBiMap.create();
for (ModContainer mc : Loader.instance().getActiveModList())
{

16
fml/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java
View File

@ -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<Class<? extends Entity>, Render> rendererMap)
public static void loadEntityRenderers(Map<Class<? extends Entity>, 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());
}
}*/
}
}