From 629d824efe61360ba675a0c4cc522b7330e8c6fd Mon Sep 17 00:00:00 2001
From: 0xSeb <info@skate702.de>
Date: Mon, 23 Feb 2015 17:57:59 +0100
Subject: [PATCH] Added full Ctrl-Functionality.

---
 .../craftingkeys/ContainerManager.java        |  2 +-
 .../skate702/craftingkeys/CraftingKeys.java   | 25 +++++++++++++----
 .../java/de/skate702/craftingkeys/Helper.java | 28 +++++++++++++++++--
 .../de/skate702/craftingkeys/Settings.java    |  1 +
 .../proxies/CraftingKeysClientProxy.java      |  2 +-
 .../proxies/CraftingKeysProxy.java            |  2 +-
 6 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/skate702/craftingkeys/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/ContainerManager.java
index 85c7719..6d26c67 100644
--- a/src/main/java/de/skate702/craftingkeys/ContainerManager.java
+++ b/src/main/java/de/skate702/craftingkeys/ContainerManager.java
@@ -127,7 +127,7 @@ public class ContainerManager {
 	 */
 	public void clickOnCraftingOutput(boolean isCraftingGUI) {
 
-		// TODO: Put current Item away
+		// TODO: Put current Item away 
 
 		if (isCraftingGUI) {
 
diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
index 9b1af7c..fa8add7 100644
--- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
+++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
@@ -96,7 +96,7 @@ public class CraftingKeys {
 				ContainerManager con = new ContainerManager(guiCrafting.inventorySlots);
 
 				// Moving item to crafting table
-				if (keyDown != -1 && currentHoveredSlot != null) {
+				if (keyDown > 0 && currentHoveredSlot != null) {
 
 					// Shift = Move all
 					if (guiCrafting.isShiftKeyDown()) {
@@ -107,21 +107,36 @@ public class CraftingKeys {
 
 				}
 
+				if (keyDown == -2) {
+
+					// TODO: Space = Move all back
+					Helper.debugPrint("onTick(): [TODO] Move all items back or drop them.");
+
+				}
+
 				// Strg = Take the output
 				if (guiCrafting.isCtrlKeyDown()) {
 
 					if (guiCrafting.isShiftKeyDown()) {
 
-						// TODO: Strg + Shift = Empty Crafting Table
-						Helper.debugPrint("onTick(): [TODO] Move all items back or drop them.");
+						//Strg + Shift = Move all (resp. faster!)
+						con.clickOnCraftingOutput(true);
 
 					} else {
 
-						// Send mouse click on crafting output
-						con.clickOnCraftingOutput(true);
+						// Send mouse click on crafting output (accept also
+						// holding)
+						int ticksdown = Helper.getStrgTimesDown(true);
+						if (ticksdown == 2 || ticksdown % 15 == 0 || (ticksdown > 60 && ticksdown % 8 == 0)) {
+							con.clickOnCraftingOutput(true);
+						}
 
 					}
 
+				} else {
+
+					// Reset Strg
+					Helper.getStrgTimesDown(false);
 				}
 
 			}
diff --git a/src/main/java/de/skate702/craftingkeys/Helper.java b/src/main/java/de/skate702/craftingkeys/Helper.java
index ee49371..182d1da 100644
--- a/src/main/java/de/skate702/craftingkeys/Helper.java
+++ b/src/main/java/de/skate702/craftingkeys/Helper.java
@@ -144,7 +144,8 @@ public class Helper {
 	/**
 	 * Reads the current Keyboard-Input and converts it to a Inventory-Slot.
 	 * 
-	 * @return A Inventory-Slot (based on CraftingGUI)
+	 * @return A Inventory-Slot (based on CraftingGUI), -1 for wrong input, -2
+	 *         for space
 	 */
 	public static int craftingKeyDownToSlotNumber() {
 
@@ -170,8 +171,10 @@ public class Helper {
 			returnValue = 8;
 		} else if (Keyboard.isKeyDown(Keyboard.KEY_C)) {
 			returnValue = 9;
+		} else if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {
+			returnValue = -2;
 		}
-		
+
 		return returnValue;
 	}
 
@@ -199,4 +202,25 @@ public class Helper {
 		return returnValue;
 
 	}
+
+	/**
+	 * Saves the times strg was pressed before reseting
+	 */
+	private static int strgTimesDown = 0;
+
+	/**
+	 * Return the times Strg was pressed before reseting
+	 * 
+	 * @param strgDown
+	 *            false, if reset
+	 * @return A number of tick strg was down before
+	 */
+	public static int getStrgTimesDown(boolean strgDown) {
+
+		if (!strgDown)
+			strgTimesDown = 0;
+
+		return ++strgTimesDown;
+
+	}
 }
diff --git a/src/main/java/de/skate702/craftingkeys/Settings.java b/src/main/java/de/skate702/craftingkeys/Settings.java
index 6e68fd6..6c89ac2 100644
--- a/src/main/java/de/skate702/craftingkeys/Settings.java
+++ b/src/main/java/de/skate702/craftingkeys/Settings.java
@@ -3,3 +3,4 @@ package de.skate702.craftingkeys;
 public class Settings {
 
 }
+ 
\ No newline at end of file
diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java
index 4970649..1d295db 100644
--- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java
+++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysClientProxy.java
@@ -13,7 +13,7 @@ public class CraftingKeysClientProxy extends CraftingKeysProxy {
 
 	@Override
 	public void registerRenderers() {
-
+ 
 	}
 
 	@Override
diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
index 2731fa4..140f492 100644
--- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
+++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
@@ -19,7 +19,7 @@ public class CraftingKeysProxy {
 	public void registerRenderers() {
 
 	}
-
+ 
 	/**
 	 * The Minecraft call to send a mouse click to a GUI. [Based on INVTW]
 	 *