GLFW sucks

Author: Avanatiker

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

@@ -2,7 +2,6 @@ package com.lambda.config.serializer
 
 import com.google.gson.*
 import com.lambda.util.KeyCode
-import com.lambda.util.primitives.extension.displayValue
 import java.lang.reflect.Type
 
 object KeyCodeSerializer : JsonSerializer<KeyCode>, JsonDeserializer<KeyCode> {
@@ -12,13 +11,13 @@ object KeyCodeSerializer : JsonSerializer<KeyCode>, JsonDeserializer<KeyCode> {
         context: JsonSerializationContext?,
     ): JsonElement =
         src?.let {
-            JsonPrimitive(it.displayValue)
+            JsonPrimitive(it.name)
         } ?: JsonNull.INSTANCE
 
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ): KeyCode =
-        json?.asString?.let(KeyCode::byNameOrNull) ?: throw JsonParseException("Invalid key code format")
+        json?.asString?.let(KeyCode::fromNameOrNull) ?: throw JsonParseException("Invalid key code format")
 }

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

@@ -80,11 +80,11 @@ abstract class LambdaGui(
     }
 
     final override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-        KeyCode.byIdOrNull(keyCode)?.let {
+        KeyCode.fromKeyCodeOrNull(keyCode)?.let {
             onEvent(GuiEvent.KeyPress(it))
         }
 
-        if (keyCode == KeyCode.Escape.key) {
+        if (keyCode == KeyCode.Escape.keyCode) {
             close()
         }
 

…l/clickgui/buttons/setting/BIndButton.kt …l/clickgui/buttons/setting/BindButton.ktcommon/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BIndButton.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BindButton.kt common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BIndButton.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BindButton.kt

@@ -9,7 +9,6 @@ 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,
@@ -23,7 +22,7 @@ class BindButton(
         override val showAnimation      get() = this@BindButton.showAnimation
         override val isKeyBind = true
 
-        override fun getText() = value.displayValue
+        override fun getText() = value.localizedName
         override fun setKeyValue(key: KeyCode) { value = key }
     }.apply(layer::addChild)
 

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

@@ -109,7 +109,7 @@ abstract class Module(
     init {
         listener<KeyPressEvent>(alwaysListen = true) { event ->
             val screen = mc.currentScreen
-            if (event.key == keybind.key
+            if (event.key == keybind.keyCode
                 && !mc.options.commandKey.isPressed
                 && (screen == null
                 || screen is LambdaClickGui)

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

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

common/src/main/kotlin/com/lambda/module/modules/render/XRay.kt

@@ -23,14 +23,14 @@ object XRay : Module(
         Blocks.ANCIENT_DEBRIS
     )
 
-    private val selection by setting("Block Selection", defaultBlocks, "Block selection that will be shown (whitelist) or hidden (blacklist)")
+//    private val selection by setting("Block Selection", defaultBlocks, "Block selection that will be shown (whitelist) or hidden (blacklist)")
     private val mode by setting("Selection Mode", Selection.WHITELIST, "The mode of the block selection")
 
     @JvmStatic fun isSelected(blockState: BlockState) = mode.select(blockState)
 
     enum class Selection(val select: (BlockState) -> Boolean) {
-        WHITELIST({ it.block in selection }),
-        BLACKLIST({ it.block !in selection })
+        WHITELIST({ it.block in defaultBlocks }),
+        BLACKLIST({ it.block !in defaultBlocks })
     }
 
     init {

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

@@ -127,7 +127,7 @@ object Communication {
             literal("\n")
             literal("Keybind: ")
             color(GuiSettings.primaryColor) {
-                literal(module.keybind.key.toString())
+                literal(module.keybind.keyCode.toString())
             }
             literal("\n")
             literal("Default tags: ")

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

@@ -3,7 +3,7 @@ package com.lambda.util
 import com.lambda.util.primitives.extension.displayValue
 import org.lwjgl.glfw.GLFW
 
-enum class KeyCode(val key: Int) {
+enum class KeyCode(val keyCode: Int) {
     Unbound(GLFW.GLFW_KEY_UNKNOWN),
     Space(GLFW.GLFW_KEY_SPACE),
     Apostrophe(GLFW.GLFW_KEY_APOSTROPHE),
@@ -127,11 +127,13 @@ enum class KeyCode(val key: Int) {
     MENU(GLFW.GLFW_KEY_MENU),
     LAST(GLFW.GLFW_KEY_LAST);
 
+    val localizedName by lazy { GLFW.glfwGetKeyName(keyCode, 0)?.uppercase() ?: displayValue }
+
     companion object {
-        fun byIdOrNull(key: Int) = entries.firstOrNull { it.key == key }
-        fun byId(key: Int) = byIdOrNull(key) ?: Unbound
+        fun fromKeyCodeOrNull(keyCode: Int) = entries.firstOrNull { it.keyCode == keyCode }
+        fun fromKeyCode(keyCode: Int) = fromKeyCodeOrNull(keyCode) ?: Unbound
 
-        fun byNameOrNull(name: String) = entries.firstOrNull { it.displayValue.equals(name, true) }
-        fun byName(name: String) = byNameOrNull(name) ?: Unbound
+        fun fromNameOrNull(name: String) = entries.firstOrNull { it.name.equals(name, true) }
+        fun fromName(name: String) = fromNameOrNull(name) ?: Unbound
     }
 }