was dumb and didnt fix renders the way i thought i did. Also only reset breaking texture if redundant or primary when cancelling

Author: beanbag44

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

@@ -101,8 +101,8 @@ data class BreakInfo(
 
     private fun getBreakTextureProgress(player: PlayerEntity, world: ClientWorld): Int {
         val breakDelta = context.cachedState.calcItemBlockBreakingDelta(player, world, context.blockPos, player.mainHandStack)
-        val progress = (breakDelta * breakingTicks) / getBreakThreshold()
-        return if (progress > 0.0f) (progress * 10.0f).toInt() else -1
+        val progress = (breakDelta * breakingTicks) / (getBreakThreshold() + (breakDelta * breakConfig.fudgeFactor))
+        return if (progress > 0.0f) (progress * 10.0f).toInt().coerceAtMost(10) else -1
     }
 
     fun getBreakThreshold() = type.getBreakThreshold(breakConfig)

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

@@ -229,10 +229,8 @@ object BreakManager : RequestHandler<BreakRequest>(
                         info.breakConfig,
                         if (!info.isRedundant) player.inventory.getStack(info.context.hotbarIndex) else null
                     )
-                    val progress = (info.breakingTicks * breakDelta).let {
-                        if (info.isPrimary) it * (2 - info.breakConfig.breakThreshold)
-                        else it
-                    }.toDouble() * (1 - (breakDelta * config.fudgeFactor))
+                    val threshold = if (info.isPrimary) info.breakConfig.breakThreshold else 1f
+                    val progress = (info.breakingTicks * breakDelta).toDouble() / (threshold + (breakDelta * config.fudgeFactor))
                     val state = info.context.cachedState
                     val boxes = state.getOutlineShape(world, info.context.blockPos).boundingBoxes.map {
                         it.offset(info.context.blockPos)
@@ -562,17 +560,19 @@ object BreakManager : RequestHandler<BreakRequest>(
     private fun BreakInfo.cancelBreak() =
         runSafe {
             if (isRedundant || abandoned) return@runSafe
-            setBreakingTextureStage(player, world, -1)
             if (isPrimary) {
                 if (breaking) abortBreakPacket(world, interaction)
                 nullify()
+                setBreakingTextureStage(player, world, -1)
                 request.onCancel?.invoke(context.blockPos)
             } else if (isSecondary) {
                 if (breakConfig.unsafeCancels) {
                     makeRedundant()
+                    setBreakingTextureStage(player, world, -1)
                     request.onCancel?.invoke(context.blockPos)
+                } else {
+                    abandoned = true
                 }
-                else abandoned = true
             }
         }