Hook KeyEvent into Minecraft's runKeyboardTick()

Instead of creating our own loop and keeping track of which keys were
pressed, we should instead hook into Minecraft's existing Keyboard.next()
loop (runKeyboardTick()).

This both simplifies our code and allows KeyEvents to take advantage of
Keyboard's event methods (e.g. getEventKeyCharacter()).

Author: LeafHacker

src/main/java/me/zero/client/api/event/handle/ClientHandler.java

@@ -25,7 +25,6 @@
 import me.zero.client.api.event.defaults.game.network.PacketEvent;
 import me.zero.client.api.event.defaults.game.core.KeyEvent;
 import me.zero.client.api.event.defaults.game.core.ProfilerEvent;
-import me.zero.client.api.event.defaults.game.core.TickEvent;
 import me.zero.client.api.event.defaults.game.render.Render3DEvent;
 import me.zero.client.api.event.defaults.game.render.RenderHudEvent;
 import me.zero.client.api.util.interfaces.Helper;
@@ -34,12 +33,9 @@
 import me.zero.client.api.util.render.camera.CameraManager;
 import net.minecraft.network.play.client.CPacketChatMessage;
 import net.minecraft.network.play.server.SPacketChat;
-import org.lwjgl.input.Keyboard;
 
 import java.util.stream.Stream;
 
-import static org.lwjgl.input.Keyboard.KEYBOARD_SIZE;
-
 /**
  * Some basic events that the client uses
  *
@@ -48,11 +44,6 @@
  */
 public final class ClientHandler implements Helper {
 
-    /**
-     * A map of all key states
-     */
-    private final boolean[] keyMap = new boolean[KEYBOARD_SIZE];
-
     /**
      * Handles camera updates
      */
@@ -64,8 +55,18 @@ public final class ClientHandler implements Helper {
      * Handles keybinds
      */
     @EventHandler
-    private final Listener<KeyEvent> keyListener = new Listener<>(event ->
-            Keybind.getKeybinds().stream().filter(keybind -> keybind.getType() == Keybind.Type.TOGGLE && keybind.getKey() == event.getKey()).forEach(Keybind::onClick));
+    private final Listener<KeyEvent> keyListener = new Listener<>(event -> {
+        // Get all matching keybinds
+        Stream<Keybind> keybinds = Keybind.getKeybinds().stream()
+                .filter(bind -> bind.getKey() == event.getKey());
+
+        // Run onClick for the toggle keybinds
+        keybinds.filter(bind -> bind.getType() == Keybind.Type.TOGGLE)
+                .forEach(Keybind::onClick);
+
+        // Run onPres for all matching keybinds
+        keybinds.forEach(Keybind::onPress);
+    });
 
     /**
      * Handles profiling events
@@ -78,29 +79,6 @@ public final class ClientHandler implements Helper {
             ClientAPI.EVENT_BUS.post(new Render3DEvent());
     });
 
-    /**
-     * Handles key states
-     */
-    @EventHandler
-    private final Listener<TickEvent> tickListener = new Listener<>(event -> {
-        if (mc.currentScreen != null) return;
-
-        for (int i = 1; i < KEYBOARD_SIZE; i++) {
-            final int key = i;
-            boolean currentState = Keyboard.isKeyDown(i);
-            if (currentState != keyMap[i]) {
-                if (keyMap[i] = !keyMap[i])
-                    ClientAPI.EVENT_BUS.post(new KeyEvent(i));
-
-                Stream<Keybind> keybinds = Keybind.getKeybinds().stream().filter(keybind -> keybind.getKey() == key);
-                if (currentState)
-                    keybinds.forEach(Keybind::onPress);
-                else
-                    keybinds.forEach(Keybind::onRelease);
-            }
-        }
-    });
-
     /**
      * Handles packet out-flow
      */

src/main/java/me/zero/client/load/mixin/MixinMinecraft.java

@@ -20,13 +20,11 @@
 import me.zero.client.api.Client;
 import me.zero.client.api.ClientInfo;
 import me.zero.client.api.ClientAPI;
-import me.zero.client.api.event.defaults.game.core.ClickEvent;
-import me.zero.client.api.event.defaults.game.core.GameShutdownEvent;
-import me.zero.client.api.event.defaults.game.core.LoopEvent;
-import me.zero.client.api.event.defaults.game.core.TickEvent;
+import me.zero.client.api.event.defaults.game.core.*;
 import me.zero.client.api.event.defaults.game.render.GuiEvent;
 import me.zero.client.api.event.defaults.game.world.WorldEvent;
 import me.zero.client.api.event.handle.ClientHandler;
+import me.zero.client.api.util.keybind.Keybind;
 import me.zero.client.api.util.render.gl.GlUtils;
 import me.zero.client.load.ClientInitException;
 import me.zero.client.load.mixin.wrapper.IMinecraft;
@@ -35,6 +33,7 @@
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.util.Session;
 import net.minecraft.util.Timer;
+import org.lwjgl.input.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -86,6 +85,20 @@ public void onLoop(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new LoopEvent());
     }
 
+    @Inject(method = "runTickKeyboard", at = @At(value = "INVOKE_ASSIGN", target = "org/lwjgl/input/Keyboard.getEventKeyState()Z", remap = false))
+    public void onKeyEvent(CallbackInfo ci) {
+        boolean down = Keyboard.getEventKeyState();
+        int key = Keyboard.getEventKey();
+
+        if (down)
+            ClientAPI.EVENT_BUS.post(new KeyEvent(key));
+        else
+            // TODO: split into new KeyUp event
+            Keybind.getKeybinds().stream()
+                    .filter(bind -> bind.getKey() == key)
+                    .forEach(Keybind::onRelease);
+    }
+
     @Inject(method = "init", at = @At("RETURN"))
     public void init(CallbackInfo ci) {
         // Try and find the "client.json" config