fixed instability issue at slower rotation speeds when using a higher break radius in packetmine and renamed / moved onAccept and onBreak to onStart and onStop to and are now called when starting and stopping breaking a block.

Author: beanbag44

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

@@ -43,8 +43,6 @@ data class BreakInfo(
     var breakingTicks = 0
     var soundsCooldown = 0.0f
 
-    var pending = false
-
     var vanillaInstantBreakable = false
     val reBreakable get() = !vanillaInstantBreakable && isPrimary
 
@@ -63,7 +61,6 @@ data class BreakInfo(
     @Synchronized
     fun internalOnBreak() {
         if (!isReBreaking) broken = true
-        request.onBreak?.invoke(context.expectedPos)
         item?.let { item ->
             request.onItemDrop?.invoke(item)
         }

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

@@ -255,6 +255,7 @@ object BreakManager : RequestHandler<BreakRequest>(
     private fun SafeContext.populateFrom(request: BreakRequest) {
         // Sanitize the new breaks
         val newBreaks = request.contexts
+            .distinctBy { it.expectedPos }
             .filter { ctx -> canAccept(ctx, request.build.breaking) }
             .toMutableList()
 
@@ -316,7 +317,6 @@ object BreakManager : RequestHandler<BreakRequest>(
             if (!rotated || tickStage !in request.build.breaking.breakStageMask) return false
 
             val breakInfo = initNewBreak(ctx, request) ?: return false
-            request.onAccept?.invoke(ctx.expectedPos)
             updateBreakProgress(breakInfo)
             breaksThisTick++
             iterator.remove()
@@ -337,7 +337,6 @@ object BreakManager : RequestHandler<BreakRequest>(
         while (iterator.hasNext()) {
             val ctx = iterator.next()
             initNewBreak(ctx, request) ?: return false
-            request.onAccept?.invoke(ctx.expectedPos)
             iterator.remove()
             if (atMaxBreakInfos(request.build.breaking)) return false
         }
@@ -404,6 +403,7 @@ object BreakManager : RequestHandler<BreakRequest>(
      * @see startPending
      */
     private fun SafeContext.onBlockBreak(info: BreakInfo) {
+        info.request.onStop?.invoke(info.context.expectedPos)
         when (info.breakConfig.breakConfirmation) {
             BreakConfirmationMode.None -> {
                 destroyBlock(info)
@@ -520,7 +520,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                     primaryBreak = reBreakResult.breakInfo.apply {
                         type = Primary
                         ReBreakManager.clearReBreak()
-                        request.onAccept?.invoke(ctx.expectedPos)
+                        request.onStart?.invoke(ctx.expectedPos)
                     }
 
                     return primaryBreak?.let { primary ->
@@ -631,13 +631,15 @@ object BreakManager : RequestHandler<BreakRequest>(
         if (gamemode.isCreative) {
             lastPosStarted = ctx.expectedPos
             onBlockBreak(info)
+            info.request.onStart?.invoke(ctx.expectedPos)
             interaction.sendSequencedPacket(world) { sequence: Int ->
                 PlayerActionC2SPacket(Action.START_DESTROY_BLOCK, ctx.expectedPos, ctx.result.side, sequence)
             }
             breakCooldown = info.breakConfig.breakDelay
             return true
         }
         if (info.breaking) return false
+        info.request.onStart?.invoke(ctx.expectedPos)
 
         lastPosStarted = ctx.expectedPos
 

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

@@ -35,9 +35,9 @@ data class BreakRequest(
     val rotation: RotationConfig,
     val hotbar: HotbarConfig,
     val pendingInteractions: MutableCollection<BuildContext>,
-    val onAccept: ((BlockPos) -> Unit)? = null,
+    val onStart: ((BlockPos) -> Unit)? = null,
+    val onStop: ((BlockPos) -> Unit)? = null,
     val onCancel: ((BlockPos) -> Unit)? = null,
-    val onBreak: ((BlockPos) -> Unit)? = null,
     val onItemDrop: ((ItemEntity) -> Unit)? = null,
     val onReBreakStart: ((BlockPos) -> Unit)? = null,
     val onReBreak: ((BlockPos) -> Unit)? = null,

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

@@ -131,7 +131,6 @@ object BrokenBlockHandler {
      * Adds the [info] to the [BrokenBlockHandler], and requesters, pending interaction collections.
      */
     fun BreakInfo.startPending() {
-        pending = true
         pendingBreaks.add(this)
         pendingInteractions.add(context)
     }

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

@@ -104,7 +104,7 @@ object PacketMine : Module(
                 }
             }
             positions.removeIf { breakPos ->
-                breakPositions.any { it == breakPos }
+                breakPositions.any { it == breakPos } || queuePositions.any { it == pos }
             }
             if (positions.isEmpty()) return@listen
             val activeBreaking = if (queue) {
@@ -142,9 +142,9 @@ object PacketMine : Module(
         }
         val request = BreakRequest(
             breakContexts, build, rotation, hotbar, pendingInteractions = pendingInteractionsList,
-            onAccept = { queuePositions.removePos(it); addBreak(it) },
+            onStart = { queuePositions.removePos(it); addBreak(it) },
+            onStop = { removeBreak(it); breaks++ },
             onCancel = { removeBreak(it, true) },
-            onBreak = { removeBreak(it); breaks++ },
             onReBreakStart = { reBreakPos = it },
             onReBreak = { reBreakPos = it },
             onItemDrop = { _ -> itemDrops++ }
@@ -202,6 +202,12 @@ object PacketMine : Module(
         return modified
     }
 
+    private fun LinkedHashSet<MutableCollection<BlockPos>>.any(predicate: (BlockPos) -> Boolean): Boolean {
+        if (isEmpty()) return false
+        forEach { if (it.any(predicate)) return true }
+        return false
+    }
+
     enum class Page {
         Build, Rotation, Interaction, Inventory, Hotbar
     }

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

@@ -157,7 +157,7 @@ class BuildTask @Ta5kBuilder constructor(
                             val request = BreakRequest(
                                 requestContexts, build, rotation, hotbar,
                                 pendingInteractions = pendingInteractions,
-                                onBreak = { breaks++ },
+                                onStop = { breaks++ },
                                 onItemDrop = onItemDrop
                             )
                             build.breaking.request(request)