From ca7fc4aaf44d711c8d46524b8a89a20c32962fa9 Mon Sep 17 00:00:00 2001
From: aidancbrady <me@aidancbrady.com>
Date: Tue, 15 Mar 2016 19:30:16 -0400
Subject: [PATCH] Formulaic Assemblicators are cool!

---
 .../client/gui/GuiFormulaicAssemblicator.java |  84 +++++++++++++-----
 src/main/java/mekanism/common/Mekanism.java   |   2 +-
 .../TileEntityFormulaicAssemblicator.java     |  16 +++-
 .../gui/GuiFormulaicAssemblicator.png         | Bin 6978 -> 7291 bytes
 .../resources/assets/mekanism/lang/en_US.lang |   1 +
 5 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
index 2b91bfd9c..c6ffa935f 100644
--- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
+++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
@@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay;
 import mekanism.client.gui.element.GuiSlot.SlotType;
 import mekanism.client.gui.element.GuiTransporterConfigTab;
 import mekanism.client.render.MekanismRenderer;
+import mekanism.client.sound.SoundHandler;
 import mekanism.common.Mekanism;
 import mekanism.common.inventory.container.ContainerFormulaicAssemblicator;
 import mekanism.common.item.ItemCraftingFormula;
@@ -67,6 +68,11 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
 		fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040);
 		fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
 		
+		if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91)
+		{
+			drawCreativeTabHoveringText(LangUtils.localize("gui.fillEmpty"), xAxis, yAxis);
+		}
+		
 		if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59)
 		{
 			drawCreativeTabHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis);
@@ -102,6 +108,20 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
 		int xAxis = mouseX - guiWidth;
 		int yAxis = mouseY - guiHeight;
 		
+		if(!tileEntity.autoMode)
+		{
+			if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91)
+			{
+				drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 0, 16, 16);
+			}
+			else {
+				drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 16, 16, 16);
+			}
+		}
+		else {
+			drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 32, 16, 16);
+		}
+		
 		if(!tileEntity.autoMode && tileEntity.isRecipe)
 		{
 			if(canEncode())
@@ -114,6 +134,9 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
 					drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14);
 				}
 			}
+			else {
+				drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 28, 14, 14);
+			}
 			
 			if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91)
 			{
@@ -203,33 +226,52 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
 			int xAxis = (mouseX - (width - xSize) / 2);
 			int yAxis = (mouseY - (height - ySize) / 2);
 
-			if(!tileEntity.autoMode && tileEntity.isRecipe)
+			if(!tileEntity.autoMode)
 			{
-				if(canEncode())
+				if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91)
 				{
-					if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59)
+					SoundHandler.playSound("gui.button.press");
+					
+					ArrayList data = new ArrayList();
+					data.add(4);
+
+					Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
+				}
+				
+				if(tileEntity.isRecipe)
+				{
+					if(canEncode())
 					{
+						if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59)
+						{
+							SoundHandler.playSound("gui.button.press");
+							
+							ArrayList data = new ArrayList();
+							data.add(1);
+		
+							Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
+						}
+					}
+					
+					if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91)
+					{
+						SoundHandler.playSound("gui.button.press");
+						
 						ArrayList data = new ArrayList();
-						data.add(1);
+						data.add(2);
+	
+						Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
+					}
+					
+					if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91)
+					{
+						SoundHandler.playSound("gui.button.press");
+						
+						ArrayList data = new ArrayList();
+						data.add(3);
 	
 						Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
 					}
-				}
-				
-				if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91)
-				{
-					ArrayList data = new ArrayList();
-					data.add(2);
-
-					Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
-				}
-				
-				if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91)
-				{
-					ArrayList data = new ArrayList();
-					data.add(3);
-
-					Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data));
 				}
 			}
 			
@@ -237,6 +279,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
 			{
 				if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91)
 				{
+					SoundHandler.playSound("gui.button.press");
+					
 					ArrayList data = new ArrayList();
 					data.add(0);
 	
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index 567acc64b..2bdbb49bb 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -520,7 +520,7 @@ public class Mekanism
 			"OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore
 		}));
 		MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] {
-			"STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 8), Character.valueOf('C'), Blocks.chest
+			"STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), Blocks.chest
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] {
 			Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC)
diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java
index f39623c3c..f80abd209 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java
@@ -344,11 +344,11 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im
 		while(craftSingle());
 	}
 	
-	private void moveItemsToInput()
+	private void moveItemsToInput(boolean forcePush)
 	{
 		for(int i = 27; i <= 35; i++)
 		{
-			if(inventory[i] != null && formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27))
+			if(inventory[i] != null && (forcePush || (formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27))))
 			{
 				inventory[i] = tryMoveToInput(inventory[i]);
 			}
@@ -364,7 +364,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im
 		}
 		else if(formula != null)
 		{
-			moveItemsToInput();
+			moveItemsToInput(false);
 			autoMode = true;
 		}
 		
@@ -547,6 +547,16 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im
 			{
 				craftAll();
 			}
+			else if(type == 4)
+			{
+				if(formula != null)
+				{
+					moveItemsToGrid();
+				}
+				else {
+					moveItemsToInput(true);
+				}
+			}
 			
 			return;
 		}
diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png
index 0bb436c0f23872b3d97904de4e58fa256c96aad1..12b4246bb645fa74832b89150cd88edcb23f45e1 100644
GIT binary patch
delta 6129
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
YAc_~ei`0_W1)z`NB@^9Z9hb;|1CefcVgLXD

delta 5817
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

diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index 7e30c7eb5..59ed5d2db 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -536,6 +536,7 @@ gui.encodeFormula=Encode Formula
 gui.autoModeToggle=Turn Auto-Mode
 gui.craftSingle=Craft Single Item
 gui.craftAvailable=Craft Available Items
+gui.fillEmpty=Fill/Empty Grid
 
 gui.reactor.injectionRate=Injection Rate