Make requests data classes so we can debug them better

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/material/transfer/SlotTransfer.kt

@@ -56,7 +56,7 @@ class SlotTransfer @Ta5kBuilder constructor(
         listen<TickEvent.Pre> {
             val current = player.currentScreenHandler
             if (current != screen) {
-                failure("Screen has changed. Expected ${screen::class.simpleName} (revision ${screen.revision}, got ${current::class.simpleName} (revision ${current.revision})")
+                failure("Screen has changed. Expected ${screen::class.simpleName} (revision ${screen.revision}) but got ${current::class.simpleName} (revision ${current.revision})")
                 return@listen
             }
 

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationRequest.kt

@@ -22,15 +22,15 @@ import com.lambda.interaction.request.Request
 import com.lambda.interaction.request.rotation.visibilty.RotationTarget
 import com.lambda.threading.runSafe
 
-class RotationRequest(
+data class RotationRequest(
     val target: RotationTarget,
-    priority: Priority,
+    val prio: Priority,
     val mode: RotationMode,
     var keepTicks: Int = 3,
     var decayTicks: Int = 0,
     val turnSpeed: () -> Double = { 180.0 },
     val speedMultiplier: Double = 1.0
-) : Request(priority) {
+) : Request(prio) {
 
     constructor(
         target: RotationTarget,

common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RequestedHit.kt

@@ -33,10 +33,9 @@ import net.minecraft.util.math.Direction
 /**
  * An abstract class representing a rotation target, which can be either a block or an entity.
  */
-abstract class RequestedHit private constructor(
-    val sides: Set<Direction>,
-    val reach: Double
-) {
+abstract class RequestedHit {
+    abstract val sides: Set<Direction>
+    abstract val reach: Double
 
     /**
      * Verifies if the given [HitResult] satisfies the criteria of this
@@ -80,8 +79,11 @@ abstract class RequestedHit private constructor(
      * @param entity The [LivingEntity] to be hit.
      * @param reach The maximum distance for the hit.
      */
-    class Entity(val entity: LivingEntity, reach: Double) : RequestedHit(ALL_SIDES, reach) {
-
+    data class Entity(
+        val entity: LivingEntity,
+        override val reach: Double,
+        override val sides: Set<Direction> = ALL_SIDES
+    ) : RequestedHit() {
         override fun getBoundingBoxes() =
             listOf(entity.boundingBox)
 
@@ -96,8 +98,11 @@ abstract class RequestedHit private constructor(
      * @param sides The set of directions for which the hit is requested.
      * @param reach The maximum distance for the hit.
      */
-    class Block(val blockPos: BlockPos, sides: Set<Direction>, reach: Double) : RequestedHit(sides, reach) {
-
+    data class Block(
+        val blockPos: BlockPos,
+        override val sides: Set<Direction>,
+        override val reach: Double
+    ) : RequestedHit() {
         override fun getBoundingBoxes(): List<Box> = runSafe {
             val state = blockPos.blockState(world)
             val voxelShape = state.getOutlineShape(world, blockPos)

common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RotationTarget.kt

@@ -31,7 +31,7 @@ import com.lambda.util.collections.cached
  * @param verify A lambda to check the active rotation.
  * @param buildRotation A lambda that builds the rotation.
  */
-class RotationTarget(
+data class RotationTarget(
     val hit: RequestedHit? = null,
     val verify: RotationTarget.() -> Boolean = { hit?.verifyRotation() ?: true },
     private val buildRotation: SafeContext.() -> Rotation?,

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

@@ -66,7 +66,6 @@ class BuildTask @Ta5kBuilder constructor(
     private var currentPlacement: PlaceContext? = null
     private var placements = 0
     private var breaks = 0
-    private var inScope = 0
 
     override fun SafeContext.onStart() {
         (blueprint as? DynamicBlueprint)?.create()
@@ -83,12 +82,10 @@ class BuildTask @Ta5kBuilder constructor(
             }
 
             currentPlacement?.let { context ->
-                if (!context.rotation.done) return@listen
-                if (inScope++ < 1) return@listen // ToDo: Should not be needed but timings are wrong
+                if (build.rotateForPlace && !context.rotation.done) return@listen
                 context.place(interact.swingHand)
                 pendingPlacements.add(context)
                 currentPlacement = null
-                inScope = 0
             }
 
             (blueprint as? DynamicBlueprint)?.update()
@@ -161,12 +158,10 @@ class BuildTask @Ta5kBuilder constructor(
         }
 
         onRotate {
-            if (currentPlacement == null) return@onRotate
             if (!build.rotateForPlace) return@onRotate
+            val rotateTo = currentPlacement?.rotation ?: return@onRotate
 
-            rotation.request(
-                currentPlacement?.rotation ?: return@onRotate
-            )
+            rotation.request(rotateTo)
         }
 
         listen<MovementEvent.InputUpdate> {