dependency tweaks

Author: beanbag44

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, Stack(), this
+                pov, Stack(), concurrentResults, this
             ).takeIf { it.checkRequirements() }?.sim(null, simBuilder)
         }
 
@@ -77,7 +77,7 @@ interface ISimInfo : Automated {
             SimInfo(
                 pos, state, targetState,
                 targetState.getProcessingInfo(pos) ?: return,
-                pov, concurrentResults, dependencyStack, this
+                pov, dependencyStack, concurrentResults, this
             ).takeIf { it.checkRequirements() }?.sim(dependable, simBuilder)
         }
 
@@ -96,8 +96,8 @@ data class SimInfo(
     override val targetState: TargetState,
     override val preProcessing: PreProcessingInfo,
     override val pov: Vec3d,
-    override val concurrentResults: MutableSet<BuildResult>,
     override val dependencyStack: Stack<Dependable>,
+    override val concurrentResults: MutableSet<BuildResult>,
     private val automated: Automated
 ) : ISimInfo, Automated by automated
 

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

@@ -44,14 +44,14 @@ annotation class SimCheckerDsl
 
 @SimCheckerDsl
 abstract class SimChecker<T : BuildResult> {
-    protected fun ISimInfo.checkDependent(caller: Dependable?): Boolean {
-        if (caller == null) {
-            dependencyStack.clear()
-            return true
+    protected suspend fun ISimInfo.withDependable(dependable: Dependable?, block: suspend () -> Unit) {
+        if (dependable == null) dependencyStack.clear()
+        else {
+            if (dependencyStack.size >= maxSimDependencies) return
+            dependencyStack.push(dependable)
         }
-        if (dependencyStack.size >= maxSimDependencies) return false
-        dependencyStack.push(caller)
-        return true
+        block()
+        if (dependable != null) dependencyStack.pop()
     }
 
     fun ISimInfo.result(result: GenericResult) = addResult(result)

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

@@ -78,12 +78,13 @@ class BreakSim private constructor(simInfo: ISimInfo)
         context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
         suspend fun SimBuilder.simBreak() =
             BreakSim(this).run {
-                if (!checkDependent(dependable)) return
-                automatedSafeContext.checkBreaks()
+                withDependable(dependable) {
+                    automatedSafeContext.simBreaks()
+                }
             }
     }
 
-    private suspend fun AutomatedSafeContext.checkBreaks() {
+    private suspend fun AutomatedSafeContext.simBreaks() {
         if (breakConfig.avoidSupporting) player.supportingBlockPos.getOrNull()?.let { support ->
             if (support != pos) return@let
             result(BreakResult.PlayerOnTop(pos, state))

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

@@ -81,12 +81,13 @@ class PlaceSim private constructor(simInfo: ISimInfo)
         @SimBuilderDsl
         suspend fun SimBuilder.simPlacement() =
             PlaceSim(this).run {
-                if (!checkDependent(dependable)) return
-                automatedSafeContext.checkPlacements()
+                withDependable(dependable) {
+                    automatedSafeContext.simPlacements()
+                }
             }
     }
 
-    private suspend fun AutomatedSafeContext.checkPlacements() =
+    private suspend fun AutomatedSafeContext.simPlacements() =
         supervisorScope {
             preProcessing.sides.forEach { side ->
                 launch {

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

@@ -57,12 +57,13 @@ class PostProcessingSim private constructor(simInfo: ISimInfo)
         @SimBuilderDsl
         suspend fun SimBuilder.simPostProcessing() =
             PostProcessingSim(this).run {
-                if (!checkDependent(dependable)) return
-                automatedSafeContext.checkPostProcessing()
+                withDependable(dependable) {
+                    automatedSafeContext.simPostProcessing()
+                }
             }
     }
 
-    private suspend fun AutomatedSafeContext.checkPostProcessing() {
+    private suspend fun AutomatedSafeContext.simPostProcessing() {
         val targetState = (targetState as? TargetState.State) ?: return
 
         val mismatchedProperties = state.properties.filter { state.get(it) != targetState.blockState.get(it) }