Fix plate roller

TeamOpenIndustry · Mar 24, 2018 · e58f287 · e58f287
1 parent 1182af6
commit e58f287
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/main/java/cam72cam/immersiverailroading/gui/PlateRollerGUI.java b/src/main/java/cam72cam/immersiverailroading/gui/PlateRollerGUI.java
@@ -10,7 +10,6 @@
 import cam72cam.immersiverailroading.library.Gauge;
 import cam72cam.immersiverailroading.library.GuiText;
 import cam72cam.immersiverailroading.library.PlateType;
-import cam72cam.immersiverailroading.multiblock.PlateRollerMultiblock.PlateRollerInstance;
 import cam72cam.immersiverailroading.registry.EntityRollingStockDefinition;
 import cam72cam.immersiverailroading.tile.TileMultiblock;
 import net.minecraft.client.gui.GuiButton;
@@ -32,7 +31,7 @@ public class PlateRollerGUI extends GuiScreen {
 
 	public PlateRollerGUI(TileMultiblock te) {
 		this.tile = te;
-		currentItem = ((PlateRollerInstance) te.getMultiblock()).getCraftItem();
+		currentItem = te.getCraftItem();
 		if (currentItem == null || currentItem.isEmpty()) {
 			currentItem = new ItemStack(IRItems.ITEM_PLATE, 1);
 		}

diff --git a/src/main/java/cam72cam/immersiverailroading/multiblock/PlateRollerMultiblock.java b/src/main/java/cam72cam/immersiverailroading/multiblock/PlateRollerMultiblock.java
@@ -110,7 +110,7 @@ public boolean onBlockActivated(EntityPlayer player, EnumHand hand, BlockPos off
 				}
 
 				if (world.isRemote) {
-					BlockPos pos = getPos(offset);
+					BlockPos pos = getPos(crafter);
 					player.openGui(ImmersiveRailroading.instance, GuiTypes.PLATE_ROLLER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
 				}
 				return true;
@@ -222,13 +222,5 @@ public boolean hasPower() {
 			return energy.getEnergyStored() > 32;
 
 		}
-
-		public ItemStack getCraftItem() {
-			TileMultiblock craftingTe = getTile(crafter);
-			if (craftingTe == null) {
-				return ItemStack.EMPTY;
-			}
-			return craftingTe.getCraftItem();
-		}
 	}
 }