hotbar swapping delegated to the break manager

Author: beanbag44

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

@@ -27,6 +27,7 @@ import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
 import com.lambda.interaction.request.breaking.BreakConfig.BreakMode
+import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationManager.onRotate
 import com.lambda.module.modules.client.TaskFlowModule
@@ -69,24 +70,23 @@ object BreakManager : RequestHandler<BreakRequest>() {
                 return@listen
             }
 
-            if (updateRequest(false) { true }) {
+            var swapped = false
+
+            if (updateRequest(true) { true }) {
                 currentRequest?.let request@ { request ->
                     var instaBreaks = 0
                     request.contexts
                         .sortedBy { it.instantBreak }
                         .forEach { requestCtx ->
-                            if (!canAccept(requestCtx)) {
-                                return@forEach
-                            }
-                            val breakType = handleRequestContext(
-                                requestCtx,
-                                request.onBreak,
-                                request.buildConfig,
-                                request.rotationConfig
-                            )
+                            if (!canAccept(requestCtx)) return@forEach
+                            val breakType = handleRequestContext(requestCtx, request.onBreak, request.buildConfig, request.rotationConfig)
                             if (breakType == BreakType.Null) return@request
                             if (requestCtx.instantBreak && instaBreaks < request.buildConfig.breakSettings.breaksPerTick) {
                                 breakingInfos.getOrNull(breakType.index)?.let { info ->
+                                    if (!swapped) {
+                                        request.hotbarConfig.request(HotbarRequest(info.context.hotbarIndex))
+                                        swapped = true
+                                    }
                                     updateBlockBreakingProgress(info, player.mainHandStack)
                                     instaBreaks++
                                 }
@@ -95,6 +95,13 @@ object BreakManager : RequestHandler<BreakRequest>() {
                 }
             }
 
+            currentRequest?.let { request ->
+                breakingInfos.firstOrNull()?.let { info ->
+                    if (!swapped && !request.hotbarConfig.request(HotbarRequest(info.context.hotbarIndex)).done)
+                        return@listen
+                }
+            }
+
             breakingInfos.reversed().filterNotNull().forEach { info ->
                 if (info.breakConfig.rotateForBreak && !info.context.rotation.done) return@listen
                 updateBlockBreakingProgress(info, player.mainHandStack)

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

@@ -21,12 +21,14 @@ import com.lambda.config.groups.BuildConfig
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.Request
+import com.lambda.interaction.request.hotbar.HotbarConfig
 import com.lambda.interaction.request.rotation.RotationConfig
 
 data class BreakRequest(
     val contexts: List<BreakContext>,
     val buildConfig: BuildConfig,
     val rotationConfig: RotationConfig,
+    val hotbarConfig: HotbarConfig,
     val prio: Priority = 0,
     val onBreak: () -> Unit
 ) : Request(prio) {

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -166,9 +166,8 @@ class BuildTask @Ta5kBuilder constructor(
                     .sorted()
                     .take(build.breakSettings.breaksPerTick)
 
-                instantResults.firstOrNull()?.let { firstInstant ->
-                    if (!hotbar.request(HotbarRequest(firstInstant.context.hotbarIndex)).done) return@onRotate
-                    build.breakSettings.request(BreakRequest(instantResults.map { it.context }, build, rotation) { breaks++ })
+                instantResults.firstOrNull()?.let {
+                    build.breakSettings.request(BreakRequest(instantResults.map { it.context }, build, rotation, hotbar) { breaks++ })
                     return@onRotate
                 }
             }
@@ -210,7 +209,7 @@ class BuildTask @Ta5kBuilder constructor(
                     if (bestResult !is BreakResult.Break) return@onRotate
 
                     val contexts = resultsNotBlocked.filterIsInstance<BreakResult.Break>().take(2).map { it.context }
-                    val request = BreakRequest(contexts, build, rotation) { breaks++ }
+                    val request = BreakRequest(contexts, build, rotation, hotbar) { breaks++ }
                     build.breakSettings.request(request)
                 }