From 757e311804488ab7a0bf598d0695388ff1bba6a0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 26 Nov 2016 19:01:10 +0000 Subject: [PATCH] Fix #804 --- .../java/techreborn/client/GuiHandler.java | 2 +- .../container/ContainerAssemblingMachine.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 7f3425154..7c8676cba 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -99,7 +99,7 @@ public class GuiHandler implements IGuiHandler { } else if (ID == chunkloaderID) { return new ContainerChunkloader((TileChunkLoader) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == assemblingmachineID) { - container = new ContainerAssemblingMachine(); + container = new ContainerAssemblingMachine(player, (TileAssemblingMachine) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == dieselGeneratorID) { return new ContainerDieselGenerator((TileDieselGenerator) world.getTileEntity(new BlockPos(x, y, z)), player); diff --git a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java index 85276ab54..d006e0fcc 100644 --- a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java @@ -5,13 +5,14 @@ import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; import reborncore.client.gui.BaseSlot; import reborncore.client.gui.SlotOutput; +import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileAssemblingMachine; import javax.annotation.Nullable; import java.util.List; -public class ContainerAssemblingMachine extends ContainerCrafting implements IContainerLayout { +public class ContainerAssemblingMachine extends ContainerCrafting{ public int tickTime; EntityPlayer player; @@ -22,7 +23,15 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo return true; } - @Override + public ContainerAssemblingMachine(EntityPlayer player, TileAssemblingMachine tile) { + super(tile.crafter); + this.player = player; + this.tile = tile; + addPlayerSlots(); + addInventorySlots(); + } + + public void addInventorySlots() { // input this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 47, 17)); @@ -38,7 +47,7 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62)); } - @Override + public void addPlayerSlots() { int i; @@ -53,32 +62,4 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo } } - @Override - public void setTile(TileAssemblingMachine tile) { - this.tile = tile; - this.crafter = tile.crafter; - } - - @Nullable - @Override - public TileAssemblingMachine 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; - } }