Sort build results by rotation distance

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -71,7 +71,7 @@ data class BreakContext(
     override fun compareTo(other: BuildContext): Int {
         return when (other) {
             is BreakContext -> compareBy<BreakContext> {
-                it.distance
+                it.rotation.target.distance
             }.compare(this, other)
 
             else -> 1

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

@@ -22,6 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
@@ -81,6 +82,8 @@ data class PlaceContext(
                 it.hand
             }.thenBy {
                 it.sneak
+            }.thenBy {
+                it.rotation.target.distance
             }.thenBy {
                 it.distance
             }.thenBy {

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

@@ -28,7 +28,6 @@ import com.lambda.interaction.material.container.ContainerManager.findBestAvaila
 import com.lambda.interaction.material.container.ContainerManager.transfer
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.container.containers.MainHandContainer
-import com.lambda.task.tasks.BreakBlock
 import net.minecraft.block.BlockState
 import net.minecraft.item.Item
 import net.minecraft.util.math.BlockPos
@@ -106,7 +105,7 @@ sealed class BreakResult : BuildResult() {
                 ?: selectStack {
                     isItem(badItem).not()
                 }.transfer(MainHandContainer, inventory)
-                ?: MaterialContainer.Nothing("Couldn't find a tool for ${blockState.block.name.string} with $badItem in main hand.")
+                ?: MaterialContainer.FailureTask("Couldn't find a tool for ${blockState.block.name.string} with $badItem in main hand.")
 
         override fun SafeContext.buildRenderer() {
             withPos(blockPos, color)

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

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

@@ -80,7 +80,7 @@ abstract class MaterialContainer(
         this.stacks = stacks
     }
 
-    class Nothing(override val name: String = "Nothing") : Task<Unit>() {
+    class FailureTask(override val name: String) : Task<Unit>() {
         override fun SafeContext.onStart() {
             failure(name)
         }

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

@@ -19,6 +19,8 @@ package com.lambda.interaction.request.rotation.visibilty
 
 import com.lambda.context.SafeContext
 import com.lambda.interaction.request.rotation.Rotation
+import com.lambda.interaction.request.rotation.Rotation.Companion.dist
+import com.lambda.interaction.request.rotation.Rotation.Companion.rotation
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
@@ -41,6 +43,10 @@ data class RotationTarget(
         runSafe { buildRotation() }
     }
 
+    val distance by lazy {
+        runSafe { targetRotation.value?.dist(player.rotation) } ?: 1000.0
+    }
+
     /**
      * Requests a rotation based on the given configuration.
      *

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

@@ -129,6 +129,7 @@ class BuildTask @Ta5kBuilder constructor(
                 is BuildResult.Unbreakable,
                 is BuildResult.Restricted,
                 is BuildResult.NoPermission -> {
+                    if (pendingInteractions.isNotEmpty()) return@listen
                     if (blueprint is PropagatingBlueprint) {
                         blueprint.next()
                         return@listen