aligned keep ticks timings

Author: beanbag44

common/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt

@@ -37,10 +37,10 @@ class RotationSettings(
     override var rotationMode by c.setting("Mode", RotationMode.Sync, "SILENT - server-side rotation, SYNC - server-side rotation; client-side movement, LOCK - Lock camera, NONE - No rotation", vis)
 
     /** How many ticks to keep the rotation before resetting */
-    override val keepTicks by c.setting("Keep Rotation", 3, 0..10, 1, "Ticks to keep rotation", " ticks") { rotate && vis() }
+    override val keepTicks by c.setting("Keep Rotation", 1, 1..10, 1, "Ticks to keep rotation", " ticks") { rotate && vis() }
 
     /** How many ticks to wait before resetting the rotation */
-    override val decayTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate && vis() }
+    override val decayTicks by c.setting("Reset Rotation", 1, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate && vis() }
 
     /**
      * At what sub-tick stages rotations can be performed

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

@@ -71,7 +71,7 @@ abstract class RequestHandler<R : Request>(
      * opens the handler for requests for the duration of the given event
      */
     private inline fun <reified T : Event> openRequestsFor(instance: KClass<out T>, stage: T) {
-        listen(instance, priority = Int.MAX_VALUE - (accumulatedManagerPriority - stagePriority)) {
+        listen(instance, priority = (Int.MAX_VALUE - 1) - (accumulatedManagerPriority - stagePriority)) {
             tickStage = stage
             queuedRequest?.let { request ->
                 handleRequest(request)
@@ -83,7 +83,7 @@ abstract class RequestHandler<R : Request>(
             preEvent()
         }
 
-        listen(instance, priority = Int.MIN_VALUE + stagePriority) {
+        listen(instance, priority = (Int.MIN_VALUE + 1) + stagePriority) {
             onClose?.invoke(this)
             acceptingRequests = false
         }

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

@@ -58,15 +58,19 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     override fun load(): String {
         super.load()
 
+        listen<TickEvent>(priority = Int.MAX_VALUE) {
+            activeRequest?.let { activeInfo ->
+                if (activeInfo.keepTicks <= 0) {
+                    activeRequest = null
+                }
+            }
+        }
+
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             swapsThisTick = 0
             if (swapDelay > 0) swapDelay--
             val activeInfo = activeRequest ?: return@listen
 
-            if (activeInfo.keepTicks <= 0) {
-                activeRequest = null
-            }
-
             activeInfo.swapPauseAge++
             activeInfo.activeRequestAge++
             activeInfo.keepTicks--
@@ -80,12 +84,6 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     }
 
     override fun SafeContext.handleRequest(request: HotbarRequest) {
-        activeRequest?.let { activeInfo ->
-            if (activeInfo.keepTicks <= 0) {
-                activeRequest = null
-            }
-        }
-
         val config = request.hotbar
         maxSwapsThisTick = config.swapsPerTick
         swapDelay = swapDelay.coerceAtMost(config.swapDelay)
@@ -113,12 +111,12 @@ object HotbarManager : RequestHandler<HotbarRequest>(
 
     private fun SafeContext.checkResetSwap() {
         activeRequest?.let { activeInfo ->
-            if (activeInfo.keepTicks <= 0) {
-                if (tickStage in activeInfo.hotbar.sequenceStageMask) {
-                    interaction.syncSelectedSlot()
-                }
-                activeRequest = null
+            if (activeInfo.keepTicks > 0) return
+
+            if (tickStage in activeInfo.hotbar.sequenceStageMask) {
+                interaction.syncSelectedSlot()
             }
+            activeRequest = null
         }
     }
 

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

@@ -73,6 +73,14 @@ object RotationManager : RequestHandler<RotationRequest>(
     override fun load(): String {
         super.load()
 
+        listen<TickEvent.Pre>(priority = Int.MAX_VALUE) {
+            activeRequest?.let {
+                if (it.keepTicks <= 0 && it.decayTicks <= 0) {
+                    activeRequest = null
+                }
+            }
+        }
+
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             activeRequest?.let { request ->
                 request.age++
@@ -116,9 +124,8 @@ object RotationManager : RequestHandler<RotationRequest>(
 
         // Tick and reset the context
         activeRequest?.let {
-            if (--it.keepTicks > 0) return@let
-            if (--it.decayTicks >= 0) return@let
-            activeRequest = null
+            if (it.keepTicks-- > 0) return@let
+            it.decayTicks--
         }
     }