move shouldProgress into its own variable for use in swap checks

Author: beanbag44

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

@@ -49,6 +49,7 @@ data class BreakInfo(
         } == true
     }
 
+    var shouldProgress = false
     var breaking = false
     var abandoned = false
     var breakingTicks = 0
@@ -103,7 +104,7 @@ data class BreakInfo(
     }
 
     fun shouldSwap(player: ClientPlayerEntity, world: WorldView): Boolean {
-        if (BreakManager.tickStage !in breakConfig.breakStageMask) return false
+        if (!shouldProgress) return false
         val item = player.inventory.getStack(context.hotbarIndex)
         val breakDelta = context.cachedState.calcItemBlockBreakingDelta(player, world, context.blockPos, item)
         val breakProgress = breakDelta * ((breakingTicks + 1) - breakConfig.fudgeFactor).let {

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

@@ -299,7 +299,12 @@ object BreakManager : RequestHandler<BreakRequest>(
                             }
                     }
                     .also  {
-                        it.forEach { it.couldReBreak.update() }
+                        it.forEach {
+                            it.couldReBreak.update()
+                            it.shouldProgress = !it.progressedThisTick &&
+                                    tickStage in it.breakConfig.breakStageMask &&
+                                    rotated || !it.isPrimary
+                        }
                     }
                     .also {
                         if (breakInfos.none { it?.shouldSwap(player, world) == true }) return@also
@@ -329,10 +334,7 @@ object BreakManager : RequestHandler<BreakRequest>(
                     }
                     .asReversed()
                     .forEach { info ->
-                        if (info.progressedThisTick) return@forEach
-                        if (tickStage !in info.breakConfig.breakStageMask) return@forEach
-                        if (!rotated && info.isPrimary) return@run
-
+                        if (!info.shouldProgress) return@forEach
                         updateBreakProgress(info)
                     }
             }
@@ -814,7 +816,7 @@ object BreakManager : RequestHandler<BreakRequest>(
         config: BreakConfig,
         item: ItemStack? = null
     ) = runSafe {
-        val delta = calcItemBlockBreakingDelta(player, world, pos, item ?: player.inventory.selectedStack)
+        val delta = calcItemBlockBreakingDelta(player, world, pos, item ?: player.mainHandStack)
         //ToDo: This setting requires some fixes / improvements in the player movement prediction to work properly. Currently, it's broken
 //        if (config.desyncFix) {
 //            val nextTickPrediction = buildPlayerPrediction().next()