Exhausting interactable block prevention

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt

@@ -242,7 +242,8 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
         override val pausesParent get() = true
 
         override fun resolve() =
-            neededStack.select().transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededStack.item.name.string} anywhere.")
+            neededStack.select()
+                .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededStack.item.name.string} anywhere.")
 
         override fun SafeContext.buildRenderer() {
             if (blockPos.blockState(world).isAir) {

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -279,7 +279,7 @@ object BuildSimulator {
 
                 val blockHit = checkedResult.blockResult ?: return@forEach
                 val hitBlock = blockHit.blockPos.blockState(world).block
-                val shouldSneak = hitBlock in BlockUtils.interactionBlacklist
+                val shouldSneak = hitBlock::class in BlockUtils.interactionClasses
 
                 val primeDirection =
                     (target as? TargetState.State)?.blockState?.getOrEmpty(Properties.HORIZONTAL_FACING)?.getOrNull()
@@ -440,9 +440,7 @@ object BuildSimulator {
             val blockHit = checkedHit.hit.blockResult ?: return@let
 
             val breakContext = BreakContext(
-                eye, blockHit, RotationRequest(
-                    lookAtBlock(blockHit.blockPos, config = interact), rotation
-                ), state, player.activeHand, instantBreakable(state, pos)
+                eye, blockHit, RotationRequest(lookAt(checkedHit.targetRotation, 0.001), rotation), state, player.activeHand, instantBreakable(state, pos)
             )
 
             /* player has a better tool for the job available */

common/src/main/kotlin/com/lambda/interaction/material/transfer/SlotTransfer.kt

@@ -73,8 +73,8 @@ class SlotTransfer @Ta5kBuilder constructor(
 
             transfer {
 //                moveSlot(nextFrom.id, nextTo.id)
-                swap(nextTo.id, 0)
-                swap(nextFrom.id, 0)
+                swap(nextTo.id, 1)
+                swap(nextFrom.id, 1)
             }.finally { change ->
                 changes merge change
             }.execute(this@SlotTransfer)

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/ClickSlotTransaction.kt

@@ -17,10 +17,8 @@
 
 package com.lambda.interaction.material.transfer.transaction
 
-import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.material.transfer.InventoryChanges
 import com.lambda.interaction.material.transfer.InventoryTransaction
 import com.lambda.util.player.SlotUtils.clickSlot
 import net.minecraft.screen.slot.SlotActionType
@@ -32,10 +30,10 @@ class ClickSlotTransaction @Ta5kBuilder constructor(
 ) : InventoryTransaction() {
     override val name: String get() = "Click slot #$slotId with action $actionType and button $button"
 
-    override fun SafeContext.onStart() {
-        changes = InventoryChanges(player.currentScreenHandler.slots)
-        clickSlot(slotId, button, actionType)
-        changes.detectChanges()
-        success(changes)
+    init {
+    	listen<TickEvent.Pre> {
+            clickSlot(slotId, button, actionType)
+            finish()
+        }
     }
 }

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

@@ -23,6 +23,7 @@ import com.lambda.interaction.construction.verify.ScanMode
 import com.lambda.interaction.construction.verify.SurfaceScan
 import com.lambda.interaction.request.rotation.*
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
+import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.util.extension.component6
 import com.lambda.util.math.distSq
 import com.lambda.util.world.raycast.InteractionMask
@@ -170,7 +171,7 @@ object VisibilityChecker {
     ) {
         excludedSides.forEach { side ->
             if (excludedSides.isNotEmpty() && side !in excludedSides) return@forEach
-            val (minX, minY, minZ, maxX, maxY, maxZ) = box.contract(1.0E-3).bounds(side)
+            val (minX, minY, minZ, maxX, maxY, maxZ) = box.contract(TaskFlowModule.shrinkFactor).bounds(side)
             val stepX = (maxX - minX) / resolution
             val stepY = (maxY - minY) / resolution
             val stepZ = (maxZ - minZ) / resolution

common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt

@@ -41,6 +41,7 @@ object TaskFlowModule : Module(
     val inventory = InventorySettings(this) { page == Page.Inventory }
 
     val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree") { page == Page.Debug }
+    val shrinkFactor by setting("Shrink Factor", 0.001, 0.0..1.0, 0.001) { page == Page.Debug }
 
     @Volatile
     var drawables = listOf<Drawable>()

common/src/main/kotlin/com/lambda/task/Task.kt

@@ -28,6 +28,7 @@ import com.lambda.threading.runSafe
 import com.lambda.util.Communication.logError
 import com.lambda.util.Nameable
 import com.lambda.util.StringUtils.capitalize
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -315,7 +316,7 @@ abstract class Task<Result> : Nameable, Muteable {
 
     private fun StringBuilder.appendTaskTree(task: Task<*>, level: Int = 0, maxEntries: Int = 10) {
         if (task.state == State.CANCELLED) return
-        appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is RootTask) " [${task.state.display}] ${task.duration}" else "")
+        appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is RootTask) " [${task.state.display}] ${(task.age * 50).milliseconds}" else "")
         val left = task.subTasks.size - maxEntries
         if (left > 0) {
             appendLine("${" ".repeat((level + 1) * 4)}...and $left more tasks")

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

@@ -50,6 +50,7 @@ import com.lambda.util.BaritoneUtils
 import com.lambda.util.BlockUtils
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.Communication.info
+import com.lambda.util.Communication.warn
 import com.lambda.util.Formatting.string
 import com.lambda.util.collections.LimitedDecayQueue
 import com.lambda.util.extension.Structure
@@ -88,8 +89,9 @@ class BuildTask @Ta5kBuilder constructor(
     init {
         listen<TickEvent.Pre> {
             currentInteraction?.let { context ->
-//                TaskFlowModule.drawables = listOf(context)
+                TaskFlowModule.drawables = listOf(context)
                 if (context.shouldRotate(build) && !context.rotation.done) return@let
+                if (context is PlaceContext && context.sneak && !player.isSneaking) return@let
                 context.interact(interact.swingHand)
             }
             instantBreaks.forEach { context ->
@@ -143,8 +145,8 @@ class BuildTask @Ta5kBuilder constructor(
             // ToDo: Simulate for each pair player positions that work
             val results = blueprint.simulate(player.eyePos, interact, rotation, inventory, build)
 
-            TaskFlowModule.drawables = results.filterIsInstance<Drawable>()
-                .plus(pendingInteractions.toList())
+//            TaskFlowModule.drawables = results.filterIsInstance<Drawable>()
+//                .plus(pendingInteractions.toList())
 //                .plus(sim.goodPositions())
 
             if (build.breaksPerTick > 1) {
@@ -179,7 +181,8 @@ class BuildTask @Ta5kBuilder constructor(
                 is BuildResult.NotVisible,
                 is PlaceResult.NoIntegrity -> {
                     if (!build.pathing) return@onRotate
-                    val goal = BuildGoal(blueprint.simulation(interact, rotation, inventory, build), player.blockPos)
+                    val sim = blueprint.simulation(interact, rotation, inventory, build)
+                    val goal = BuildGoal(sim, player.blockPos)
                     BaritoneUtils.setGoalAndPath(goal)
                 }
 
@@ -209,10 +212,7 @@ class BuildTask @Ta5kBuilder constructor(
         listen<MovementEvent.InputUpdate> {
             val context = currentInteraction ?: return@listen
             if (context !is PlaceContext) return@listen
-            val hitBlock = context.result.blockPos.blockState(world).block
-            if (hitBlock in BlockUtils.interactionBlacklist) {
-                it.input.sneaking = true
-            }
+            if (context.sneak) it.input.sneaking = true
         }
 
         listen<WorldEvent.BlockUpdate.Client> { event ->
@@ -225,7 +225,10 @@ class BuildTask @Ta5kBuilder constructor(
         listen<WorldEvent.BlockUpdate.Server>(alwaysListen = true) { event ->
             pendingInteractions.firstOrNull { it.expectedPos == event.pos }?.let { context ->
                 pendingInteractions.remove(context)
-                if (!context.targetState.matches(event.newState, event.pos, world)) return@let
+                if (!context.targetState.matches(event.newState, event.pos, world)) {
+                    this@BuildTask.warn("Update at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${context.targetState}")
+                    return@let
+                }
                 when (context) {
                     is BreakContext -> breaks++
                     is PlaceContext -> placements++