update request before and include custom break threshold in break texture overlay stage

Author: beanbag44

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

@@ -59,7 +59,19 @@ object BreakManager : RequestHandler<BreakRequest>() {
 
     init {
         listen<TickEvent.Pre>(Int.MIN_VALUE) {
-            val updated = updateRequest(true) { true }
+            if (updateRequest(true) { true }) {
+                currentRequest?.contexts?.forEach { requestCtx ->
+                    if (requestCtx == null) return@forEach
+                    if (!canAccept(requestCtx)) return@forEach
+
+                    primaryBreakingInfo?.let { primaryInfo ->
+                        if (primaryInfo.startedWithSecondary) return@let
+                        secondaryBreakingInfo = BreakInfo.SecondaryBreakInfo(requestCtx)
+                    } ?: run {
+                        primaryBreakingInfo = BreakInfo.PrimaryBreakInfo(requestCtx)
+                    }
+                }
+            }
 
             for (it in breakingInfos.reversed()) {
                 if (interaction.blockBreakingCooldown > 0) {
@@ -73,20 +85,6 @@ object BreakManager : RequestHandler<BreakRequest>() {
                         primaryBreakingInfo?.startedWithSecondary = true
                 }
             }
-
-            if (!updated) return@listen
-
-            currentRequest?.contexts?.forEach { requestCtx ->
-                if (requestCtx == null) return@forEach
-                if (!canAccept(requestCtx)) return@forEach
-
-                primaryBreakingInfo?.let { primaryInfo ->
-                    if (primaryInfo.startedWithSecondary) return@let
-                    secondaryBreakingInfo = BreakInfo.SecondaryBreakInfo(requestCtx)
-                } ?: run {
-                    primaryBreakingInfo = BreakInfo.PrimaryBreakInfo(requestCtx)
-                }
-            }
         }
 
         listen<WorldEvent.BlockUpdate.Server>(alwaysListen = true) { event ->
@@ -326,7 +324,7 @@ object BreakManager : RequestHandler<BreakRequest>() {
                 player.mainHandStack
             )
 
-            val progress = breakDelta * breakingTicks
+            val progress = (breakDelta * breakingTicks) / buildConfig.breakSettings.breakThreshold
             return if (progress > 0.0f) (progress * 10.0f).toInt() else -1
         }