value builder function

beanbag44 · beanbag44 · commit 582f1b3b2633 · 2025-09-09T03:00:21.000+01:00
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt
@@ -81,13 +81,13 @@ data class BreakContext(
         buildLogContext {
             text("Break Context:")
             pushTab()
-            text("Block Pos: ${blockPos.toLogContext()}")
+            text(blockPos.toLogContext())
             text(result.toLogContext())
             text(rotation.toLogContext())
-            text("Hotbar Index: $hotbarIndex")
-            text("Instant Break: $instantBreak")
-            text("Cached State: $cachedState")
-            text("Expected State: $expectedState")
-            text("Sort Mode: $sortMode")
+            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
@@ -76,11 +76,11 @@ class InteractionContext(
         buildLogContext {
             text("Interaction Context:")
             pushTab()
-            text("Block Pos: ${blockPos.toLogContext()}")
+            text(blockPos.toLogContext())
             text(result.toLogContext())
             text(rotation.toLogContext())
-            text("Hotbar Index: $hotbarIndex")
-            text("Cached State: $cachedState")
-            text("Expected State: $expectedState")
+            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
@@ -87,14 +87,14 @@ data class PlaceContext(
         buildLogContext {
             text("Place Context:")
             pushTab()
-            text("Block Pos: ${blockPos.toLogContext()}")
+            text(blockPos.toLogContext())
             text(result.toLogContext())
             text(rotation.toLogContext())
-            text("Hotbar Index: $hotbarIndex")
-            text("Cached State: $cachedState")
-            text("Expected State: $expectedState")
-            text("Sneak: $sneak")
-            text("Inside Block: $insideBlock")
-            text("Current Dir Is Invalid: $currentDirIsValid")
+            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
@@ -141,16 +141,18 @@ class DebugLogger(
         companion object {
             fun BlockPos.toLogContext(): String {
                 val pos = if (this is BlockPos.Mutable) toImmutable() else this
-                return "Pos: ${pos.toShortString()}"
+                return buildLogContext {
+                    value("Block Pos", pos.toShortString())
+                }
             }
 
             fun BlockHitResult.toLogContext() =
                 buildLogContext {
                     text("Block Hit Result:")
                     pushTab()
-                    text("Side: $side")
-                    text("Block Pos: $blockPos")
-                    text("Pos: $pos")
+                    value("Side", side)
+                    value("Block Pos", blockPos)
+                    value("Pos", pos)
                 }
         }
     }
diff --git a/src/main/kotlin/com/lambda/interaction/request/LogContext.kt b/src/main/kotlin/com/lambda/interaction/request/LogContext.kt
@@ -47,6 +47,14 @@ interface LogContext {
                 logContext += "$text\n"
             }
 
+            fun value(name: String, value: Any) {
+                text("$name: $value")
+            }
+
+            fun value(name: String, value: String) {
+                text("$name: $value")
+            }
+
             @LogContextDsl
             fun pushTab() {
                 tabs++
diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt
@@ -155,24 +155,24 @@ data class BreakInfo(
         buildLogContext {
             text("Break Info:")
             pushTab()
-            text("Type: $type")
-            text("Pos: ${context.blockPos.toLogContext()}")
+            value("Type", type)
+            text(context.blockPos.toLogContext())
             text(context.toLogContext())
             text("Details:")
             pushTab()
-            text("Should Progress: $shouldProgress")
-            text("Rebreak Potential: $rebreakPotential")
+            value("Should Progress", shouldProgress)
+            value("Rebreak Potential", rebreakPotential)
             text(swapInfo.toLogContext())
-            text("Swap Stack: $swapStack")
-            text("Updated This Tick: $updatedThisTick")
-            text("Updated Pre-Processing This Tick: $updatedPreProcessingThisTick")
-            text("Progressed This Tick: $progressedThisTick")
-            text("Breaking: $breaking")
-            text("Abandoned: $abandoned")
-            text("Breaking Ticks: $breakingTicks")
-            text("Sounds Cooldown: $soundsCooldown")
-            text("Vanilla Instant Breakable: $vanillaInstantBreakable")
-            text("Rebreakable: $rebreakable")
+            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
@@ -64,17 +64,17 @@ data class BreakRequest(
         buildLogContext {
             text("Break Request")
             pushTab()
-            text("Request ID: $requestID")
-            text("Contexts: ${contexts.size}")
+            value("Request ID", requestID)
+            value("Contexts", contexts.size)
             text("Callbacks:")
             pushTab()
-            text("onStart: ${onStart != null}")
-            text("onUpdate: ${onUpdate != null}")
-            text("onStop: ${onStop != null}")
-            text("onCancel: ${onCancel != null}")
-            text("onItemDrop: ${onItemDrop != null}")
-            text("onReBreakStart: ${onReBreakStart != null}")
-            text("onReBreak: ${onReBreak != null}")
+            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
@@ -47,10 +47,10 @@ data class SwapInfo(
         buildLogContext {
             text("Swap Info:")
             pushTab()
-            text("Type: $type")
-            text("Swap: $swap")
-            text("Min Keep Ticks: $minKeepTicks")
-            text("Valid Swap: $validSwap")
+            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
@@ -46,12 +46,12 @@ class HotbarRequest(
         buildLogContext {
             text("Hotbar Request:")
             pushTab()
-            text("Request ID: $requestID")
-            text("Slot: $slot")
-            text("Keep Ticks: $keepTicks")
-            text("Swap Pause: $swapPause")
-            text("Swap Pause Age: $swapPauseAge")
-            text("Active Request Age: $activeRequestAge")
+            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
@@ -50,8 +50,8 @@ data class InteractRequest(
         buildLogContext {
             text("Interact Request:")
             pushTab()
-            text("Request ID: $requestID")
-            text("Contexts: ${contexts.size}")
+            value("Request ID", requestID)
+            value("Contexts", contexts.size)
         }
 
     companion object {
diff --git a/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt b/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt
@@ -36,7 +36,7 @@ class InventoryRequest(
         buildLogContext {
             text("Inventory Request:")
             pushTab()
-            text("Request ID: $requestID")
+            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
@@ -37,6 +37,6 @@ data class PlaceInfo(
             text(context.toLogContext())
             text("Callbacks:")
             pushTab()
-            text("onPlace: ${onPlace != null}")
+            value("onPlace", onPlace != null)
         }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt
@@ -54,8 +54,8 @@ data class PlaceRequest(
         buildLogContext {
             text("PlaceRequest:")
             pushTab()
-            text("Request ID: $requestID")
-            text("Contexts: ${contexts.size}")
+            value("Request ID", requestID)
+            value("Contexts", contexts.size)
         }
 
     companion object {
diff --git a/src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt b/src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt
@@ -46,13 +46,13 @@ data class RotationRequest(
         buildLogContext {
             text("Rotation Request:")
             pushTab()
-            text("Request ID: $requestID")
-            text("Rotation Mode: $rotationMode")
-            text("Turn Speed: $turnSpeed")
-            text("Keep Ticks: $keepTicks")
-            text("Decay Ticks: $decayTicks")
-            text("Speed Multiplier: $speedMultiplier")
-            text("Age: $age")
+            value("Request ID", requestID)
+            value("Rotation Mode", rotationMode)
+            value("Turn Speed", turnSpeed)
+            value("Keep Ticks", keepTicks)
+            value("Decay Ticks", decayTicks)
+            value("Speed Multiplier", speedMultiplier)
+            value("Age", age)
         }
 
     companion object {

Original file line number	Diff line number	Diff line change
`@@ -141,16 +141,18 @@ class DebugLogger(`
`141`	`141`	`companion object {`
`142`	`142`	`fun BlockPos.toLogContext(): String {`
`143`	`143`	`val pos = if (this is BlockPos.Mutable) toImmutable() else this`
`144`		`- return "Pos: ${pos.toShortString()}"`
	`144`	`+ return buildLogContext {`
	`145`	`+ value("Block Pos", pos.toShortString())`
	`146`	`+ }`
`145`	`147`	`}`
`146`	`148`
`147`	`149`	`fun BlockHitResult.toLogContext() =`
`148`	`150`	`buildLogContext {`
`149`	`151`	`text("Block Hit Result:")`
`150`	`152`	`pushTab()`
`151`		`- text("Side: $side")`
`152`		`- text("Block Pos: $blockPos")`
`153`		`- text("Pos: $pos")`
	`153`	`+ value("Side", side)`
	`154`	`+ value("Block Pos", blockPos)`
	`155`	`+ value("Pos", pos)`
`154`	`156`	`}`
`155`	`157`	`}`
`156`	`158`	`}`