Revert "Crest Mount Attempt 3 Part 2"

This reverts commit 6853c1789e7c211719463a58fa2f7ce7941648be.

2 files changed, 31 insertions, 14 deletions

diff --git a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
index 7c78794..0ddabce 100644
--- a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
@@ -1,8 +1,6 @@
 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;
@@ -13,8 +11,7 @@ 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
@@ -22,7 +19,16 @@ 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)
         { 
@@ -33,4 +39,19 @@ public class ClientProxy extends CommonProxy
 	        } 
         		return tutChest; //default, if whenever you should have passed on a wrong id
         } 
-}
\ No newline at end of file
+      
+        @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
diff --git a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
index 2171029..69d30cc 100644
--- a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
@@ -1,9 +1,6 @@
 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;
@@ -38,21 +35,20 @@ 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, player.inventory, new TileEntity_CrestMount());
+			//return new Container_CrestMount(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, player.inventory, new TileEntity_CrestMount()));
+			//return new Gui_CrestMount((Container_CrestMount) new Container_CrestMount(player.inventory, new TileEntity_CrestMount()));
 			}
 			return null;
-		}
-} 
\ No newline at end of file
+			}
+		} 
\ No newline at end of file