Indicate non raycasting rotation. Not yet possible bc of internal castings

Author: Avanatiker

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

@@ -35,10 +35,13 @@ import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationManager
 import com.lambda.interaction.request.rotation.RotationRequest
+import com.lambda.interaction.request.rotation.visibilty.RequestedHit
+import com.lambda.interaction.request.rotation.visibilty.RotationTarget
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.CheckedHit
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.scanSurfaces
 import com.lambda.interaction.request.rotation.visibilty.lookAtBlock
+import com.lambda.interaction.request.rotation.visibilty.lookAtHit
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
@@ -58,6 +61,7 @@ import net.minecraft.item.ItemUsageContext
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.state.property.Properties
 import net.minecraft.util.Hand
+import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
@@ -180,7 +184,13 @@ object BuildSimulator {
 
                     val newRotation = eye.rotationTo(vec)
 
-                    val hit = newRotation.rayCast(interact.interactReach, eye) ?: return@scanSurfaces
+                    val hit = if (interact.strictRayCast) {
+                        newRotation.rayCast(interact.interactReach, eye)?.blockResult
+                    } else {
+                        val hitVec = newRotation.castBox(box, interact.interactReach, eye)
+                        BlockHitResult(hitVec, hitSide, hitPos, false)
+                    } ?: return@scanSurfaces
+
                     val checked = CheckedHit(hit, newRotation, interact.interactReach)
                     if (!checked.verify()) return@scanSurfaces
 
@@ -411,7 +421,13 @@ object BuildSimulator {
 
                 val newRotation = eye.rotationTo(vec)
 
-                val hit = newRotation.rayCast(interact.interactReach, eye) ?: return@scanSurfaces
+                val hit = if (interact.strictRayCast) {
+                    newRotation.rayCast(interact.interactReach, eye)?.blockResult
+                } else {
+                    val hitVec = newRotation.castBox(box, interact.interactReach, eye)
+                    BlockHitResult(hitVec, side, pos, false)
+                } ?: return@scanSurfaces
+
                 val checked = CheckedHit(hit, newRotation, interact.interactReach)
                 if (!checked.verify()) return@scanSurfaces
 

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

@@ -19,6 +19,7 @@ package com.lambda.interaction.request.rotation
 
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.Request
+import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.visibilty.RotationTarget
 import com.lambda.threading.runSafe
 
@@ -42,4 +43,6 @@ data class RotationRequest(
         mode == RotationMode.None || runSafe {
             target.verify(target)
         } == true
+
+    fun megaDone() = target.distance < 0.001
 }

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

@@ -22,6 +22,7 @@ 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.RotationManager
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
 import com.lambda.util.collections.resettableLazy
@@ -44,7 +45,7 @@ data class RotationTarget(
     }
 
     val distance by lazy {
-        runSafe { targetRotation.value?.dist(player.rotation) } ?: 1000.0
+        runSafe { targetRotation.value?.dist(RotationManager.currentRotation) } ?: 1000.0
     }
 
     /**

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

@@ -318,7 +318,7 @@ abstract class Task<Result> : Nameable, Muteable {
         appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is RootTask) " [${task.state.display}] ${task.duration}" else "")
         val left = task.subTasks.size - maxEntries
         if (left > 0) {
-            appendLine("${" ".repeat(level * 5)}...and $left more tasks")
+            appendLine("${" ".repeat((level + 1) * 4)}...and $left more tasks")
         }
         task.subTasks.takeLast(maxEntries).forEach {
             appendTaskTree(it, level + 1)

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

@@ -79,7 +79,7 @@ class BuildTask @Ta5kBuilder constructor(
     init {
         listen<TickEvent.Pre> {
             currentInteraction?.let { context ->
-                if (context.shouldRotate(build) && !context.rotation.done) return@listen
+                if (context.shouldRotate(build) && !context.rotation.megaDone()) return@listen
                 context.interact(interact.swingHand)
             }
         }
@@ -163,7 +163,6 @@ class BuildTask @Ta5kBuilder constructor(
                 is BuildResult.Contextual -> {
                     if (pendingInteractions.size >= build.maxPendingInteractions) return@listen
 
-//                    info("Swapping interaction to ${bestResult.context.expectedPos} ${bestResult.context.distance}")
                     currentInteraction = bestResult.context
                 }
 
@@ -199,7 +198,6 @@ class BuildTask @Ta5kBuilder constructor(
         }
 
         listen<WorldEvent.BlockUpdate.Server>(alwaysListen = true) { event ->
-//            info("Update at ${event.pos.toShortString()}: ${event.newState.block.name.string}")
             pendingInteractions.firstOrNull { it.expectedPos == event.pos }?.let { context ->
                 pendingInteractions.remove(context)
                 if (!context.targetState.matches(event.newState, event.pos, world)) return@let