From 5dfee9ec7a4e6b32bde3017d5590329eca3e551d Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Mon, 13 Jan 2014 00:06:13 -0500
Subject: [PATCH] Precision Sawmill and overall Chance Machine framework GUI &
 Container

---
 common/mekanism/client/ClientProxy.java       |   4 +-
 .../mekanism/client/gui/GuiChanceMachine.java |  66 ++++++-
 .../client/gui/GuiPrecisionSawmill.java       |  10 +-
 common/mekanism/common/CommonProxy.java       |   4 +
 .../mekanism/common/block/BlockMachine.java   |   2 +-
 .../container/ContainerChanceMachine.java     | 168 +++++++++++++++++-
 .../container/ContainerElectricMachine.java   |   2 +-
 .../mekanism/gui/GuiPrecisionSawmill.png      | Bin 4287 -> 4282 bytes
 8 files changed, 247 insertions(+), 9 deletions(-)

diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java
index 3d0c03277..7d6d01352 100644
--- a/common/mekanism/client/ClientProxy.java
+++ b/common/mekanism/client/ClientProxy.java
@@ -26,6 +26,7 @@ import mekanism.client.gui.GuiOsmiumCompressor;
 import mekanism.client.gui.GuiPasswordEnter;
 import mekanism.client.gui.GuiPasswordModify;
 import mekanism.client.gui.GuiPortableTeleporter;
+import mekanism.client.gui.GuiPrecisionSawmill;
 import mekanism.client.gui.GuiPurificationChamber;
 import mekanism.client.gui.GuiRobitCrafting;
 import mekanism.client.gui.GuiRobitInventory;
@@ -419,7 +420,8 @@ public class ClientProxy extends CommonProxy
 				return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
 			case 33:
 				return new GuiSalinationController(player.inventory, (TileEntitySalinationController)tileEntity);
-
+			case 34:
+				return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity);
 		}
 		
 		return null;
diff --git a/common/mekanism/client/gui/GuiChanceMachine.java b/common/mekanism/client/gui/GuiChanceMachine.java
index f07044797..e08ac3e8a 100644
--- a/common/mekanism/client/gui/GuiChanceMachine.java
+++ b/common/mekanism/client/gui/GuiChanceMachine.java
@@ -1,6 +1,68 @@
 package mekanism.client.gui;
 
-public class GuiChanceMachine
+import java.util.List;
+
+import mekanism.api.ListUtils;
+import mekanism.client.gui.GuiEnergyInfo.IInfoHandler;
+import mekanism.common.inventory.container.ContainerChanceMachine;
+import mekanism.common.tile.TileEntityChanceMachine;
+import mekanism.common.util.MekanismUtils;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import org.lwjgl.opengl.GL11;
+
+public class GuiChanceMachine extends GuiMekanism
 {
-	
+    public TileEntityChanceMachine tileEntity;
+
+    public GuiChanceMachine(InventoryPlayer inventory, TileEntityChanceMachine tentity)
+    {
+        super(tentity, new ContainerChanceMachine(inventory, tentity));
+        tileEntity = tentity;
+        
+        guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation));
+        guiElements.add(new GuiUpgradeManagement(this, tileEntity, tileEntity.guiLocation));
+        guiElements.add(new GuiConfigurationTab(this, tileEntity, tileEntity.guiLocation));
+        guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15));
+        guiElements.add(new GuiEnergyInfo(new IInfoHandler() {
+        	@Override
+        	public List<String> getInfo()
+        	{
+        		String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity.getSpeedMultiplier(), tileEntity.getEnergyMultiplier(), tileEntity.ENERGY_PER_TICK));
+        		return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
+        	}
+        }, this, tileEntity, tileEntity.guiLocation));
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    {    	
+		int xAxis = (mouseX - (width - xSize) / 2);
+		int yAxis = (mouseY - (height - ySize) / 2);
+		
+        fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040);
+        fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+		
+    	super.drawGuiContainerForegroundLayer(mouseX, mouseY);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
+    {
+    	mc.renderEngine.bindTexture(tileEntity.guiLocation);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        int guiWidth = (width - xSize) / 2;
+        int guiHeight = (height - ySize) / 2;
+        drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
+        
+        int xAxis = mouseX - guiWidth;
+		int yAxis = mouseY - guiHeight;
+		
+        int displayInt;
+        
+        displayInt = tileEntity.getScaledProgress(24);
+        drawTexturedModalRect(guiWidth + 79, guiHeight + 39, 176, 0, displayInt + 1, 7);
+
+		super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
+	}
 }
diff --git a/common/mekanism/client/gui/GuiPrecisionSawmill.java b/common/mekanism/client/gui/GuiPrecisionSawmill.java
index 33cf1a584..2cf2a8538 100644
--- a/common/mekanism/client/gui/GuiPrecisionSawmill.java
+++ b/common/mekanism/client/gui/GuiPrecisionSawmill.java
@@ -1,6 +1,12 @@
 package mekanism.client.gui;
 
-public class GuiPrecisionSawmill
+import mekanism.common.tile.TileEntityChanceMachine;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GuiPrecisionSawmill extends GuiChanceMachine
 {
-	
+    public GuiPrecisionSawmill(InventoryPlayer inventory, TileEntityChanceMachine tentity)
+    {
+    	super(inventory, tentity);
+    }
 }
diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java
index 14660b9c0..5a0f59608 100644
--- a/common/mekanism/common/CommonProxy.java
+++ b/common/mekanism/common/CommonProxy.java
@@ -4,6 +4,7 @@ import java.io.File;
 
 import mekanism.common.entity.EntityRobit;
 import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
+import mekanism.common.inventory.container.ContainerChanceMachine;
 import mekanism.common.inventory.container.ContainerChemicalInfuser;
 import mekanism.common.inventory.container.ContainerChemicalOxidizer;
 import mekanism.common.inventory.container.ContainerDictionary;
@@ -29,6 +30,7 @@ import mekanism.common.inventory.container.ContainerTeleporter;
 import mekanism.common.tile.TileEntityAdvancedElectricMachine;
 import mekanism.common.tile.TileEntityAdvancedFactory;
 import mekanism.common.tile.TileEntityBin;
+import mekanism.common.tile.TileEntityChanceMachine;
 import mekanism.common.tile.TileEntityChargepad;
 import mekanism.common.tile.TileEntityChemicalInfuser;
 import mekanism.common.tile.TileEntityChemicalInjectionChamber;
@@ -359,6 +361,8 @@ public class CommonProxy
 				return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
 			case 33:
 				return new ContainerSalinationController(player.inventory, (TileEntitySalinationController)tileEntity);
+			case 34:
+				return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity);
 		}
 		
 		return null;
diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java
index 334b7abc1..1fab1a79e 100644
--- a/common/mekanism/common/block/BlockMachine.java
+++ b/common/mekanism/common/block/BlockMachine.java
@@ -1116,7 +1116,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
 		CHEMICAL_INFUSER(Mekanism.machineBlock2ID, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true, false),
 		CHEMICAL_INJECTION_CHAMBER(Mekanism.machineBlock2ID, 3, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, false, true),
 		ELECTROLYTIC_SEPARATOR(Mekanism.machineBlock2ID, 4, "ElectrolyticSeparator", 32, 20000, TileEntityElectrolyticSeparator.class, true, false),
-		PRECISION_SAWMILL(Mekanism.machineBlock2ID, 5, "PrecisionSawmill", 33, Mekanism.precisionSawmillUsage*400, TileEntityPrecisionSawmill.class, false, true);
+		PRECISION_SAWMILL(Mekanism.machineBlock2ID, 5, "PrecisionSawmill", 34, Mekanism.precisionSawmillUsage*400, TileEntityPrecisionSawmill.class, false, true);
 
 		public int typeId;
 		public int meta;
diff --git a/common/mekanism/common/inventory/container/ContainerChanceMachine.java b/common/mekanism/common/inventory/container/ContainerChanceMachine.java
index d0dfbcd8a..88a12f88c 100644
--- a/common/mekanism/common/inventory/container/ContainerChanceMachine.java
+++ b/common/mekanism/common/inventory/container/ContainerChanceMachine.java
@@ -1,6 +1,170 @@
 package mekanism.common.inventory.container;
 
-public class ContainerChanceMachine
+import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
+import mekanism.common.inventory.slot.SlotMachineUpgrade;
+import mekanism.common.inventory.slot.SlotOutput;
+import mekanism.common.item.ItemMachineUpgrade;
+import mekanism.common.recipe.RecipeHandler;
+import mekanism.common.tile.TileEntityChanceMachine;
+import mekanism.common.util.ChargeUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerChanceMachine extends Container
 {
-	
+    private TileEntityChanceMachine tileEntity;
+
+    public ContainerChanceMachine(InventoryPlayer inventory, TileEntityChanceMachine tentity)
+    {
+        tileEntity = tentity;
+        addSlotToContainer(new Slot(tentity, 0, 56, 17));
+        addSlotToContainer(new SlotDischarge(tentity, 1, 56, 53));
+        addSlotToContainer(new SlotOutput(tentity, 2, 116, 35));
+        addSlotToContainer(new SlotMachineUpgrade(tentity, 3, 180, 11));
+        addSlotToContainer(new SlotOutput(tentity, 4, 132, 35));
+        int slotX;
+
+        for(slotX = 0; slotX < 3; ++slotX)
+        {
+            for(int slotY = 0; slotY < 9; ++slotY)
+            {
+                addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18));
+            }
+        }
+
+        for(slotX = 0; slotX < 9; ++slotX)
+        {
+            addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142));
+        }
+        
+        tileEntity.open(inventory.player);
+        tileEntity.openChest();
+    }
+    
+    @Override
+    public void onContainerClosed(EntityPlayer entityplayer)
+    {
+		super.onContainerClosed(entityplayer);
+		
+		tileEntity.close(entityplayer);
+		tileEntity.closeChest();
+    }
+
+	@Override
+    public boolean canInteractWith(EntityPlayer entityplayer)
+	{
+        return tileEntity.isUseableByPlayer(entityplayer);
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer player, int slotID)
+    {
+        ItemStack stack = null;
+        Slot currentSlot = (Slot)inventorySlots.get(slotID);
+
+        if(currentSlot != null && currentSlot.getHasStack())
+        {
+            ItemStack slotStack = currentSlot.getStack();
+            stack = slotStack.copy();
+
+            if(slotID == 2 || slotID == 4)
+            {
+            	if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
+            	{
+            		return null;
+            	}
+            }
+        	else if(ChargeUtils.canBeDischarged(slotStack))
+            {
+	            if(slotID != 1)
+	            {
+	                if(!mergeItemStack(slotStack, 1, 2, false))
+	                {
+	                	return null;
+	                }
+	            }
+	            else if(slotID == 1)
+	            {
+	            	if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
+	            	{
+	            		return null;
+	            	}
+	            }
+            }
+            else if(RecipeHandler.getChanceOutput(slotStack, false, tileEntity.getRecipes()) != null)
+    		{
+            	if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3 && slotID != 4)
+            	{
+                    if(!mergeItemStack(slotStack, 0, 1, false))
+	                {
+	                    return null;
+	                }
+            	}
+            	else {
+	            	if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
+	            	{
+	            		return null;
+	            	}
+            	}
+    		}
+            else if(slotStack.getItem() instanceof ItemMachineUpgrade)
+            {
+            	if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
+            	{
+            		if(!mergeItemStack(slotStack, 3, 4, false))
+            		{
+            			return null;
+            		}
+            	}
+            	else {
+            		if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
+            		{
+            			return null;
+            		}
+            	}
+            }
+            else {
+            	if(slotID >= 5 && slotID <= 31)
+            	{
+            		if(!mergeItemStack(slotStack, 32, inventorySlots.size(), false))
+            		{
+            			return null;
+            		}
+            	}
+            	else if(slotID > 31)
+            	{
+            		if(!mergeItemStack(slotStack, 5, 31, false))
+            		{
+            			return null;
+            		}
+            	}
+            	else {
+            		if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
+            		{
+            			return null;
+            		}
+            	}
+            }
+            
+            if(slotStack.stackSize == 0)
+            {
+                currentSlot.putStack((ItemStack)null);
+            }
+            else {
+                currentSlot.onSlotChanged();
+            }
+
+            if(slotStack.stackSize == stack.stackSize)
+            {
+                return null;
+            }
+
+            currentSlot.onPickupFromSlot(player, slotStack);
+        }
+
+        return stack;
+    }
 }
diff --git a/common/mekanism/common/inventory/container/ContainerElectricMachine.java b/common/mekanism/common/inventory/container/ContainerElectricMachine.java
index 9402da8d9..23da23b07 100644
--- a/common/mekanism/common/inventory/container/ContainerElectricMachine.java
+++ b/common/mekanism/common/inventory/container/ContainerElectricMachine.java
@@ -97,7 +97,7 @@ public class ContainerElectricMachine extends Container
     		{
             	if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
             	{
-                    if (!mergeItemStack(slotStack, 0, 1, false))
+                    if(!mergeItemStack(slotStack, 0, 1, false))
 	                {
 	                    return null;
 	                }
diff --git a/resources/assets/mekanism/gui/GuiPrecisionSawmill.png b/resources/assets/mekanism/gui/GuiPrecisionSawmill.png
index 8671d6c74dce8c7756f42a203ce663a7fd0cef2b..fba215836bf0f40899d3a71cf893070490efc586 100644
GIT binary patch
delta 2811
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

delta 2817
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
bR>%N+IU*vy#Xa*lfGk%RFXyr!i0A$eC%^l{