use middleman calcBreakDelta function for future proofing

Author: beanbag44

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

@@ -21,15 +21,14 @@ 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.interaction.request.breaking.BreakManager.calcBreakDelta
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import com.lambda.util.OneSetPerTick
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.ClientPlayerInteractionManager
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.ItemEntity
-import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action
@@ -115,11 +114,11 @@ data class BreakInfo(
         world.setBlockBreakingInfo(player.id, context.blockPos, stage)
     }
 
-    private fun getBreakTextureProgress(player: PlayerEntity, world: ClientWorld): Int {
+    private fun getBreakTextureProgress(player: ClientPlayerEntity, world: ClientWorld): Int {
         val swapMode = breakConfig.swapMode
         val item =
             if (swapMode.isEnabled() && swapMode != BreakConfig.SwapMode.Start) swapStack else player.mainHandStack
-        val breakDelta = context.cachedState.calcItemBlockBreakingDelta(player, world, context.blockPos, item)
+        val breakDelta = context.cachedState.calcBreakDelta(player, world, context.blockPos, breakConfig, item)
         val progress = (breakDelta * breakingTicks) / (getBreakThreshold() + (breakDelta * breakConfig.fudgeFactor))
         return if (progress > 0.0f) (progress * 10.0f).toInt().coerceAtMost(9) else -1
     }

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

@@ -25,7 +25,6 @@ import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.request.breaking.BreakManager.calcBreakDelta
 import com.lambda.interaction.request.breaking.BrokenBlockHandler.destroyBlock
 import com.lambda.threading.runSafe
-import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 import com.lambda.util.player.swingHand
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.util.Hand
@@ -69,7 +68,7 @@ object RebreakHandler {
             val stack = if (info.breakConfig.swapMode.isEnabled())
                 info.swapStack
             else player.mainHandStack
-            val breakDelta = info.context.cachedState.calcItemBlockBreakingDelta(player, world, info.context.blockPos, stack)
+            val breakDelta = info.context.cachedState.calcBreakDelta(player, world, info.context.blockPos, info.breakConfig, stack)
             val possible = reBreak.breakConfig.rebreak &&
                     info.context.blockPos == reBreak.context.blockPos &&
                     !reBreak.updatedThisTick

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

@@ -19,9 +19,9 @@ 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.calcBreakDelta
 import com.lambda.interaction.request.breaking.BreakManager.currentStack
 import com.lambda.module.modules.client.TaskFlowModule
-import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.world.BlockView
@@ -45,9 +45,9 @@ data class SwapInfo(
             world: BlockView
         ): SwapInfo = with(info) {
             val breakDelta = context.cachedState
-                .calcItemBlockBreakingDelta(player, world, context.blockPos, swapStack)
+                .calcBreakDelta(player, world, context.blockPos, breakConfig, swapStack)
             val breakDeltaNoEfficiency = context.cachedState
-                .calcItemBlockBreakingDelta(player, world, context.blockPos, swapStack, ignoreEfficiency = true)
+                .calcBreakDelta(player, world, context.blockPos, breakConfig, swapStack, ignoreEfficiency = true)
 
             val threshold = getBreakThreshold()