improved sending break packets

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -25,7 +25,8 @@ import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.util.world.raycast.RayCastUtils.distanceTo
 import net.minecraft.block.BlockState
-import net.minecraft.client.network.ClientPlayNetworkHandler
+import net.minecraft.client.network.ClientPlayerInteractionManager
+import net.minecraft.client.world.ClientWorld
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action
 import net.minecraft.util.hit.BlockHitResult
@@ -77,22 +78,22 @@ data class BreakContext(
         withState(checkedState, expectedPos, sideColor, result.side)
     }
 
-    fun startBreakPacket(sequence: Int, connection: ClientPlayNetworkHandler) =
-        breakPacket(Action.START_DESTROY_BLOCK, sequence, connection)
+    fun startBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
+        breakPacket(Action.START_DESTROY_BLOCK, world, interaction)
 
-    fun stopBreakPacket(sequence: Int, connection: ClientPlayNetworkHandler) =
-        breakPacket(Action.STOP_DESTROY_BLOCK, sequence, connection)
+    fun stopBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
+        breakPacket(Action.STOP_DESTROY_BLOCK, world, interaction)
 
-    fun abortBreakPacket(sequence: Int, connection: ClientPlayNetworkHandler) =
-        breakPacket(Action.ABORT_DESTROY_BLOCK, sequence, connection)
+    fun abortBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
+        breakPacket(Action.ABORT_DESTROY_BLOCK, world, interaction)
 
-    private fun breakPacket(action: Action, sequence: Int, connection: ClientPlayNetworkHandler) =
-        connection.sendPacket(
+    private fun breakPacket(action: Action, world: ClientWorld, interaction: ClientPlayerInteractionManager) =
+        interaction.sendSequencedPacket(world) { sequence: Int ->
             PlayerActionC2SPacket(
                 action,
                 expectedPos,
                 result.side,
                 sequence
             )
-        )
+        }
 }

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

@@ -425,8 +425,6 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         if (info.breaking) return false
 
         val blockState = blockState(ctx.expectedPos)
-        val pendingUpdateManager = world.pendingUpdateManager.incrementSequence()
-        val sequence = pendingUpdateManager.sequence
         val notAir = !blockState.isAir
         if (notAir && info.breakingTicks == 0) {
             blockState.onBlockBreakStart(world, ctx.expectedPos, player)
@@ -449,17 +447,13 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         }
 
         if (info.breakConfig.breakMode == BreakMode.Packet) {
-            ctx.stopBreakPacket(sequence, connection)
-            ctx.startBreakPacket(sequence + 1, connection)
-            ctx.stopBreakPacket(sequence + 1, connection)
-            repeat(2) {
-                pendingUpdateManager.incrementSequence()
-            }
+            ctx.stopBreakPacket(world, interaction)
+            ctx.startBreakPacket(world, interaction)
+            ctx.stopBreakPacket(world, interaction)
         } else {
-            ctx.startBreakPacket(sequence, connection)
+            ctx.startBreakPacket(world, interaction)
             if (breakingDelta < 1  && (breakingDelta >= 0.7 || info.breakConfig.doubleBreak)) {
-                ctx.stopBreakPacket(sequence + 1, connection)
-                pendingUpdateManager.incrementSequence()
+                ctx.stopBreakPacket(world, interaction)
             }
         }