use block attack event and cancel handleBlockBreaking call

Author: beanbag44

common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -21,12 +21,15 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.InventoryEvent;
+import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -41,6 +44,8 @@ public class MinecraftClientMixin {
     @Nullable
     public Screen currentScreen;
 
+    @Shadow @javax.annotation.Nullable public HitResult crosshairTarget;
+
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {
         EventFlow.post(new TickEvent.Pre());
@@ -74,6 +79,18 @@ private void onStartup(CallbackInfo ci) {
         EventFlow.post(new ClientEvent.Startup());
     }
 
+    @Inject(method = "handleBlockBreaking(Z)V", at = @At("HEAD"), cancellable = true)
+    private void onHandleBlockBreaking(boolean breaking, CallbackInfo ci) {
+        if (EventFlow.post(
+                new PlayerEvent.Breaking.Handle(
+                        breaking,
+                        (BlockHitResult) crosshairTarget
+                )
+        ).isCanceled()) {
+            ci.cancel();
+        }
+    }
+
     @Inject(method = "setScreen", at = @At("HEAD"))
     private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
         if (screen == null) return;

common/src/main/kotlin/com/lambda/event/events/PlayerEvent.kt

@@ -96,6 +96,14 @@ sealed class PlayerEvent {
     }
 
     sealed class Breaking {
+        /**
+         * Represents block break handling triggered each tick
+         */
+        data class Handle(
+            val breaking: Boolean,
+            val blockHitResult: BlockHitResult?
+        ) : ICancellable by Cancellable()
+
         /**
          * Represents events triggered during a block breaking action
          */

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

@@ -111,11 +111,11 @@ object PacketMineTaskRewrite : Module(
     private val blockQueue = ArrayDeque<BlockPos>()
 
     init {
-        listen<PlayerEvent.Breaking.Update> { event ->
+        listen<PlayerEvent.Attack.Block> { event ->
             event.cancel()
 
             val pos = event.pos
-            if (breakTasks.any { it?.pos == event.pos }) return@listen
+            if (breakTasks.any { it?.pos == pos }) return@listen
 
             val blockState = pos.blockState(world)
             val bestTool = findBestAvailableTool(blockState)
@@ -141,12 +141,9 @@ object PacketMineTaskRewrite : Module(
             ).run()
         }
 
-        listen<PlayerEvent.Attack.Block> { event ->
-            event.cancel()
-        }
-
-        listen<PlayerEvent.Breaking.Cancel> { event ->
-            if (breakTasks.any { it != null }) event.cancel()
+        listen<PlayerEvent.Breaking.Handle> { event ->
+            if (breakTasks.any { it != null } && !event.breaking)
+                event.cancel()
         }
 
         onDisable {