Improving performance of VirtualKeybindings

Closes #27

Author: Scribble

src/main/java/de/scribble/lp/tasmod/ClientProxy.java

@@ -25,9 +25,7 @@ public class ClientProxy extends CommonProxy{
 
 	private static SavestateHandlerClient saveHandler;
 
-	private static VirtualKeybindings vkeys;
-	
-	public static KeyBinding tickratezeroKey= new KeyBinding("Toggle Tick Advance", Keyboard.KEY_F8, "TASmod");
+	public static KeyBinding tickratezeroKey= new KeyBinding("Tickrate 0 Key", Keyboard.KEY_F8, "TASmod");
 
 	public static KeyBinding tickAdvance= new KeyBinding("Advance Tick", Keyboard.KEY_F9, "TASmod");
 
@@ -50,7 +48,6 @@ public void init(FMLInitializationEvent ev) {
 		MinecraftForge.EVENT_BUS.register(new AimAssistEvents());
 
 		saveHandler=new SavestateHandlerClient();
-		vkeys=new VirtualKeybindings();
 
 		ClientRegistry.registerKeyBinding(tickratezeroKey);
 		ClientRegistry.registerKeyBinding(tickAdvance);
@@ -67,7 +64,4 @@ public static TutorialHandler getPlaybackTutorial() {
 	public static SavestateHandlerClient getSaveHandler() {
 		return saveHandler;
 	}
-	public static VirtualKeybindings getVkeys() {
-		return vkeys;
-	}
 }

src/main/java/de/scribble/lp/tasmod/mixin/MixinMinecraft.java

@@ -21,6 +21,7 @@
 import de.scribble.lp.tasmod.recording.InputRecorder;
 import de.scribble.lp.tasmod.tickratechanger.TickrateChangerClient;
 import de.scribble.lp.tasmod.ticksync.TickSync;
+import de.scribble.lp.tasmod.virtual.VirtualKeybindings;
 import de.scribble.lp.tasmod.virtual.VirtualMouseAndKeyboard;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.MusicTicker;
@@ -216,7 +217,7 @@ public void redoentireRunGameLoop(CallbackInfo ci) throws IOException {
 //        if(TickrateChangerClient.cooldownKeyAdvance>0) {
 //        	TickrateChangerClient.cooldownKeyAdvance--;
 //        }
-        ClientProxy.getVkeys().decreaseCooldowns();
+        VirtualKeybindings.increaseCooldowntimer();
         TickrateChangerClient.INSTANCE.bypass();
         for (int j = 0; j < Math.min(10, this.timer.elapsedTicks); ++j)
         {

src/main/java/de/scribble/lp/tasmod/playback/InputPlayback.java

@@ -15,6 +15,7 @@
 import de.scribble.lp.tasmod.ClientProxy;
 import de.scribble.lp.tasmod.tutorial.TutorialHandler;
 import de.scribble.lp.tasmod.util.PointerNormalizer;
+import de.scribble.lp.tasmod.virtual.VirtualKeybindings;
 import de.scribble.lp.tasmod.virtual.VirtualKeyboardEvent;
 import de.scribble.lp.tasmod.virtual.VirtualMouseAndKeyboard;
 import de.scribble.lp.tasmod.virtual.VirtualMouseEvent;
@@ -136,7 +137,7 @@ public static void nextPlaybackTick() {
 			if(!Display.isActive()) {
 				stopPlayback();
 			}
-			if(ClientProxy.getVkeys().isKeyDown(ClientProxy.stopkey)) {
+			if(VirtualKeybindings.isKeyDown(ClientProxy.stopkey)) {
 				stopPlayback();
 			}
 			if(pausePlayback) {

src/main/java/de/scribble/lp/tasmod/recording/InputRecorder.java

@@ -13,6 +13,7 @@
 import de.scribble.lp.tasmod.ClientProxy;
 import de.scribble.lp.tasmod.tutorial.TutorialHandler;
 import de.scribble.lp.tasmod.util.PointerNormalizer;
+import de.scribble.lp.tasmod.virtual.VirtualKeybindings;
 import de.scribble.lp.tasmod.virtual.VirtualKeyboardEvent;
 import de.scribble.lp.tasmod.virtual.VirtualMouseAndKeyboard;
 import de.scribble.lp.tasmod.virtual.VirtualMouseEvent;
@@ -115,15 +116,11 @@ private static String getStartLocation() {
 	 * output
 	 */
 	public static void recordTick() {
-		if (recording) {
-			/* Key for stopping the recording */
-			if (Keyboard.isKeyDown(Keyboard.KEY_N)) {
-				stopRecording();
-			}
-			if (!Display.isActive()) {
+		if(recording) {
+			if(!Display.isActive()) {
 				stopRecording();
 			}
-			if (ClientProxy.getVkeys().isKeyDown(ClientProxy.stopkey)) {
+			if(VirtualKeybindings.isKeyDown(ClientProxy.stopkey)) {
 				stopRecording();
 			}
 			if (pauseRecording) {

src/main/java/de/scribble/lp/tasmod/tickratechanger/TickrateChangerClient.java

@@ -45,9 +45,9 @@ public static void advanceTick() {
      * Bypasses the tick system
      */
     public void bypass() {
-		if (ClientProxy.getVkeys().isKeyDown(ClientProxy.tickratezeroKey)) {
+		if (VirtualKeybindings.isKeyDown(ClientProxy.tickratezeroKey)) {
 			pauseUnpauseGame();
-		} else if (ClientProxy.getVkeys().isKeyDown(ClientProxy.tickAdvance)) {
+		} else if (VirtualKeybindings.isKeyDown(ClientProxy.tickAdvance)) {
 			advanceTick();
 		}
     }

src/main/java/de/scribble/lp/tasmod/virtual/VirtualKeybindings.java

@@ -1,12 +1,16 @@
 package de.scribble.lp.tasmod.virtual;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
 import org.lwjgl.input.Keyboard;
 
+import com.google.common.collect.Maps;
+
 import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.util.IntHashMap;
 
 /**
  * Transforms certain Minecraft keybindings to keybindings checked by LWJGL's isKeyDown method. <br>
@@ -16,69 +20,28 @@
  */
 public class VirtualKeybindings {
 	private static final int standardCooldown=10;
-	List<KeyCooldown> keyList=new ArrayList<KeyCooldown>();
-	
-	private void add(KeyBinding keybinding) {
-		keyList.add(new KeyCooldown(keybinding, standardCooldown));
-	}
+	private static HashMap<KeyBinding, Long> cooldownHashMap=Maps.<KeyBinding, Long>newHashMap();
+	private static long cooldowntimer=0;
 
-	public void decreaseCooldowns() {
-		Stack<Integer> index=new Stack<Integer>();
-		for(KeyCooldown key: keyList) {
-			if(key.getCoooldown()==0) {
-				index.add(keyList.indexOf(key));
-			}else {
-				key.cooldown--;
-			}
-		}
-		for (int i = 0; i < index.size(); i++) {
-			keyList.remove((int)index.pop());
-		}
+	public static void increaseCooldowntimer() {
+		cooldowntimer++;
 	}
 
-	public boolean isKeyDown(KeyBinding key) {
-		boolean down=Keyboard.isKeyDown(key.getKeyCode());
+	public static boolean isKeyDown(KeyBinding keybind) {
+		boolean down=Keyboard.isKeyDown(keybind.getKeyCode());
 		if(down) {
-			for(KeyCooldown keys: keyList) {
-				if(keys.getKeyName().contentEquals(key.getKeyDescription())) {
-					return false;
+			if(cooldownHashMap.containsKey(keybind)) {
+				if(standardCooldown<=cooldowntimer-(long)cooldownHashMap.get(keybind)) {
+					cooldownHashMap.put(keybind, cooldowntimer);
+					return true;
 				}
+				return false;
+			}else {
+				cooldownHashMap.put(keybind, cooldowntimer);
+				return true;
 			}
-			keyList.add(new KeyCooldown(key, standardCooldown));
 		}
-		return down;
+		return false;
 	}
 
-	class KeyCooldown{
-		private KeyBinding key;
-		private int standardCooldown;
-		public int cooldown=0;
-		
-		public KeyCooldown(KeyBinding key, int standardCooldown) {
-			this.key=key;
-			this.standardCooldown=standardCooldown;
-			this.cooldown=standardCooldown;
-		}
-		
-		public int getCoooldown() {
-			return cooldown;
-		}
-		
-		public void setPressed() {
-			cooldown=standardCooldown;
-		}
-		
-		public int getKeycode() {
-			return key.getKeyCode();
-		}
-		
-		public void decreaseCooldown() {
-			if(cooldown>0) {
-				cooldown--;
-			}
-		}
-		public String getKeyName() {
-			return key.getKeyDescription();
-		}
-	}
 }