Hopefully this unfucks whatever got fucked.

1 files changed, 50 insertions, 51 deletions

diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index 643b068..a76da7b 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -1,69 +1,68 @@
 package lance5057.tDefense.proxy;
 
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount;
-import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount;
-import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
-import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Container_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Gui_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import lance5057.tDefense.TD_Commands;
+import net.minecraftforge.client.ClientCommandHandler;
 
-public class CommonProxy implements IGuiHandler
-{
-	public static ModifierSoulHandler	SoulHandler	= null;
-
-	public void registerRenderers()
-	{
-	}
 
-	public void registerTileEntitySpecialRenderer()
+public class CommonProxy// implements IGuiHandler
+{
+	//public static ModifierSoulHandler	SoulHandler	= null;
+	
+	public void preInit()
 	{
-
 	}
 
-	public EntityPlayer getPlayerEntity(MessageContext ctx)
+	public void Init()
 	{
-		return ctx.getServerHandler().playerEntity;
 	}
 
-	public ModelBiped getArmorModel(int id)
+	public void registerTileEntitySpecialRenderer()
 	{
-		return null;
-	}
 
-	public World getClientWorld()
-	{
-		return null;
 	}
-
-	@Override
-	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	
+	public void reloadRenderers()
 	{
-		if(ID == TinkersDefense.GUI_CREST_INV)
-			return new Container_CrestMount(player.inventory,
-					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
-		if(ID == TinkersDefense.GUI_ANVIL_INV)
-			return new Container_FinishingAnvil(player.inventory,
-					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
 
-		return null;
 	}
 
-	@Override
-	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-	{
-		if(ID == TinkersDefense.GUI_CREST_INV)
-			return new Gui_CrestMount(player.inventory,
-					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
-		if(ID == TinkersDefense.GUI_ANVIL_INV)
-			return new Gui_FinishingAnvil(player.inventory,
-					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
-		return null;
-	}
+//	public EntityPlayer getPlayerEntity(MessageContext ctx)
+//	{
+//		return ctx.getServerHandler().playerEntity;
+//	}
+//
+//	public ModelBiped getArmorModel(int id)
+//	{
+//		return null;
+//	}
+//
+//	public World getClientWorld()
+//	{
+//		return null;
+//	}
+//
+//	@Override
+//	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+//	{
+//		if(ID == TinkersDefense.GUI_CREST_INV)
+//			return new Container_CrestMount(player.inventory,
+//					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
+//		if(ID == TinkersDefense.GUI_ANVIL_INV)
+//			return new Container_FinishingAnvil(player.inventory,
+//					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+//
+//		return null;
+//	}
+//
+//	@Override
+//	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+//	{
+//		if(ID == TinkersDefense.GUI_CREST_INV)
+//			return new Gui_CrestMount(player.inventory,
+//					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
+//		if(ID == TinkersDefense.GUI_ANVIL_INV)
+//			return new Gui_FinishingAnvil(player.inventory,
+//					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+//		return null;
+//	}
 }