From 1ed1596f748d07d2f3dce88ebb4f6055ee055e79 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 31 Jan 2016 16:13:04 +0100
Subject: [PATCH] fix JEI stuff going over GUIs

---
 src/main/java/storagecraft/gui/GuiBase.java   | 21 ++++++++++++++++---
 .../java/storagecraft/gui/GuiConstructor.java |  2 +-
 .../java/storagecraft/gui/GuiController.java  |  2 +-
 .../java/storagecraft/gui/GuiDestructor.java  |  2 +-
 .../java/storagecraft/gui/GuiDetector.java    |  2 +-
 src/main/java/storagecraft/gui/GuiDrive.java  |  2 +-
 .../java/storagecraft/gui/GuiExporter.java    |  2 +-
 src/main/java/storagecraft/gui/GuiGrid.java   |  2 +-
 .../java/storagecraft/gui/GuiImporter.java    |  4 ++--
 .../java/storagecraft/gui/GuiSolderer.java    |  2 +-
 .../java/storagecraft/gui/GuiStorage.java     |  4 ++--
 .../gui/GuiWirelessTransmitter.java           |  2 +-
 12 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java
index fec2e4c37..0dc1b7438 100644
--- a/src/main/java/storagecraft/gui/GuiBase.java
+++ b/src/main/java/storagecraft/gui/GuiBase.java
@@ -25,17 +25,27 @@ public abstract class GuiBase extends GuiContainer
 	private int lastButtonId = 0;
 	private int lastSideButtonY = 6;
 
-	public GuiBase(Container container, int w, int h)
+	protected int width;
+	protected int height;
+
+	public GuiBase(Container container, int width, int height)
 	{
 		super(container);
 
-		this.xSize = w;
-		this.ySize = h;
+		this.width = width;
+		this.height = height;
+		this.xSize = width;
+		this.ySize = height;
 	}
 
 	@Override
 	public void initGui()
 	{
+		if (sideButtons.size() > 0)
+		{
+			xSize -= SIDE_BUTTON_WIDTH;
+		}
+
 		super.initGui();
 
 		sideButtons.clear();
@@ -44,6 +54,11 @@ public abstract class GuiBase extends GuiContainer
 		lastSideButtonY = 6;
 
 		init(guiLeft, guiTop);
+
+		if (sideButtons.size() > 0)
+		{
+			xSize += SIDE_BUTTON_WIDTH;
+		}
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiConstructor.java b/src/main/java/storagecraft/gui/GuiConstructor.java
index 5eb84749a..f4b08d62d 100644
--- a/src/main/java/storagecraft/gui/GuiConstructor.java
+++ b/src/main/java/storagecraft/gui/GuiConstructor.java
@@ -36,7 +36,7 @@ public class GuiConstructor extends GuiBase
 	{
 		bindTexture("gui/constructor.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiController.java b/src/main/java/storagecraft/gui/GuiController.java
index 1b79650da..14c205ea5 100644
--- a/src/main/java/storagecraft/gui/GuiController.java
+++ b/src/main/java/storagecraft/gui/GuiController.java
@@ -36,7 +36,7 @@ public class GuiController extends GuiBase
 	{
 		bindTexture("gui/controller.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight);
 
diff --git a/src/main/java/storagecraft/gui/GuiDestructor.java b/src/main/java/storagecraft/gui/GuiDestructor.java
index 24a760e64..e98c490f3 100644
--- a/src/main/java/storagecraft/gui/GuiDestructor.java
+++ b/src/main/java/storagecraft/gui/GuiDestructor.java
@@ -31,7 +31,7 @@ public class GuiDestructor extends GuiBase
 	{
 		bindTexture("gui/destructor.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiDetector.java b/src/main/java/storagecraft/gui/GuiDetector.java
index 10ba333cf..4b14d4e99 100644
--- a/src/main/java/storagecraft/gui/GuiDetector.java
+++ b/src/main/java/storagecraft/gui/GuiDetector.java
@@ -51,7 +51,7 @@ public class GuiDetector extends GuiBase
 	{
 		bindTexture("gui/detector.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		amountField.drawTextBox();
 	}
diff --git a/src/main/java/storagecraft/gui/GuiDrive.java b/src/main/java/storagecraft/gui/GuiDrive.java
index 327f2be69..15baca0b8 100644
--- a/src/main/java/storagecraft/gui/GuiDrive.java
+++ b/src/main/java/storagecraft/gui/GuiDrive.java
@@ -31,7 +31,7 @@ public class GuiDrive extends GuiBase
 	{
 		bindTexture("gui/drive.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiExporter.java b/src/main/java/storagecraft/gui/GuiExporter.java
index 8e65480f9..5d9829376 100644
--- a/src/main/java/storagecraft/gui/GuiExporter.java
+++ b/src/main/java/storagecraft/gui/GuiExporter.java
@@ -36,7 +36,7 @@ public class GuiExporter extends GuiBase
 	{
 		bindTexture("gui/exporter.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java
index 6944ca616..0468b6cdb 100644
--- a/src/main/java/storagecraft/gui/GuiGrid.java
+++ b/src/main/java/storagecraft/gui/GuiGrid.java
@@ -138,7 +138,7 @@ public class GuiGrid extends GuiBase
 			bindTexture("gui/grid.png");
 		}
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		searchField.drawTextBox();
 	}
diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java
index efdded5e4..94de5af0c 100644
--- a/src/main/java/storagecraft/gui/GuiImporter.java
+++ b/src/main/java/storagecraft/gui/GuiImporter.java
@@ -2,8 +2,8 @@ package storagecraft.gui;
 
 import storagecraft.container.ContainerImporter;
 import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
 import storagecraft.gui.sidebutton.SideButtonMode;
+import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
 import storagecraft.tile.TileImporter;
 import storagecraft.util.InventoryUtils;
 
@@ -39,7 +39,7 @@ public class GuiImporter extends GuiBase
 	{
 		bindTexture("gui/importer.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/gui/GuiSolderer.java b/src/main/java/storagecraft/gui/GuiSolderer.java
index ee41d85da..e7330a9f3 100644
--- a/src/main/java/storagecraft/gui/GuiSolderer.java
+++ b/src/main/java/storagecraft/gui/GuiSolderer.java
@@ -31,7 +31,7 @@ public class GuiSolderer extends GuiBase
 	{
 		bindTexture("gui/solderer.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		if (solderer.isWorking())
 		{
diff --git a/src/main/java/storagecraft/gui/GuiStorage.java b/src/main/java/storagecraft/gui/GuiStorage.java
index 74a6e974a..dfd0593c9 100644
--- a/src/main/java/storagecraft/gui/GuiStorage.java
+++ b/src/main/java/storagecraft/gui/GuiStorage.java
@@ -5,8 +5,8 @@ import java.io.IOException;
 import net.minecraft.client.gui.GuiTextField;
 import storagecraft.container.ContainerStorage;
 import storagecraft.gui.sidebutton.SideButtonCompare;
-import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
 import storagecraft.gui.sidebutton.SideButtonMode;
+import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
 import storagecraft.storage.IStorageGui;
 import storagecraft.util.InventoryUtils;
 
@@ -66,7 +66,7 @@ public class GuiStorage extends GuiBase
 	{
 		bindTexture("gui/storage.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight);
 
diff --git a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java b/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java
index 2d4014b25..9b792e622 100644
--- a/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java
+++ b/src/main/java/storagecraft/gui/GuiWirelessTransmitter.java
@@ -31,7 +31,7 @@ public class GuiWirelessTransmitter extends GuiBase
 	{
 		bindTexture("gui/wireless_transmitter.png");
 
-		drawTexture(x, y, 0, 0, xSize, ySize);
+		drawTexture(x, y, 0, 0, width, height);
 
 		if (wirelessTransmitter.isWorking())
 		{