return foreach instead of run and remove context sorting from the managers

Author: beanbag44

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

@@ -23,6 +23,7 @@ import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.breaking.BreakRequest
+import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.util.world.raycast.RayCastUtils.distanceTo
@@ -64,8 +65,12 @@ data class BreakContext(
         return when (other) {
             is BreakContext -> compareByDescending<BreakContext> {
                 if (it.checkedState.block is FallingBlock) it.expectedPos.y else 0
+            }.thenBy {
+                it.instantBreak
             }.thenBy {
                 it.rotation.target.angleDistance
+            }.thenBy {
+                it.hotbarIndex == HotbarManager.serverSlot
             }.compare(this, other)
 
             else -> 1

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

@@ -17,11 +17,13 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.Lambda.mc
 import com.lambda.config.groups.BuildConfig
 import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.placing.PlaceRequest
 import com.lambda.interaction.request.rotation.RotationRequest
@@ -57,9 +59,11 @@ data class PlaceContext(
             }.thenByDescending {
                 it.checkedState.fluidState.level
             }.thenBy {
-                it.sneak
+                it.sneak == mc.player?.isSneaking
             }.thenBy {
                 it.rotation.target.angleDistance
+            }.thenBy {
+                it.hotbarIndex == HotbarManager.serverSlot
             }.thenBy {
                 it.distance
             }.thenBy {
@@ -79,7 +83,7 @@ data class PlaceContext(
     fun requestDependencies(request: PlaceRequest): Boolean {
         val hotbarRequest = request.hotbar.request(HotbarRequest(hotbarIndex, request.hotbar))
         val validRotation = if (request.build.placing.rotate) {
-            request.rotation.request(rotation, false).done && (!currentDirIsInvalid || rotation.matchesServerRot)
+            request.rotation.request(rotation, false).done && !currentDirIsInvalid
         } else true
         return hotbarRequest.done && validRotation
     }

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

@@ -42,7 +42,6 @@ import com.lambda.interaction.request.breaking.BrokenBlockHandler.destroyBlock
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.pendingBreaks
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.setPendingConfigs
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.startPending
-import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.placing.PlaceManager
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
@@ -199,7 +198,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                 }
                 .asReversed()
                 .forEach { info ->
-                    if (info.updatedProgressThisTick) return@run
+                    if (info.updatedProgressThisTick) return@forEach
                     if (!info.context.requestDependencies(request)) return@run
                     if ((!rotated && info.isPrimary) || tickStage !in info.breakConfig.breakStageMask) return@run
 
@@ -216,7 +215,7 @@ object BreakManager : RequestHandler<BreakRequest>(
     }
 
     /**
-     * Filters and sorts the requests [BreakContext]s, and iterates over the [breakInfos] collection looking for matches
+     * Filters the requests [BreakContext]s, and iterates over the [breakInfos] collection looking for matches
      * in positions. If a match is found, the [BreakInfo] is updated with the new context. Otherwise, the break is cancelled.
      * The [instantBreaks] and [breaks] collections are then populated with the new appropriate contexts, and the [maxBreaksThisTick]
      * value is set.
@@ -225,13 +224,10 @@ object BreakManager : RequestHandler<BreakRequest>(
      * @see cancelBreak
      */
     private fun SafeContext.populateFrom(request: BreakRequest) {
-        // Sanitize and sort the new breaks
+        // Sanitize the new breaks
         val newBreaks = request.contexts
             .filter { ctx -> canAccept(ctx) }
-            .sortedWith(
-                compareByDescending<BreakContext> { it.instantBreak }
-                    .thenByDescending { it.hotbarIndex == HotbarManager.serverSlot }
-            ).toMutableList()
+            .toMutableList()
 
         // Update the current break infos or cancel if abandoned
         breakInfos

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

@@ -30,7 +30,6 @@ import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.breaking.BreakManager
-import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.placing.PlaceManager.activeRequest
 import com.lambda.interaction.request.placing.PlaceManager.processRequest
 import com.lambda.interaction.request.placing.PlacedBlockHandler.addPendingPlace
@@ -134,7 +133,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(
 
             if (ctx.sneak) shouldSneak = true
             if (!ctx.requestDependencies(request) || !validSneak(player)) return
-            if (tickStage !in request.build.placing.placeStageMask) return
+//            if (tickStage !in request.build.placing.placeStageMask) return
 
             val actionResult = placeBlock(ctx, request, Hand.MAIN_HAND)
             if (!actionResult.isAccepted) warn("Placement interaction failed with $actionResult")
@@ -145,21 +144,18 @@ object PlaceManager : RequestHandler<PlaceRequest>(
     }
 
     /**
-     * Filters and sorts the [request]'s [PlaceContext]s, placing them into the [potentialPlacements] collection, and
+     * Filters the [request]'s [PlaceContext]s, placing them into the [potentialPlacements] collection, and
      * setting the maxPlacementsThisTick value.
      *
      * @see canPlace
      */
-    private fun SafeContext.populateFrom(request: PlaceRequest) {
+    private fun populateFrom(request: PlaceRequest) {
         val place = request.build.placing
 
         setPendingConfigs(request)
         potentialPlacements = request.contexts
             .filter { canPlace(it) }
-            .sortedWith(
-                compareByDescending<PlaceContext> { it.hotbarIndex == HotbarManager.serverSlot }
-                    .thenByDescending { it.sneak == player.isSneaking }
-            ).toMutableList()
+            .toMutableList()
 
         val pendingLimit =  (place.maxPendingPlacements - pendingPlacements.size).coerceAtLeast(0)
         maxPlacementsThisTick = (place.placementsPerTick.coerceAtMost(pendingLimit))

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

@@ -18,7 +18,6 @@
 package com.lambda.task.tasks
 
 import baritone.api.pathing.goals.GoalBlock
-import baritone.api.pathing.goals.GoalNear
 import com.lambda.Lambda.LOG
 import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.InteractionConfig
@@ -56,7 +55,6 @@ import com.lambda.util.extension.Structure
 import com.lambda.util.extension.inventorySlots
 import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.player.SlotUtils.hotbarAndStorage
-import com.lambda.util.world.toFastVec
 import net.minecraft.entity.ItemEntity
 import net.minecraft.util.math.BlockPos
 import java.util.concurrent.ConcurrentLinkedQueue