manager utils, abstracted blockedPositions, and build task now checks blocked positions before calling success

Author: beanbag44

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.interaction.request
+
+import com.lambda.interaction.request.breaking.BreakManager
+import com.lambda.interaction.request.hotbar.HotbarManager
+import com.lambda.interaction.request.placing.PlaceManager
+import com.lambda.interaction.request.rotation.RotationManager
+
+object ManagerUtils {
+    val managers = listOf(
+        RotationManager,
+        HotbarManager,
+        BreakManager,
+        PlaceManager
+    )
+
+    val positionBlockingManagers = managers
+        .filterIsInstance<PositionBlocking>()
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.interaction.request
+
+import net.minecraft.util.math.BlockPos
+
+interface PositionBlocking {
+    val blockedPositions: List<BlockPos>
+}

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

@@ -26,6 +26,7 @@ import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
 import com.lambda.interaction.request.breaking.BreakConfig.BreakMode
@@ -57,7 +58,7 @@ import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.sound.SoundCategory
 import net.minecraft.util.math.BlockPos
 
-object BreakManager : RequestHandler<BreakRequest>() {
+object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
     private var primaryBreakingInfo: BreakInfo?
         get() = breakingInfos[0]
         set(value) { breakingInfos[0] = value }
@@ -70,16 +71,16 @@ object BreakManager : RequestHandler<BreakRequest>() {
         TaskFlowModule.build.maxPendingInteractions, TaskFlowModule.build.interactionTimeout * 50L
     ) { info("${it::class.simpleName} at ${it.context.expectedPos.toShortString()} timed out") }
 
-    val blockedPositions
+    override val blockedPositions
         get() = breakingInfos.mapNotNull { it?.context?.expectedPos } + pendingInteractions.map { it.context.expectedPos }
 
+    private var rotation: RotationRequest? = null
+    private var validRotation = false
+
     private var blockBreakingCooldown = 0
 
     private var instantBreaks = listOf<BreakContext>()
 
-    private var rotation: RotationRequest? = null
-    private var validRotation = false
-
     fun Any.onBreak(
         alwaysListen: Boolean = false,
         block: SafeContext.() -> Unit

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

@@ -27,6 +27,7 @@ import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.breaking.BreakManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
@@ -56,17 +57,17 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.world.GameMode
 import org.apache.commons.lang3.mutable.MutableObject
 
-object PlaceManager : RequestHandler<PlaceRequest>() {
+object PlaceManager : RequestHandler<PlaceRequest>(), PositionBlocking {
     private val pendingInteractions = LimitedDecayQueue<PlaceInfo>(
         TaskFlowModule.build.maxPendingInteractions, TaskFlowModule.build.interactionTimeout * 50L
     ) { info("${it::class.simpleName} at ${it.context.expectedPos.toShortString()} timed out") }
 
+    override val blockedPositions
+        get() = pendingInteractions.map { it.context.expectedPos }
+
     private var rotation: RotationRequest? = null
     private var validRotation = false
 
-    val blockedPositions
-        get() = pendingInteractions.map { it.context.expectedPos }
-
     init {
         listen<TickEvent.Pre>(priority = Int.MIN_VALUE) {
             currentRequest?.let { request ->

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

@@ -39,6 +39,7 @@ import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
 import com.lambda.interaction.construction.simulation.Simulation.Companion.simulation
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.material.transfer.TransactionExecutor.Companion.transfer
+import com.lambda.interaction.request.ManagerUtils.positionBlockingManagers
 import com.lambda.interaction.request.breaking.BreakManager
 import com.lambda.interaction.request.breaking.BreakRequest
 import com.lambda.interaction.request.hotbar.HotbarConfig
@@ -140,7 +141,9 @@ class BuildTask @Ta5kBuilder constructor(
                         blueprint.next()
                         return@onRotate
                     }
-                    if (finishOnDone) success()
+
+                    val managersStillRunning = positionBlockingManagers.any { it.blockedPositions.isNotEmpty() }
+                    if (finishOnDone && !managersStillRunning) success()
                 }
 
                 is BuildResult.NotVisible,