allow overriding the current queued request if the config matches and couple configs with requests

Author: beanbag44

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

@@ -21,6 +21,5 @@ enum class TickStage {
     TickStart,
     PostHotbar,
     PostInteract,
-    PreMovement,
     PostMovement,
 }

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

@@ -18,7 +18,8 @@
 package com.lambda.interaction.request
 
 abstract class Request (
-    val priority: Priority
+    val priority: Priority,
+    val config: RequestConfig<*>
 ) {
     var fresh = true
 

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

@@ -62,7 +62,6 @@ abstract class RequestHandler<R : Request>(
                 TickStage.TickStart -> openRequestsFor<TickEvent.Pre>(TickStage.TickStart)
                 TickStage.PostHotbar -> { /*ToDo*/ }
                 TickStage.PostInteract -> { /*ToDo*/ }
-                TickStage.PreMovement -> openRequestsFor<MovementEvent.Player.Pre>(TickStage.PreMovement)
                 TickStage.PostMovement -> openRequestsFor<MovementEvent.Player.Post>(TickStage.PostMovement)
             }
         }
@@ -102,7 +101,8 @@ abstract class RequestHandler<R : Request>(
      */
     fun request(request: R, queueIfClosed: Boolean = true): R {
         if (!acceptingRequests) {
-            if (queueIfClosed && queuedRequest == null) {
+            val canOverrideQueued = queuedRequest?.run { config === request.config } ?: true
+            if (queueIfClosed && canOverrideQueued) {
                 queuedRequest = request
             }
             return request

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

@@ -40,7 +40,7 @@ data class BreakRequest(
     val onBreak: ((BlockPos) -> Unit)? = null,
     val onItemDrop: ((ItemEntity) -> Unit)? = null,
     private val prio: Priority = 0
-) : Request(prio) {
+) : Request(prio, build.breaking) {
     override val done: Boolean
         get() = runSafe {
             contexts.all {

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

@@ -77,11 +77,11 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     }
 
     override fun SafeContext.handleRequest(request: HotbarRequest) {
-        val hotbarConfig = request.hotbarConfig
-        maxSwapsThisTick = hotbarConfig.swapsPerTick
-        swapDelay = swapDelay.coerceAtMost(hotbarConfig.swapDelay)
+        val hotbar = request.hotbar
+        maxSwapsThisTick = hotbar.swapsPerTick
+        swapDelay = swapDelay.coerceAtMost(hotbar.swapDelay)
 
-        if (tickStage !in hotbarConfig.sequenceStageMask) return
+        if (tickStage !in hotbar.sequenceStageMask) return
 
         if (request.slot != activeRequest?.slot) {
             if (swapsThisTick + 1 > maxSwapsThisTick || swapDelay > 0) return
@@ -91,7 +91,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
             }
 
             swapsThisTick++
-            swapDelay = hotbarConfig.swapDelay
+            swapDelay = hotbar.swapDelay
         } else activeRequest?.let { current ->
             request.swapPauseAge = current.swapPauseAge
             if (current.swappedThisTick && current.keeping) return

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

@@ -22,11 +22,11 @@ import com.lambda.interaction.request.Request
 
 class HotbarRequest(
     val slot: Int,
-    val hotbarConfig: HotbarConfig,
-    var keepTicks: Int = hotbarConfig.keepTicks,
-    var swapPause: Int = hotbarConfig.swapPause,
+    val hotbar: HotbarConfig,
+    var keepTicks: Int = hotbar.keepTicks,
+    var swapPause: Int = hotbar.swapPause,
     priority: Priority = 0,
-) : Request(priority) {
+) : Request(priority, hotbar) {
     var activeRequestAge = 0
     var swapPauseAge = 0
 

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

@@ -173,7 +173,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(
         if (!request.rotation.rotate) return
 
         // In case you cant rotate and place within the same tick
-        potentialPlacements.getOrNull(maxPlacementsThisTick)?.let { nextPredictedPlacement ->
+        potentialPlacements.getOrNull(maxPlacementsThisTick - 1)?.let { nextPredictedPlacement ->
             request.rotation.request(nextPredictedPlacement.rotation)
         }
     }

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

@@ -35,7 +35,7 @@ data class PlaceRequest(
     val pendingInteractions: MutableCollection<BuildContext>,
     val prio: Priority = 0,
     val onPlace: () -> Unit
-) : Request(prio) {
+) : Request(prio, build.placing) {
     override val done: Boolean
         get() = runSafe {
             contexts.all { it.targetState.matches(blockState(it.expectedPos), it.expectedPos, world) }

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

@@ -51,7 +51,7 @@ import kotlin.math.sign
 import kotlin.math.sin
 
 object RotationManager : RequestHandler<RotationRequest>(
-    TickStage.PreMovement,
+    TickStage.TickStart,
     preOpen = { preEvent() }
 ), Loadable {
     var currentRotation = Rotation.ZERO
@@ -70,7 +70,6 @@ object RotationManager : RequestHandler<RotationRequest>(
         block()
     }
 
-
     init {
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             activeRequest?.let { request ->

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

@@ -26,12 +26,12 @@ data class RotationRequest(
     val target: RotationTarget,
     val prio: Priority,
     val mode: RotationMode,
-    val rotationConfig: RotationConfig,
+    val rot: RotationConfig,
     var keepTicks: Int = 3,
     var decayTicks: Int = 0,
     val turnSpeed: () -> Double = { 180.0 },
     val speedMultiplier: Double = 1.0
-) : Request(prio) {
+) : Request(prio, rot) {
     var age = 0
 
     constructor(