rotations for instant breakable blocks

Author: beanbag44

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

@@ -20,8 +20,8 @@ package com.lambda.interaction.request
 abstract class RequestConfig <R : Request>(
     val priority: Priority
 ) {
-    protected abstract fun requestInternal(request: R)
+    protected abstract fun requestInternal(request: R, queueIfClosed: Boolean = true)
 
-    fun request(request: R): R =
-        request.apply(::requestInternal)
+    fun request(request: R, queueIfClosed: Boolean = true): R =
+        request.apply { requestInternal(this, queueIfClosed) }
 }

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

@@ -47,8 +47,8 @@ abstract class BreakConfig(
     abstract val minFortuneLevel: Int
     abstract val ignoredBlocks: Set<Block>
 
-    override fun requestInternal(request: BreakRequest) {
-        BreakManager.request(request)
+    override fun requestInternal(request: BreakRequest, queueIfClosed: Boolean) {
+        BreakManager.request(request, queueIfClosed)
     }
 
     enum class BreakMode {

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

@@ -191,15 +191,16 @@ object BreakManager : RequestHandler<BreakRequest>(
                 .filterNotNull()
                 .filter { !it.isRedundant }
                 .also { infos ->
-                    infos.firstOrNull { it.breakConfig.rotateForBreak }?.let { info ->
-                        info.request.rotation.request(info.context.rotation)
+                    rotationRequest = infos.firstOrNull { it.breakConfig.rotateForBreak }?.let { info ->
+                        val rotation = info.context.rotation
+                        if (instantBreaks.isEmpty()) info.request.rotation.request(rotation, false) else rotation
                     }
                 }
                 .reversed()
                 .forEach { info ->
                     if (info.updatedProgressThisTick) return@forEach
                     if (!info.context.requestDependencies(request)) return@breakInfos
-                    if (!rotated || tickStage !in info.breakConfig.breakStageMask) return@breakInfos
+                    if ((!rotated && info.isPrimary) || tickStage !in info.breakConfig.breakStageMask) return@breakInfos
                     updateBreakProgress(info)
                 }
         }
@@ -283,7 +284,8 @@ object BreakManager : RequestHandler<BreakRequest>(
             val ctx = iterator.next()
 
             if (!ctx.requestDependencies(request)) return false
-            if (tickStage !in request.build.breaking.breakStageMask) return false
+            rotationRequest = if (request.build.breaking.rotateForBreak) request.rotation.request(ctx.rotation, false) else null
+            if (!rotated || tickStage !in request.build.breaking.breakStageMask) return false
 
             val breakInfo = initNewBreak(ctx, request) ?: return false
             request.onAccept?.invoke(ctx.expectedPos)

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

@@ -64,7 +64,7 @@ abstract class HotbarConfig(
      *
      * @param request The hotbar request to register.
      */
-    override fun requestInternal(request: HotbarRequest) {
-        HotbarManager.request(request)
+    override fun requestInternal(request: HotbarRequest, queueIfClosed: Boolean) {
+        HotbarManager.request(request, queueIfClosed)
     }
 }

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

@@ -40,8 +40,8 @@ abstract class PlaceConfig(
     abstract val swingType: BuildConfig.SwingType
     abstract val sounds: Boolean
 
-    override fun requestInternal(request: PlaceRequest) {
-        PlaceManager.request(request)
+    override fun requestInternal(request: PlaceRequest, queueIfClosed: Boolean) {
+        PlaceManager.request(request, queueIfClosed)
     }
 
     enum class AirPlaceMode {

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

@@ -57,8 +57,8 @@ abstract class RotationConfig(priority: Priority) : RequestConfig<RotationReques
 
     val rotate: Boolean get() = rotationMode != RotationMode.None
 
-    override fun requestInternal(request: RotationRequest) {
-        RotationManager.request(request)
+    override fun requestInternal(request: RotationRequest, queueIfClosed: Boolean) {
+        RotationManager.request(request, queueIfClosed)
     }
 
     open class Instant(mode: RotationMode, priority: Priority = 0) : RotationConfig(priority) {

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

@@ -50,7 +50,9 @@ import kotlin.math.sign
 import kotlin.math.sin
 
 object RotationManager : RequestHandler<RotationRequest>(
-    TickStage.TickStart
+    TickStage.TickStart,
+    TickStage.PostHotbar,
+    TickStage.PostInteract,
 ), Loadable {
     var activeRotation = Rotation.ZERO; private set
     var serverRotation = Rotation.ZERO; private set