big refactor

Author: beanbag44

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

@@ -34,7 +34,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.supervisorScope
 import net.minecraft.util.math.Vec3d
 
-object BuildSimulator : SimChecker<PostSimResult>() {
+object BuildSimulator : Sim<PostSimResult>() {
     context(automatedSafeContext: AutomatedSafeContext)
     fun Blueprint.simulate(
         pov: Vec3d = automatedSafeContext.player.eyePos

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

@@ -22,83 +22,65 @@ import com.lambda.context.AutomatedSafeContext
 import com.lambda.interaction.construction.processing.PreProcessingInfo
 import com.lambda.interaction.construction.processing.ProcessorRegistry.getProcessingInfo
 import com.lambda.interaction.construction.result.BuildResult
-import com.lambda.interaction.construction.result.Dependable
-import com.lambda.interaction.construction.simulation.checks.RequirementChecker.checkRequirements
+import com.lambda.interaction.construction.simulation.checks.BasicChecker.hasBasicRequirements
 import com.lambda.interaction.construction.verify.TargetState
 import net.minecraft.block.BlockState
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
 import java.util.*
 
-@DslMarker
-annotation class SimBuilderDsl
-
 interface ISimInfo : Automated {
     val pos: BlockPos
     val state: BlockState
     val targetState: TargetState
     val preProcessing: PreProcessingInfo
     val pov: Vec3d
     val concurrentResults: MutableSet<BuildResult>
-    val dependencyStack: Stack<Dependable>
+    val dependencyStack: Stack<Sim<*>>
 
     companion object {
-        @SimBuilderDsl
-        private suspend fun ISimInfo.sim(
-            dependable: Dependable?,
-            simBuilder: suspend context(Dependable?) SimBuilder.() -> Unit
-        ) = SimBuilder(this).run { with(dependable) { simBuilder() } }
-
-        @SimBuilderDsl
+        @SimDsl
+        context(_: BuildSimulator)
         suspend fun AutomatedSafeContext.sim(
             pos: BlockPos,
             state: BlockState,
             targetState: TargetState,
             pov: Vec3d,
             concurrentResults: MutableSet<BuildResult>,
-            simBuilder: suspend context(Dependable?) SimBuilder.() -> Unit
+            simBuilder: suspend ISimInfo.() -> Unit
         ) {
             SimInfo(
                 pos, state, targetState,
                 targetState.getProcessingInfo(pos) ?: return,
                 pov, Stack(), concurrentResults, this
-            ).takeIf { it.checkRequirements() }?.sim(null, simBuilder)
+            ).takeIf { it.hasBasicRequirements() }?.run { simBuilder() }
         }
 
-        @SimBuilderDsl
-        context(_: AutomatedSafeContext, dependable: Dependable)
+        @SimDsl
+        context(_: AutomatedSafeContext, dependent: Sim<*>)
         suspend fun ISimInfo.sim(
             pos: BlockPos = this.pos,
             state: BlockState = this.state,
             targetState: TargetState = this.targetState,
             pov: Vec3d = this.pov,
-            simBuilder: suspend context(Dependable?) SimBuilder.() -> Unit
+            simBuilder: suspend ISimInfo.() -> Unit
         ) {
             SimInfo(
                 pos, state, targetState,
                 targetState.getProcessingInfo(pos) ?: return,
                 pov, dependencyStack, concurrentResults, this
-            ).takeIf { it.checkRequirements() }?.sim(dependable, simBuilder)
+            ).takeIf { it.hasBasicRequirements() }?.run { simBuilder() }
         }
-
-        @SimBuilderDsl
-        context(dependable: Dependable)
-        suspend fun ISimInfo.sim(
-            simBuilder: suspend context(Dependable?) SimBuilder.() -> Unit
-        ) = sim(dependable, simBuilder)
     }
 }
 
-@SimBuilderDsl
 data class SimInfo(
     override val pos: BlockPos,
     override val state: BlockState,
     override val targetState: TargetState,
     override val preProcessing: PreProcessingInfo,
     override val pov: Vec3d,
-    override val dependencyStack: Stack<Dependable>,
+    override val dependencyStack: Stack<Sim<*>>,
     override val concurrentResults: MutableSet<BuildResult>,
     private val automated: Automated
-) : ISimInfo, Automated by automated
-
-class SimBuilder(simInfo: ISimInfo) : ISimInfo by simInfo
+) : ISimInfo, Automated by automated

…action/construction/result/Dependable.kt …ction/construction/simulation/Results.ktsrc/main/kotlin/com/lambda/interaction/construction/result/Dependable.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/Results.kt src/main/kotlin/com/lambda/interaction/construction/result/Dependable.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/Results.kt

@@ -15,10 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.interaction.construction.result
+package com.lambda.interaction.construction.simulation
 
-import com.lambda.interaction.construction.simulation.ISimInfo
+import com.lambda.interaction.construction.result.BuildResult
+import com.lambda.interaction.construction.result.results.GenericResult
 
-interface Dependable : ISimInfo {
-    fun asDependent(buildResult: BuildResult): BuildResult
+@SimDsl
+interface Results<T : BuildResult> {
+    fun ISimInfo.result(result: GenericResult) = addResult(result)
+    fun ISimInfo.result(result: T) = addResult(result)
+
+    private fun ISimInfo.addResult(result: BuildResult) {
+        concurrentResults.add(
+            dependencyStack
+                .asReversed()
+                .fold(result) { acc, dependable ->
+                    with(dependable) { dependentUpon(acc) }
+                }
+        )
+    }
 }

…on/construction/simulation/SimChecker.kt …teraction/construction/simulation/Sim.ktsrc/main/kotlin/com/lambda/interaction/construction/simulation/SimChecker.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/Sim.kt src/main/kotlin/com/lambda/interaction/construction/simulation/SimChecker.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/Sim.kt

@@ -20,7 +20,6 @@ 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
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.request.rotating.Rotation.Companion.rotationTo
 import com.lambda.interaction.request.rotating.visibilty.VisibilityChecker.CheckedHit
@@ -40,32 +39,19 @@ import net.minecraft.util.shape.VoxelShape
 import kotlin.math.pow
 
 @DslMarker
-annotation class SimCheckerDsl
-
-@SimCheckerDsl
-abstract class SimChecker<T : BuildResult> {
-    protected suspend fun ISimInfo.withDependable(dependable: Dependable?, block: suspend () -> Unit) {
-        if (dependable == null) dependencyStack.clear()
-        else {
-            if (dependencyStack.size >= maxSimDependencies) return
-            dependencyStack.push(dependable)
-        }
-        block()
-        if (dependable != null) dependencyStack.pop()
-    }
+annotation class SimDsl
 
-    fun ISimInfo.result(result: GenericResult) = addResult(result)
-    fun ISimInfo.result(result: T) = addResult(result)
+@SimDsl
+abstract class Sim<T : BuildResult> : Results<T> {
+    @SimDsl
+    open fun dependentUpon(buildResult: BuildResult): BuildResult = buildResult
 
-    private fun ISimInfo.addResult(result: BuildResult) {
-        if (this@SimChecker is BuildSimulator) concurrentResults.add(result)
-        else concurrentResults.add(
-            dependencyStack
-                .asReversed()
-                .fold(result) { acc, dependable ->
-                    with(dependable) { asDependent(acc) }
-                }
-        )
+    protected suspend fun ISimInfo.withDependent(dependent: Sim<*>, block: suspend () -> Unit) {
+        // +1 because the build sim counts as a dependent
+        if (dependencyStack.size >= maxSimDependencies + 1) return
+        dependencyStack.push(dependent)
+        block()
+        dependencyStack.pop()
     }
 
     suspend fun ISimInfo.scanShape(

…/simulation/checks/RequirementChecker.kt …uction/simulation/checks/BasicChecker.ktsrc/main/kotlin/com/lambda/interaction/construction/simulation/checks/RequirementChecker.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BasicChecker.kt src/main/kotlin/com/lambda/interaction/construction/simulation/checks/RequirementChecker.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BasicChecker.kt

@@ -20,18 +20,18 @@ package com.lambda.interaction.construction.simulation.checks
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.construction.result.results.PreSimResult
-import com.lambda.interaction.construction.simulation.SimBuilderDsl
-import com.lambda.interaction.construction.simulation.SimChecker
+import com.lambda.interaction.construction.simulation.Results
+import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.SimInfo
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.util.player.gamemode
 import com.lambda.util.world.WorldUtils.isLoaded
 import net.minecraft.block.OperatorBlock
 
-object RequirementChecker : SimChecker<PreSimResult>() {
-    @SimBuilderDsl
+object BasicChecker : Results<PreSimResult> {
+    @SimDsl
     context(automatedSafeContext: AutomatedSafeContext)
-    fun SimInfo.checkRequirements(): Boolean = with(automatedSafeContext) {
+    fun SimInfo.hasBasicRequirements(): Boolean = with(automatedSafeContext) {
         // the chunk is not loaded
         if (!isLoaded(pos)) {
             result(PreSimResult.ChunkNotLoaded(pos))

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

@@ -20,14 +20,12 @@ package com.lambda.interaction.construction.simulation.checks
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.construction.result.BuildResult
-import com.lambda.interaction.construction.result.Dependable
 import com.lambda.interaction.construction.result.results.BreakResult
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.construction.simulation.ISimInfo
 import com.lambda.interaction.construction.simulation.ISimInfo.Companion.sim
-import com.lambda.interaction.construction.simulation.SimBuilder
-import com.lambda.interaction.construction.simulation.SimBuilderDsl
-import com.lambda.interaction.construction.simulation.SimChecker
+import com.lambda.interaction.construction.simulation.Sim
+import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.checks.PlaceSim.Companion.simPlacement
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
@@ -67,18 +65,18 @@ import net.minecraft.util.math.Direction
 import kotlin.jvm.optionals.getOrNull
 
 class BreakSim private constructor(simInfo: ISimInfo)
-    : SimChecker<BreakResult>(), Dependable,
+    : Sim<BreakResult>(),
     ISimInfo by simInfo
 {
-    override fun asDependent(buildResult: BuildResult) =
+    override fun dependentUpon(buildResult: BuildResult) =
         BreakResult.Dependency(pos, buildResult)
 
     companion object {
-        @SimBuilderDsl
-        context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
-        suspend fun SimBuilder.simBreak() =
+        @SimDsl
+        context(automatedSafeContext: AutomatedSafeContext, dependent: Sim<*>)
+        suspend fun ISimInfo.simBreak() =
             BreakSim(this).run {
-                withDependable(dependable) {
+                withDependent(dependent) {
                     automatedSafeContext.simBreaks()
                 }
             }

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

@@ -20,14 +20,12 @@ package com.lambda.interaction.construction.simulation.checks
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.interaction.construction.result.BuildResult
-import com.lambda.interaction.construction.result.Dependable
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.construction.result.results.PlaceResult
 import com.lambda.interaction.construction.simulation.ISimInfo
 import com.lambda.interaction.construction.simulation.ISimInfo.Companion.sim
-import com.lambda.interaction.construction.simulation.SimBuilder
-import com.lambda.interaction.construction.simulation.SimBuilderDsl
-import com.lambda.interaction.construction.simulation.SimChecker
+import com.lambda.interaction.construction.simulation.Sim
+import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.checks.BreakSim.Companion.simBreak
 import com.lambda.interaction.construction.simulation.checks.PlaceSim.RotatePlaceTest.Companion.rotatePlaceTest
 import com.lambda.interaction.construction.verify.TargetState
@@ -70,18 +68,18 @@ import net.minecraft.util.math.Direction
 import net.minecraft.util.shape.VoxelShapes
 
 class PlaceSim private constructor(simInfo: ISimInfo)
-    : SimChecker<PlaceResult>(), Dependable,
+    : Sim<PlaceResult>(),
     ISimInfo by simInfo
 {
-    override fun asDependent(buildResult: BuildResult) =
+    override fun dependentUpon(buildResult: BuildResult) =
         PlaceResult.Dependency(pos, buildResult)
 
     companion object {
-        context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
-        @SimBuilderDsl
-        suspend fun SimBuilder.simPlacement() =
+        context(automatedSafeContext: AutomatedSafeContext, dependent: Sim<*>)
+        @SimDsl
+        suspend fun ISimInfo.simPlacement() =
             PlaceSim(this).run {
-                withDependable(dependable) {
+                withDependent(dependent) {
                     automatedSafeContext.simPlacements()
                 }
             }

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

@@ -20,14 +20,11 @@ package com.lambda.interaction.construction.simulation.checks
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.interaction.construction.context.InteractionContext
 import com.lambda.interaction.construction.result.BuildResult
-import com.lambda.interaction.construction.result.Dependable
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.construction.result.results.InteractResult
 import com.lambda.interaction.construction.simulation.ISimInfo
-import com.lambda.interaction.construction.simulation.ISimInfo.Companion.sim
-import com.lambda.interaction.construction.simulation.SimBuilder
-import com.lambda.interaction.construction.simulation.SimBuilderDsl
-import com.lambda.interaction.construction.simulation.SimChecker
+import com.lambda.interaction.construction.simulation.Sim
+import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.checks.PlaceSim.Companion.simPlacement
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
@@ -46,18 +43,18 @@ import net.minecraft.state.property.Properties
 import net.minecraft.util.math.Direction
 
 class PostProcessingSim private constructor(simInfo: ISimInfo)
-    : SimChecker<InteractResult>(), Dependable,
+    : Sim<InteractResult>(),
     ISimInfo by simInfo
 {
-    override fun asDependent(buildResult: BuildResult) =
+    override fun dependentUpon(buildResult: BuildResult) =
         InteractResult.Dependency(pos, buildResult)
 
     companion object {
-        context(automatedSafeContext: AutomatedSafeContext, dependable: Dependable?)
-        @SimBuilderDsl
-        suspend fun SimBuilder.simPostProcessing() =
+        context(automatedSafeContext: AutomatedSafeContext, dependent: Sim<*>)
+        @SimDsl
+        suspend fun ISimInfo.simPostProcessing() =
             PostProcessingSim(this).run {
-                withDependable(dependable) {
+                withDependent(dependent) {
                     automatedSafeContext.simPostProcessing()
                 }
             }
@@ -99,7 +96,7 @@ class PostProcessingSim private constructor(simInfo: ISimInfo)
                     simInteraction(expectedState)
                 }
 
-                Properties.SLAB_TYPE -> sim { simPlacement() }
+                Properties.SLAB_TYPE -> simPlacement()
             }
         }
     }