catch rebreak logic up to the rest and raise minimum secondary swap ticks to 3

Author: beanbag44

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

@@ -20,6 +20,7 @@ package com.lambda.interaction.request.breaking
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.ActionInfo
 import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Primary
+import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Rebreak
 import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
@@ -125,7 +126,8 @@ data class BreakInfo(
 
     fun getBreakThreshold() =
         when (type) {
-            Primary -> breakConfig.breakThreshold
+            Primary,
+            Rebreak-> breakConfig.breakThreshold
             else -> 1.0f
         }
 

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

@@ -772,6 +772,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                     }
 
                     primaryBreak?.let { primary ->
+                        if (!handlePreProcessing()) return false
                         updateBreakProgress(primary)
                     }
                     return true

src/main/kotlin/com/lambda/interaction/request/breaking/RebreakManager.kt

@@ -35,7 +35,7 @@ object RebreakManager {
     var rebreak: BreakInfo? = null
 
     init {
-        listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
+        listen<TickEvent.Post>(priority = Int.MIN_VALUE + 1) {
             rebreak?.run {
                 if (!progressedThisTick) {
                     breakingTicks++
@@ -89,7 +89,8 @@ object RebreakManager {
 
             val context = reBreak.context
             val breakDelta = context.cachedState.calcBreakDelta(player, world, context.blockPos, reBreak.breakConfig)
-            return@runSafe if ((reBreak.breakingTicks - reBreak.breakConfig.fudgeFactor) * breakDelta >= reBreak.breakConfig.breakThreshold) {
+            val breakTicks = reBreak.breakingTicks - reBreak.breakConfig.fudgeFactor
+            return@runSafe if (breakTicks * breakDelta >= reBreak.getBreakThreshold() && reBreak.swapInfo.canCompleteBreak) {
                 if (reBreak.breakConfig.breakConfirmation != BreakConfig.BreakConfirmationMode.AwaitThenBreak) {
                     destroyBlock(reBreak)
                 }

src/main/kotlin/com/lambda/interaction/request/breaking/SwapInfo.kt

@@ -18,6 +18,7 @@
 package com.lambda.interaction.request.breaking
 
 import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Primary
+import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Rebreak
 import com.lambda.interaction.request.breaking.BreakManager.currentStack
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
@@ -32,8 +33,8 @@ data class SwapInfo(
     val minKeepTicks: Int = 0,
 ) {
     val canCompleteBreak
-        get() = (BreakManager.heldTicks + 1) >= if (type == Primary) breakConfig.serverSwapTicks
-        else breakConfig.serverSwapTicks.coerceAtLeast(2)
+        get() = (BreakManager.heldTicks + 1) >= if (type == Primary || type == Rebreak) breakConfig.serverSwapTicks
+        else breakConfig.serverSwapTicks.coerceAtLeast(3)
 
     companion object {
         val EMPTY = SwapInfo(Primary)
@@ -63,7 +64,7 @@ data class SwapInfo(
                         !withoutEfficiency) 1
                     else 0
                 } else {
-                    val serverSwapTicks = breakConfig.serverSwapTicks.coerceAtLeast(2)
+                    val serverSwapTicks = breakConfig.serverSwapTicks.coerceAtLeast(3)
                     val swapTickProgress = breakDelta * (breakTicks + serverSwapTicks - 1)
                     if (swapTickProgress >= threshold && swapStack.heldTicks < serverSwapTicks) 1
                     else 0