Some fixes

Author: Avanatiker

common/src/main/kotlin/com/lambda/module/modules/movement/Pathfinder.kt

@@ -44,6 +44,7 @@ import com.lambda.util.Formatting.string
 import com.lambda.util.math.setAlpha
 import com.lambda.util.player.MovementUtils.buildMovementInput
 import com.lambda.util.player.MovementUtils.mergeFrom
+import com.lambda.util.world.WorldUtils.isPathClear
 import com.lambda.util.world.fastVectorOf
 import com.lambda.util.world.toBlockPos
 import com.lambda.util.world.toFastVec
@@ -67,7 +68,7 @@ object Pathfinder : Module(
     private val pathing = PathingSettings(this) { page == Page.Pathing }
     private val rotation = RotationSettings(this) { page == Page.Rotation }
 
-    private val target = fastVectorOf(0, 91, -4)
+    private val target = fastVectorOf(0, 78, 0)
     private var longPath = Path()
     private var shortPath = Path()
     private var currentTarget: Vec3d? = null

common/src/main/kotlin/com/lambda/pathing/Pathing.kt

@@ -47,7 +47,7 @@ object Pathing {
 
         while (openSet.isNotEmpty() && startedAt + config.cutoffTimeout > System.currentTimeMillis()) {
             val current = openSet.remove()
-            //            println("Considering node: ${current.pos.toBlockPos()}")
+//            println("Considering node: ${current.pos.toBlockPos()}")
             if (goal.inGoal(current.pos)) {
                 println("Not yet considered nodes: ${openSet.size}")
                 println("Closed nodes: ${closedSet.size}")

common/src/main/kotlin/com/lambda/pathing/PathingConfig.kt

@@ -17,23 +17,16 @@
 
 package com.lambda.pathing
 
-import com.lambda.interaction.request.Priority
-import com.lambda.interaction.request.RequestConfig
+interface PathingConfig {
+    val kP: Double
+    val kI: Double
+    val kD: Double
+    val tolerance: Double
+    val cutoffTimeout: Long
+    val shortcutLength: Int
+    val clearancePrecition: Double
+    val allowSprint: Boolean
+    val maxFallHeight: Double
 
-abstract class PathingConfig(priority: Priority) : RequestConfig<PathRequest>(priority) {
-    abstract val kP: Double
-    abstract val kI: Double
-    abstract val kD: Double
-    abstract val tolerance: Double
-    abstract val cutoffTimeout: Long
-    abstract val shortcutLength: Int
-    abstract val clearancePrecition: Double
-    abstract val allowSprint: Boolean
-    abstract val maxFallHeight: Double
-
-    abstract val assumeJesus: Boolean
-
-    override fun requestInternal(request: PathRequest) {
-        PathingManager.registerRequest(this, request)
-    }
+    val assumeJesus: Boolean
 }

common/src/main/kotlin/com/lambda/pathing/PathingSettings.kt

@@ -18,13 +18,11 @@
 package com.lambda.pathing
 
 import com.lambda.config.Configurable
-import com.lambda.interaction.request.Priority
 
 class PathingSettings(
     c: Configurable,
-    priority: Priority = 0,
     vis: () -> Boolean = { true }
-) : PathingConfig(priority) {
+) : PathingConfig {
     enum class Page {
         Pathfinding, Movement, Misc
     }

common/src/main/kotlin/com/lambda/util/world/WorldUtils.kt

@@ -76,16 +76,19 @@ object WorldUtils {
         playerFitsIn(Vec3d.ofBottomCenter(pos))
 
     fun SafeContext.playerFitsIn(pos: Vec3d) =
-        world.isSpaceEmpty(pos.playerBox().contract(1.0E-6))
+        world.isSpaceEmpty(player, pos.playerBox().contract(1.0E-6))
 
     fun SafeContext.hasSupport(pos: BlockPos) =
-          hasSupport(Vec3d.ofBottomCenter(pos))
+        hasSupport(Vec3d.ofBottomCenter(pos))
 
 //    private fun SafeContext.hasSupport(pos: BlockPos) =
 //        blockState(pos.down()).isSideSolidFullSquare(world, pos.down(), Direction.UP)
 
     fun SafeContext.hasSupport(pos: Vec3d) =
-        !world.isSpaceEmpty(pos.playerBox().expand(1.0E-6))
+        !world.isSpaceEmpty(player, pos.playerBox().expand(1.0E-6))
+
+//    fun SafeContext.hasSupport(pos: Vec3d) =
+//        world.canCollide(null, pos.playerBox().expand(1.0E-6))
 
     fun Vec3d.playerBox(): Box =
         Box(x - 0.3, y, z - 0.3, x + 0.3, y + 1.8, z + 0.3)