fixed issues with break radius / queue. Added onUpdate callback for break requests

Author: beanbag44

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

@@ -315,7 +315,10 @@ object BreakManager : RequestHandler<BreakRequest>(
             .filterNotNull()
             .forEach { info ->
                 newBreaks.find { ctx -> ctx.expectedPos == info.context.expectedPos }?.let { ctx ->
-                    if (!info.updatedThisTick) info.updateInfo(ctx, request)
+                    if (!info.updatedThisTick) {
+                        info.updateInfo(ctx, request)
+                        info.request.onUpdate?.invoke(info.context.expectedPos)
+                    }
                     newBreaks.remove(ctx)
                     return@forEach
                 }

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

@@ -41,6 +41,7 @@ data class BreakRequest(
     private val prio: Priority = 0
 ) : Request(prio, build.breaking) {
     var onStart: ((BlockPos) -> Unit)? = null
+    var onUpdate: ((BlockPos) -> Unit)? = null
     var onStop: ((BlockPos) -> Unit)? = null
     var onCancel: ((BlockPos) -> Unit)? = null
     var onItemDrop: ((ItemEntity) -> Unit)? = null
@@ -66,6 +67,11 @@ data class BreakRequest(
             request.onStart = callback
         }
 
+        @BreakRequestBuilder
+        fun onUpdate(callback: (BlockPos) -> Unit) {
+            request.onUpdate = callback
+        }
+
         @BreakRequestBuilder
         fun onStop(callback: (BlockPos) -> Unit) {
             request.onStop = callback
@@ -96,6 +102,7 @@ data class BreakRequest(
     }
 
     companion object {
+        @BreakRequestBuilder
         fun breakRequest(
             contexts: Collection<BreakContext>,
             build: BuildConfig,

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

@@ -46,7 +46,6 @@ import com.lambda.util.world.raycast.InteractionMask
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import java.awt.Color
-import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue
 import kotlin.collections.ArrayList
 
@@ -105,17 +104,19 @@ object PacketMine : Module(
         listen<PlayerEvent.Breaking.Update> { event ->
             event.cancel()
             val pos = event.pos
-            val positions = mutableListOf(pos).apply {
-                if (breakRadius <= 0) return@apply
+            val positions = mutableListOf<BlockPos>().apply {
+                if (breakRadius <= 0) {
+                    add(pos)
+                    return@apply
+                }
                 BlockPos.iterateOutwards(pos, breakRadius, breakRadius, breakRadius).forEach { blockPos ->
-                    if (blockPos distSq pos <= (breakRadius * breakRadius) && (!flatten || blockPos.y >= player.blockPos.y)) {
+                    if (blockPos distSq pos <= (breakRadius * breakRadius) && (!flatten || (blockPos.y >= player.blockPos.y || blockPos == pos))) {
                         add(blockPos.toImmutable())
                     }
                 }
             }
             positions.removeIf { breakPos ->
-                breakPositions.any { it == breakPos }
-                        || (queue && queuePositions.any { it == pos })
+                queue && queuePositions.any { it == breakPos }
             }
             if (positions.isEmpty()) return@listen
             val activeBreaking = if (queue) {
@@ -178,6 +179,7 @@ object PacketMine : Module(
         }
         val request = breakRequest(breakContexts, build, rotation, hotbar, pendingInteractions) {
             onStart { queuePositions.removePos(it); addBreak(it) }
+            onUpdate { queuePositions.removePos(it) }
             onStop { removeBreak(it); breaks++ }
             onCancel { removeBreak(it, true) }
             onReBreakStart { reBreakPos = it }