lambda-client
diff --git a/‎src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt‎
Lines changed: 46 additions & 20 deletions b/‎src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt‎
Lines changed: 46 additions & 20 deletions
diff --git a/‎src/main/kotlin/com/lambda/event/events/KeyboardEvent.kt‎
Lines changed: 3 additions & 0 deletions b/‎src/main/kotlin/com/lambda/event/events/KeyboardEvent.kt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/main/kotlin/com/lambda/event/events/MouseEvent.kt‎
Lines changed: 3 additions & 0 deletions b/‎src/main/kotlin/com/lambda/event/events/MouseEvent.kt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/main/kotlin/com/lambda/module/Module.kt‎
Lines changed: 14 additions & 11 deletions b/‎src/main/kotlin/com/lambda/module/Module.kt‎
Lines changed: 14 additions & 11 deletions
diff --git a/‎src/main/kotlin/com/lambda/module/hud/ModuleList.kt‎
Lines changed: 1 addition & 1 deletion b/‎src/main/kotlin/com/lambda/module/hud/ModuleList.kt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/kotlin/com/lambda/util/Communication.kt‎
Lines changed: 2 additions & 2 deletions b/‎src/main/kotlin/com/lambda/util/Communication.kt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/kotlin/com/lambda/util/InputUtils.kt‎
Lines changed: 2 additions & 2 deletions b/‎src/main/kotlin/com/lambda/util/InputUtils.kt‎
Lines changed: 2 additions & 2 deletions
@@ -39,7 +39,14 @@ import imgui.flag.ImGuiCol
 import imgui.flag.ImGuiHoveredFlags
 import imgui.flag.ImGuiMouseButton
 import net.minecraft.command.CommandRegistryAccess
-import org.lwjgl.glfw.GLFW
+import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_SHIFT
+import org.lwjgl.glfw.GLFW.GLFW_KEY_RIGHT_SUPER
+import org.lwjgl.glfw.GLFW.GLFW_MOD_ALT
+import org.lwjgl.glfw.GLFW.GLFW_MOD_CAPS_LOCK
+import org.lwjgl.glfw.GLFW.GLFW_MOD_CONTROL
+import org.lwjgl.glfw.GLFW.GLFW_MOD_NUM_LOCK
+import org.lwjgl.glfw.GLFW.GLFW_MOD_SHIFT
+import org.lwjgl.glfw.GLFW.GLFW_MOD_SUPER
 
 class KeybindSetting(
     override val name: String,
@@ -56,10 +63,9 @@ class KeybindSetting(
 
     override fun ImGuiBuilder.buildLayout() {
         val bind = value
-        val scancode = if (bind.code == KeyCode.UNBOUND.code) -69 else GLFW.glfwGetKeyScancode(bind.code)
-        val translated = if (bind.keyCode == KeyCode.UNBOUND) bind.keyCode else KeyCode.virtualMapUS(bind.code, scancode)
-        val preview = if (listening) "$name: Press any key…"
-        else if (bind.isMouseButton) "Mouse ${bind.code}" else "$name: $translated"
+        val preview =
+            if (listening) "$name: Press any key…"
+            else bind.name
 
         if (listening) {
             withStyleColor(ImGuiCol.Button, 0.20f, 0.50f, 1.00f, 1.00f) {
@@ -99,18 +105,23 @@ class KeybindSetting(
             lambdaTooltip("Clear binding")
         }
 
-        val keyboardPoll = InputUtils.lastKeyboardEvent
-        val mousePoll = InputUtils.lastMouseEvent
+        val keypoll = InputUtils.lastKeyboardEvent ?: return
+        val mousepoll = InputUtils.lastMouseEvent ?: return
+
         if (listening) {
-            if (keyboardPoll.isPressed) {
-                when (val key = keyboardPoll.translated) {
+            val isModKey = keypoll.keyCode in GLFW_KEY_LEFT_SHIFT..GLFW_KEY_RIGHT_SUPER
+
+            if ((keypoll.isPressed && !isModKey)
+                || (keypoll.isReleased && isModKey)
+            ) {
+                when (keypoll.translated) {
                     KeyCode.ESCAPE -> {}
                     KeyCode.BACKSPACE, KeyCode.DELETE -> value = Bind.EMPTY
-                    else -> value = Bind(key)
+                    else -> value = Bind(keypoll.keyCode, keypoll.modifiers, -1)
                 }
                 listening = false
-            } else if (mousePoll.action == Mouse.Action.Click.ordinal) {
-                value = mouseBind(mousePoll.button)
+            } else if (mousepoll.action == Mouse.Action.Click.ordinal) {
+                value = Bind(0, mousepoll.modifiers, mousepoll.button)
                 listening = false
             }
         }
@@ -136,7 +147,7 @@ class KeybindSetting(
                         bind = mouseBind(num)
                     } else {
                         bind = try {
-                            Bind(KeyCode.valueOf(name().value()))
+                            Bind(KeyCode.valueOf(name().value()).code, 0)
                         } catch(_: IllegalArgumentException) {
                             return@executeWithResult failure("${name().value()} doesn't match with a bind")
                         }
@@ -151,19 +162,34 @@ class KeybindSetting(
 }
 
 data class Bind(
-    val keyCode: KeyCode = KeyCode.UNBOUND,
-    val code: Int = keyCode.code,
-    val isMouseButton: Boolean = false
+    val key: Int,
+    val modifiers: Int,
+    val mouse: Int = -1,
 ) {
+    val truemods = buildList {
+        if (modifiers and GLFW_MOD_SHIFT != 0) add(KeyCode.LEFT_SHIFT)
+        if (modifiers and GLFW_MOD_CONTROL != 0) add(KeyCode.LEFT_CONTROL)
+        if (modifiers and GLFW_MOD_ALT != 0) add(KeyCode.LEFT_ALT)
+        if (modifiers and GLFW_MOD_SUPER != 0) add(KeyCode.LEFT_SUPER)
+        if (modifiers and GLFW_MOD_CAPS_LOCK != 0) add(KeyCode.CAPS_LOCK)
+        if (modifiers and GLFW_MOD_NUM_LOCK != 0) add(KeyCode.NUM_LOCK)
+    }
+
     val name: String
-        get() = if (isMouseButton) "Mouse $code" else keyCode.name
+        get() = buildString {
+            if (mouse >= 0) append("${Mouse.Button.fromMouseCode(mouse)} + ")
+            if (modifiers > 0) append("${truemods.joinToString(separator = "+") { it.name }} +")
+            if (key > 0) append(KeyCode.fromKeyCode(key))
+
+            if (mouse < 0 && modifiers <= 0 && key <= 0) append("Unbound")
+        }
 
     override fun toString() =
-        "Key Code: $keyCode, Code: $code, Mouse Button: $isMouseButton"
+        "Key Code: $key"
 
     companion object {
-        val EMPTY = Bind()
+        val EMPTY = Bind(0, 0)
 
-        fun mouseBind(code: Int) = Bind(code = code, isMouseButton = true)
+        fun mouseBind(code: Int) = Bind(0, 0, code)
     }
 }
@@ -17,6 +17,7 @@
 
 package com.lambda.event.events
 
+import com.lambda.config.settings.complex.Bind
 import com.lambda.event.Event
 import com.lambda.util.KeyCode
 import org.lwjgl.glfw.GLFW.GLFW_MOD_ALT
@@ -54,6 +55,8 @@ sealed class KeyboardEvent {
         val isPressed = action == GLFW_PRESS
         val isReleased = action == GLFW_RELEASE
 
+        fun satisfies(bind: Bind) = bind.key == keyCode && bind.modifiers == modifiers
+
         val hasShift = modifiers and GLFW_MOD_SHIFT != 0
         val hasControl = modifiers and GLFW_MOD_CONTROL != 0
         val hasAlt = modifiers and GLFW_MOD_ALT != 0
 
@@ -17,6 +17,7 @@
 
 package com.lambda.event.events
 
+import com.lambda.config.settings.complex.Bind
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.util.Mouse
@@ -50,6 +51,8 @@ sealed class MouseEvent {
             position
         )
 
+        fun satisfies(bind: Bind) = bind.modifiers == modifiers && bind.mouse == button
+
         val isMainButton = button <= 2
         val isSideButton = button > 2
         val isLeftButton = button == 0
 
@@ -17,7 +17,7 @@
 
 package com.lambda.module
 
-import com.lambda.Lambda.mc
+import com.lambda.Lambda
 import com.lambda.command.LambdaCommand
 import com.lambda.config.AbstractSetting
 import com.lambda.config.Configurable
@@ -135,13 +135,24 @@ abstract class Module(
 
     init {
         listen<KeyboardEvent.Press>(alwaysListen = true) { event ->
-            onButtonPress(event.keyCode, event.isPressed, event.isReleased)
+            if (Lambda.mc.options.commandKey.isPressed
+                || Lambda.mc.currentScreen != null
+                || !event.satisfies(keybind)) return@listen
+
+            if (event.isPressed) toggle()
+            else if (event.isReleased && disableOnRelease) disable()
         }
 
         listen<MouseEvent.Click>(alwaysListen = true) { event ->
             val pressed = event.action == Mouse.Action.Click.ordinal
             val released = event.action == Mouse.Action.Release.ordinal
-            onButtonPress(event.button, pressed, released)
+
+            if (mc.options.commandKey.isPressed
+                || mc.currentScreen != null
+                || !event.satisfies(keybind)) return@listen
+
+            if (pressed) toggle()
+            else if (released && disableOnRelease) disable()
         }
 
         onEnable { LambdaSound.MODULE_ON.play() }
@@ -155,14 +166,6 @@ abstract class Module(
         listen<ConnectionEvent.Disconnect> { if (autoDisable) disable() }
     }
 
-    private fun onButtonPress(code: Int, pressed: Boolean, released: Boolean) {
-        if (mc.options.commandKey.isPressed) return
-        if (mc.currentScreen != null) return
-        if (code != keybind.code) return
-        if (pressed) toggle()
-        else if (released && disableOnRelease) disable()
-    }
-
     fun enable() {
         isEnabled = true
     }
 
@@ -39,7 +39,7 @@ object ModuleList : HudModule(
 
         enabled.forEach {
             text(it.name); sameLine()
-            val color = if (it.keybind.code == KeyCode.UNBOUND.code) Color.RED else Color.GREEN
+            val color = if (it.keybind.key == 0 && it.keybind.mouse == -1) Color.RED else Color.GREEN
 
             withStyleColor(ImGuiCol.Text, color) { text(" [${it.keybind.name}]") }
         }
 
@@ -179,8 +179,8 @@ object Communication {
             }
             literal("Keybind: ")
             color(ClickGuiLayout.primaryColor) {
-                if (module.keybind.code != -1) {
-                    literal(module.keybind.code.toString())
+                if (module.keybind.key != 0 || module.keybind.mouse > -1) {
+                    literal(module.keybind.name)
                 } else {
                     literal("Unbound")
                 }
 
@@ -26,8 +26,8 @@ import com.lambda.util.math.Vec2d
 import net.minecraft.client.util.InputUtil
 
 object InputUtils : Loadable {
-    var lastKeyboardEvent: KeyboardEvent.Press = KeyboardEvent.Press(0, 0, -1, 0); private set
-    var lastMouseEvent: MouseEvent.Click = MouseEvent.Click(Mouse.Button.Left, Mouse.Action.Click, 0, Vec2d(0, 0)); private set
+    var lastKeyboardEvent: KeyboardEvent.Press? = null; private set
+    var lastMouseEvent: MouseEvent.Click? = null; private set
 
     /**
      * Returns whether any of the key-codes (not scan-codes) are being pressed
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ object ModuleList : HudModule(`
`39`	`39`
`40`	`40`	`enabled.forEach {`
`41`	`41`	`text(it.name); sameLine()`
`42`		`- val color = if (it.keybind.code == KeyCode.UNBOUND.code) Color.RED else Color.GREEN`
	`42`	`+ val color = if (it.keybind.key == 0 && it.keybind.mouse == -1) Color.RED else Color.GREEN`
`43`	`43`
`44`	`44`	`withStyleColor(ImGuiCol.Text, color) { text(" [${it.keybind.name}]") }`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ object Communication {`
`179`	`179`	`}`
`180`	`180`	`literal("Keybind: ")`
`181`	`181`	`color(ClickGuiLayout.primaryColor) {`
`182`		`- if (module.keybind.code != -1) {`
`183`		`- literal(module.keybind.code.toString())`
	`182`	`+ if (module.keybind.key != 0 \|\| module.keybind.mouse > -1) {`
	`183`	`+ literal(module.keybind.name)`
`184`	`184`	`} else {`
`185`	`185`	`literal("Unbound")`
`186`	`186`	`}`