upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

WorldGen rejects, lots of them. Couple of small fixes elsewhere.

Browse Source
This commit is contained in:
cpw committed 2015-11-12 23:30:53 -05:00
1 parent 8f94ff14ff
commit ce40f91fb0
30 files changed
+524 -579
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
+2 -2
View File
@@ -330,7 +330,7 @@ public class FMLClientHandler implements IFMLSidedHandler
// Reload resources
client.refreshResources();
RenderingRegistry.loadEntityRenderers((Map<Class<? extends Entity>, Render>)Minecraft.getMinecraft().getRenderManager().entityRenderMap);
RenderingRegistry.loadEntityRenderers(Minecraft.getMinecraft().getRenderManager().entityRenderMap);
guiFactories = HashBiMap.create();
for (ModContainer mc : Loader.instance().getActiveModList())
{
@@ -825,7 +825,7 @@ public class FMLClientHandler implements IFMLSidedHandler
{
setupServerList();
OldServerPinger osp = new OldServerPinger();
ServerData serverData = new ServerData("Command Line", host+":"+port);
ServerData serverData = new ServerData("Command Line", host+":"+port,false);
try
{
osp.ping(serverData);
src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java
+5 -5
View File
@@ -36,27 +36,27 @@ public class RenderingRegistry
* @param entityClass
* @param renderer
*/
public static void registerEntityRenderingHandler(Class<? extends Entity> entityClass, Render renderer)
public static void registerEntityRenderingHandler(Class<? extends Entity> entityClass, Render<? extends Entity> renderer)
{
INSTANCE.entityRenderers.add(new EntityRendererInfo(entityClass, renderer));
}
private static class EntityRendererInfo
{
public EntityRendererInfo(Class<? extends Entity> target, Render renderer)
public EntityRendererInfo(Class<? extends Entity> target, Render<? extends Entity> renderer)
{
this.target = target;
this.renderer = renderer;
}
private Class<? extends Entity> target;
private Render renderer;
private Render<? extends Entity> renderer;
}
public static void loadEntityRenderers(Map<Class<? extends Entity>, Render> rendererMap)
public static void loadEntityRenderers(Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap)
{
for (EntityRendererInfo info : INSTANCE.entityRenderers)
{
rendererMap.put(info.target, info.renderer);
entityRenderMap.put(info.target, info.renderer);
}
}
}