disallow vanilla instant breakables from re-break and cleanup

Author: beanbag44

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

@@ -43,6 +43,9 @@ data class BreakInfo(
     var breakingTicks = 0
     var soundsCooldown = 0.0f
 
+    var vanillaInstantBreakable = false
+    val reBreakable get() = !vanillaInstantBreakable && isPrimary
+
     val isPrimary get() = type == BreakType.Primary
     val isSecondary get() = type == BreakType.Secondary
     val isRedundant get() = type == BreakType.RedundantSecondary
@@ -85,6 +88,12 @@ data class BreakInfo(
         }
     }
 
+    fun tickStats() {
+        activeAge++
+        updatedThisTick = false
+        updatedProgressThisTick = false
+    }
+
     fun resetCallbacks() {
         broken = false
         item = null

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

@@ -121,9 +121,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                         this.cancelBreak()
                         return@apply
                     }
-                    activeAge++
-                    updatedThisTick = false
-                    updatedProgressThisTick = false
+                    tickStats()
                 }
             }
             activeRequest = null
@@ -146,8 +144,8 @@ object BreakManager : RequestHandler<BreakRequest>(
                     info.internalOnBreak()
                     if (!info.callbacksCompleted) {
                         info.startPending()
-                    } else if (info.isPrimary) {
-                        ReBreakManager.startReBreak(info)
+                    } else {
+                        ReBreakManager.offerReBreak(info)
                     }
                     info.nullify()
                 }
@@ -402,8 +400,8 @@ object BreakManager : RequestHandler<BreakRequest>(
                 info.internalOnBreak()
                 if (!info.callbacksCompleted) {
                     info.startPending()
-                } else if (info.isPrimary) {
-                    ReBreakManager.startReBreak(info)
+                } else {
+                    ReBreakManager.offerReBreak(info)
                 }
             }
             BreakConfirmationMode.BreakThenAwait -> {
@@ -655,8 +653,11 @@ object BreakManager : RequestHandler<BreakRequest>(
         if (info.breakConfig.breakMode == BreakMode.Packet) {
             info.stopBreakPacket(world, interaction)
         }
+
         info.startBreakPacket(world, interaction)
-        if (info.isSecondary || (breakDelta < 1  && breakDelta >= info.breakConfig.breakThreshold)) {
+        info.vanillaInstantBreakable = breakDelta >= 1
+
+        if (info.isSecondary || (!info.vanillaInstantBreakable && breakDelta >= info.breakConfig.breakThreshold)) {
             info.stopBreakPacket(world, interaction)
         }
 

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

@@ -92,7 +92,7 @@ object BrokenBlockHandler {
                 if (pending.callbacksCompleted) {
                     pending.stopPending()
                     if (lastPosStarted == pending.context.expectedPos) {
-                        ReBreakManager.startReBreak(pending)
+                        ReBreakManager.offerReBreak(pending)
                     }
                 }
                 return@listen
@@ -112,7 +112,7 @@ object BrokenBlockHandler {
                 if (pending.callbacksCompleted) {
                     pending.stopPending()
                     if (lastPosStarted == pending.context.expectedPos) {
-                        ReBreakManager.startReBreak(pending)
+                        ReBreakManager.offerReBreak(pending)
                     }
                 }
                 return@listen

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

@@ -36,7 +36,7 @@ object ReBreakManager {
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
             reBreak?.apply {
                 breakingTicks++
-                activeAge++
+                tickStats()
             }
         }
 
@@ -45,8 +45,10 @@ object ReBreakManager {
         }
     }
 
-    fun startReBreak(info: BreakInfo?) {
-        reBreak = info?.apply {
+    fun offerReBreak(info: BreakInfo) {
+        if (!info.reBreakable) return
+
+        reBreak = info.apply {
             type = BreakType.ReBreak
             breaking = true
         }
@@ -63,8 +65,7 @@ object ReBreakManager {
             if (info.context.expectedPos != ctx.expectedPos || info.breakConfig.reBreak.mode != ReBreakSettings.Mode.Manual) {
                 return@runSafe ReBreakResult.Ignored
             }
-            info.context = ctx
-            info.request = breakRequest
+            info.updateInfo(ctx, breakRequest)
 
             val context = info.context
             val awaitThenBreak = info.breakConfig.breakConfirmation == BreakConfig.BreakConfirmationMode.AwaitThenBreak