timeout redundant secondary breaks after 10 seconds if they should have already been broken

Author: beanbag44

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

@@ -28,8 +28,6 @@ import com.lambda.interaction.managers.breaking.BreakManager.calcBreakDelta
 import com.lambda.threading.runSafeAutomated
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
-import net.minecraft.client.network.ClientPlayerEntity
-import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.ItemEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
@@ -118,10 +116,8 @@ data class BreakInfo(
 
 	context(safeContext: SafeContext)
 	fun setBreakingTextureStage(
-		player: ClientPlayerEntity,
-		world: ClientWorld,
 		stage: Int = getBreakTextureProgress()
-	) = world.setBlockBreakingInfo(player.id, context.blockPos, stage)
+	) = safeContext.world.setBlockBreakingInfo(safeContext.player.id, context.blockPos, stage)
 
 	context(safeContext: SafeContext)
 	private fun getBreakTextureProgress(): Int = with(safeContext) {

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

@@ -558,6 +558,15 @@ object BreakManager : Manager<BreakRequest>(
 						info.nullify()
 						return@forEach
 					}
+					info.request.runSafeAutomated {
+						val breakDelta = cachedState.calcBreakDelta(info.context.blockPos, player.mainHandStack)
+						val ticksToBreak = 1.0 / breakDelta
+						val ticksPast = info.breakingTicks - ticksToBreak
+						if (ticksPast >= 200) {
+							info.nullify()
+							return@forEach
+						}
+					}
 					info.progressedThisTick = true
 					info.breakingTicks++
 				} else info.cancelBreak()
@@ -640,15 +649,15 @@ object BreakManager : Manager<BreakRequest>(
 					if (!PacketLimitHandler.canSendPackets(1, PacketType.PlayerAction)) return@safeContext
 				}
 				nullify()
-				setBreakingTextureStage(player, world, -1)
+				setBreakingTextureStage(-1)
 				abortBreakPacket()
 				PacketLimitHandler.sentPackets(1, PacketType.PlayerAction)
 				request.onCancel?.invoke(this, context.blockPos)
 			}
 			Secondary -> {
 				if (breakConfig.unsafeCancels) {
 					type = RedundantSecondary
-					setBreakingTextureStage(player, world, -1)
+					setBreakingTextureStage(-1)
 					request.onCancel?.invoke(this, context.blockPos)
 				} else abandoned = true
 			}
@@ -727,7 +736,7 @@ object BreakManager : Manager<BreakRequest>(
 			}
 
 			if (breakConfig.particles) world.spawnBlockBreakingParticle(ctx.blockPos, hitResult.side)
-			if (breakConfig.breakingTexture) info.setBreakingTextureStage(player, world)
+			if (breakConfig.breakingTexture) info.setBreakingTextureStage()
 
 			val swing = breakConfig.swing
 			if (progress >= info.getBreakThreshold()) {
@@ -826,7 +835,7 @@ object BreakManager : Manager<BreakRequest>(
 				breaking = true
 				breakingTicks = 1
 				soundsCooldown = 0.0f
-				if (breakConfig.breakingTexture) setBreakingTextureStage(player, world)
+				if (breakConfig.breakingTexture) setBreakingTextureStage()
 			}
 		}
 

src/main/kotlin/com/lambda/interaction/managers/breaking/BrokenBlockHandler.kt

@@ -160,6 +160,6 @@ object BrokenBlockHandler : PostActionHandler<BreakInfo>() {
 		val setState = world.setBlockState(ctx.blockPos, fluidState.blockState, 11)
 		if (setState) block.onBroken(world, ctx.blockPos, ctx.cachedState)
 
-		if (info.breakConfig.breakingTexture) info.setBreakingTextureStage(player, world, -1)
+		if (info.breakConfig.breakingTexture) info.setBreakingTextureStage(-1)
 	}
 }