group build function

lambda-client · Avanatiker · Sep 15, 2025 · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025
commit 9a45a506d90b541ed319f6d3dbe003e9af8bcdf8
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt
@@ -21,9 +21,9 @@ import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.material.StackSelection
-import com.lambda.interaction.request.DebugLogger.LogEntry.Companion.toLogContext
 import com.lambda.interaction.request.LogContext
 import com.lambda.interaction.request.LogContext.Companion.buildLogContext
+import com.lambda.interaction.request.LogContext.Companion.toLogContext
 import com.lambda.interaction.request.breaking.BreakConfig
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.rotating.RotationRequest
@@ -79,15 +79,15 @@ data class BreakContext(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Break Context:")
-            pushTab()
-            text(blockPos.toLogContext())
-            text(result.toLogContext())
-            text(rotation.toLogContext())
-            value("Hotbar Index", hotbarIndex)
-            value("Instant Break", instantBreak)
-            value("Cached State", cachedState)
-            value("Expected State", expectedState)
-            value("Sort Mode", sortMode)
+            group("Break Context") {
+                text(blockPos.toLogContext())
+                text(result.toLogContext())
+                text(rotation.toLogContext())
+                value("Hotbar Index", hotbarIndex)
+                value("Instant Break", instantBreak)
+                value("Cached State", cachedState)
+                value("Expected State", expectedState)
+                value("Sort Mode", sortMode)
+            }
         }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt
@@ -19,9 +19,9 @@ package com.lambda.interaction.construction.context
 
 import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.graphics.renderer.esp.ShapeBuilder
-import com.lambda.interaction.request.DebugLogger.LogEntry.Companion.toLogContext
 import com.lambda.interaction.request.LogContext
 import com.lambda.interaction.request.LogContext.Companion.buildLogContext
+import com.lambda.interaction.request.LogContext.Companion.toLogContext
 import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
@@ -74,13 +74,13 @@ class InteractionContext(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Interaction Context:")
-            pushTab()
-            text(blockPos.toLogContext())
-            text(result.toLogContext())
-            text(rotation.toLogContext())
-            value("Hotbar Index", hotbarIndex)
-            value("Cached State", cachedState)
-            value("Expected State", expectedState)
+            group("Interaction Context") {
+                text(blockPos.toLogContext())
+                text(result.toLogContext())
+                text(rotation.toLogContext())
+                value("Hotbar Index", hotbarIndex)
+                value("Cached State", cachedState)
+                value("Expected State", expectedState)
+            }
         }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt
@@ -20,9 +20,9 @@ package com.lambda.interaction.construction.context
 import com.lambda.Lambda.mc
 import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.graphics.renderer.esp.ShapeBuilder
-import com.lambda.interaction.request.DebugLogger.LogEntry.Companion.toLogContext
 import com.lambda.interaction.request.LogContext
 import com.lambda.interaction.request.LogContext.Companion.buildLogContext
+import com.lambda.interaction.request.LogContext.Companion.toLogContext
 import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
@@ -85,16 +85,16 @@ data class PlaceContext(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Place Context:")
-            pushTab()
-            text(blockPos.toLogContext())
-            text(result.toLogContext())
-            text(rotation.toLogContext())
-            value("Hotbar Index", hotbarIndex)
-            value("Cached State", cachedState)
-            value("Expected State", expectedState)
-            value("Sneak", sneak)
-            value("Inside Block", insideBlock)
-            value("Current Dir Is Invalid", currentDirIsValid)
+            group("Place Context") {
+                text(blockPos.toLogContext())
+                text(result.toLogContext())
+                text(rotation.toLogContext())
+                value("Hotbar Index", hotbarIndex)
+                value("Cached State", cachedState)
+                value("Expected State", expectedState)
+                value("Sneak", sneak)
+                value("Inside Block", insideBlock)
+                value("Current Dir Is Invalid", currentDirIsValid)
+            }
         }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/DebugLogger.kt b/src/main/kotlin/com/lambda/interaction/request/DebugLogger.kt
@@ -138,23 +138,6 @@ class DebugLogger(
         vararg val extraContext: String?
     ) {
         val uuid = UUID.randomUUID().toString()
-        companion object {
-            fun BlockPos.toLogContext(): String {
-                val pos = if (this is BlockPos.Mutable) toImmutable() else this
-                return buildLogContext {
-                    value("Block Pos", pos.toShortString())
-                }
-            }
-
-            fun BlockHitResult.toLogContext() =
-                buildLogContext {
-                    text("Block Hit Result:")
-                    pushTab()
-                    value("Side", side)
-                    value("Block Pos", blockPos)
-                    value("Pos", pos)
-                }
-        }
     }
 
     enum class LogType(val color: Color) {

diff --git a/src/main/kotlin/com/lambda/interaction/request/LogContext.kt b/src/main/kotlin/com/lambda/interaction/request/LogContext.kt
@@ -17,23 +17,42 @@
 
 package com.lambda.interaction.request
 
+import net.minecraft.util.hit.BlockHitResult
+import net.minecraft.util.math.BlockPos
+
 interface LogContext {
     fun toLogContext(): String
 
     companion object {
         @DslMarker
         private annotation class LogContextDsl
 
+        fun BlockPos.toLogContext(): String {
+            val pos = if (this is BlockPos.Mutable) toImmutable() else this
+            return buildLogContext {
+                value("Block Pos", pos.toShortString())
+            }
+        }
+
+        fun BlockHitResult.toLogContext() =
+            buildLogContext {
+                group("Block Hit Result") {
+                    value("Side", side)
+                    value("Block Pos", blockPos)
+                    value("Pos", pos)
+                }
+            }
+
         @LogContextDsl
-        fun buildLogContext(builder: LogContextBuilder.() -> Unit): String =
-            LogContextBuilder().apply(builder).build()
+        fun buildLogContext(tabMin: Int = 0, builder: LogContextBuilder.() -> Unit): String =
+            LogContextBuilder(tabMin).apply(builder).build()
 
         private fun LogContextBuilder.build() = logContext
 
-        class LogContextBuilder {
+        class LogContextBuilder(val tabMin: Int = 0) {
             var logContext = ""
 
-            private var tabs = 0
+            private var tabs = tabMin
 
             @LogContextDsl
             fun sameLine() =
@@ -55,6 +74,12 @@ interface LogContext {
                 text("$name: $value")
             }
 
+            @LogContextDsl
+            fun group(name: String, builder: LogContextBuilder.() -> Unit) {
+                text("$name:")
+                text(LogContextBuilder(tabs + 1).apply(builder).build())
+            }
+
             @LogContextDsl
             fun pushTab() {
                 tabs++
@@ -63,6 +88,7 @@ interface LogContext {
             @LogContextDsl
             fun popTab() {
                 tabs--
+                if (tabs < tabMin) throw IllegalStateException("Cannot reduce tabs beneath the minimum tab count")
             }
         }
     }

diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt
@@ -19,7 +19,6 @@ package com.lambda.interaction.request.breaking
 
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.ActionInfo
-import com.lambda.interaction.request.DebugLogger.LogEntry.Companion.toLogContext
 import com.lambda.interaction.request.LogContext
 import com.lambda.interaction.request.LogContext.Companion.buildLogContext
 import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Primary
@@ -153,26 +152,25 @@ data class BreakInfo(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Break Info:")
-            pushTab()
-            value("Type", type)
-            text(context.blockPos.toLogContext())
-            text(context.toLogContext())
-            text("Details:")
-            pushTab()
-            value("Should Progress", shouldProgress)
-            value("Rebreak Potential", rebreakPotential)
-            text(swapInfo.toLogContext())
-            value("Swap Stack", swapStack)
-            value("Updated This Tick", updatedThisTick)
-            value("Updated Pre-Processing This Tick", updatedPreProcessingThisTick)
-            value("Progressed This Tick", progressedThisTick)
-            value("Breaking", breaking)
-            value("Abandoned", abandoned)
-            value("Breaking Ticks", breakingTicks)
-            value("Sounds Cooldown", soundsCooldown)
-            value("Vanilla Instant Breakable", vanillaInstantBreakable)
-            value("Rebreakable", rebreakable)
+            group("Break Info") {
+                value("Type", type)
+                text(context.toLogContext())
+                group("Details") {
+                    value("Should Progress", shouldProgress)
+                    value("Rebreak Potential", rebreakPotential)
+                    text(swapInfo.toLogContext())
+                    value("Swap Stack", swapStack)
+                    value("Updated This Tick", updatedThisTick)
+                    value("Updated Pre-Processing This Tick", updatedPreProcessingThisTick)
+                    value("Progressed This Tick", progressedThisTick)
+                    value("Breaking", breaking)
+                    value("Abandoned", abandoned)
+                    value("Breaking Ticks", breakingTicks)
+                    value("Sounds Cooldown", soundsCooldown)
+                    value("Vanilla Instant Breakable", vanillaInstantBreakable)
+                    value("Rebreakable", rebreakable)
+                }
+            }
         }
 
     override fun toString() = "$type, ${context.cachedState}, ${context.blockPos}"

diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt
@@ -62,19 +62,19 @@ data class BreakRequest(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Break Request")
-            pushTab()
-            value("Request ID", requestID)
-            value("Contexts", contexts.size)
-            text("Callbacks:")
-            pushTab()
-            value("onStart", onStart != null)
-            value("onUpdate", onUpdate != null)
-            value("onStop", onStop != null)
-            value("onCancel", onCancel != null)
-            value("onItemDrop", onItemDrop != null)
-            value("onReBreakStart", onReBreakStart != null)
-            value("onReBreak", onReBreak != null)
+            group("Break Request") {
+                value("Request ID", requestID)
+                value("Contexts", contexts.size)
+                group("Callbacks") {
+                    value("onStart", onStart != null)
+                    value("onUpdate", onUpdate != null)
+                    value("onStop", onStop != null)
+                    value("onCancel", onCancel != null)
+                    value("onItemDrop", onItemDrop != null)
+                    value("onReBreakStart", onReBreakStart != null)
+                    value("onReBreak", onReBreak != null)
+                }
+            }
         }
 
     @DslMarker

diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/SwapInfo.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/SwapInfo.kt
@@ -45,12 +45,12 @@ data class SwapInfo(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Swap Info:")
-            pushTab()
-            value("Type", type)
-            value("Swap", swap)
-            value("Min Keep Ticks", minKeepTicks)
-            value("Valid Swap", validSwap)
+            group("Swap Info") {
+                value("Type", type)
+                value("Swap", swap)
+                value("Min Keep Ticks", minKeepTicks)
+                value("Valid Swap", validSwap)
+            }
         }
 
     companion object {

diff --git a/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt b/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt
@@ -44,14 +44,14 @@ class HotbarRequest(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Hotbar Request:")
-            pushTab()
-            value("Request ID", requestID)
-            value("Slot", slot)
-            value("Keep Ticks", keepTicks)
-            value("Swap Pause", swapPause)
-            value("Swap Pause Age", swapPauseAge)
-            value("Active Request Age", activeRequestAge)
+            group("Hotbar Request") {
+                value("Request ID", requestID)
+                value("Slot", slot)
+                value("Keep Ticks", keepTicks)
+                value("Swap Pause", swapPause)
+                value("Swap Pause Age", swapPauseAge)
+                value("Active Request Age", activeRequestAge)
+            }
         }
 
     companion object {

diff --git a/src/main/kotlin/com/lambda/interaction/request/interacting/InteractRequest.kt b/src/main/kotlin/com/lambda/interaction/request/interacting/InteractRequest.kt
@@ -48,10 +48,10 @@ data class InteractRequest(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Interact Request:")
-            pushTab()
-            value("Request ID", requestID)
-            value("Contexts", contexts.size)
+            group("Interact Request") {
+                value("Request ID", requestID)
+                value("Contexts", contexts.size)
+            }
         }
 
     companion object {

diff --git a/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionInfo.kt b/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionInfo.kt
@@ -30,8 +30,8 @@ data class InteractionInfo(
 ) : ActionInfo, InteractConfig by config, LogContext {
     override fun toLogContext() =
         buildLogContext {
-            text("Interaction Info:")
-            pushTab()
-            text(context.toLogContext())
+            group("Interaction Info") {
+                text(context.toLogContext())
+            }
         }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt b/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt
@@ -34,9 +34,9 @@ class InventoryRequest(
 
     override fun toLogContext() =
         buildLogContext {
-            text("Inventory Request:")
-            pushTab()
-            value("Request ID", requestID)
+            group("Inventory Request") {
+                value("Request ID", requestID)
+            }
         }
 
     companion object {

diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceInfo.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceInfo.kt
@@ -32,11 +32,11 @@ data class PlaceInfo(
 ) : ActionInfo, LogContext {
     override fun toLogContext() =
         buildLogContext {
-            text("Place Info:")
-            pushTab()
-            text(context.toLogContext())
-            text("Callbacks:")
-            pushTab()
-            value("onPlace", onPlace != null)
+            group("Place Info") {
+                text(context.toLogContext())
+                group("Callbacks") {
+                    value("onPlace", onPlace != null)
+                }
+            }
         }
 }