Fixed the bind settings

Author: emyfops

src/main/kotlin/com/lambda/config/settings/complex/KeybindSetting.kt

@@ -65,9 +65,12 @@ class KeybindSetting(
     private var listening = false
 
     override fun ImGuiBuilder.buildLayout() {
+        text(name)
+        sameLine()
+
         val bind = value
         val preview =
-            if (listening) "$name: Press any key…"
+            if (listening) "Press any key…"
             else bind.name
 
         if (listening) {

src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt

@@ -41,7 +41,7 @@ class Vec3dSetting(
     visibility
 ) {
     override fun ImGuiBuilder.buildLayout() {
-        inputVec3d(name, ::value as Vec3d) // what the fuck
+        inputVec3d(name, ::value as Vec3d) // FixMe: what the fuck
         lambdaTooltip(description)
     }
 

src/main/kotlin/com/lambda/util/InputUtils.kt

@@ -22,6 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.events.KeyboardEvent
 import com.lambda.event.events.MouseEvent
+import it.unimi.dsi.fastutil.ints.Int2IntArrayMap
 import org.lwjgl.glfw.GLFW
 import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_ALT
 import org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_CONTROL
@@ -38,21 +39,7 @@ import org.lwjgl.glfw.GLFW.glfwGetKey
 import org.lwjgl.glfw.GLFW.glfwGetMouseButton
 
 object InputUtils : Loadable {
-    private val keys = KeyCode.entries.map { it.code }
-    private val scancodes = keys.associateWith { GLFW.glfwGetKeyScancode(it) }
-
-    private val mouses = GLFW_MOUSE_BUTTON_1..GLFW_MOUSE_BUTTON_8
-
-    private val modMap = mapOf(
-        GLFW_KEY_LEFT_SHIFT     to 0x1,
-        GLFW_KEY_RIGHT_SHIFT    to 0x1,
-        GLFW_KEY_LEFT_CONTROL   to 0x2,
-        GLFW_KEY_RIGHT_CONTROL  to 0x2,
-        GLFW_KEY_LEFT_ALT       to 0x4,
-        GLFW_KEY_RIGHT_ALT      to 0x4,
-        GLFW_KEY_LEFT_SUPER     to 0x8,
-        GLFW_KEY_RIGHT_SUPER    to 0x8,
-    )
+    private val lastPressedKeys = Int2IntArrayMap() // Keep track of the previously pressed keys to report GLFW_RELEASE states
 
     /**
      * Returns whether any of the key-codes (not scan-codes) are being pressed
@@ -61,15 +48,23 @@ object InputUtils : Loadable {
         keys.any { glfwGetKey(mc.window.handle, it) >= GLFW_PRESS }
 
     /**
-     * Creates a new event from the currently pressed keys
+     * Creates a new event from the currently pressed keys.
+     * Note: This function is extremely expensive to execute, it is recommended to not use
+     * it unless you absolutely need to. Additionally, you might screw with the key cache.
      */
     fun newKeyboardEvent(): KeyboardEvent.Press? {
         val pressedKeys = keys
             .associateWith { glfwGetKey(mc.window.handle, it) }
-            .filter { (_, state) -> state >= GLFW_PRESS }
+            .filter { (key, state) -> state >= GLFW_PRESS || lastPressedKeys[key] >= GLFW_PRESS }
+            .also { lastPressedKeys.clear() }
+            .onEach { (key, state) -> lastPressedKeys[key] = state }
+
+        // FixMe: If you are pressing two or more keys considered 'modifier' keys, you must release both of them at the
+        //  same time in order to receive an update stipulating that the last key (not actually a modifier) was released alongside its modifiers.
+        //  For the time being, I will allow this as players can still bind unique 'modifier' keys with no issues.
 
         val mods = pressedKeys.keys
-            .filter { it in GLFW_KEY_LEFT_SHIFT..GLFW_KEY_RIGHT_SUPER }
+            .filter { it in GLFW_KEY_LEFT_SHIFT..GLFW_KEY_RIGHT_SUPER && lastPressedKeys.keys.firstOrNull()?.equals(it) == false }
             .foldRight(0) { v, acc -> acc or modMap.getValue(v) }
 
         val key = pressedKeys
@@ -94,4 +89,20 @@ object InputUtils : Loadable {
 
         return MouseEvent.Click(mouse, GLFW_PRESS, mods)
     }
+
+    private val keys = KeyCode.entries.map { it.code }
+    private val scancodes = keys.associateWith { GLFW.glfwGetKeyScancode(it) }
+
+    private val mouses = GLFW_MOUSE_BUTTON_1..GLFW_MOUSE_BUTTON_8
+
+    private val modMap = mapOf(
+        GLFW_KEY_LEFT_SHIFT     to 0x1,
+        GLFW_KEY_RIGHT_SHIFT    to 0x1,
+        GLFW_KEY_LEFT_CONTROL   to 0x2,
+        GLFW_KEY_RIGHT_CONTROL  to 0x2,
+        GLFW_KEY_LEFT_ALT       to 0x4,
+        GLFW_KEY_RIGHT_ALT      to 0x4,
+        GLFW_KEY_LEFT_SUPER     to 0x8,
+        GLFW_KEY_RIGHT_SUPER    to 0x8,
+    )
 }