properly cancels vanilla breaking interactions, and makes rotation nullable for if the user wants them disabled. ik its probably not the best solution but it works for now

Author: beanbag44

common/src/main/kotlin/com/lambda/module/modules/player/PacketMineTaskRewrite.kt

@@ -99,10 +99,12 @@ object PacketMineTaskRewrite : Module(
     private val blockQueue = ArrayDeque<BlockPos>()
 
     init {
-        listen<PlayerEvent.Attack.Block>(1) { event ->
+        listen<PlayerEvent.Breaking.Update> { event ->
             event.cancel()
 
             val pos = event.pos
+            if (breakTasks.any { it?.pos == event.pos }) return@listen
+
             val blockState = pos.blockState(world)
             val bestTool = findBestAvailableTool(blockState)
 
@@ -122,10 +124,19 @@ object PacketMineTaskRewrite : Module(
                     blockState,
                     pos,
                     bestTool?.select()?.itemStack ?: player.mainHandStack
-                )
+                ),
+                BreakType.Primary
             ).run()
         }
 
+        listen<PlayerEvent.Attack.Block> { event ->
+            event.cancel()
+        }
+
+        listen<PlayerEvent.Breaking.Cancel> { event ->
+            if (breakTasks.any { it != null }) event.cancel()
+        }
+
         onDisable {
             breakTasks.forEach {
                 it?.cancelBreak()
@@ -135,13 +146,14 @@ object PacketMineTaskRewrite : Module(
         }
     }
 
-    class PacketBreakInfo(
+    private class PacketBreakInfo(
         val pos: BlockPos,
         val blockState: BlockState,
         val hand: Hand,
         val side: Direction,
         bestTool: Item?,
-        instantBreak: Boolean
+        instantBreak: Boolean,
+        breakType: BreakType
     ) {
         private val breakContext: BreakContext
         private val packetBreakTask: PacketBreakBlock
@@ -166,8 +178,11 @@ object PacketMineTaskRewrite : Module(
                 breakingTexture = true,
                 breakingSound = true,
                 breakingParticles = true,
-                collectDrop = false
-            )
+                collectDrop = false,
+                rotation = null
+            ).finally {
+                breakTasks[breakType.index] = null
+            } as PacketBreakBlock
         }
 
         fun run(): PacketBreakInfo {
@@ -180,6 +195,11 @@ object PacketMineTaskRewrite : Module(
         }
     }
 
+    private enum class BreakType(val index: Int) {
+        Primary(0),
+        Secondary(1)
+    }
+
     private enum class Page {
         General,
         Rebreak,

common/src/main/kotlin/com/lambda/task/tasks/PacketBreakBlock.kt

@@ -60,7 +60,7 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     private val breakingSound: Boolean = true,
     private val breakingParticles: Boolean = true,
     private val collectDrop: Boolean = false,
-    private val rotation: RotationConfig = TaskFlowModule.rotation,
+    private val rotation: RotationConfig? = TaskFlowModule.rotation,
     private val interact: InteractionConfig = TaskFlowModule.interact,
     private val sides: Set<Direction> = Direction.entries.toSet(),
     private val rotate: Boolean = TaskFlowModule.build.rotateForBreak,
@@ -103,16 +103,20 @@ class PacketBreakBlock @Ta5kBuilder constructor(
     }
 
     init {
-        rotate {
-            onUpdate {
-                if (state != State.BREAKING) return@onUpdate null
-                if (!rotate || ctx.instantBreak) return@onUpdate null
+        rotation?.let { rotation ->
+            rotate {
+                onUpdate {
+                    if (state != State.BREAKING) return@onUpdate null
+                    if (!rotate || ctx.instantBreak) return@onUpdate null
 
-                lookAtBlock(blockPos, rotation, interact, sides)
-            }
-            onReceive { context ->
-                isValid = context.isValid
+                    lookAtBlock(blockPos, rotation, interact, sides)
+                }
+                onReceive { context ->
+                    isValid = context.isValid
+                }
             }
+        } ?: run {
+            isValid = true
         }
 
         listen<TickEvent.Pre> {
@@ -231,6 +235,10 @@ class PacketBreakBlock @Ta5kBuilder constructor(
                 )
         }
 
+        if (breakingParticles) {
+            mc.particleManager.addBlockBreakingParticles(blockPos, side)
+        }
+
         interaction.blockBreakingSoundCooldown++
         if (interaction.currentBreakingProgress >= 1.0f) {
             interaction.breakingBlock = false