config passing cleanup

Author: beanbag44

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

@@ -817,7 +817,7 @@ object BuildSimulator {
             sorter = compareByDescending<ItemStack> {
                 it.canBreak(CachedBlockPosition(world, pos, false))
             }.thenByDescending {
-                state.calcItemBlockBreakingDelta(player, world, pos, it)
+                state.calcItemBlockBreakingDelta(pos, it)
             }
         ) {
             isTool() and if (breakConfig.suitableToolsOnly) {
@@ -859,7 +859,7 @@ object BuildSimulator {
                 var bestStack = ItemStack.EMPTY
                 var bestBreakDelta = -1f
                 containerStacks.forEach { stack ->
-                    val breakDelta = state.calcItemBlockBreakingDelta(player, world, pos, stack)
+                    val breakDelta = state.calcItemBlockBreakingDelta(pos, stack)
                     if (breakDelta > bestBreakDelta ||
                         (stack == player.mainHandStack && breakDelta >= bestBreakDelta)
                     ) {

src/main/kotlin/com/lambda/interaction/request/PostActionHandler.kt

@@ -17,7 +17,7 @@
 
 package com.lambda.interaction.request
 
-import com.lambda.config.groups.BuildConfig
+import com.lambda.context.Automated
 import com.lambda.event.events.ConnectionEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
@@ -48,8 +48,8 @@ abstract class PostActionHandler<T : ActionInfo> {
         pendingInteractionsList.remove(context)
     }
 
-    fun setPendingConfigs(build: BuildConfig) {
-        BrokenBlockHandler.pendingActions.setSizeLimit(build.breakConfig.maxPendingBreaks)
-        BrokenBlockHandler.pendingActions.setDecayTime(build.interactionTimeout * 50L)
+    fun Automated.setPendingConfigs() {
+        BrokenBlockHandler.pendingActions.setSizeLimit(buildConfig.breakConfig.maxPendingBreaks)
+        BrokenBlockHandler.pendingActions.setDecayTime(buildConfig.interactionTimeout * 50L)
     }
 }

src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt

@@ -18,13 +18,14 @@
 package com.lambda.interaction.request
 
 import com.lambda.context.Automated
+import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.Event
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.ManagerUtils.accumulatedManagerPriority
-import com.lambda.threading.runSafe
+import com.lambda.threading.runSafeAutomated
 import kotlin.reflect.KClass
 
 /**
@@ -76,7 +77,7 @@ abstract class RequestHandler<R : Request>(
         listen(instance, priority = (Int.MAX_VALUE - 1) - (accumulatedManagerPriority - stagePriority)) {
             tickStage = stage
             queuedRequest?.let { request ->
-                handleRequest(request)
+                request.runSafeAutomated { handleRequest(request) }
                 request.fresh = false
                 queuedRequest = null
             }
@@ -107,7 +108,7 @@ abstract class RequestHandler<R : Request>(
             return request
         }
 
-        runSafe {
+        request.runSafeAutomated {
             handleRequest(request)
             request.fresh = false
         }
@@ -117,7 +118,7 @@ abstract class RequestHandler<R : Request>(
     /**
      * Handles a request
      */
-    abstract fun SafeContext.handleRequest(request: R)
+    abstract fun AutomatedSafeContext.handleRequest(request: R)
 
     protected abstract fun preEvent(): Event
 }

src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.request.breaking
 
+import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.ActionInfo
 import com.lambda.interaction.request.LogContext
@@ -26,10 +27,10 @@ import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Rebreak
 import com.lambda.interaction.request.breaking.BreakInfo.BreakType.RedundantSecondary
 import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Secondary
 import com.lambda.interaction.request.breaking.BreakManager.calcBreakDelta
+import com.lambda.threading.runSafeAutomated
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import net.minecraft.client.network.ClientPlayerEntity
-import net.minecraft.client.network.ClientPlayerInteractionManager
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.ItemEntity
 import net.minecraft.item.ItemStack
@@ -112,19 +113,19 @@ data class BreakInfo(
         progressedThisTick = false
     }
 
+    context(safeContext: SafeContext)
     fun setBreakingTextureStage(
         player: ClientPlayerEntity,
         world: ClientWorld,
-        stage: Int = getBreakTextureProgress(player, world)
-    ) {
-        world.setBlockBreakingInfo(player.id, context.blockPos, stage)
-    }
+        stage: Int = getBreakTextureProgress()
+    ) = world.setBlockBreakingInfo(player.id, context.blockPos, stage)
 
-    private fun getBreakTextureProgress(player: ClientPlayerEntity, world: ClientWorld): Int {
-        val swapMode = breakConfig.swapMode
+    context(safeContext: SafeContext)
+    private fun getBreakTextureProgress(): Int = with(safeContext) {
         val item =
-            if (swapMode.isEnabled() && swapMode != BreakConfig.SwapMode.Start) swapStack else player.mainHandStack
-        val breakDelta = context.cachedState.calcBreakDelta(player, world, context.blockPos, breakConfig, item)
+            if (breakConfig.swapMode.isEnabled() && breakConfig.swapMode != BreakConfig.SwapMode.Start) swapStack
+            else player.mainHandStack
+        val breakDelta = request.runSafeAutomated { context.cachedState.calcBreakDelta(context.blockPos, item) }
         val progress = (breakDelta * breakingTicks) / (getBreakThreshold() + (breakDelta * breakConfig.fudgeFactor))
         return if (progress > 0.0f) (progress * 10.0f).toInt().coerceAtMost(9) else -1
     }
@@ -136,23 +137,29 @@ data class BreakInfo(
             else -> 1.0f
         }
 
-    fun startBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.START_DESTROY_BLOCK, world, interaction)
-
-    fun stopBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.STOP_DESTROY_BLOCK, world, interaction)
-
-    fun abortBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.ABORT_DESTROY_BLOCK, world, interaction)
-
-    private fun breakPacket(action: Action, world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        interaction.sendSequencedPacket(world) { sequence: Int ->
-            PlayerActionC2SPacket(
-                action,
-                context.blockPos,
-                context.result.side,
-                sequence
-            )
+    context(_: SafeContext)
+    fun startBreakPacket() =
+        breakPacket(Action.START_DESTROY_BLOCK)
+
+    context(_: SafeContext)
+    fun stopBreakPacket() =
+        breakPacket(Action.STOP_DESTROY_BLOCK)
+
+    context(_: SafeContext)
+    fun abortBreakPacket() =
+        breakPacket(Action.ABORT_DESTROY_BLOCK)
+
+    context(safeContext: SafeContext)
+    private fun breakPacket(action: Action) =
+        with(safeContext) {
+            interaction.sendSequencedPacket(world) { sequence: Int ->
+                PlayerActionC2SPacket(
+                    action,
+                    context.blockPos,
+                    context.result.side,
+                    sequence
+                )
+            }
         }
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {