Some fixes

Author: Avanatiker

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

@@ -17,10 +17,13 @@
 
 package com.lambda.interaction.construction.simulation
 
+import com.lambda.config.groups.InteractionConfig
+import com.lambda.config.groups.InventoryConfig
 import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.blueprint.Blueprint
 import com.lambda.interaction.construction.result.BuildResult
 import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
+import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils.blockState
@@ -32,11 +35,18 @@ import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
 
-data class Simulation(val blueprint: Blueprint) {
+data class Simulation(
+    val blueprint: Blueprint,
+    val interact: InteractionConfig = TaskFlowModule.interact,
+    val rotation: RotationConfig = TaskFlowModule.rotation,
+    val inventory: InventoryConfig = TaskFlowModule.inventory,
+) {
     private val cache: MutableMap<FastVector, Set<BuildResult>> = mutableMapOf()
     private fun FastVector.toView(): Vec3d = toVec3d().add(0.5, ClientPlayerEntity.DEFAULT_EYE_HEIGHT.toDouble(), 0.5)
 
-    fun simulate(pos: FastVector) =
+    fun simulate(
+        pos: FastVector
+    ) =
         cache.getOrPut(pos) {
             val view = pos.toView()
             runSafe {
@@ -50,8 +60,7 @@ data class Simulation(val blueprint: Blueprint) {
                 ) return@getOrPut emptySet()
             }
 
-            // ToDo: wtf was that "reach = TaskFlowModule.interact.reach - 1"
-            blueprint.simulate(view)
+            blueprint.simulate(view, interact, rotation, inventory)
         }
 
     private fun SafeContext.playerFitsIn(pos: Vec3d): Boolean {
@@ -61,6 +70,10 @@ data class Simulation(val blueprint: Blueprint) {
     }
 
     companion object {
-        fun Blueprint.simulation() = Simulation(this)
+        fun Blueprint.simulation(
+            interact: InteractionConfig = TaskFlowModule.interact,
+            rotation: RotationConfig = TaskFlowModule.rotation,
+            inventory: InventoryConfig = TaskFlowModule.inventory,
+        ) = Simulation(this, interact, rotation, inventory)
     }
 }

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

@@ -185,10 +185,6 @@ object RotationManager : RequestHandler<RotationRequest>(), Loadable {
 
     object BaritoneProcessor {
         private var baritoneContext: RotationRequest? = null
-        private val baritoneRotation get() = Baritone.rotation.apply {
-            if (rotationMode == RotationMode.Sync) return@apply
-            rotationMode = RotationMode.Sync
-        }
 
         private val movementYawList = arrayOf(
             0.0, 45.0,
@@ -199,9 +195,7 @@ object RotationManager : RequestHandler<RotationRequest>(), Loadable {
 
         @JvmStatic
         fun handleBaritoneRotation(yaw: Float, pitch: Float) {
-            lookAt(
-                Rotation(yaw, pitch)
-            ).requestBy(baritoneRotation)
+            lookAt(Rotation(yaw, pitch)).requestBy(Baritone.rotation)
         }
 
         @JvmStatic

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

@@ -26,5 +26,5 @@ object Baritone : Module(
     description = "Baritone configuration",
     defaultTags = setOf(ModuleTag.CLIENT)
 ) {
-    val rotation = RotationSettings(this, Int.MIN_VALUE)
+    val rotation = RotationSettings(this, Int.MAX_VALUE)
 }

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

@@ -20,6 +20,7 @@ package com.lambda.task.tasks
 import com.lambda.Lambda.LOG
 import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.InteractionConfig
+import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.InventoryConfig
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.context.SafeContext
@@ -39,6 +40,7 @@ import com.lambda.interaction.construction.simulation.BuildGoal
 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.request.rotation.visibilty.PointSelection
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.task.Task
 import com.lambda.util.BaritoneUtils
@@ -123,13 +125,29 @@ class BuildTask @Ta5kBuilder constructor(
                 is BuildResult.Ignored,
                 is BuildResult.Unbreakable,
                 is BuildResult.Restricted,
-                is BuildResult.NoPermission,
-                    -> {
+                is BuildResult.NoPermission -> {
                     if (finishOnDone) success()
                 }
 
-                is BuildResult.NotVisible, is PlaceResult.NoIntegrity -> {
-                    if (build.pathing) BaritoneUtils.setGoalAndPath(BuildGoal(blueprint.simulation()))
+                is BuildResult.NotVisible,
+                is PlaceResult.NoIntegrity -> {
+                    if (!build.pathing) return@listen
+                    // ToDo:
+                    //  Solve the problem that baritone stops pathing when it thinks it is in a valid goal
+                    //  but the player position does not perfectly match the simulated position
+                    // hacky fix for now is to walk "closer" but it wont work in every situation
+                    val interaction = object : InteractionConfig {
+                        override val attackReach = interact.attackReach
+                        override val interactReach = interact.interactReach - 1
+                        override val scanReach = interact.scanReach
+                        override val strictRayCast = interact.strictRayCast
+                        override val checkSideVisibility = interact.checkSideVisibility
+                        override val resolution = interact.resolution
+                        override val pointSelection = interact.pointSelection
+                        override val swingHand = interact.swingHand
+                    }
+                    val goal = BuildGoal(blueprint.simulation(interaction, rotation, inventory))
+                    BaritoneUtils.setGoalAndPath(goal)
                 }
 
                 is Navigable -> {