Merge pull request #156 from draknyte1/Multiblock-Fix

Multiblock fix for #141, other misc. fixes & a few new additions.

8 files changed, 242 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java
new file mode 100644
index 0000000000..60106825a0
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java
@@ -0,0 +1,31 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+public class CONTAINER_2by2 extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 71, 26));
+        addSlotToContainer(new Slot(mTileEntity, 1, 89, 26));
+        addSlotToContainer(new Slot(mTileEntity, 2, 71, 44));
+        addSlotToContainer(new Slot(mTileEntity, 3, 89, 44));
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 4;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 4;
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java
new file mode 100644
index 0000000000..0c011f164b
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java
@@ -0,0 +1,43 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+
+public class CONTAINER_4by4 extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new Slot(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new Slot(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new Slot(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new Slot(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new Slot(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new Slot(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new Slot(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new Slot(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new Slot(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new Slot(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new Slot(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new Slot(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new Slot(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new Slot(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new Slot(mTileEntity, 15, 107, 62));
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 16;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 16;
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java
new file mode 100644
index 0000000000..b78d8454c3
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_2by2 extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_2by2(CONTAINER_2by2 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(containerType, RES_PATH_GUI + "2by2.png");
+        mName = aName;
+    }
+    
+    public GUI_2by2(CONTAINER_2by2 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(containerType, RES_PATH_GUI + aBackground + "2by2.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java
new file mode 100644
index 0000000000..4cd599110c
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_4by4 extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_4by4(CONTAINER_4by4 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(containerType, RES_PATH_GUI + "4by4.png");
+        mName = aName;
+    }
+    
+    public GUI_4by4(CONTAINER_4by4 containerType, InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(containerType, RES_PATH_GUI + aBackground + "4by4.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java
new file mode 100644
index 0000000000..d2ca190658
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.slots.SlotElectric;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_2by2;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class CONTAINER_Electric_2by2 extends CONTAINER_2by2{
+
+	public CONTAINER_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+	
+	@Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new SlotElectric(mTileEntity, 0, 71, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 1, 89, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 2, 71, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 3, 89, 44));
+    }
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java
new file mode 100644
index 0000000000..bb70df0558
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java
@@ -0,0 +1,35 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.slots.SlotElectric;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_4by4;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class CONTAINER_Electric_4by4 extends CONTAINER_4by4{
+
+	public CONTAINER_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new SlotElectric(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new SlotElectric(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new SlotElectric(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new SlotElectric(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new SlotElectric(mTileEntity, 15, 107, 62));
+    }
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java
new file mode 100644
index 0000000000..2e365277ea
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java
@@ -0,0 +1,19 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_2by2;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_Electric_2by2 extends GUI_2by2{
+
+	public GUI_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+		super(new CONTAINER_Electric_2by2(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, aName);
+	}
+	
+	public GUI_Electric_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+       super(new CONTAINER_Electric_2by2(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, RES_PATH_GUI + aBackground + "2by2.png");
+    }
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java
new file mode 100644
index 0000000000..a09ab7d7aa
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java
@@ -0,0 +1,20 @@
+package gtPlusPlus.xmod.gregtech.api.gui.hatches.charge;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_4by4;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_Electric_4by4 extends GUI_4by4{
+
+	public GUI_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+		super(new CONTAINER_Electric_4by4(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, aName);
+	}
+	
+	public GUI_Electric_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(new CONTAINER_Electric_4by4(aInventoryPlayer, aTileEntity), aInventoryPlayer, aTileEntity, RES_PATH_GUI + aBackground + "4by4.png");
+
+    }
+
+}