Merge remote-tracking branch 'origin/feature/renderer' into feature/renderer

# Conflicts:
#	common/src/main/kotlin/com/lambda/gui/api/component/button/InputBarOverlay.kt

Author: bladekt

common/src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -14,6 +14,6 @@ public class KeyboardMixin {
     void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
         if (key <= 0) return;
         if (action != 1) return;
-        EventFlow.post(new KeyPressEvent(key));
+        EventFlow.post(new KeyPressEvent(key, scancode, action, modifiers));
     }
 }

common/src/main/kotlin/com/lambda/config/serializer/KeyCodeSerializer.kt

@@ -19,5 +19,5 @@ object KeyCodeSerializer : JsonSerializer<KeyCode>, JsonDeserializer<KeyCode> {
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ): KeyCode =
-        json?.asString?.let(KeyCode::fromNameOrNull) ?: throw JsonParseException("Invalid key code format")
+        json?.asString?.let(KeyCode::fromKeyName) ?: throw JsonParseException("Invalid key code format")
 }

common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt

@@ -3,13 +3,25 @@ package com.lambda.event.events
 import com.lambda.event.EventFlow
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
+import com.lambda.util.KeyCode
 
 /**
  * A class representing a [KeyPressEvent] in the event system ([EventFlow]).
  *
  * A [KeyPressEvent] is a type of event that is triggered when a key is pressed.
  * It implements [ICancellable] interface, which means the event can be cancelled.
  *
- * @property key The key code of the key that was pressed.
+ * @property keyCode The key code of the key that was pressed.
+ * @property scanCode The scan code of the key that was pressed.
+ * @property action The action that was performed on the key.
+ * @property modifiers The modifiers that were active when the key was pressed.
  */
-class KeyPressEvent(val key: Int) : ICancellable by Cancellable()
+data class KeyPressEvent(
+    val keyCode: Int,
+    val scanCode: Int,
+    val action: Int,
+    val modifiers: Int,
+) : ICancellable by Cancellable() {
+    val translated: KeyCode
+        get() = KeyCode.fromUS(keyCode, scanCode)
+}

common/src/main/kotlin/com/lambda/gui/api/LambdaGui.kt

@@ -80,17 +80,17 @@ abstract class LambdaGui(
     }
 
     final override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-        KeyCode.fromKeyCodeOrNull(keyCode)?.let {
-            onEvent(GuiEvent.KeyPress(it))
-        }
+        val translated = KeyCode.fromUS(keyCode, scanCode)
+        onEvent(GuiEvent.KeyPress(translated))
 
-        if (keyCode == KeyCode.Escape.keyCode) {
+        if (keyCode == KeyCode.ESCAPE.keyCode) {
             close()
         }
 
         return true
     }
 
+
     final override fun charTyped(chr: Char, modifiers: Int): Boolean {
         onEvent(GuiEvent.CharTyped(chr))
         return true

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BindButton.kt

@@ -9,6 +9,7 @@ import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.gui.impl.clickgui.buttons.SettingButton
 import com.lambda.util.KeyCode
 import com.lambda.util.math.ColorUtils.multAlpha
+import com.lambda.util.primitives.extension.displayValue
 
 class BindButton(
     setting: KeyBindSetting,
@@ -22,7 +23,7 @@ class BindButton(
         override val showAnimation      get() = this@BindButton.showAnimation
         override val isKeyBind = true
 
-        override fun getText() = value.localizedName
+        override fun getText() = value.displayValue
         override fun setKeyValue(key: KeyCode) { value = key }
     }.apply(layer.children::add)
 

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -15,8 +15,10 @@ import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.event.listener.UnsafeListener
 import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.module.tag.ModuleTag
+import com.lambda.util.Communication.info
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
+import org.lwjgl.glfw.GLFW
 
 /**
  * A [Module] is a feature or tool for the utility mod.
@@ -33,7 +35,7 @@ import com.lambda.util.Nameable
  * The default [keybind] is the key on which
  * the module will be activated by default.
  * If a module does not need to be activated by a key (like [ClickGUI]),
- * the default [keybind] should not be set (using [KeyCode.Unbound]).
+ * the default [keybind] should not be set (using [KeyCode.UNBOUND]).
  *
  * [Module]s are [Configurable]s with [settings] (see [AbstractSetting] for all setting types).
  * For example, a [BooleanSetting] and a [DoubleSetting] can be defined like this:
@@ -93,7 +95,7 @@ abstract class Module(
     val defaultTags: Set<ModuleTag> = setOf(),
     private val alwaysListening: Boolean = false,
     enabledByDefault: Boolean = false,
-    defaultKeybind: KeyCode = KeyCode.Unbound,
+    defaultKeybind: KeyCode = KeyCode.UNBOUND,
 ) : Nameable, Muteable, Configurable(ModuleConfig) {
     private val isEnabledSetting = setting("Enabled", enabledByDefault, visibility = { false })
     private val keybindSetting = setting("Keybind", defaultKeybind)
@@ -109,7 +111,7 @@ abstract class Module(
     init {
         listener<KeyPressEvent>(alwaysListen = true) { event ->
             val screen = mc.currentScreen
-            if (event.key == keybind.keyCode
+            if (event.translated == keybind
                 && !mc.options.commandKey.isPressed
                 && (screen == null
                 || screen is LambdaClickGui)

common/src/main/kotlin/com/lambda/module/modules/player/Nuker.kt

@@ -12,8 +12,7 @@ import net.minecraft.util.math.Vec3i
 
 object Nuker : Module(
     name = "Nuker",
-    description = "Breaks blocks around you",
-    defaultKeybind = KeyCode.Comma
+    description = "Breaks blocks around you"
 ) {
     private val flatten by setting("Flatten", true)
 

common/src/main/kotlin/com/lambda/module/modules/player/Replay.kt

@@ -98,11 +98,11 @@ object Replay : Module(
         listener<KeyPressEvent> {
             if (mc.currentScreen != null && !mc.options.commandKey.isPressed) return@listener
 
-            when (it.key) {
-                record.keyCode -> handleRecord()
-                play.keyCode -> handlePlay()
-                cycle.keyCode -> handlePlayModeCycle()
-                check.keyCode -> handleCheckpoint()
+            when (it.translated) {
+                record -> handleRecord()
+                play -> handlePlay()
+                cycle -> handlePlayModeCycle()
+                check -> handleCheckpoint()
                 else -> {}
             }
         }

common/src/main/kotlin/com/lambda/task/tasks/TaskTester.kt

@@ -9,7 +9,7 @@ import org.lwjgl.glfw.GLFW
 object TaskTester {
     init {
         listener<KeyPressEvent> {
-            if (it.key != GLFW.GLFW_KEY_Z) {
+            if (it.keyCode != GLFW.GLFW_KEY_Z) {
                 return@listener
             }
 

common/src/main/kotlin/com/lambda/util/KeyCode.kt

@@ -1,28 +1,27 @@
 package com.lambda.util
 
-import com.lambda.util.primitives.extension.displayValue
 import org.lwjgl.glfw.GLFW
 
 enum class KeyCode(val keyCode: Int) {
-    Unbound(GLFW.GLFW_KEY_UNKNOWN),
-    Space(GLFW.GLFW_KEY_SPACE),
-    Apostrophe(GLFW.GLFW_KEY_APOSTROPHE),
-    Comma(GLFW.GLFW_KEY_COMMA),
-    Minus(GLFW.GLFW_KEY_MINUS),
-    Period(GLFW.GLFW_KEY_PERIOD),
-    Slash(GLFW.GLFW_KEY_SLASH),
-    Num0(GLFW.GLFW_KEY_0),
-    Num1(GLFW.GLFW_KEY_1),
-    Num2(GLFW.GLFW_KEY_2),
-    Num3(GLFW.GLFW_KEY_3),
-    Num4(GLFW.GLFW_KEY_4),
-    Num5(GLFW.GLFW_KEY_5),
-    Num6(GLFW.GLFW_KEY_6),
-    Num7(GLFW.GLFW_KEY_7),
-    Num8(GLFW.GLFW_KEY_8),
-    Num9(GLFW.GLFW_KEY_9),
-    Semicolon(GLFW.GLFW_KEY_SEMICOLON),
-    Equal(GLFW.GLFW_KEY_EQUAL),
+    UNBOUND(GLFW.GLFW_KEY_UNKNOWN),
+    SPACE(GLFW.GLFW_KEY_SPACE),
+    APOSTROPHE(GLFW.GLFW_KEY_APOSTROPHE),
+    COMMA(GLFW.GLFW_KEY_COMMA),
+    MINUS(GLFW.GLFW_KEY_MINUS),
+    PERIOD(GLFW.GLFW_KEY_PERIOD),
+    SLASH(GLFW.GLFW_KEY_SLASH),
+    NUM_0(GLFW.GLFW_KEY_0),
+    NUM_1(GLFW.GLFW_KEY_1),
+    NUM_2(GLFW.GLFW_KEY_2),
+    NUM_3(GLFW.GLFW_KEY_3),
+    NUM_4(GLFW.GLFW_KEY_4),
+    NUM_5(GLFW.GLFW_KEY_5),
+    NUM_6(GLFW.GLFW_KEY_6),
+    NUM_7(GLFW.GLFW_KEY_7),
+    NUM_8(GLFW.GLFW_KEY_8),
+    NUM_9(GLFW.GLFW_KEY_9),
+    SEMICOLON(GLFW.GLFW_KEY_SEMICOLON),
+    EQUAL(GLFW.GLFW_KEY_EQUAL),
     A(GLFW.GLFW_KEY_A),
     B(GLFW.GLFW_KEY_B),
     C(GLFW.GLFW_KEY_C),
@@ -49,31 +48,31 @@ enum class KeyCode(val keyCode: Int) {
     X(GLFW.GLFW_KEY_X),
     Y(GLFW.GLFW_KEY_Y),
     Z(GLFW.GLFW_KEY_Z),
-    LeftBracket(GLFW.GLFW_KEY_LEFT_BRACKET),
-    Backslash(GLFW.GLFW_KEY_BACKSLASH),
-    RightBracket(GLFW.GLFW_KEY_RIGHT_BRACKET),
-    GraveAccent(GLFW.GLFW_KEY_GRAVE_ACCENT),
-    World1(GLFW.GLFW_KEY_WORLD_1),
-    World2(GLFW.GLFW_KEY_WORLD_2),
-    Escape(GLFW.GLFW_KEY_ESCAPE),
-    Enter(GLFW.GLFW_KEY_ENTER),
-    Tab(GLFW.GLFW_KEY_TAB),
-    Backspace(GLFW.GLFW_KEY_BACKSPACE),
-    Insert(GLFW.GLFW_KEY_INSERT),
-    Delete(GLFW.GLFW_KEY_DELETE),
-    Right(GLFW.GLFW_KEY_RIGHT),
-    Left(GLFW.GLFW_KEY_LEFT),
-    Down(GLFW.GLFW_KEY_DOWN),
-    Up(GLFW.GLFW_KEY_UP),
-    PageUp(GLFW.GLFW_KEY_PAGE_UP),
-    PageDown(GLFW.GLFW_KEY_PAGE_DOWN),
-    Home(GLFW.GLFW_KEY_HOME),
-    End(GLFW.GLFW_KEY_END),
-    CapsLock(GLFW.GLFW_KEY_CAPS_LOCK),
-    ScrollLock(GLFW.GLFW_KEY_SCROLL_LOCK),
-    NumLock(GLFW.GLFW_KEY_NUM_LOCK),
-    PrintScreen(GLFW.GLFW_KEY_PRINT_SCREEN),
-    Pause(GLFW.GLFW_KEY_PAUSE),
+    LEFT_BRACKET(GLFW.GLFW_KEY_LEFT_BRACKET),
+    BACKSLASH(GLFW.GLFW_KEY_BACKSLASH),
+    RIGHT_BRACKET(GLFW.GLFW_KEY_RIGHT_BRACKET),
+    GRAVE_ACCENT(GLFW.GLFW_KEY_GRAVE_ACCENT),
+    WORLD_1(GLFW.GLFW_KEY_WORLD_1),
+    WORLD_2(GLFW.GLFW_KEY_WORLD_2),
+    ESCAPE(GLFW.GLFW_KEY_ESCAPE),
+    ENTER(GLFW.GLFW_KEY_ENTER),
+    TAB(GLFW.GLFW_KEY_TAB),
+    BACKSPACE(GLFW.GLFW_KEY_BACKSPACE),
+    INSERT(GLFW.GLFW_KEY_INSERT),
+    DELETE(GLFW.GLFW_KEY_DELETE),
+    RIGHT(GLFW.GLFW_KEY_RIGHT),
+    LEFT(GLFW.GLFW_KEY_LEFT),
+    DOWN(GLFW.GLFW_KEY_DOWN),
+    UP(GLFW.GLFW_KEY_UP),
+    PAGE_UP(GLFW.GLFW_KEY_PAGE_UP),
+    PAGE_DOWN(GLFW.GLFW_KEY_PAGE_DOWN),
+    HOME(GLFW.GLFW_KEY_HOME),
+    END(GLFW.GLFW_KEY_END),
+    CAPS_LOCK(GLFW.GLFW_KEY_CAPS_LOCK),
+    SCROLL_LOCK(GLFW.GLFW_KEY_SCROLL_LOCK),
+    NUM_LOCK(GLFW.GLFW_KEY_NUM_LOCK),
+    PRINT_SCREEN(GLFW.GLFW_KEY_PRINT_SCREEN),
+    PAUSE(GLFW.GLFW_KEY_PAUSE),
     F1(GLFW.GLFW_KEY_F1),
     F2(GLFW.GLFW_KEY_F2),
     F3(GLFW.GLFW_KEY_F3),
@@ -127,13 +126,15 @@ enum class KeyCode(val keyCode: Int) {
     MENU(GLFW.GLFW_KEY_MENU),
     LAST(GLFW.GLFW_KEY_LAST);
 
-    val localizedName by lazy { GLFW.glfwGetKeyName(keyCode, 0)?.uppercase() ?: displayValue }
-
     companion object {
-        fun fromKeyCodeOrNull(keyCode: Int) = entries.firstOrNull { it.keyCode == keyCode }
-        fun fromKeyCode(keyCode: Int) = fromKeyCodeOrNull(keyCode) ?: Unbound
+        private val keyCodeMap: Map<Int, KeyCode> = entries.associateBy { it.keyCode }
+        private val nameMap: Map<String, KeyCode> = entries.associateBy { it.name.lowercase() }
+
+        fun fromKeyCodeOrNull(keyCode: Int) = keyCodeMap[keyCode]
+        fun fromKeyCode(keyCode: Int) = fromKeyCodeOrNull(keyCode) ?: UNBOUND
+        fun fromKeyName(name: String) = nameMap[name.lowercase()] ?: UNBOUND
 
-        fun fromNameOrNull(name: String) = entries.firstOrNull { it.name.equals(name, true) }
-        fun fromName(name: String) = fromNameOrNull(name) ?: Unbound
+        fun fromUS(keyCode: Int, scanCode: Int) =
+            GLFW.glfwGetKeyName(keyCode, scanCode)?.let { fromKeyName(it) } ?: fromKeyCode(keyCode)
     }
-}
+}