Add build config to simulator

Author: Avanatiker

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

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.simulation
 
+import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.config.groups.InventoryConfig
 import com.lambda.context.SafeContext
@@ -70,16 +71,17 @@ object BuildSimulator {
         interact: InteractionConfig = TaskFlowModule.interact,
         rotation: RotationConfig = TaskFlowModule.rotation,
         inventory: InventoryConfig = TaskFlowModule.inventory,
+        build: BuildConfig = TaskFlowModule.build,
     ) = runSafe {
         structure.entries.flatMap { (pos, target) ->
-            checkRequirements(pos, target)?.let {
+            checkRequirements(pos, target, build)?.let {
                 return@flatMap setOf(it)
             }
             checkPlaceResults(pos, target, eye, interact, rotation, inventory).let {
                 if (it.isEmpty()) return@let
                 return@flatMap it
             }
-            checkBreakResults(pos, eye, interact, rotation, inventory).let {
+            checkBreakResults(pos, eye, interact, rotation, inventory, build).let {
                 if (it.isEmpty()) return@let
                 return@flatMap it
             }
@@ -91,6 +93,7 @@ object BuildSimulator {
     private fun SafeContext.checkRequirements(
         pos: BlockPos,
         target: TargetState,
+        build: BuildConfig
     ): BuildResult? {/* the chunk is not loaded */
         if (!world.isChunkLoaded(pos)) {
             return BuildResult.ChunkNotLoaded(pos)
@@ -104,7 +107,7 @@ object BuildSimulator {
         }
 
         /* block should be ignored */
-        if (state.block in TaskFlowModule.build.ignoredBlocks && target.type == TargetState.Type.AIR) {
+        if (state.block in build.ignoredBlocks && target.type == TargetState.Type.AIR) {
             return BuildResult.Ignored(pos)
         }
 
@@ -314,13 +317,14 @@ object BuildSimulator {
         eye: Vec3d,
         interact: InteractionConfig,
         rotation: RotationConfig,
-        inventory: InventoryConfig
+        inventory: InventoryConfig,
+        build: BuildConfig
     ): Set<BuildResult> {
         val acc = mutableSetOf<BuildResult>()
         val state = pos.blockState(world)
 
         /* is a block that will be destroyed by breaking adjacent blocks */
-        if (TaskFlowModule.build.breakWeakBlocks && state.block.hardness == 0f && !state.isAir) {
+        if (build.breakWeakBlocks && state.block.hardness == 0f && !state.isAir) {
             acc.add(BuildResult.Ignored(pos))
             return acc
         }

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

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.simulation
 
+import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.config.groups.InventoryConfig
 import com.lambda.context.SafeContext
@@ -40,6 +41,7 @@ data class Simulation(
     val interact: InteractionConfig = TaskFlowModule.interact,
     val rotation: RotationConfig = TaskFlowModule.rotation,
     val inventory: InventoryConfig = TaskFlowModule.inventory,
+    val build: BuildConfig = TaskFlowModule.build,
 ) {
     private val cache: MutableMap<FastVector, Set<BuildResult>> = mutableMapOf()
     private fun FastVector.toView(): Vec3d = toVec3d().add(0.5, ClientPlayerEntity.DEFAULT_EYE_HEIGHT.toDouble(), 0.5)
@@ -60,7 +62,7 @@ data class Simulation(
                 ) return@getOrPut emptySet()
             }
 
-            blueprint.simulate(view, interact, rotation, inventory)
+            blueprint.simulate(view, interact, rotation, inventory, build)
         }
 
     private fun SafeContext.playerFitsIn(pos: Vec3d): Boolean {

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

@@ -60,7 +60,7 @@ class BuildTask @Ta5kBuilder constructor(
     private val interact: InteractionConfig = TaskFlowModule.interact,
     private val inventory: InventoryConfig = TaskFlowModule.inventory,
 ) : Task<Unit>() {
-    override val name: String get() = "Building $blueprint with ${(placements / (age / 20.0 + 0.001)).string} p/s"
+    override val name: String get() = "Building $blueprint with ${(placements / (age / 20.0 + 0.001)).string} p/s ${(breaks / (age / 20.0 + 0.001)).string} p/s"
 
     private val pendingPlacements = ConcurrentLinkedQueue<PlaceContext>()
     private val pendingBreaks = ConcurrentLinkedQueue<BreakContext>()
@@ -99,7 +99,7 @@ class BuildTask @Ta5kBuilder constructor(
             }
 
             // ToDo: Simulate for each pair player positions that work
-            val results = blueprint.simulate(player.eyePos, interact, rotation, inventory)
+            val results = blueprint.simulate(player.eyePos, interact, rotation, inventory, build)
             TaskFlowModule.drawables = results.filterIsInstance<Drawable>().plus(pendingPlacements.toList())
 
             val instantResults = results.filterIsInstance<BreakResult.Break>()

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

@@ -48,7 +48,7 @@ class PlaceContainer @Ta5kBuilder constructor(
                 it.blockPos
                     .toStructure(TargetState.Stack(startStack))
                     .toBlueprint()
-                    .simulate(player.getCameraPosVec(mc.tickDelta))
+                    .simulate(player.eyePos)
             }
 
         val succeeds = results.filterIsInstance<PlaceResult.Place>().filter {