From 54eee49e5dfdeaf630c2b7a8d80ce92b137bdc38 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Nov 2016 18:31:50 +0000 Subject: [PATCH] Fix #810 --- .../java/techreborn/client/GuiHandler.java | 2 +- .../container/ContainerAlloySmelter.java | 43 ++++++------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index f75fb7d5e..8e54a659a 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -86,7 +86,7 @@ public class GuiHandler implements IGuiHandler { } else if (ID == blastFurnaceID) { return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == alloySmelterID) { - container = new ContainerAlloySmelter(); + container = new ContainerAlloySmelter(player, (TileAlloySmelter) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == industrialGrinderID) { return new ContainerIndustrialGrinder((TileIndustrialGrinder) world.getTileEntity(new BlockPos(x, y, z)), player); diff --git a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java index 9811bfc24..d339c8018 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java +++ b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java @@ -7,24 +7,33 @@ import reborncore.client.gui.BaseSlot; import reborncore.client.gui.SlotCharge; import reborncore.client.gui.SlotInput; import reborncore.client.gui.SlotOutput; +import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileAlloySmelter; import javax.annotation.Nullable; import java.util.List; -public class ContainerAlloySmelter extends ContainerCrafting implements IContainerLayout { +public class ContainerAlloySmelter extends ContainerCrafting { public int tickTime; EntityPlayer player; TileAlloySmelter tile; + public ContainerAlloySmelter(EntityPlayer player, TileAlloySmelter tile) { + super(tile.crafter); + this.player = player; + this.tile = tile; + addPlayerSlots(); + addInventorySlots(); + } + @Override public boolean canInteractWith(EntityPlayer player) { return true; } - @Override + public void addInventorySlots() { // input @@ -41,7 +50,7 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62)); } - @Override + public void addPlayerSlots() { int i; @@ -56,32 +65,4 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain } } - @Override - public void setTile(TileAlloySmelter tile) { - this.tile = tile; - setCrafter(tile.crafter); - } - - @Nullable - @Override - public TileAlloySmelter getTile() { - return tile; - } - - @Override - public void setPlayer(EntityPlayer player) { - this.player = player; - } - - @Nullable - @Override - public EntityPlayer getPlayer() { - return player; - } - - @Nullable - @Override - public List getSlotsForSide(EnumFacing facing) { - return null; - } }