max dependency depth and reintroduce blocked by player build result

Author: beanbag44

src/main/kotlin/com/lambda/context/AutomationConfig.kt

@@ -62,6 +62,7 @@ object AutomationConfig : Configurable(LambdaConfig), Automated {
     val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree").group(Group.Debug)
     val shrinkFactor by setting("Shrink Factor", 0.001, 0.0..1.0, 0.001).group(Group.Debug)
     val ignoreItemDropWarnings by setting("Ignore Drop Warnings", false, "Hides the item drop warnings from the break manager").group(Group.Debug)
+    val maxSimDependencies by setting("Max Sim Dependencies", 10, 0..25, 1, "Maximum dependency build results").group(Group.Debug)
 
     @Volatile
     var drawables = listOf<Drawable>()

src/main/kotlin/com/lambda/interaction/construction/result/results/PlaceResult.kt

@@ -22,8 +22,6 @@ import baritone.api.pathing.goals.GoalInverted
 import com.lambda.context.Automated
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.construction.context.PlaceContext
-import com.lambda.interaction.construction.verify.TargetState
-import com.lambda.task.Task
 import com.lambda.interaction.construction.result.BuildResult
 import com.lambda.interaction.construction.result.ComparableResult
 import com.lambda.interaction.construction.result.Contextual
@@ -33,7 +31,6 @@ import com.lambda.interaction.construction.result.Navigable
 import com.lambda.interaction.construction.result.Rank
 import com.lambda.interaction.construction.result.Resolvable
 import com.lambda.task.tasks.BuildTask.Companion.breakBlock
-import com.lambda.task.tasks.BuildTask.Companion.build
 import net.minecraft.block.BlockState
 import net.minecraft.entity.Entity
 import net.minecraft.item.ItemPlacementContext
@@ -97,6 +94,23 @@ sealed class PlaceResult : BuildResult() {
         }
     }
 
+    /**
+     * Represents a scenario where block placement is obstructed by the player itself.
+     *
+     * @property pos The position of the block that was attempted to be placed.
+     */
+    data class BlockedBySelf(
+        override val pos: BlockPos
+    ) : Drawable, Navigable, PlaceResult() {
+        override val rank = Rank.PlaceBlockedByPlayer
+        private val color = Color(252, 3, 3, 100)
+        override val goal = GoalInverted(GoalBlock(pos))
+
+        override fun ShapeBuilder.buildRenderer() {
+            box(pos, color, color)
+        }
+    }
+
     /**
      * Represents a scenario where block placement is obstructed by an entity.
      *

src/main/kotlin/com/lambda/interaction/construction/simulation/ISimInfo.kt

@@ -61,7 +61,7 @@ interface ISimInfo : Automated {
             SimInfo(
                 pos, state, targetState,
                 targetState.getProcessingInfo(pos) ?: return,
-                pov, concurrentResults, this
+                pov, concurrentResults, Stack(), this
             ).takeIf { it.checkRequirements() }?.sim(null, simBuilder)
         }
 
@@ -77,7 +77,7 @@ interface ISimInfo : Automated {
             SimInfo(
                 pos, state, targetState,
                 targetState.getProcessingInfo(pos) ?: return,
-                pov, concurrentResults, this
+                pov, concurrentResults, dependencyStack, this
             ).takeIf { it.checkRequirements() }?.sim(dependable, simBuilder)
         }
 
@@ -97,9 +97,10 @@ data class SimInfo(
     override val preProcessing: PreProcessingInfo,
     override val pov: Vec3d,
     override val concurrentResults: MutableSet<BuildResult>,
+    override val dependencyStack: Stack<Dependable>,
     val automated: Automated
 ) : ISimInfo, Automated by automated {
-    override val dependencyStack = Stack<Dependable>()
+
 }
 
 class SimBuilder(simInfo: ISimInfo) : ISimInfo by simInfo

src/main/kotlin/com/lambda/interaction/construction/simulation/SimChecker.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.simulation
 
+import com.lambda.context.AutomationConfig.maxSimDependencies
 import com.lambda.interaction.construction.processing.PreProcessingInfo
 import com.lambda.interaction.construction.result.BuildResult
 import com.lambda.interaction.construction.result.Dependable
@@ -43,12 +44,14 @@ annotation class SimCheckerDsl
 
 @SimCheckerDsl
 abstract class SimChecker<T : BuildResult> {
-    protected fun ISimInfo.checkDependent(caller: Dependable?) {
+    protected fun ISimInfo.checkDependent(caller: Dependable?): Boolean {
         if (caller == null) {
             dependencyStack.clear()
-            return
+            return true
         }
+        if (dependencyStack.size >= maxSimDependencies) return false
         dependencyStack.push(caller)
+        return true
     }
 
     fun ISimInfo.result(result: GenericResult) = addResult(result)

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

@@ -78,7 +78,7 @@ class BreakSim private constructor(simInfo: ISimInfo)
         context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
         suspend fun SimBuilder.simBreak() =
             BreakSim(this).run {
-                checkDependent(dependable)
+                if (!checkDependent(dependable)) return
                 automatedSafeContext.checkBreaks()
             }
     }

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PlaceSim.kt

@@ -81,7 +81,7 @@ class PlaceSim private constructor(simInfo: ISimInfo)
         @SimBuilderDsl
         suspend fun SimBuilder.simPlacement() =
             PlaceSim(this).run {
-                checkDependent(dependable)
+                if (!checkDependent(dependable)) return
                 automatedSafeContext.checkPlacements()
             }
     }
@@ -251,14 +251,13 @@ class PlaceSim private constructor(simInfo: ISimInfo)
     }
 
     private suspend fun AutomatedSafeContext.handleEntityBlockage(context: ItemPlacementContext): List<Entity> {
+        val pos = context.blockPos
         val theoreticalState = context.stack.blockItem.block.getPlacementState(context)
             ?: return emptyList()
 
         val collisionShape = theoreticalState.getCollisionShape(
-            world,
-            context.blockPos,
-            ShapeContext.ofPlacement(player)
-        ).offset(context.blockPos)
+            world, pos, ShapeContext.ofPlacement(player)
+        ).offset(pos)
 
         val collidingEntities = collisionShape.boundingBoxes.flatMap { box ->
             world.entities.filter { it.boundingBox.intersects(box) }
@@ -267,6 +266,10 @@ class PlaceSim private constructor(simInfo: ISimInfo)
         if (collidingEntities.isNotEmpty()) {
             collidingEntities
                 .mapNotNull { entity ->
+                    if (entity === player) {
+                        result(PlaceResult.BlockedBySelf(pos))
+                        return@mapNotNull null
+                    }
                     val hitbox = entity.boundingBox
                     entity.getPositionsWithinHitboxXZ(
                         (pos.y - (hitbox.maxY - hitbox.minY)).floorToInt(),

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PostProcessingSim.kt

@@ -57,7 +57,7 @@ class PostProcessingSim private constructor(simInfo: ISimInfo)
         @SimBuilderDsl
         suspend fun SimBuilder.simPostProcessing() =
             PostProcessingSim(this).run {
-                checkDependent(dependable)
+                if (!checkDependent(dependable)) return
                 automatedSafeContext.checkPostProcessing()
             }
     }