only handle request when the manager is open and the tick stage is whitelisted in the config

beanbag44 · beanbag44 · commit b7b922edc28d · 2025-11-28T01:30:46.000Z
diff --git a/src/main/kotlin/com/lambda/config/groups/ActionConfig.kt b/src/main/kotlin/com/lambda/config/groups/ActionConfig.kt
@@ -17,11 +17,13 @@
 
 package com.lambda.config.groups
 
+import com.lambda.event.events.TickEvent
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 
 interface ActionConfig {
     val sorter: SortMode
+    val tickStageMask: Set<TickEvent>
 
     enum class SortMode(
         override val displayName: String,
diff --git a/src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt b/src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt
@@ -31,5 +31,5 @@ class HotbarSettings(
     override val swapDelay by c.setting("Swap Delay", 0, 0..3, 1, "The number of ticks delay before allowing another hotbar selection swap", " ticks").group(baseGroup).index()
     override val swapsPerTick by c.setting("Swaps Per Tick", 3, 1..10, 1, "The number of hotbar selection swaps that can take place each tick") { swapDelay <= 0 }.group(baseGroup).index()
     override val swapPause by c.setting("Swap Pause", 0, 0..20, 1, "The delay in ticks to pause actions after switching to the slot", " ticks").group(baseGroup).index()
-    override val sequenceStageMask by c.setting("Hotbar Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Hotbar Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()
 }
diff --git a/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt b/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt
@@ -19,6 +19,7 @@ package com.lambda.config.groups
 
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.rotating.RotationConfig
 import com.lambda.interaction.request.rotating.RotationMode
 import com.lambda.util.NamedEnum
@@ -41,6 +42,8 @@ class RotationSettings(
     /** How many ticks to wait before resetting the rotation */
     override val decayTicks by c.setting("Reset Rotation", 1, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate }.group(baseGroup).index()
 
+    override val tickStageMask = ALL_STAGES.toSet()
+
     /** Whether the rotation is instant */
     var instant by c.setting("Instant Rotation", true, "Instantly rotate") { rotate }.group(baseGroup).index()
 
diff --git a/src/main/kotlin/com/lambda/event/events/TickEvent.kt b/src/main/kotlin/com/lambda/event/events/TickEvent.kt
@@ -159,4 +159,25 @@ sealed class TickEvent : Event {
          */
         data object Post : TickEvent()
     }
+
+    companion object {
+        val ALL_STAGES by lazy {
+            listOf(
+                Pre,
+                Post,
+                Network.Pre,
+                Network.Post,
+                Input.Pre,
+                Input.Post,
+                WorldRender.Pre,
+                WorldRender.Post,
+                Sound.Pre,
+                Sound.Post,
+                Render.Pre,
+                Render.Post,
+                Player.Pre,
+                Player.Post,
+            )
+        }
+    }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt
@@ -59,7 +59,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
                         }
                     }
                     onComplete { success() }
-                }.submit(queueIfClosed = false)
+                }.submit(queueIfMismatchedStage = false)
             }
         }
     }
@@ -87,7 +87,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
                         clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
                         action { player.inventory.selectedStack = optimalStack }
                         onComplete { success() }
-                    }.submit(queueIfClosed = false)
+                    }.submit(queueIfMismatchedStage = false)
                     return@listen
                 }
 
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/MainHandContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/MainHandContainer.kt
@@ -76,7 +76,7 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {
                     if (hand == Hand.OFF_HAND) swapHands()
 
                     onComplete { success() }
-                }.submit(queueIfClosed = false)
+                }.submit(queueIfMismatchedStage = false)
             }
         }
     }
diff --git a/src/main/kotlin/com/lambda/interaction/material/transfer/SlotTransfer.kt b/src/main/kotlin/com/lambda/interaction/material/transfer/SlotTransfer.kt
@@ -74,7 +74,7 @@ class SlotTransfer @Ta5kBuilder constructor(
                 swap(nextTo.id, 1)
                 swap(nextFrom.id, 1)
                 onComplete { success() }
-            }.submit(queueIfClosed = false)
+            }.submit(queueIfMismatchedStage = false)
         }
     }
 
diff --git a/src/main/kotlin/com/lambda/interaction/request/Request.kt b/src/main/kotlin/com/lambda/interaction/request/Request.kt
@@ -18,6 +18,7 @@
 package com.lambda.interaction.request
 
 import com.lambda.context.Automated
+import com.lambda.event.events.TickEvent
 
 /**
  * A simple format to ensure basic requirements and information when requesting a manager.
@@ -30,11 +31,12 @@ abstract class Request : Automated {
     abstract val requestId: Int
     var fresh = true
 
+    abstract val tickStageMask: Set<TickEvent>
     abstract val nowOrNothing: Boolean
 
     abstract val done: Boolean
 
-    abstract fun submit(queueIfClosed: Boolean = true): Request
+    abstract fun submit(queueIfMismatchedStage: Boolean = true): Request
 
     companion object {
         fun submit(request: Request, queueIfClosed: Boolean = true) =
diff --git a/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt b/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt
@@ -23,6 +23,7 @@ import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.Event
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.ManagerUtils.accumulatedManagerPriority
 import com.lambda.threading.runSafeAutomated
@@ -77,6 +78,7 @@ abstract class RequestHandler<R : Request>(
         listen(instance, priority = (Int.MAX_VALUE - 1) - (accumulatedManagerPriority - stagePriority)) {
             tickStage = stage
             queuedRequest?.let { request ->
+                if (tickStage !in request.tickStageMask) return@let
                 request.runSafeAutomated { handleRequest(request) }
                 request.fresh = false
                 queuedRequest = null
@@ -96,15 +98,18 @@ abstract class RequestHandler<R : Request>(
      * Registers a new request
      *
      * @param request The request to register.
-     * @param queueIfClosed queues the request for the next time the handlers accepting requests
+     * @param queueIfMismatchedStage queues the request for the next time the handlers accepting requests
      * @return The registered request.
      */
-    fun request(request: R, queueIfClosed: Boolean = true): R {
-        if (!acceptingRequests) {
-            val canOverrideQueued = queuedRequest?.let { it as Automated === request as Automated } != false
-            if (queueIfClosed && canOverrideQueued) {
-                queuedRequest = request
-            }
+    fun request(request: R, queueIfMismatchedStage: Boolean = true): R {
+        val canOverrideQueued = queuedRequest?.let { it as Automated === request as Automated } != false
+        if (!canOverrideQueued) return request
+        if ((!acceptingRequests || tickStage !in request.tickStageMask)) {
+            if (!queueIfMismatchedStage || request.nowOrNothing) return request
+            val currentStageIndex = ALL_STAGES.indexOf(tickStage)
+            if (openStages.none { ALL_STAGES.indexOf(it) > currentStageIndex && it in request.tickStageMask })
+                return request
+            queuedRequest = request
             return request
         }
 
diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakConfig.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakConfig.kt
@@ -19,7 +19,6 @@ package com.lambda.interaction.request.breaking
 
 import com.lambda.config.groups.ActionConfig
 import com.lambda.config.groups.BuildConfig
-import com.lambda.event.Event
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import net.minecraft.block.Block
@@ -39,8 +38,6 @@ interface BreakConfig : ActionConfig {
 //    abstract val desyncFix: Boolean
     val breakDelay: Int
 
-    val tickStageMask: Set<Event>
-
     val swapMode: SwapMode
 
     val swing: SwingMode
diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt
@@ -51,6 +51,7 @@ data class BreakRequest private constructor(
     override val nowOrNothing: Boolean = false
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
+    override val tickStageMask get() = breakConfig.tickStageMask
 
     var onStart: (SafeContext.(BlockPos) -> Unit)? = null
     var onUpdate: (SafeContext.(BlockPos) -> Unit)? = null
@@ -63,8 +64,8 @@ data class BreakRequest private constructor(
     override val done: Boolean
         get() = runSafe { contexts.all { blockState(it.blockPos).isEmpty } } == true
 
-    override fun submit(queueIfClosed: Boolean) =
-        BreakManager.request(this, queueIfClosed)
+    override fun submit(queueIfMismatchedStage: Boolean) =
+        BreakManager.request(this, queueIfMismatchedStage)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("Break Request") {
diff --git a/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarConfig.kt b/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarConfig.kt
@@ -17,7 +17,7 @@
 
 package com.lambda.interaction.request.hotbar
 
-import com.lambda.event.Event
+import com.lambda.event.events.TickEvent
 
 /**
  * Abstract base class for configuring hotbar slot switch behavior.
@@ -53,5 +53,5 @@ interface HotbarConfig {
     /**
      * The sub-tick timings at which hotbar actions can be performed
      */
-    val sequenceStageMask: Set<Event>
+    val tickStageMask: Set<TickEvent>
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt b/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt
@@ -113,7 +113,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     override fun AutomatedSafeContext.handleRequest(request: HotbarRequest) {
         logger.debug("Handling request:", request)
 
-        if (request.nowOrNothing && tickStage !in hotbarConfig.sequenceStageMask) return
+        if (request.nowOrNothing && tickStage !in hotbarConfig.tickStageMask) return
 
         activeRequest?.let { active ->
             if (active.activeRequestAge <= 0 && active.keepTicks > 0) {
@@ -144,7 +144,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     private fun SafeContext.setActiveSlot(): Boolean {
         activeRequest?.let { activeRequest ->
             if (serverSlot != activeRequest.slot) {
-                if (tickStage !in activeRequest.hotbarConfig.sequenceStageMask) return false
+                if (tickStage !in activeRequest.hotbarConfig.tickStageMask) return false
                 if (swapsThisTick + 1 > maxSwapsThisTick || swapDelay > 0) return false
                 swapsThisTick++
                 swappedTicks = 0
@@ -160,14 +160,14 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     /**
      * Called after every [tickStage] closes. This method checks if the current [activeRequest] should be stopped.
      * This action is counted as another swap, so the conditions for a regular swap must be met. If the requests
-     * [HotbarConfig.sequenceStageMask] does not contain the current tick stage, no actions can be performed.
+     * [HotbarConfig.tickStageMask] does not contain the current tick stage, no actions can be performed.
      *
      * @see net.minecraft.client.network.ClientPlayerInteractionManager.syncSelectedSlot
      */
     private fun SafeContext.checkResetSwap() {
         activeRequest?.let { active ->
             val canStopSwap = swapsThisTick < maxSwapsThisTick
-            if (active.keepTicks <= 0 && tickStage in active.hotbarConfig.sequenceStageMask && canStopSwap) {
+            if (active.keepTicks <= 0 && tickStage in active.hotbarConfig.tickStageMask && canStopSwap) {
                 logger.debug("Clearing request and syncing slot", activeRequest)
                 val prevSlot = activeSlot
                 activeRequest = null
diff --git a/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt b/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt
@@ -30,15 +30,16 @@ class HotbarRequest(
     override val nowOrNothing: Boolean = true
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
+    override val tickStageMask get() = hotbarConfig.tickStageMask
 
     var activeRequestAge = 0
     var swapPauseAge = 0
 
     override val done: Boolean
         get() = slot == HotbarManager.activeSlot && swapPauseAge >= swapPause
 
-    override fun submit(queueIfClosed: Boolean) =
-        HotbarManager.request(this, queueIfClosed)
+    override fun submit(queueIfMismatchedStage: Boolean) =
+        HotbarManager.request(this, queueIfMismatchedStage)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("Hotbar Request") {
diff --git a/src/main/kotlin/com/lambda/interaction/request/interacting/InteractConfig.kt b/src/main/kotlin/com/lambda/interaction/request/interacting/InteractConfig.kt
@@ -19,14 +19,12 @@ package com.lambda.interaction.request.interacting
 
 import com.lambda.config.groups.ActionConfig
 import com.lambda.config.groups.BuildConfig
-import com.lambda.event.Event
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 
 interface InteractConfig : ActionConfig {
     val rotate: Boolean
     val swingHand: Boolean
-    val tickStageMask: Set<Event>
     val interactSwingType: BuildConfig.SwingType
     val interactConfirmationMode: InteractConfirmationMode
 
diff --git a/src/main/kotlin/com/lambda/interaction/request/interacting/InteractRequest.kt b/src/main/kotlin/com/lambda/interaction/request/interacting/InteractRequest.kt
@@ -35,12 +35,13 @@ data class InteractRequest(
     val onInteract: ((BlockPos) -> Unit)?
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
+    override val tickStageMask get() = interactConfig.tickStageMask
 
     override val done: Boolean
         get() = contexts.all { mc.world?.getBlockState(it.blockPos)?.matches(it.expectedState) == true }
 
-    override fun submit(queueIfClosed: Boolean) =
-        InteractionManager.request(this, queueIfClosed)
+    override fun submit(queueIfMismatchedStage: Boolean) =
+        InteractionManager.request(this, queueIfMismatchedStage)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("Interact Request") {
diff --git a/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt b/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt
@@ -46,10 +46,11 @@ class InventoryRequest private constructor(
     val onComplete: (SafeContext.() -> Unit)?
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
+    override val tickStageMask get() = inventoryConfig.tickStageMask
     override var done = false
 
-    override fun submit(queueIfClosed: Boolean) =
-        InventoryManager.request(this, queueIfClosed)
+    override fun submit(queueIfMismatchedStage: Boolean) =
+        InventoryManager.request(this, queueIfMismatchedStage)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("Inventory Request") {
diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceConfig.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceConfig.kt
@@ -19,7 +19,6 @@ package com.lambda.interaction.request.placing
 
 import com.lambda.config.groups.ActionConfig
 import com.lambda.config.groups.BuildConfig
-import com.lambda.event.Event
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 
@@ -29,7 +28,6 @@ interface PlaceConfig : ActionConfig {
     val axisRotateSetting: Boolean
     val axisRotate
         get() = rotateForPlace && airPlace.isEnabled && axisRotateSetting
-    val tickStageMask: Set<Event>
     val placeConfirmationMode: PlaceConfirmationMode
     val maxPendingPlacements: Int
     val placementsPerTick: Int
diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt
@@ -336,7 +336,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(
                 swapHands()
                 action { sendPlacePacket(placeHand, hitResult) }
                 swapHands()
-            }.submit(queueIfClosed = false)
+            }.submit(queueIfMismatchedStage = false)
             if (!inventoryRequest.done) return ActionResult.FAIL
         } else {
             sendPlacePacket(hand, hitResult)
diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt
@@ -37,14 +37,15 @@ data class PlaceRequest(
     val onPlace: (SafeContext.(BlockPos) -> Unit)? = null
 ) : Request(), LogContext, Automated by automated {
     override val requestId = ++requestCount
+    override val tickStageMask get() = placeConfig.tickStageMask
 
     override val done: Boolean
         get() = runSafe {
             contexts.all { it.expectedState.matches(blockState(it.blockPos)) }
         } == true
 
-    override fun submit(queueIfClosed: Boolean) =
-        PlaceManager.request(this, queueIfClosed)
+    override fun submit(queueIfMismatchedStage: Boolean) =
+        PlaceManager.request(this, queueIfMismatchedStage)
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {
         group("PlaceRequest") {
diff --git a/src/main/kotlin/com/lambda/interaction/request/rotating/RotationConfig.kt b/src/main/kotlin/com/lambda/interaction/request/rotating/RotationConfig.kt
@@ -17,6 +17,9 @@
 
 package com.lambda.interaction.request.rotating
 
+import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
+
 interface RotationConfig {
     /**
      * - [RotationMode.Silent] Spoofing server-side rotation.
@@ -41,12 +44,15 @@ interface RotationConfig {
      */
     val decayTicks: Int
 
+    val tickStageMask: Set<TickEvent>
+
     val rotate: Boolean get() = rotationMode != RotationMode.None
 
     open class Instant(mode: RotationMode) : RotationConfig {
         override val rotationMode = mode
         override val keepTicks = 1
         override val decayTicks = 1
         override val turnSpeed = 360.0
+        override val tickStageMask = ALL_STAGES.toSet()
     }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt b/src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt
diff --git a/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt b/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ class HotbarSettings(`
`31`	`31`	`override val swapDelay by c.setting("Swap Delay", 0, 0..3, 1, "The number of ticks delay before allowing another hotbar selection swap", " ticks").group(baseGroup).index()`
`32`	`32`	`override val swapsPerTick by c.setting("Swaps Per Tick", 3, 1..10, 1, "The number of hotbar selection swaps that can take place each tick") { swapDelay <= 0 }.group(baseGroup).index()`
`33`	`33`	`override val swapPause by c.setting("Swap Pause", 0, 0..20, 1, "The delay in ticks to pause actions after switching to the slot", " ticks").group(baseGroup).index()`
`34`		`- override val sequenceStageMask by c.setting("Hotbar Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()`
	`34`	`+ override val tickStageMask by c.setting("Hotbar Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`onComplete { success() }`
`62`		`- }.submit(queueIfClosed = false)`
	`62`	`+ }.submit(queueIfMismatchedStage = false)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -87,7 +87,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {`
`87`	`87`	`clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)`
`88`	`88`	`action { player.inventory.selectedStack = optimalStack }`
`89`	`89`	`onComplete { success() }`
`90`		`- }.submit(queueIfClosed = false)`
	`90`	`+ }.submit(queueIfMismatchedStage = false)`
`91`	`91`	`return@listen`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {`
`76`	`76`	`if (hand == Hand.OFF_HAND) swapHands()`
`77`	`77`
`78`	`78`	`onComplete { success() }`
`79`		`- }.submit(queueIfClosed = false)`
	`79`	`+ }.submit(queueIfMismatchedStage = false)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class SlotTransfer @Ta5kBuilder constructor(`
`74`	`74`	`swap(nextTo.id, 1)`
`75`	`75`	`swap(nextFrom.id, 1)`
`76`	`76`	`onComplete { success() }`
`77`		`- }.submit(queueIfClosed = false)`
	`77`	`+ }.submit(queueIfMismatchedStage = false)`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`