- added unsafe cancels option

- BreakManager is now like other managers in the sense that you need to keep posting requests to keep a block breaking.
- improved double break logic

Author: beanbag44

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

@@ -44,10 +44,9 @@ public class MinecraftClientMixin {
     @Shadow
     @Nullable
     public Screen currentScreen;
-
-    @Shadow @Nullable public HitResult crosshairTarget;
-
-    @Shadow @Nullable public ClientPlayerEntity player;
+    @Shadow
+    @Nullable
+    public HitResult crosshairTarget;
 
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {
@@ -100,9 +99,9 @@ private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
 
     @Redirect(method = "doAttack()Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
     private void redirectHandSwing(ClientPlayerEntity instance, Hand hand) {
-        if (this.crosshairTarget == null || this.player != null) return;
+        if (this.crosshairTarget == null) return;
         if (this.crosshairTarget.getType() != HitResult.Type.BLOCK || PacketMine.INSTANCE.isDisabled()) {
-            this.player.swingHand(hand);
+            instance.swingHand(hand);
         }
     }
 

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -28,7 +28,6 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -120,11 +119,6 @@ float fixHeldItemPitch(ClientPlayerEntity instance) {
         return Objects.requireNonNullElse(RotationManager.getHandPitch(), instance.getPitch());
     }
 
-    @Inject(method = "swingHand", at = @At("HEAD"), cancellable = true)
-    void onSwingHandPre(Hand hand, CallbackInfo ci) {
-        if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
-    }
-
     @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
     public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) {

common/src/main/kotlin/com/lambda/config/groups/BreakSettings.kt

@@ -28,6 +28,7 @@ class BreakSettings(
     vis: () -> Boolean = { true }
 ) : BreakConfig(priority) {
     override val breakMode by c.setting("Break Mode", BreakMode.Vanilla) { vis() }
+    override val unsafeCancels by c.setting("Unsafe Cancels", true, "Allows cancelling block breaking even if the server might continue breaking sever side, potentially causing unexpected state changes") { vis() }
     override val breakThreshold by c.setting("Break Threshold", 1.0f, 0.1f..1.0f, 0.02f, "The break amount at which the block is considered broken") { vis() }
     override val doubleBreak by c.setting("Double Break", false, "Allows breaking two blocks at once") { vis() }
     override val breakDelay by c.setting("Break Delay", 5, 0..5, 1, "The delay between breaking blocks", " ticks") { vis() }

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

@@ -25,12 +25,7 @@ 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.block.Blocks
 import net.minecraft.block.FallingBlock
-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
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
@@ -81,23 +76,4 @@ data class BreakContext(
         withState(checkedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side))
         withState(checkedState, expectedPos, sideColor, result.side)
     }
-
-    fun startBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.START_DESTROY_BLOCK, world, interaction)
-
-    fun stopBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.STOP_DESTROY_BLOCK, world, interaction)
-
-    fun abortBreakPacket(world: ClientWorld, interaction: ClientPlayerInteractionManager) =
-        breakPacket(Action.ABORT_DESTROY_BLOCK, world, interaction)
-
-    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/BreakConfig.kt

@@ -26,6 +26,7 @@ abstract class BreakConfig(
     priority: Priority = 0
 ) : RequestConfig<BreakRequest>(priority) {
     abstract val breakMode: BreakMode
+    abstract val unsafeCancels: Boolean
     abstract val breakThreshold: Float
     abstract val doubleBreak: Boolean
     abstract val breakDelay: Int