activity checks

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt

@@ -18,6 +18,8 @@
 package com.lambda.interaction.request
 
 import com.lambda.event.Event
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -29,11 +31,24 @@ abstract class RequestHandler<R : Request> {
 
     private val requestMap = ConcurrentHashMap<RequestConfig<R>, R>()
 
+    /**
+     * Represents if the handler performed any external actions within this tick
+     */
+    protected var activeThisTick = false
+
     /**
      * The currently active request.
      */
     var currentRequest: R? = null; protected set
 
+    init {
+        listen<TickEvent.Post>(Int.MIN_VALUE) {
+            activeThisTick = false
+        }
+    }
+
+    fun activeThisTick() = activeThisTick
+
     /**
      * Registers a new request with the given configuration.
      *

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

@@ -31,6 +31,7 @@ import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
 import com.lambda.interaction.request.breaking.BreakConfig.BreakMode
 import com.lambda.interaction.request.hotbar.HotbarConfig
 import com.lambda.interaction.request.hotbar.HotbarRequest
+import com.lambda.interaction.request.placing.PlaceManager
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationManager.onRotate
 import com.lambda.module.modules.client.TaskFlowModule
@@ -80,6 +81,12 @@ object BreakManager : RequestHandler<BreakRequest>() {
                 return@listen
             }
 
+            if (PlaceManager.activeThisTick()) {
+                updateRequest(true) { true }
+                postEvent()
+                return@listen
+            }
+
             var swapped = false
 
             //ToDo: improve instamine / non instamine integration
@@ -106,25 +113,33 @@ object BreakManager : RequestHandler<BreakRequest>() {
                                         request.hotbarConfig.request(HotbarRequest(info.context.hotbarIndex))
                                         swapped = true
                                     }
-                                    updateBlockBreakingProgress(info, player.mainHandStack)
-                                    instaBreaks++
+                                    if (updateBlockBreakingProgress(info, player.mainHandStack)) {
+                                        instaBreaks++
+                                        activeThisTick = true
+                                    }
                                 }
                             }
                         }
                 }
             }
 
-            breakingInfos.firstOrNull()?.let { info ->
-                if ((!swapped && !info.hotbarConfig.request(HotbarRequest(info.context.hotbarIndex)).done)
-                    || (info.breakConfig.rotateForBreak && !info.context.rotation.done)) {
-                    postEvent()
-                    return@listen
+            breakingInfos
+                .filterNotNull()
+                .firstOrNull()?.let { info ->
+                    activeThisTick = true
+                    if ((!swapped && !info.hotbarConfig.request(HotbarRequest(info.context.hotbarIndex)).done)
+                        || (info.breakConfig.rotateForBreak && !info.context.rotation.done)) {
+                        postEvent()
+                        return@listen
+                    }
                 }
-            }
 
-            breakingInfos.reversed().filterNotNull().forEach { info ->
-                updateBlockBreakingProgress(info, player.mainHandStack)
-            }
+            breakingInfos
+                .filterNotNull()
+                .reversed()
+                .forEach { info ->
+                    updateBlockBreakingProgress(info, player.mainHandStack)
+                }
 
             postEvent()
         }

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

@@ -48,8 +48,8 @@ object HotbarManager : RequestHandler<HotbarRequest>(), Loadable {
 
         listen<TickEvent.Pre> {
             preEvent()
-            updateRequest()
-            interaction.syncSelectedSlot()
+            if (updateRequest()) interaction.syncSelectedSlot()
+            if (currentRequest != null) activeThisTick = true
             postEvent()
         }
 

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

@@ -28,6 +28,7 @@ import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.RequestHandler
+import com.lambda.interaction.request.breaking.BreakManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.rotation.RotationManager.onRotate
 import com.lambda.module.modules.client.TaskFlowModule
@@ -65,10 +66,17 @@ object PlaceManager : RequestHandler<PlaceRequest>() {
                 return@listen
             }
 
+            if (BreakManager.activeThisTick()) {
+                postEvent()
+                return@listen
+            }
+
             currentRequest?.let request@ { request ->
                 if (pendingInteractions.size >= request.buildConfig.placeSettings.maxPendingPlacements)
                     return@request
 
+                activeThisTick = true
+
                 if (request.placeContext.sneak && !player.isSneaking
                     || (request.buildConfig.placeSettings.rotateForPlace && !request.placeContext.rotation.done)
                     || (!request.hotbarConfig.request(HotbarRequest(request.placeContext.hotbarIndex)).done)
@@ -79,7 +87,7 @@ object PlaceManager : RequestHandler<PlaceRequest>() {
                 pendingInteractions.setMaxSize(request.buildConfig.maxPendingInteractions)
                 pendingInteractions.setDecayTime(request.buildConfig.interactionTimeout * 50L)
                 placeBlock(request, Hand.MAIN_HAND)
-             }
+            }
 
             postEvent()
         }

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt

@@ -77,6 +77,8 @@ object RotationManager : RequestHandler<RotationRequest>(), Loadable {
                 entry.value.target.targetRotation.value != null
             }
 
+            if (currentRequest != null) activeThisTick = true
+
             if (!changed) { // rebuild the rotation if the same context gets used again
                 currentRequest?.target?.targetRotation?.update()
             }