sorter setting for breaks

Author: beanbag44

common/src/main/kotlin/com/lambda/config/groups/BreakSettings.kt

@@ -29,6 +29,7 @@ class BreakSettings(
 ) : BreakConfig() {
     val page by c.setting("Break Page", Page.General, visibility = vis)
     override val breakMode by c.setting("Break Mode", BreakMode.Packet) { vis() && page == Page.General }
+    override val sorter by c.setting("Sorter", SortMode.Closest, "The order in which breaks are performed") { vis() && page == Page.General }
     override val reBreak by c.setting("ReBreak", true, "Re-breaks blocks after they've been broken once") { vis() && page == Page.General }
     override val unsafeCancels by c.setting("Unsafe Cancels", true, "Allows cancelling block breaking even if the server might continue breaking sever side, potentially causing unexpected state changes") { vis() && page == Page.General }
     override val breakThreshold by c.setting("Break Threshold", 0.70f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken") { vis() && page == Page.General }

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

@@ -20,38 +20,49 @@ package com.lambda.interaction.construction.context
 import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
+import com.lambda.interaction.request.breaking.BreakConfig
 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.rotating.RotationRequest
+import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.util.BlockUtils.emptyState
 import net.minecraft.block.BlockState
 import net.minecraft.block.FallingBlock
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import java.awt.Color
+import kotlin.random.Random
 
 data class BreakContext(
     override val result: BlockHitResult,
     override val rotation: RotationRequest,
     override var hotbarIndex: Int,
     override var cachedState: BlockState,
-    var instantBreak: Boolean
+    var instantBreak: Boolean,
+    val sortMode: BreakConfig.SortMode = TaskFlowModule.build.breaking.sorter
 ) : BuildContext() {
     private val baseColor = Color(222, 0, 0, 25)
     private val sideColor = Color(222, 0, 0, 100)
 
     override val blockPos: BlockPos = result.blockPos
     override val expectedState: BlockState = cachedState.emptyState
 
+    val random = Random.nextDouble()
+
     override fun compareTo(other: BuildContext): Int {
         return when (other) {
             is BreakContext -> compareByDescending<BreakContext> {
                 if (it.cachedState.block is FallingBlock) it.blockPos.y else 0
             }.thenBy {
                 it.instantBreak
             }.thenBy {
-                it.rotation.target.angleDistance
+                when (sortMode) {
+                    BreakConfig.SortMode.Closest -> it.distance
+                    BreakConfig.SortMode.Farthest -> -it.distance
+                    BreakConfig.SortMode.Rotation -> it.rotation.target.angleDistance
+                    BreakConfig.SortMode.Random -> it.random
+                }
             }.thenBy {
                 it.hotbarIndex == HotbarManager.serverSlot
             }.compare(this, other)

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

@@ -698,7 +698,8 @@ object BuildSimulator {
                     rotationRequest,
                     player.inventory.selectedSlot,
                     state,
-                    instantBreakable(state, pos, breaking.breakThreshold)
+                    instantBreakable(state, pos, breaking.breakThreshold),
+                    breaking.sorter
                 )
                 acc.add(BreakResult.Break(pos, breakContext))
                 return acc

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

@@ -25,6 +25,7 @@ import java.awt.Color
 
 abstract class BreakConfig : RequestConfig<BreakRequest>() {
     abstract val breakMode: BreakMode
+    abstract val sorter: SortMode
     abstract val reBreak: Boolean
     abstract val unsafeCancels: Boolean
     abstract val breakThreshold: Float
@@ -77,6 +78,13 @@ abstract class BreakConfig : RequestConfig<BreakRequest>() {
         Packet
     }
 
+    enum class SortMode {
+        Closest,
+        Farthest,
+        Rotation,
+        Random
+    }
+
     enum class SwingMode {
         Constant,
         StartAndEnd,

common/src/main/kotlin/com/lambda/module/modules/player/AntiAim.kt

@@ -72,7 +72,6 @@ object AntiAim : Module(
     private var currentYaw = 0.0f
     private var currentPitch = 0.0f
 
-    private val random = Random(0)
     private var jitterRight = true
     private var jitterUp = true
     private var pitchingUp = true
@@ -90,7 +89,7 @@ object AntiAim : Module(
                     LeftRight.Right -> currentYaw + yawSpeed
                 }
                 YawMode.Jitter -> {
-                    val delta = random.nextFloat() * (yawSpeed)
+                    val delta = Random.nextFloat() * (yawSpeed)
                     if (jitterRight) {
                         jitterRight = false
                         currentYaw + delta
@@ -131,7 +130,7 @@ object AntiAim : Module(
                     }
                 }
                 PitchMode.Jitter -> {
-                    val delta = random.nextFloat() * (pitchSpeed)
+                    val delta = Random.nextFloat() * (pitchSpeed)
                     if (jitterUp) {
                         jitterUp = false
                         currentPitch - delta