hotbar manager debug logs

Author: beanbag44

src/main/kotlin/com/lambda/interaction/request/ManagerUtils.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.request
 
+import com.lambda.event.Event
 import com.lambda.util.reflections.getInstances
 import net.minecraft.util.math.BlockPos
 
@@ -28,6 +29,9 @@ object ManagerUtils {
     fun DebugLogger.newTick() =
         system("------------- New Tick -------------")
 
+    fun DebugLogger.newStage(tickStage: Event?) =
+        system("Tick stage ${tickStage?.run { this::class.qualifiedName }}")
+
     fun isPosBlocked(pos: BlockPos) =
         positionBlockingManagers.any { manager -> manager.blockedPositions.any { blocked -> blocked == pos } }
 }

src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -41,6 +41,7 @@ import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.interaction.request.Logger
 import com.lambda.interaction.request.ManagerUtils.isPosBlocked
+import com.lambda.interaction.request.ManagerUtils.newStage
 import com.lambda.interaction.request.ManagerUtils.newTick
 import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.RequestHandler
@@ -107,7 +108,7 @@ object BreakManager : RequestHandler<BreakRequest>(
     TickEvent.Player.Post,
     onOpen = {
         if (activeInfos.isNotEmpty() || breaks.isNotEmpty() || instantBreaks.isNotEmpty())
-            BreakManager.logger.system("Tick stage ${BreakManager.tickStage?.run { this::class.qualifiedName }}")
+            BreakManager.logger.newStage(BreakManager.tickStage)
         processRequest(activeRequest)
         simulateAbandoned()
              },

src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -24,6 +24,8 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.Logger
+import com.lambda.interaction.request.ManagerUtils.newStage
+import com.lambda.interaction.request.ManagerUtils.newTick
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.hotbar.HotbarManager.checkResetSwap
 import com.lambda.module.hud.ManagerDebugLoggers.hotbarManagerLogger
@@ -35,6 +37,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     TickEvent.Input.Pre,
     TickEvent.Input.Post,
     TickEvent.Player.Post,
+    onOpen = { if (HotbarManager.activeRequest != null) HotbarManager.logger.newStage(HotbarManager.tickStage) },
     onClose = { checkResetSwap() }
 ), Logger {
     val serverSlot get() = runSafe {
@@ -52,6 +55,11 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     override fun load(): String {
         super.load()
 
+        listen<TickEvent.Pre>(priority = Int.MAX_VALUE) {
+            if (activeRequest != null)
+                logger.newTick()
+        }
+
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             swapsThisTick = 0
             if (swapDelay > 0) swapDelay--
@@ -66,6 +74,8 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     }
 
     override fun SafeContext.handleRequest(request: HotbarRequest) {
+        logger.debug("Handling request ${request.requestID}")
+
         maxSwapsThisTick = request.swapsPerTick
         swapDelay = swapDelay.coerceAtMost(request.swapDelay)
 
@@ -76,6 +86,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
         } == true
 
         if (sameButLonger) activeRequest?.let { current ->
+            logger.debug("Request is the same as current, but longer or the same keep time")
             request.swapPauseAge = current.swapPauseAge
         } else run swap@{
             if (request.slot != activeRequest?.slot) {
@@ -97,6 +108,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
         }
 
         activeRequest = request
+        logger.success("Set active request to ${request.requestID}")
         interaction.syncSelectedSlot()
         return
     }
@@ -105,6 +117,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
         activeRequest?.let { active ->
             val canStopSwap = swapsThisTick < maxSwapsThisTick
             if (active.keepTicks <= 0 && tickStage in active.sequenceStageMask && canStopSwap) {
+                logger.debug("Clearing request and syncing slot")
                 activeRequest = null
                 interaction.syncSelectedSlot()
             }

src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

@@ -27,6 +27,7 @@ import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.interaction.request.Logger
 import com.lambda.interaction.request.ManagerUtils.isPosBlocked
+import com.lambda.interaction.request.ManagerUtils.newStage
 import com.lambda.interaction.request.ManagerUtils.newTick
 import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.RequestHandler
@@ -74,7 +75,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(
     onOpen = {
         activeRequest?.let { processRequest(it) }
         if (potentialPlacements.isNotEmpty())
-            PlaceManager.logger.system("Tick stage ${PlaceManager.tickStage?.run { this::class.qualifiedName }}")
+            PlaceManager.logger.newStage(PlaceManager.tickStage)
     }
 ), PositionBlocking, Logger {
     private var activeRequest: PlaceRequest? = null