refactor: fit new bind system

- refactor: use `int[]` for `mouseStates`

Author: MukjepScarlet

src-theme/src/integration/events.ts

@@ -44,19 +44,13 @@ export interface KeyEvent {
 }
 
 export interface KeyBindingEvent {
-    key: {
-        code: number;
-        name: string;
-    };
+    key: string;
     action: number;
     mods: number;
 }
 
 export interface KeyBindingCPSEvent {
-    key: {
-        code: number;
-        name: string;
-    };
+    key: string;
     cps: number;
 }
 

src-theme/src/routes/hud/elements/keystrokes/Key.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
     import {listen} from "../../../../integration/ws";
-    import type {KeyEvent, KeyCPSEvent} from "../../../../integration/events";
+    import type {KeyBindingEvent, KeyBindingCPSEvent} from "../../../../integration/events";
     import type {MinecraftKeybind} from "../../../../integration/types";
 
     export let flexBasis: string = '50px';
@@ -11,7 +11,7 @@
 
     let cps = 0;
 
-    listen("key", (e: KeyEvent) => {
+    listen("keybinding", (e: KeyBindingEvent) => {
         if (e.key !== key?.key.translationKey) {
             return;
         }
@@ -20,7 +20,7 @@
     });
 
     if (showCPS) {
-        listen("keyCPS", (e: KeyCPSEvent) => {
+        listen("keybindingCPS", (e: KeyBindingCPSEvent) => {
             if (e.key !== key?.key.translationKey) {
                 return;
             }

src/main/kotlin/net/ccbluex/liquidbounce/LiquidBounce.kt

@@ -133,7 +133,6 @@ object LiquidBounce : Listenable {
 
             ChunkScanner
             WorldChangeNotifier
-            MouseStateTracker
             InputTracker
 
             // Features

src/main/kotlin/net/ccbluex/liquidbounce/event/events/GameEvents.kt

@@ -37,10 +37,6 @@ class GameTickEvent : Event()
 @WebSocketEvent
 class KeyEvent(val key: InputUtil.Key, val action: Int) : Event()
 
-@Nameable("keyCPS")
-@WebSocketEvent
-class KeyCPSEvent(val key: InputUtil.Key, val cps: Int) : Event()
-
 // Input events
 @Nameable("inputHandle")
 class InputHandleEvent : Event()
@@ -55,6 +51,14 @@ class MouseRotationEvent(var cursorDeltaX: Double, var cursorDeltaY: Double) : C
 @WebSocketEvent
 class KeybindChangeEvent : Event()
 
+@Nameable("keybinding")
+@WebSocketEvent
+class KeyBindingEvent(val key: InputUtil.Key, val action: Int, val mods: Int) : Event()
+
+@Nameable("keybindingCPS")
+@WebSocketEvent
+class KeyBindingCPSEvent(val key: InputUtil.Key, val cps: Int) : Event()
+
 @Nameable("useCooldown")
 class UseCooldownEvent(var cooldown: Int) : Event()
 

src/main/kotlin/net/ccbluex/liquidbounce/utils/input/InputTracker.kt

@@ -19,12 +19,15 @@
 
 package net.ccbluex.liquidbounce.utils.input
 
+import net.ccbluex.liquidbounce.event.EventManager
 import net.ccbluex.liquidbounce.event.Listenable
-import net.ccbluex.liquidbounce.event.events.MouseButtonEvent
+import net.ccbluex.liquidbounce.event.events.*
 import net.ccbluex.liquidbounce.event.handler
 import net.ccbluex.liquidbounce.utils.client.mc
 import net.minecraft.client.option.KeyBinding
 import net.minecraft.client.util.InputUtil
+import net.minecraft.client.util.InputUtil.Type.KEYSYM
+import net.minecraft.client.util.InputUtil.Type.MOUSE
 import org.lwjgl.glfw.GLFW
 
 /**
@@ -34,8 +37,71 @@ import org.lwjgl.glfw.GLFW
  */
 object InputTracker : Listenable {
 
-    // Tracks the state of each mouse button (pressed or not).
-    private val mouseStates = mutableMapOf<Int, Boolean>()
+    private val trackers = listOf(
+        KeyBindingTracker(mc.options.forwardKey),
+        KeyBindingTracker(mc.options.backKey),
+        KeyBindingTracker(mc.options.leftKey),
+        KeyBindingTracker(mc.options.rightKey),
+        KeyBindingTracker(mc.options.jumpKey),
+        KeyBindingTracker(mc.options.attackKey),
+        KeyBindingTracker(mc.options.useKey),
+    )
+
+    override fun children(): List<Listenable> = trackers
+
+    // Tracks CPS
+    class KeyBindingTracker internal constructor(val keyBinding: KeyBinding) : Listenable {
+        // Records clicks in latest 20 ticks (1 sec)
+        private val countByTick = IntArray(20)
+        private var tickIndex = 0
+        private var currentCount = 0
+
+        // Sum of countByTick
+        var cps = 0
+            private set
+
+        var pressed = false
+            private set(value) {
+                if (value) {
+                    currentCount++
+                }
+                field = value
+            }
+
+        @Suppress("NOTHING_TO_INLINE")
+        private inline fun setPressed(action: Int) {
+            when (action) {
+                GLFW.GLFW_RELEASE -> pressed = false
+                GLFW.GLFW_PRESS -> pressed = true
+            }
+        }
+
+        val keyHandler = handler<KeyboardKeyEvent> {
+            if (keyBinding.boundKey.category == KEYSYM && keyBinding.boundKey.code == it.key.code) {
+                setPressed(it.action)
+                EventManager.callEvent(KeyBindingEvent(keyBinding.boundKey, it.action, it.mods))
+            }
+        }
+
+        val mouseHandler = handler<MouseButtonEvent> {
+            if (keyBinding.boundKey.category == MOUSE && keyBinding.boundKey.code == it.button) {
+                setPressed(it.action)
+                EventManager.callEvent(KeyBindingEvent(keyBinding.boundKey, it.action, it.mods))
+            }
+        }
+
+        val tickHandler = handler<PlayerTickEvent> {
+            cps -= countByTick[tickIndex]
+            countByTick[tickIndex] = currentCount
+            cps += currentCount
+            currentCount = 0
+            tickIndex = (tickIndex + 1) % countByTick.size
+            EventManager.callEvent(KeyBindingCPSEvent(keyBinding.boundKey, cps))
+        }
+    }
+
+    // Tracks the state of each mouse button.
+    private val mouseStates = IntArray(32)
 
     /**
      * Extension property that checks if a key binding is pressed on either the keyboard or mouse.
@@ -68,7 +134,7 @@ object InputTracker : Listenable {
      */
     @Suppress("unused")
     private val handleMouseAction = handler<MouseButtonEvent> {
-        mouseStates[it.button] = it.action == GLFW.GLFW_PRESS
+        mouseStates[it.button] = it.action
     }
 
     /**
@@ -77,5 +143,5 @@ object InputTracker : Listenable {
      * @param button The GLFW code of the mouse button.
      * @return True if the mouse button is pressed, false otherwise.
      */
-    fun isMouseButtonPressed(button: Int): Boolean = mouseStates.getOrDefault(button, false)
+    fun isMouseButtonPressed(button: Int): Boolean = mouseStates[button] == GLFW.GLFW_PRESS
 }

src/main/kotlin/net/ccbluex/liquidbounce/web/persistant/PersistentLocalStorage.kt

@@ -24,7 +24,7 @@ import net.ccbluex.liquidbounce.config.Configurable
 
 object PersistentLocalStorage : Configurable("storage") {
 
-    var map by value("map", mutableMapOf<String, String>())
+    val map by value("map", mutableMapOf<String, String>())
 
     init {
         ConfigSystem.root(this)