From cb42ce164ca5b54afef6f68e814b942560fe86ba Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Sat, 19 Apr 2014 20:41:43 -0500
Subject: [PATCH] Move RenderManager interaction to Post Init ( fixes some kind
 of weird conflict with a key bind mod )

---
 client/ClientHelper.java | 4 ++++
 core/AppEng.java         | 1 +
 core/CommonHelper.java   | 2 ++
 server/ServerHelper.java | 6 ++++++
 4 files changed, 13 insertions(+)

diff --git a/client/ClientHelper.java b/client/ClientHelper.java
index 7eb035281..7c0017c2e 100644
--- a/client/ClientHelper.java
+++ b/client/ClientHelper.java
@@ -139,7 +139,11 @@ public class ClientHelper extends ServerHelper
 	public void init()
 	{
 		MinecraftForge.EVENT_BUS.register( this );
+	}
 
+	@Override
+	public void postinit()
+	{
 		RenderingRegistry.registerBlockHandler( WorldRender.instance );
 		RenderManager.instance.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed() );
 	}
diff --git a/core/AppEng.java b/core/AppEng.java
index e4e2dc9dc..a8c7df048 100644
--- a/core/AppEng.java
+++ b/core/AppEng.java
@@ -158,6 +158,7 @@ public class AppEng
 		Registration.instance.PostInit( event );
 		IntegrationRegistry.instance.postinit();
 
+		CommonHelper.proxy.postinit();
 		AEConfig.instance.save();
 
 		NetworkRegistry.INSTANCE.registerGuiHandler( this, GuiBridge.GUI_Handler );
diff --git a/core/CommonHelper.java b/core/CommonHelper.java
index 344c320bc..e1b9a0e16 100644
--- a/core/CommonHelper.java
+++ b/core/CommonHelper.java
@@ -37,4 +37,6 @@ public abstract class CommonHelper
 
 	public abstract void doRenderItem(ItemStack sis, TileEntity tile);
 
+	public abstract void postinit();
+
 }
diff --git a/server/ServerHelper.java b/server/ServerHelper.java
index 144fd4304..7e8ae23b9 100644
--- a/server/ServerHelper.java
+++ b/server/ServerHelper.java
@@ -72,6 +72,12 @@ public class ServerHelper extends CommonHelper
 
 	}
 
+	@Override
+	public void postinit()
+	{
+
+	}
+
 	@Override
 	public World getWorld()
 	{