fixed config variable in Request

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -67,6 +67,6 @@ data class BreakContext(
 
     fun requestDependencies(breakRequest: BreakRequest, minKeepTicks: Int = 0): Boolean {
         val request = HotbarRequest(hotbarIndex, breakRequest.hotbar, breakRequest.hotbar.keepTicks.coerceAtLeast(minKeepTicks))
-        return request.hotbar.request(request, false).done
+        return request.config.request(request, false).done
     }
 }

common/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt

@@ -67,7 +67,7 @@ class InteractionContext(
 
     fun requestDependencies(request: InteractionRequest): Boolean {
         val hotbarRequest = request.hotbar.request(HotbarRequest(hotbarIndex, request.hotbar), false)
-        val validRotation = if (request.interact.rotate) {
+        val validRotation = if (request.config.rotate) {
             request.rotation.request(rotation, false).done
         } else true
         return hotbarRequest.done && validRotation

common/src/main/kotlin/com/lambda/interaction/request/Request.kt

@@ -17,9 +17,8 @@
 
 package com.lambda.interaction.request
 
-abstract class Request(
-    val config: RequestConfig<*>
-) {
+abstract class Request {
+    abstract val config: RequestConfig<*>
     var fresh = true
 
     abstract val done: Boolean

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt

@@ -42,7 +42,8 @@ data class BreakRequest(
     val inventory: InventoryConfig,
     val interact: InteractionConfig,
     val build: BuildConfig
-) : Request(build.breaking) {
+) : Request() {
+    override val config = build.breaking
     var onStart: ((BlockPos) -> Unit)? = null
     var onUpdate: ((BlockPos) -> Unit)? = null
     var onStop: ((BlockPos) -> Unit)? = null

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -75,7 +75,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     }
 
     override fun SafeContext.handleRequest(request: HotbarRequest) {
-        val config = request.hotbar
+        val config = request.config
         maxSwapsThisTick = config.swapsPerTick
         swapDelay = swapDelay.coerceAtMost(config.swapDelay)
 
@@ -114,7 +114,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     private fun SafeContext.checkResetSwap() {
         activeRequest?.let { activeInfo ->
             val canStopSwap = swapsThisTick < maxSwapsThisTick
-            if (activeInfo.keepTicks <= 0 && tickStage in activeInfo.hotbar.sequenceStageMask && canStopSwap) {
+            if (activeInfo.keepTicks <= 0 && tickStage in activeInfo.config.sequenceStageMask && canStopSwap) {
                 activeRequest = null
                 interaction.syncSelectedSlot()
             }

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt

@@ -21,10 +21,10 @@ import com.lambda.interaction.request.Request
 
 class HotbarRequest(
     val slot: Int,
-    val hotbar: HotbarConfig,
-    var keepTicks: Int = hotbar.keepTicks,
-    var swapPause: Int = hotbar.swapPause
-) : Request(hotbar) {
+    override val config: HotbarConfig,
+    var keepTicks: Int = config.keepTicks,
+    var swapPause: Int = config.swapPause
+) : Request() {
     var activeRequestAge = 0
     var swapPauseAge = 0
 

common/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionManager.kt

@@ -87,15 +87,15 @@ object InteractionManager : RequestHandler<InteractionRequest>(
         val iterator = potentialInteractions.iterator()
         while (iterator.hasNext()) {
             if (interactionsThisTick + 1 > maxInteractionsThisTick) break
-            val interact = request.interact
+            val config = request.config
             val ctx = iterator.next()
 
             if (!ctx.requestDependencies(request)) return
 
-            if (interact.interactConfirmationMode == InteractionConfig.InteractConfirmationMode.None) {
-                InteractionInfo(ctx, request.pendingInteractionsList, interact).startPending()
+            if (config.interactConfirmationMode == InteractionConfig.InteractConfirmationMode.None) {
+                InteractionInfo(ctx, request.pendingInteractionsList, config).startPending()
             }
-            if (interact.interactConfirmationMode != InteractionConfig.InteractConfirmationMode.AwaitThenInteract) {
+            if (config.interactConfirmationMode != InteractionConfig.InteractConfirmationMode.AwaitThenInteract) {
                 interaction.interactBlock(player, Hand.MAIN_HAND, ctx.result)
             } else {
                 interaction.sendSequencedPacket(world) { sequence ->

common/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionRequest.kt

@@ -32,11 +32,11 @@ data class InteractionRequest(
     val contexts: Collection<InteractionContext>,
     val onInteract: ((BlockPos) -> Unit)?,
     val pendingInteractionsList: MutableCollection<BuildContext>,
-    val interact: InteractionConfig,
+    override val config: InteractionConfig,
     val build: BuildConfig,
     val hotbar: HotbarConfig,
     val rotation: RotationConfig
-) : Request(interact) {
+) : Request() {
     override val done: Boolean
         get() = contexts.all { mc.world?.getBlockState(it.blockPos)?.matches(it.expectedState) == true }
 }

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt

@@ -34,7 +34,8 @@ data class PlaceRequest(
     val hotbar: HotbarConfig,
     val pendingInteractions: MutableCollection<BuildContext>,
     val onPlace: () -> Unit
-) : Request(build.placing) {
+) : Request() {
+    override val config = build.placing
     override val done: Boolean
         get() = runSafe {
             contexts.all { it.expectedState.matches(blockState(it.blockPos)) }

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

@@ -24,12 +24,12 @@ import com.lambda.threading.runSafe
 data class RotationRequest(
     val target: RotationTarget,
     val mode: RotationMode,
-    val rot: RotationConfig,
+    override val config: RotationConfig,
     var keepTicks: Int = 3,
     var decayTicks: Int = 0,
     val turnSpeed: () -> Double = { 180.0 },
     val speedMultiplier: Double = 1.0
-) : Request(rot) {
+) : Request() {
     var age = 0
 
     constructor(