Refactor client config and add option for disabling nested pattern name rendering

Author: object-Object

Common/src/main/java/gay/object/hexdebug/api/client/splicing/SplicingTableIotaRenderer.java

@@ -3,6 +3,7 @@
 import at.petrak.hexcasting.api.casting.iota.IotaType;
 import at.petrak.hexcasting.common.lib.hex.HexIotaTypes;
 import gay.object.hexdebug.api.splicing.SplicingTableIotaClientView;
+import gay.object.hexdebug.config.HexDebugClientConfig;
 import gay.object.hexdebug.gui.splicing.SplicingTableScreen;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Tooltip;
@@ -75,7 +76,17 @@ public Tooltip createTooltip() {
      */
     @NotNull
     protected SplicingTableIotaTooltipBuilder buildTooltip() {
-        var builder = new SplicingTableIotaTooltipBuilder(iota.name())
+        Component name;
+        if (
+            type == HexIotaTypes.PATTERN
+            || HexDebugClientConfig.getConfig().getSplicingTable().getShowNestedPatternNames()
+        ) {
+            name = iota.display();
+        } else {
+            name = type.display(iota.getData());
+        }
+
+        var builder = new SplicingTableIotaTooltipBuilder(name)
             .addDetailsLine(SplicingTableScreen.tooltipText("index", iota.index()));
 
         var typeKey = HexIotaTypes.REGISTRY.getKey(type);

Common/src/main/java/gay/object/hexdebug/api/splicing/SplicingTableIotaClientView.java

@@ -18,14 +18,17 @@
  * NOTE: Consumers should not construct this class themselves, as its fields may change at any time.
  * All constructors are annotated with {@link ApiStatus.Internal} to indicate this.
  * @param tag The raw iota NBT.
- * @param name The formatted name of the iota for use in tooltips.
+ * @param display The formatted iota for use in tooltips. For patterns (including those nested in
+ *                lists), this is the pattern's name as calculated on the server, so that per-world
+ *                patterns and special handlers can be displayed with their actual names instead of
+ *                just the raw angle signature.
  * @param hexpatternSource The iota converted to a plain string in {@code .hexpattern} format.
  * @param index The index of this iota in the list.
  * @param depth The number of unclosed Introspection patterns preceding this iota.
  */
 public record SplicingTableIotaClientView(
     @NotNull CompoundTag tag,
-    @NotNull Component name,
+    @NotNull Component display,
     @NotNull String hexpatternSource,
     int index,
     int depth

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

@@ -115,28 +115,35 @@ object HexDebugClientConfig {
         @Tooltip
         val showDebugClientLineNumber: Boolean = false
 
-        @Tooltip
-        val invertSplicingTableScrollDirection: Boolean = false
-
-        @Tooltip
-        val enableSplicingTableRainbowBrackets: Boolean = true
-
-        // split Turbo into 8 samples, took the middle 6
-        @Tooltip
-        @ColorPicker
-        val rainbowBracketColors: List<Int> = listOf(
-            0xda3907,
-            0xfe9b2d,
-            0xd1e934,
-            0x62fc6b,
-            0x1bcfd5,
-            0x4676ee,
-        )
+        @CollapsibleObject(startExpanded = true)
+        val splicingTable = SplicingTable()
 
         @Tooltip
         @CollapsibleObject
         val splicingTableKeybinds = SplicingTableKeybinds()
 
+        class SplicingTable {
+            @Tooltip
+            val invertScrollDirection: Boolean = false
+
+            @Tooltip
+            val enableRainbowBrackets: Boolean = true
+
+            // split Turbo into 8 samples, took the middle 6
+            @ColorPicker
+            val rainbowBracketColors: List<Int> = listOf(
+                0xda3907,
+                0xfe9b2d,
+                0xd1e934,
+                0x62fc6b,
+                0x1bcfd5,
+                0x4676ee,
+            )
+
+            @Tooltip
+            val showNestedPatternNames: Boolean = true
+        }
+
         @Suppress("MemberVisibilityCanBePrivate")
         class SplicingTableKeybinds {
             @Tooltip

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

@@ -607,7 +607,7 @@ class SplicingTableScreen(
     override fun mouseScrolled(mouseX: Double, mouseY: Double, delta: Double): Boolean {
         if (super.mouseScrolled(mouseX, mouseY, delta)) return true
 
-        val adjustedDelta = if (HexDebugClientConfig.config.invertSplicingTableScrollDirection) {
+        val adjustedDelta = if (HexDebugClientConfig.config.splicingTable.invertScrollDirection) {
             delta * -1
         } else {
             delta

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

@@ -53,10 +53,10 @@ class PatternRenderer(
     )
 
     private val outer = if (
-        HexDebugClientConfig.config.enableSplicingTableRainbowBrackets
+        HexDebugClientConfig.config.splicingTable.enableRainbowBrackets
         && (pattern.sigsEqual(SpecialPatterns.INTROSPECTION) || pattern.sigsEqual(SpecialPatterns.RETROSPECTION))
     ) {
-        HexDebugClientConfig.config.rainbowBracketColors.getWrapping(iota.depth)
+        HexDebugClientConfig.config.splicingTable.rainbowBracketColors.getWrapping(iota.depth)
     } else {
         0xd2c8c8
     } or 0xff_000000.toInt()

Common/src/main/kotlin/gay/object/hexdebug/networking/msg/MsgSplicingTableNewDataS2C.kt

@@ -48,7 +48,7 @@ data class MsgSplicingTableNewDataS2C(
                 buf.writeNullable(list) { _, list ->
                     buf.writeCollection(list) { _, it ->
                         buf.writeNbt(it.tag)
-                        buf.writeComponent(it.name)
+                        buf.writeComponent(it.display)
                         buf.writeUtf(it.hexpatternSource)
                         buf.writeInt(it.index)
                         buf.writeInt(it.depth)

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

@@ -95,17 +95,21 @@
             "": "Show Debug Client Line Number",
             "@Tooltip": "If true, show the line number (usually 1-indexed) from the debug client (eg. VSCode) in Debugger status messages; otherwise, show the list index (0-indexed)."
           },
-          invertSplicingTableScrollDirection: {
-            "": "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.",
-          },
-          enableSplicingTableRainbowBrackets: {
-            "": "Enable Splicing Table Rainbow Brackets",
-            "@Tooltip": "If true, tint the outline of Introspection and Retrospection with rainbow colors to help identify matching brackets.",
-          },
-          rainbowBracketColors: {
-            "": "Rainbow Bracket Colors",
-            "@Tooltip": "Colors for rainbow brackets in the Splicing Table GUI.",
+          splicingTable: {
+            "": "General Splicing Table Options",
+            invertScrollDirection: {
+              "": "Invert Scroll Direction",
+              "@Tooltip": "Whether scrolling up (as opposed to down) will increase the view index of the Splicing Table, and vice versa.",
+            },
+            enableRainbowBrackets: {
+              "": "Enable Rainbow Brackets",
+              "@Tooltip": "If true, tint the outline of Introspection and Retrospection with rainbow colors to help identify matching brackets.",
+            },
+            rainbowBracketColors: "Rainbow Bracket Colors",
+            showNestedPatternNames: {
+              "": "Show Nested Pattern Names",
+              "@Tooltip": "If true, for patterns inside of embedded lists, show pattern names in the tooltip instead of the built-in inline pattern display.",
+            },
           },
           splicingTableKeybinds: {
             "": "Splicing Table Keybinds",