Prevent combat modules from targeting the Blink fake player

closes #6032

Author: Wide-Cat

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

@@ -25,12 +25,12 @@
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.JumpingMount;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.JumpingMount;
 import net.minecraft.util.PlayerInput;
-import org.objectweb.asm.Opcodes;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -117,7 +117,7 @@ private void changeJumpingMount(CallbackInfoReturnable<JumpingMount> info) {
         if (Modules.get().get(EntityControl.class).cancelJump()) info.setReturnValue(null);
     }
 
-    @ModifyReturnValue(method = "getCrosshairTarget(FLnet/minecraft/entity/Entity;)Lnet/minecraft/util/hit/HitResult;", at = @At("RETURN"))
+    @ModifyReturnValue(method = "getCrosshairTarget(Lnet/minecraft/entity/Entity;DDF)Lnet/minecraft/util/hit/HitResult;", at = @At("RETURN"))
     private static HitResult onUpdateTargetedEntity(HitResult original, @Local HitResult hitResult) {
         if (original instanceof EntityHitResult ehr) {
             if (Modules.get().get(NoMiningTrace.class).canWork(ehr.getEntity()) && hitResult.getType() == HitResult.Type.BLOCK) {

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/BowAimbot.java

@@ -98,16 +98,16 @@ private void onTick(TickEvent.Pre event) {
 
         target = TargetUtils.get(entity -> {
             if (entity == mc.player || entity == mc.getCameraEntity()) return false;
-            if ((entity instanceof LivingEntity && ((LivingEntity) entity).isDead()) || !entity.isAlive()) return false;
+            if ((entity instanceof LivingEntity livingEntity && livingEntity.isDead()) || !entity.isAlive()) return false;
             if (!PlayerUtils.isWithin(entity, range.get())) return false;
             if (!entities.get().contains(entity.getType())) return false;
             if (!nametagged.get() && entity.hasCustomName()) return false;
             if (!PlayerUtils.canSeeEntity(entity)) return false;
-            if (entity instanceof PlayerEntity) {
-                if (((PlayerEntity) entity).isCreative()) return false;
-                if (!Friends.get().shouldAttack((PlayerEntity) entity)) return false;
+            if (entity instanceof PlayerEntity player) {
+                if (player.isCreative()) return false;
+                if (!Friends.get().shouldAttack(player)) return false;
             }
-            return !(entity instanceof AnimalEntity) || babies.get() || !((AnimalEntity) entity).isBaby();
+            return !(entity instanceof AnimalEntity animal) || babies.get() || !animal.isBaby();
         }, priority.get());
 
         if (target == null) {

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java

@@ -17,6 +17,7 @@
 import meteordevelopment.meteorclient.utils.entity.SortPriority;
 import meteordevelopment.meteorclient.utils.entity.Target;
 import meteordevelopment.meteorclient.utils.entity.TargetUtils;
+import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.player.PlayerUtils;
@@ -411,6 +412,7 @@ private boolean entityCheck(Entity entity) {
             if (player.isCreative()) return false;
             if (!Friends.get().shouldAttack(player)) return false;
             if (shieldMode.get() == ShieldMode.Ignore && player.isBlocking()) return false;
+            if (player instanceof FakePlayerEntity fakePlayer && fakePlayer.noHit) return false;
         }
         if (entity instanceof AnimalEntity animal) {
             return switch (mobAgeFilter.get()) {

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

@@ -93,9 +93,9 @@ public AutoWasp() {
     public void onActivate() {
         if (target == null || target.isRemoved()) {
             target = (PlayerEntity) TargetUtils.get(entity -> {
-                if (!(entity instanceof PlayerEntity) || entity == mc.player) return false;
-                if (((PlayerEntity) entity).isDead() || ((PlayerEntity) entity).getHealth() <= 0) return false;
-                return !onlyFriends.get() || Friends.get().get((PlayerEntity) entity) != null;
+                if (!(entity instanceof PlayerEntity player) || entity == mc.player) return false;
+                if (player.isDead() || player.getHealth() <= 0) return false;
+                return !onlyFriends.get() || Friends.get().get(player) != null;
             }, SortPriority.LowestDistance);
 
             if (target == null) {

src/main/java/meteordevelopment/meteorclient/utils/entity/TargetUtils.java

@@ -60,11 +60,12 @@ public static void getList(List<Entity> targetList, Predicate<Entity> isGood, So
     public static PlayerEntity getPlayerTarget(double range, SortPriority priority) {
         if (!Utils.canUpdate()) return null;
         return (PlayerEntity) get(entity -> {
-            if (!(entity instanceof PlayerEntity) || entity == mc.player) return false;
-            if (((PlayerEntity) entity).isDead() || ((PlayerEntity) entity).getHealth() <= 0) return false;
+            if (!(entity instanceof PlayerEntity player) || entity == mc.player) return false;
+            if (player.isDead() || player.getHealth() <= 0) return false;
             if (!PlayerUtils.isWithin(entity, range)) return false;
-            if (!Friends.get().shouldAttack((PlayerEntity) entity)) return false;
-            return EntityUtils.getGameMode((PlayerEntity) entity) == GameMode.SURVIVAL || entity instanceof FakePlayerEntity;
+            if (!Friends.get().shouldAttack(player)) return false;
+            if (entity instanceof FakePlayerEntity fakePlayer) return !fakePlayer.noHit;
+            return EntityUtils.getGameMode(player) == GameMode.SURVIVAL;
         }, priority);
     }
 

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

@@ -17,7 +17,12 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class FakePlayerEntity extends OtherClientPlayerEntity {
-    public boolean doNotPush, hideWhenInsideCamera, noHit;
+    /** Disables entity push with this fake player */
+    public boolean doNotPush;
+    /** Stops rendering the fake player when you are inside it */
+    public boolean hideWhenInsideCamera;
+    /** Prevents you from interacting with the fake player; will also prevent TargetUtils selecting it as a target */
+    public boolean noHit;
 
     public FakePlayerEntity(PlayerEntity player, String name, float health, boolean copyInv) {
         super(mc.world, new GameProfile(UUID.randomUUID(), name));