Refactor keybind settings

Author: object-Object

Common/src/main/java/gay/object/hexdebug/mixin/interop/emi/MixinEmiScreenManager.java

@@ -18,7 +18,7 @@ public abstract class MixinEmiScreenManager {
     @ModifyExpressionValue(method = "keyPressed", at = @At(value = "MIXINEXTRAS:EXPRESSION"), require = 0)
     private static boolean hexdebug$cancelHardcodedKeybindInSplicingTable(boolean original) {
         if (
-            HexDebugClientConfig.getConfig().getEnableSplicingTableKeybinds()
+            HexDebugClientConfig.getConfig().getSplicingTableKeybinds().getEnabled()
             && Minecraft.getInstance().screen instanceof SplicingTableScreen
         ) {
             return false;

Common/src/main/kotlin/gay/object/hexdebug/config/HexDebugClientConfig.kt

@@ -38,7 +38,7 @@ object HexDebugClientConfig {
                     entryBuilder.startModifierKeyCodeField(
                         when (config) {
                             is ClientConfig.SplicingTableKeybinds,
-                            is ClientConfig.EnlightenedSplicingTableKeybinds -> {
+                            is ClientConfig.SplicingTableKeybinds.Enlightened -> {
                                 SplicingTableScreen.buttonText(field.name.camelToSnakeCase())
                             }
                             else -> i18n.asTranslatedComponent
@@ -96,19 +96,15 @@ object HexDebugClientConfig {
         @Tooltip
         val invertSplicingTableScrollDirection: Boolean = false
 
-        @Tooltip
-        val enableSplicingTableKeybinds: Boolean = true
-
         @Tooltip
         @CollapsibleObject
         val splicingTableKeybinds = SplicingTableKeybinds()
 
-        @Tooltip
-        @CollapsibleObject
-        val enlightenedSplicingTableKeybinds = EnlightenedSplicingTableKeybinds()
-
         @Suppress("MemberVisibilityCanBePrivate")
         class SplicingTableKeybinds {
+            @Tooltip
+            val enabled: Boolean = true
+
             @Tooltip
             val overrideVanillaArrowKeys = true
 
@@ -145,6 +141,10 @@ object HexDebugClientConfig {
             val pasteSplat = ConfigModifierKey(InputConstants.KEY_V, ctrl = true)
             val pasteVerbatim = ConfigModifierKey(InputConstants.KEY_V, ctrl = true, shift = true)
 
+            @Tooltip
+            @CollapsibleObject
+            val enlightened = Enlightened()
+
             fun getActionForKey(keyCode: Int, scanCode: Int): SplicingTableAction? {
                 for ((key, action) in arrayOf(
                     viewLeft to SplicingTableAction.VIEW_LEFT,
@@ -179,10 +179,10 @@ object HexDebugClientConfig {
                 }
                 return null
             }
-        }
 
-        class EnlightenedSplicingTableKeybinds {
-            val cast = ConfigModifierKey(InputConstants.KEY_RETURN, ctrl = true)
+            class Enlightened {
+                val cast = ConfigModifierKey(InputConstants.KEY_RETURN, ctrl = true)
+            }
         }
     }
 }

Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/SplicingTableScreen.kt

@@ -538,7 +538,7 @@ class SplicingTableScreen(
     }
 
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-        if (HexDebugClientConfig.config.enableSplicingTableKeybinds) {
+        if (HexDebugClientConfig.config.splicingTableKeybinds.enabled) {
             // AbstractContainerScreen.keyPressed always returns true, so check our keys first
             if (keyPressedInner(keyCode, scanCode)) return true
 
@@ -556,8 +556,10 @@ class SplicingTableScreen(
     }
 
     private fun keyPressedInner(keyCode: Int, scanCode: Int): Boolean {
+        val keybinds = HexDebugClientConfig.config.splicingTableKeybinds
+
         if (
-            HexDebugClientConfig.config.enlightenedSplicingTableKeybinds.cast.matchesKey(keyCode, scanCode)
+            keybinds.enlightened.cast.matchesKey(keyCode, scanCode)
             && canCastIgnoringCooldown
             && castingCooldown <= 0
         ) {
@@ -567,7 +569,7 @@ class SplicingTableScreen(
             return true
         }
 
-        val action = HexDebugClientConfig.config.splicingTableKeybinds.getActionForKey(keyCode, scanCode)
+        val action = keybinds.getActionForKey(keyCode, scanCode)
             ?: return false
 
         if (data.isListReadable && action.test()) {

Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/widgets/SplicingTableButton.kt

@@ -66,10 +66,7 @@ abstract class SplicingTableButton(
     open fun reload() {}
 
     override fun updateTooltip() {
-        if (
-            HexDebugClientConfig.config.enableSplicingTableKeybinds
-            && HexDebugClientConfig.config.splicingTableKeybinds.overrideVanillaArrowKeys
-        ) {
+        if (HexDebugClientConfig.config.splicingTableKeybinds.let { it.enabled && it.overrideVanillaArrowKeys }) {
             updateFocus()
         }
         super.updateTooltip()

Common/src/main/resources/assets/hexdebug/lang/en_us.flatten.json5

@@ -95,21 +95,21 @@
             "": "Invert Splicing Table Scroll Direction",
             "@Tooltip": "Whether scrolling up (as opposed to down) will increase the view index of the splicing table, and vice versa.",
           },
-          enableSplicingTableKeybinds: {
-            "": "Enable Splicing/Mindsplice Table Keybinds",
-            "@Tooltip": "Enable custom keybinds in the Splicing Table and Mindsplice Table GUIs. If disabled, all settings in the next two categories are ignored.",
-          },
           splicingTableKeybinds: {
             "": "Splicing Table Keybinds",
             "@Tooltip": "Keybinds for actions in the Splicing Table GUI.",
+            enabled: {
+              "": "Enable Keybinds",
+              "@Tooltip": "Enable custom keybinds in the Splicing Table and Mindsplice Table GUIs. If disabled, all other settings in this category are ignored.",
+            },
             overrideVanillaArrowKeys: {
               "": "Override Vanilla Arrow Key Navigation",
               "@Tooltip": "In the Splicing Table GUI, override the vanilla feature that allows the arrow keys to be used to focus on UI elements. This setting improves usability with the default keybinds, but you may want to disable it if you rely on this feature for accessibility purposes.",
             },
-          },
-          enlightenedSplicingTableKeybinds: {
-            "": "Mindsplice Table Keybinds",
-            "@Tooltip": "Keybinds for actions in the Mindsplice Table GUI.",
+            enlightened: {
+              "": "Mindsplice Table",
+              "@Tooltip": "Keybinds for actions in the Mindsplice Table GUI.",
+            },
           },
         },
         server: {