From 2f1397cf799804571c1c267f37e9bd89c98ca244 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Mon, 23 Feb 2015 09:48:07 -0600 Subject: Revert "Revert "Crest Mount Attempt 3 Part 2"" This reverts commit da8aa0a9994d1bf635c4ec8b1e98fce46c5ec09d. --- src/main/java/gmail/Lance5057/proxy/CommonProxy.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/main/java/gmail/Lance5057/proxy/CommonProxy.java') 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 -- cgit v1.2.3