Revert "Revert "Crest Mount Attempt 3 Part 2""

This reverts commit da8aa0a9994d1bf635c4ec8b1e98fce46c5ec09d.

2 files changed, 14 insertions, 31 deletions

diff --git a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
index 0ddabce..7c78794 100644
--- a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
@@ -1,6 +1,8 @@
 package gmail.Lance5057.proxy;
 
 import gmail.Lance5057.blocks.Renderer_CrestMount;
+import gmail.Lance5057.containers.Container_CrestMount;
+import gmail.Lance5057.gui.Gui_CrestMount;
 import gmail.Lance5057.items.ModelTinkerArmor;
 import gmail.Lance5057.tileentities.TileEntity_CrestMount;
 import net.minecraft.client.model.ModelBiped;
@@ -11,7 +13,8 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 
 
-public class ClientProxy extends CommonProxy {
+public class ClientProxy extends CommonProxy 
+{
 	private static final ModelTinkerArmor tutChest = new ModelTinkerArmor(1.0f);
 	
         @Override
@@ -19,16 +22,7 @@ public class ClientProxy extends CommonProxy {
                 // This is for rendering entities and so forth later on
         	ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_CrestMount.class, new Renderer_CrestMount());
         }
-        @Override
-        public World getClientWorld()
-        {
-        return FMLClientHandler.instance().getClient().theWorld;
-        }
         
-        public void registerTileEntitySpecialRenderer()
-        {
-        	
-        }
         @Override
         public ModelBiped getArmorModel(int id)
         { 
@@ -39,19 +33,4 @@ public class ClientProxy extends CommonProxy {
 	        } 
         		return tutChest; //default, if whenever you should have passed on a wrong id
         } 
-      
-        @Override
-        public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-        {
-        TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null && te instanceof TileEntity_CrestMount)
-        {
-        	return null;
-			//return new Gui_CrestMount((Container_CrestMount) new Container_CrestMount(player.inventory, new TileEntity_CrestMount()));
-        }
-        else
-        {
-        return null;
-        }
-        }
-        }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
index 69d30cc..2171029 100644
--- a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
@@ -1,6 +1,9 @@
 package gmail.Lance5057.proxy;
 
 import gmail.Lance5057.com.mod_TinkersDefense;
+import gmail.Lance5057.containers.Container_CrestMount;
+import gmail.Lance5057.gui.Gui_CrestMount;
+import gmail.Lance5057.tileentities.TileEntity_CrestMount;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
@@ -35,20 +38,21 @@ public class CommonProxy implements IGuiHandler {
 			if (ID == mod_TinkersDefense.GUI_ITEM_INV)
 			{
 			// Use the player's held item to create the inventory
-			//return new Container_CrestMount(player.inventory, new TileEntity_CrestMount());
+				return new Container_CrestMount(player, player.inventory, new TileEntity_CrestMount());
 			}
 			return null;
 		}
 
 		@Override
 		public Object getClientGuiElement(int ID, EntityPlayer player,
-				World world, int x, int y, int z) {
+				World world, int x, int y, int z) 
+		{
 			if (ID == mod_TinkersDefense.GUI_ITEM_INV)
 			{
 			// We have to cast the new container as our custom class
 			// and pass in currently held item for the inventory
-			//return new Gui_CrestMount((Container_CrestMount) new Container_CrestMount(player.inventory, new TileEntity_CrestMount()));
+	        	return new Gui_CrestMount((Container_CrestMount) new Container_CrestMount(player, player.inventory, new TileEntity_CrestMount()));
 			}
 			return null;
-			}
-		} 
\ No newline at end of file
+		}
+} 
\ No newline at end of file