Update Blink

- add a pulse setting to stop and start blinking after a delay
- reset velocity after cancelling the blink
- disable interacting with the player model at the original position

closes MeteorDevelopment#2693
closes MeteorDevelopment#3941
closes MeteorDevelopment#3131

Co-authored-by: Hexzii <[email protected]>

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/mixin/GameRendererMixin.java

@@ -24,6 +24,7 @@
 import meteordevelopment.meteorclient.systems.modules.render.Zoom;
 import meteordevelopment.meteorclient.systems.modules.world.HighwayBuilder;
 import meteordevelopment.meteorclient.utils.Utils;
+import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
 import meteordevelopment.meteorclient.utils.render.NametagUtils;
 import meteordevelopment.meteorclient.utils.render.RenderUtils;
 import net.minecraft.client.MinecraftClient;
@@ -129,6 +130,10 @@ private HitResult onUpdateTargetedEntity(HitResult original, @Local HitResult hi
         if (Modules.get().get(NoMiningTrace.class).canWork(original instanceof EntityHitResult ehr ? ehr.getEntity() : null) && hitResult.getType() == HitResult.Type.BLOCK) {
             return hitResult;
         }
+        else if (original instanceof EntityHitResult entityHitResult && entityHitResult.getEntity() instanceof FakePlayerEntity fakePlayer && fakePlayer.noHit) {
+            return hitResult;
+        }
+
         return original;
     }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java

@@ -7,17 +7,15 @@
 
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
-import meteordevelopment.meteorclient.settings.BoolSetting;
-import meteordevelopment.meteorclient.settings.KeybindSetting;
-import meteordevelopment.meteorclient.settings.Setting;
-import meteordevelopment.meteorclient.settings.SettingGroup;
+import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
 import meteordevelopment.meteorclient.utils.misc.Keybind;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
+import net.minecraft.util.math.Vec3d;
 import org.joml.Vector3d;
 
 import java.util.ArrayList;
@@ -33,6 +31,15 @@ public class Blink extends Module {
         .build()
     );
 
+    private final Setting<Integer> delay = sgGeneral.add(new IntSetting.Builder()
+        .name("pulse-delay")
+        .description("After the duration in ticks has elapsed, send all packets and start blinking again. 0 to disable.")
+        .defaultValue(0)
+        .min(0)
+        .sliderMax(60)
+        .build()
+    );
+
     @SuppressWarnings("unused")
     private final Setting<Keybind> cancelBlink = sgGeneral.add(new KeybindSetting.Builder()
         .name("cancel-blink")
@@ -49,7 +56,7 @@ public class Blink extends Module {
     private FakePlayerEntity model;
     private final Vector3d start = new Vector3d();
 
-    private boolean cancelled = false;
+    private boolean cancelled, sending;
     private int timer = 0;
 
     public Blink() {
@@ -62,6 +69,7 @@ public void onActivate() {
             model = new FakePlayerEntity(mc.player, mc.player.getGameProfile().getName(), 20, true);
             model.doNotPush = true;
             model.hideWhenInsideCamera = true;
+            model.noHit = true;
             model.spawn();
         }
 
@@ -71,17 +79,28 @@ public void onActivate() {
     @Override
     public void onDeactivate() {
         dumpPackets(!cancelled);
-        if (cancelled) mc.player.setPos(start.x, start.y, start.z);
+
+        if (cancelled) {
+            mc.player.setPos(start.x, start.y, start.z);
+            mc.player.setVelocity(Vec3d.ZERO);
+        }
+
         cancelled = false;
     }
 
     @EventHandler
     private void onTick(TickEvent.Post event) {
         timer++;
+
+        if (delay.get() != 0 && delay.get() <= timer) {
+            onDeactivate();
+            onActivate();
+        }
     }
 
     @EventHandler
     private void onSendPacket(PacketEvent.Send event) {
+        if (sending) return;
         if (!(event.packet instanceof PlayerMoveC2SPacket p)) return;
         event.cancel();
 
@@ -107,10 +126,12 @@ public String getInfoString() {
     }
 
     private void dumpPackets(boolean send) {
+        sending = true;
         synchronized (packets) {
             if (send) packets.forEach(mc.player.networkHandler::sendPacket);
             packets.clear();
         }
+        sending = false;
 
         if (model != null) {
             model.despawn();

src/main/java/meteordevelopment/meteorclient/utils/entity/fakeplayer/FakePlayerEntity.java

@@ -16,7 +16,7 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class FakePlayerEntity extends OtherClientPlayerEntity {
-    public boolean doNotPush, hideWhenInsideCamera;
+    public boolean doNotPush, hideWhenInsideCamera, noHit;
 
     public FakePlayerEntity(PlayerEntity player, String name, float health, boolean copyInv) {
         super(mc.world, new GameProfile(UUID.randomUUID(), name));