merge main branch (new netty server)

src-theme/src/integration/events.ts

@@ -43,6 +43,17 @@ export interface KeyEvent {
     mods: number;
 }
 
+export interface KeyBindingEvent {
+    key: string;
+    action: number;
+    mods: number;
+}
+
+export interface KeyBindingCPSEvent {
+    key: string;
+    cps: number;
+}
+
 export interface TargetChangeEvent {
     target: PlayerData | null;
 }

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

@@ -1,24 +1,43 @@
 <script lang="ts">
     import {listen} from "../../../../integration/ws";
-    import type {KeyEvent} from "../../../../integration/events";
+    import type {KeyBindingEvent, KeyBindingCPSEvent} from "../../../../integration/events";
     import type {MinecraftKeybind} from "../../../../integration/types";
 
-    export let gridArea: string;
+    export let flexBasis: string = '50px';
     export let key: MinecraftKeybind | undefined;
+    export let showName: boolean = false;
+    export let showCPS: boolean = false;
 
     let active = false;
 
-    listen("key", (e: KeyEvent) => {
+    let cps = 0;
+
+    listen("keybinding", (e: KeyBindingEvent) => {
         if (e.key !== key?.key.translationKey) {
             return;
         }
 
         active = e.action === 1 || e.action === 2;
     });
+
+    if (showCPS) {
+        listen("keybindingCPS", (e: KeyBindingCPSEvent) => {
+            if (e.key !== key?.key.translationKey) {
+                return;
+            }
+
+            cps = e.cps;
+        });
+    }
 </script>
 
-<div class="key" style="grid-area: {gridArea};" class:active>
-    {key?.key.localized ?? "???"}
+<div class="key" style="flex-basis: {flexBasis};" class:active>
+    {#if showName}
+        <span>{key?.key.localized ?? "???"}</span>
+    {/if}
+    {#if showCPS}
+        <span>{cps}</span>
+    {/if}
 </div>
 
 <style lang="scss">
@@ -29,6 +48,7 @@
     background-color: rgba($keystrokes-base-color, .68);
     color: $keystrokes-text-color;
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: center;
     border-radius: 5px;

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

@@ -10,6 +10,8 @@
     let keyLeft: MinecraftKeybind | undefined;
     let keyRight: MinecraftKeybind | undefined;
     let keyJump: MinecraftKeybind | undefined;
+    let keyAttack: MinecraftKeybind | undefined;
+    let keyUse: MinecraftKeybind | undefined;
 
     async function updateKeybinds() {
         const keybinds = await getMinecraftKeybinds();
@@ -19,6 +21,8 @@
         keyLeft = keybinds.find(k => k.bindName === "key.left");
         keyRight = keybinds.find(k => k.bindName === "key.right");
         keyJump = keybinds.find(k => k.bindName === "key.jump");
+        keyAttack = keybinds.find(k => k.bindName === "key.attack");
+        keyUse = keybinds.find(k => k.bindName === "key.use");
     }
 
     onMount(updateKeybinds);
@@ -27,21 +31,26 @@
 </script>
 
 <div class="keystrokes">
-    <Key key={keyForward} gridArea="a" />
-    <Key key={keyLeft} gridArea="b" />
-    <Key key={keyBack} gridArea="c" />
-    <Key key={keyRight} gridArea="d" />
-    <Key key={keyJump} gridArea="e" />
+    <div class="nil"></div>
+    <Key key={keyForward} showName/>
+    <div class="nil"></div>
+    <Key key={keyLeft} showName/>
+    <Key key={keyBack} showName/>
+    <Key key={keyRight} showName/>
+    <Key key={keyJump} flexBasis="100%" showName/>
+    <Key key={keyAttack} flexBasis="calc(50% - 2.5px)" showCPS/>
+    <Key key={keyUse} flexBasis="calc(50% - 2.5px)" showCPS/>
 </div>
 
 <style lang="scss">
-    .keystrokes {
-      display: grid;
-      grid-template-areas:
-        ". a ."
-        "b c d"
-        "e e e";
-      grid-template-columns: repeat(3, 50px);
-      gap: 5px;
-    }
-</style>
+  .keystrokes {
+    display: flex;
+    flex-wrap: wrap;
+    width: calc(50px * 3 + 5px * 2);
+    gap: 5px;
+  }
+
+  .nil {
+    width: 50px;
+  }
+</style>

src/main/kotlin/net/ccbluex/liquidbounce/api/oauth/OAuthClient.kt

@@ -33,7 +33,7 @@ object OAuthClient {
     private var authCodeContinuation: Continuation<String>? = null
 
     fun runWithScope(block: suspend CoroutineScope.() -> Unit) {
-        scope.launch { block() }
+        scope.launch(block = block)
     }
 
     suspend fun startAuth(onUrl: (String) -> Unit): ClientAccount {

src/main/kotlin/net/ccbluex/liquidbounce/event/EventManager.kt

@@ -50,6 +50,8 @@ val ALL_EVENT_CLASSES: Array<KClass<out Event>> = arrayOf(
     KeyEvent::class,
     MouseRotationEvent::class,
     KeybindChangeEvent::class,
+    KeyBindingEvent::class,
+    KeyBindingCPSEvent::class,
     AttackEvent::class,
     SessionEvent::class,
     ScreenEvent::class,

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

@@ -49,7 +49,15 @@ class MouseRotationEvent(var cursorDeltaX: Double, var cursorDeltaY: Double) : C
 
 @Nameable("keybindChange")
 @WebSocketEvent
-class KeybindChangeEvent: Event()
+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
 }