BindSetting & KeyCode rework

Author: bladekt

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

@@ -2,23 +2,23 @@ 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
 
-// ToDo: Use key lookup table to store actual key names
 object KeyCodeSerializer : JsonSerializer<KeyCode>, JsonDeserializer<KeyCode> {
     override fun serialize(
         src: KeyCode?,
         typeOfSrc: Type?,
         context: JsonSerializationContext?,
     ): JsonElement =
         src?.let {
-            JsonPrimitive(it.key)
+            JsonPrimitive(it.displayValue)
         } ?: JsonNull.INSTANCE
 
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ): KeyCode =
-        json?.asInt?.let { KeyCode(it) } ?: throw JsonParseException("Invalid key code format")
+        json?.asString?.let(KeyCode::byNameOrNull) ?: throw JsonParseException("Invalid key code format")
 }

common/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -1,8 +1,6 @@
 package com.lambda.config.settings.comparable
 
 import com.lambda.config.AbstractSetting
-import com.lambda.util.Nameable
-import java.util.*
 
 class EnumSetting<T : Enum<T>>(
     override val name: String,
@@ -14,12 +12,6 @@ class EnumSetting<T : Enum<T>>(
     description,
     visibility,
 ) {
-    val displayValue get() = (value as? Nameable)?.name ?: value.name.split('_').joinToString(" ") { low ->
-        low.lowercase().replaceFirstChar {
-            if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
-        }
-    }
-
     val enumValues: Array<T> = defaultValue.declaringJavaClass.enumConstants
 
     fun next() {

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

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

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

@@ -23,6 +23,7 @@ abstract class InputBarOverlay (renderer: LayerEntry, owner: ChildLayer.Drawable
     protected abstract val interactAnimation: Double
     protected abstract val hoverFontAnimation: Double
     protected abstract val showAnimation: Double
+    protected open val isKeyBind: Boolean = false
 
     val activeAnimation by owner.gui.animation.exp(0.0, 1.0, 0.7, ::isActive)
     private var typeAnimation by owner.gui.animation.exp({ 0.0 }, 0.2)
@@ -31,7 +32,8 @@ abstract class InputBarOverlay (renderer: LayerEntry, owner: ChildLayer.Drawable
     private var offset by owner.gui.animation.exp(::targetOffset, 0.4)
 
     abstract fun getText(): String
-    abstract fun setValue(string: String)
+    open fun setStringValue(string: String) {}
+    open fun setKeyValue(key: KeyCode) {}
 
     open fun isCharAllowed(char: Char): Boolean = true
 
@@ -76,24 +78,38 @@ abstract class InputBarOverlay (renderer: LayerEntry, owner: ChildLayer.Drawable
             }
 
             is GuiEvent.CharTyped -> {
-                if (!isActive || !isCharAllowed(e.char)) return
+                if (!isActive || !isCharAllowed(e.char) || isKeyBind) return
                 field.text += e.char
                 typeAnimation = 1.0
             }
 
             is GuiEvent.KeyPress -> {
                 if (!isActive) return
 
+                if (isKeyBind) {
+                    val key = when (e.key) {
+                        KeyCode.Delete, KeyCode.Backspace -> KeyCode.Unbound
+                        KeyCode.Escape -> return
+                        else -> e.key
+                    }
+
+                    setKeyValue(key)
+                    toggle()
+                    return
+                }
+
                 when (e.key) {
                     KeyCode.Enter -> {
-                        setValue(field.text)
+                        setStringValue(field.text)
                         toggle()
                     }
 
                     KeyCode.Backspace -> {
                         field.text = field.text.dropLast(1)
                         typeAnimation = -1.0
                     }
+
+                    else -> {}
                 }
             }
         }

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

@@ -4,6 +4,7 @@ import com.lambda.config.settings.NumericSetting
 import com.lambda.config.settings.StringSetting
 import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.config.settings.comparable.EnumSetting
+import com.lambda.config.settings.complex.KeyBindSetting
 import com.lambda.core.LambdaSound
 import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.graphics.animation.Animation.Companion.exp
@@ -13,10 +14,7 @@ import com.lambda.gui.api.component.WindowComponent
 import com.lambda.gui.api.component.button.ListButton
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.api.layer.RenderLayer
-import com.lambda.gui.impl.clickgui.buttons.setting.BooleanButton
-import com.lambda.gui.impl.clickgui.buttons.setting.EnumSlider
-import com.lambda.gui.impl.clickgui.buttons.setting.NumberSlider
-import com.lambda.gui.impl.clickgui.buttons.setting.StringButton
+import com.lambda.gui.impl.clickgui.buttons.setting.*
 import com.lambda.module.Module
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.Mouse
@@ -108,6 +106,7 @@ class ModuleButton(
                 is NumericSetting<*> -> NumberSlider(it, settingsLayer)
                 is StringSetting -> StringButton(it, settingsLayer)
                 is EnumSetting<*> -> EnumSlider(it, settingsLayer)
+                is KeyBindSetting -> BindButton(it, settingsLayer)
                 else -> null
             }
         }.forEach(settingsLayer::addChild)

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

@@ -0,0 +1,45 @@
+package com.lambda.gui.impl.clickgui.buttons.setting
+
+import com.lambda.config.settings.complex.KeyBindSetting
+import com.lambda.gui.api.GuiEvent
+import com.lambda.gui.api.component.button.InputBarOverlay
+import com.lambda.gui.api.component.core.list.ChildLayer
+import com.lambda.gui.impl.clickgui.AbstractClickGui
+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,
+    owner: ChildLayer.Drawable<SettingButton<*, *>, ModuleButton>
+) : SettingButton<KeyCode, KeyBindSetting>(setting, owner) {
+    private val layer = ChildLayer.Drawable(owner.gui, this, owner.renderer, ::rect, InputBarOverlay::isActive)
+    private val inputBar: InputBarOverlay = object : InputBarOverlay(renderer, layer) {
+        override val pressAnimation     get() = this@BindButton.pressAnimation
+        override val interactAnimation  get() = this@BindButton.interactAnimation
+        override val hoverFontAnimation get() = this@BindButton.hoverFontAnimation
+        override val showAnimation      get() = this@BindButton.showAnimation
+        override val isKeyBind = true
+
+        override fun getText() = value.displayValue
+        override fun setKeyValue(key: KeyCode) { value = key }
+    }.apply(layer::addChild)
+
+    override val textColor get() = super.textColor.multAlpha(1.0 - inputBar.activeAnimation)
+
+    override fun onEvent(e: GuiEvent) {
+        super.onEvent(e)
+        layer.onEvent(e)
+    }
+
+    override fun unfocus() {
+        inputBar.isActive = false
+    }
+
+    override fun performClickAction(e: GuiEvent.MouseClick) {
+        if (!inputBar.isActive) (owner.gui as? AbstractClickGui)?.unfocusSettings()
+        inputBar.toggle()
+    }
+}

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

@@ -10,6 +10,7 @@ import com.lambda.util.math.ColorUtils.setAlpha
 import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.transform
+import com.lambda.util.primitives.extension.displayValue
 import java.awt.Color
 import kotlin.math.floor
 
@@ -40,7 +41,7 @@ class EnumSlider <T : Enum<T>> (
 
     init {
         renderer.font {
-            text = setting.displayValue
+            text = value.displayValue
 
             val progress = 1.0 - activeAnimation
             scale = lerp(0.5, 1.0, progress)

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

@@ -32,7 +32,7 @@ class NumberSlider <N>(
         override val showAnimation      get() = this@NumberSlider.showAnimation
 
         override fun getText() = value.let(Number::toString)
-        override fun setValue(string: String) {
+        override fun setStringValue(string: String) {
             string.toDoubleOrNull()?.let(::setValue)
         }
     }.apply(layer::addChild)

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

@@ -7,7 +7,6 @@ import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.clickgui.AbstractClickGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.gui.impl.clickgui.buttons.SettingButton
-import com.lambda.util.Mouse
 import com.lambda.util.math.ColorUtils.multAlpha
 
 class StringButton(
@@ -22,7 +21,7 @@ class StringButton(
         override val showAnimation      get() = this@StringButton.showAnimation
 
         override fun getText() = value
-        override fun setValue(string: String) { value = string }
+        override fun setStringValue(string: String) { value = string }
     }.apply(layer::addChild)
 
     override val textColor get() = super.textColor.multAlpha(1.0 - inputBar.activeAnimation)
@@ -37,7 +36,6 @@ class StringButton(
     }
 
     override fun performClickAction(e: GuiEvent.MouseClick) {
-        if (e.button != Mouse.Button.Right) return
         if (!inputBar.isActive) (owner.gui as? AbstractClickGui)?.unfocusSettings()
         inputBar.toggle()
     }

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

@@ -78,7 +78,7 @@ object Freecam : Module(
             it.context = RotationContext(rotation, rotationConfig)
         }
 
-        listener<MovementEvent.InputUpdate> { event ->2
+        listener<MovementEvent.InputUpdate> { event ->
             // Don't block baritone from working
             if (event.input !is PlayerMovementInput) {
                 // Reset actual input