From 8ff805db0abe092c65addfa17e809d812123f857 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 21 Apr 2015 06:15:56 +1000 Subject: [PATCH] Moved rendering registration into the client proxy. Fixes server crashing --- .../java/biomesoplenty/common/init/ModEntities.java | 10 ---------- src/main/java/biomesoplenty/core/BiomesOPlenty.java | 2 -- src/main/java/biomesoplenty/core/ClientProxy.java | 7 +++++++ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/biomesoplenty/common/init/ModEntities.java b/src/main/java/biomesoplenty/common/init/ModEntities.java index c79c7656d..c3ad080d8 100644 --- a/src/main/java/biomesoplenty/common/init/ModEntities.java +++ b/src/main/java/biomesoplenty/common/init/ModEntities.java @@ -26,14 +26,4 @@ public class ModEntities } - - - public static void initRender(RenderManager renderManager) - { - - RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, new RenderDart(renderManager)); - - } - - } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/core/BiomesOPlenty.java b/src/main/java/biomesoplenty/core/BiomesOPlenty.java index c00b2ee93..b47b4ac39 100644 --- a/src/main/java/biomesoplenty/core/BiomesOPlenty.java +++ b/src/main/java/biomesoplenty/core/BiomesOPlenty.java @@ -10,7 +10,6 @@ package biomesoplenty.core; import java.io.File; -import net.minecraft.client.Minecraft; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -68,7 +67,6 @@ public class BiomesOPlenty public void init(FMLInitializationEvent event) { proxy.registerRenderers(); - ModEntities.initRender( Minecraft.getMinecraft().getRenderManager() ); } @EventHandler diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index ce314c1f2..6f5c88764 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -10,6 +10,7 @@ package biomesoplenty.core; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -18,8 +19,11 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.config.MiscConfigurationHandler; +import biomesoplenty.common.entities.projectiles.EntityDart; +import biomesoplenty.common.entities.projectiles.RenderDart; public class ClientProxy extends CommonProxy @@ -29,10 +33,13 @@ public class ClientProxy extends CommonProxy @Override public void registerRenderers() { + Minecraft minecraft = Minecraft.getMinecraft(); + if (MiscConfigurationHandler.overrideTitlePanorama) GuiMainMenu.titlePanoramaPaths = bopTitlePanoramaPaths; //Entity rendering and other stuff will go here in future + RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, new RenderDart(minecraft.getRenderManager())); } @Override