Update Packet Mine

- add a setting to obscure the block breaking progress
- fix the broken auto switch setting (hasn't worked properly since it was added ~4 years ago)
- make it more resilient to mining failures

closes #3614

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/systems/modules/render/BreakIndicators.java

@@ -131,13 +131,13 @@ private void renderNormal(Render3DEvent event) {
 
     private void renderPacket(Render3DEvent event, List<PacketMine.MyBlock> blocks) {
         for (PacketMine.MyBlock block : blocks) {
-            if (block.mining && block.progress != Double.POSITIVE_INFINITY) {
+            if (block.mining && block.progress() != Double.POSITIVE_INFINITY) {
                 VoxelShape shape = block.blockState.getOutlineShape(mc.world, block.blockPos);
                 if (shape == null || shape.isEmpty()) return;
 
                 Box orig = shape.getBoundingBox();
 
-                double progressNormalised = block.progress > 1 ? 1 : block.progress;
+                double progressNormalised = Math.min(1, block.progress());
                 double shrinkFactor = 1d - progressNormalised;
                 BlockPos pos = block.blockPos;
 

src/main/java/meteordevelopment/meteorclient/systems/modules/world/HighwayBuilder.java

@@ -2831,7 +2831,7 @@ public boolean shouldRemove() {
             // when it isn't supposed to due to latency
             boolean timeout = progress() > 2 && (b.mc.player.age - (packet ? packetStartTime : normalStartTime) > 60);
 
-            return  distance || timeout;
+            return distance || timeout;
         }
 
         public double progress() {

src/main/java/meteordevelopment/meteorclient/systems/modules/world/PacketMine.java

@@ -24,10 +24,8 @@
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
@@ -71,6 +69,13 @@ public class PacketMine extends Module {
         .build()
     );
 
+    private final Setting<Boolean> obscureBreakingProgress = sgGeneral.add(new BoolSetting.Builder()
+        .name("obscure-breaking-progress")
+        .description("Spams abort breaking packets to obscure the block mining progress from other players. Does not hide it perfectly.")
+        .defaultValue(false)
+        .build()
+    );
+
     // Render
 
     private final Setting<Boolean> render = sgRender.add(new BoolSetting.Builder()
@@ -133,6 +138,7 @@ public void onActivate() {
     public void onDeactivate() {
         for (MyBlock block : blocks) blockPool.free(block);
         blocks.clear();
+
         if (shouldUpdateSlot) {
             mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(mc.player.getInventory().getSelectedSlot()));
             shouldUpdateSlot = false;
@@ -142,7 +148,6 @@ public void onDeactivate() {
     @EventHandler
     private void onStartBreakingBlock(StartBreakingBlockEvent event) {
         if (!BlockUtils.canBreak(event.blockPos)) return;
-
         event.cancel();
 
         swapped = false;
@@ -167,31 +172,30 @@ private void onTick(TickEvent.Pre event) {
         if (shouldUpdateSlot) {
             mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(mc.player.getInventory().getSelectedSlot()));
             shouldUpdateSlot = false;
+            swapped = false;
         }
 
-        if (!blocks.isEmpty()) blocks.getFirst().mine();
-
-        if (!swapped && autoSwitch.get() && (!mc.player.isUsingItem() || !notOnUse.get())) {
-            for (MyBlock block : blocks) {
-                if (block.isReady()) {
-                    FindItemResult slot = InvUtils.findFastestTool(block.blockState);
-                    if (!slot.found() || mc.player.getInventory().getSelectedSlot() == slot.slot()) continue;
-                    mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(slot.slot()));
-                    swapped = true;
-                    shouldUpdateSlot = true;
-                    break;
-                }
+        if (!blocks.isEmpty()) {
+            MyBlock block = blocks.getFirst();
+            block.mine();
+
+            if (block.isReady() && !swapped && autoSwitch.get() && (!mc.player.isUsingItem() || !notOnUse.get())) {
+                FindItemResult slot = InvUtils.findFastestTool(block.blockState);
+                if (!slot.found() || mc.player.getInventory().getSelectedSlot() == slot.slot()) return;
+                mc.player.networkHandler.sendPacket(new UpdateSelectedSlotC2SPacket(slot.slot()));
+                swapped = true;
+                shouldUpdateSlot = true;
             }
         }
     }
 
     @EventHandler
     private void onRender(Render3DEvent event) {
-        if (render.get()) {
-            for (MyBlock block : blocks) {
-                if (Modules.get().get(BreakIndicators.class).isActive() && Modules.get().get(BreakIndicators.class).packetMine.get() && block.mining) {
-                    continue;
-                } else block.render(event);
+        if (!render.get()) return;
+
+        for (MyBlock block : blocks) {
+            if (!Modules.get().get(BreakIndicators.class).isActive() || !Modules.get().get(BreakIndicators.class).packetMine.get() || !block.mining) {
+                block.render(event);
             }
         }
     }
@@ -203,9 +207,8 @@ public class MyBlock {
 
         public Direction direction;
 
-        public int timer;
+        public int timer, startTime;
         public boolean mining;
-        public double progress;
 
         public MyBlock set(StartBreakingBlockEvent event) {
             this.blockPos = event.blockPos;
@@ -214,43 +217,32 @@ public MyBlock set(StartBreakingBlockEvent event) {
             this.block = blockState.getBlock();
             this.timer = delay.get();
             this.mining = false;
-            this.progress = 0;
 
             return this;
         }
 
         public boolean shouldRemove() {
-            boolean remove = mc.world.getBlockState(blockPos).getBlock() != block || Utils.distance(mc.player.getX() - 0.5, mc.player.getY() + mc.player.getEyeHeight(mc.player.getPose()), mc.player.getZ() - 0.5, blockPos.getX() + direction.getOffsetX(), blockPos.getY() + direction.getOffsetY(), blockPos.getZ() + direction.getOffsetZ()) > mc.player.getBlockInteractionRange();
-
-            if (remove) {
-                mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, blockPos, direction));
-                mc.getNetworkHandler().sendPacket(new HandSwingC2SPacket(Hand.MAIN_HAND));
-            }
+            boolean broken = mc.world.getBlockState(blockPos).getBlock() != block;
+            boolean timeout = progress() > 2 && (mc.player.age - startTime > 50);
+            boolean distance = Utils.distance(mc.player.getEyePos().x, mc.player.getEyePos().y, mc.player.getEyePos().z, blockPos.getX() + direction.getOffsetX(), blockPos.getY() + direction.getOffsetY(), blockPos.getZ() + direction.getOffsetZ()) > mc.player.getBlockInteractionRange();
 
-            return remove;
+            return broken || timeout || distance;
         }
 
         public boolean isReady() {
-            return progress >= 1;
+            return progress() >= 1;
+        }
+
+        public double progress() {
+            if (!mining) return 0;
+
+            FindItemResult fir = InvUtils.findFastestTool(blockState);
+            return BlockUtils.getBreakDelta(fir.found() ? fir.slot() : mc.player.getInventory().getSelectedSlot(), blockState) * ((mc.player.age - startTime) + 1);
         }
 
         public void mine() {
             if (rotate.get()) Rotations.rotate(Rotations.getYaw(blockPos), Rotations.getPitch(blockPos), 50, this::sendMinePackets);
             else sendMinePackets();
-
-            double bestScore = -1;
-            int bestSlot = -1;
-
-            for (int i = 0; i < 9; i++) {
-                double score = mc.player.getInventory().getStack(i).getMiningSpeedMultiplier(blockState);
-
-                if (score > bestScore) {
-                    bestScore = score;
-                    bestSlot = i;
-                }
-            }
-
-            progress += BlockUtils.getBreakDelta(bestSlot != -1 ? bestSlot : mc.player.getInventory().getSelectedSlot(), blockState);
         }
 
         private void sendMinePackets() {
@@ -260,11 +252,14 @@ private void sendMinePackets() {
                     mc.interactionManager.sendSequencedPacket(mc.world, (sequence) -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, blockPos, direction, sequence));
 
                     mining = true;
+                    startTime = mc.player.age;
                 }
             }
             else {
                 timer--;
             }
+
+            if (mining && obscureBreakingProgress.get()) mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, blockPos, direction));
         }
 
         public void render(Render3DEvent event) {