fix(AttributeSwap): handle entity hits before spear checks and respect Hitboxes expansion (#6725)

Author: Eccys

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

@@ -11,6 +11,7 @@
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.orbit.EventHandler;
@@ -28,6 +29,7 @@
 import net.minecraft.world.item.TridentItem;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 
@@ -297,6 +299,14 @@ public class AttributeSwap extends Module {
         .build()
     );
 
+    private final Setting<Boolean> spear = sgWeapon.add(new BoolSetting.Builder()
+        .name("spear")
+        .description("Works while holding a spear.")
+        .defaultValue(true)
+        .visible(onlyOnWeapon::get)
+        .build()
+    );
+
     private final Setting<Boolean> trident = sgWeapon.add(new BoolSetting.Builder()
         .name("trident")
         .description("Works while holding a trident.")
@@ -320,18 +330,27 @@ public void onDeactivate() {
 
     @EventHandler
     private void onAttack(DoAttackEvent event) {
-        if (mc.hitResult.getType() == HitResult.Type.BLOCK || !canSwapByWeapon()) return;
+        if (mc.hitResult == null || mc.hitResult.getType() == HitResult.Type.BLOCK || !canSwapByWeapon()) return;
+
+        if (mc.hitResult instanceof EntityHitResult entityHitResult) {
+            if (mode.get() == Mode.Simple) {
+                if (!swapOnMiss.get()) {
+                    performSwap(entityHitResult.getEntity());
+                    return;
+                }
+            } else if (isWithinMeleeRange(entityHitResult)) {
+                performSwap(entityHitResult.getEntity());
+                return;
+            }
+        }
 
         if (mode.get() == Mode.Smart && spearSwapping.get()) {
             if (spearHitbox.get()) {
-                Entity target = getTargetEntity();
+                Entity target = mc.hitResult instanceof EntityHitResult entityHitResult ? entityHitResult.getEntity() : getTargetEntity();
                 if (target != null) {
-                    if (mc.player.distanceTo(target) <= mc.player.entityInteractionRange() + 0.5) return;
                     int spearSlot = getSmartSpearSlot(false);
-                    if (spearSlot != -1) {
-                        doSwap(spearSlot);
-                        return;
-                    }
+                    if (spearSlot != -1) doSwap(spearSlot);
+                    return;
                 }
             }
 
@@ -394,6 +413,7 @@ private boolean canSwapByWeapon() {
                 (shovel.get() && item.is(ItemTags.SHOVELS)) ||
                 (hoe.get() && item.is(ItemTags.HOES)) ||
                 (mace.get() && item.getItem() instanceof MaceItem) ||
+                (spear.get() && item.is(ItemTags.SPEARS)) ||
                 (trident.get() && item.getItem() instanceof TridentItem)
         );
     }
@@ -407,7 +427,7 @@ private int getSmartSlot(Entity target) {
             if (axeSlot != -1) return axeSlot;
         }
 
-        boolean isFalling = mc.player.fallDistance > 1.5;
+        boolean isFalling = mc.player.fallDistance > 1.5 && !mc.player.isFallFlying();
         boolean durability = smartDurability.get();
 
         boolean isLiving = target instanceof LivingEntity;
@@ -439,22 +459,35 @@ private int getSmartSlot(Entity target) {
         return bestSlot;
     }
 
-    private int getSmartSpearSlot(boolean requireLunge) {
-        for (int i = 0; i < 9; i++) {
-            if (i == mc.player.getInventory().getSelectedSlot()) continue;
-            ItemStack stack = mc.player.getInventory().getItem(i);
-            if (!stack.is(ItemTags.SPEARS)) continue;
+    private boolean isWithinMeleeRange(EntityHitResult hitResult) {
+        double range = mc.player.entityInteractionRange();
+        return hitResult.getLocation().distanceToSqr(mc.player.getEyePosition(1.0f)) <= range * range;
+    }
 
-            boolean hasLunge = Utils.getEnchantmentLevel(stack, Enchantments.LUNGE) > 0;
-            if (requireLunge && !hasLunge) continue;
-            if (!requireLunge && excludeLungeFromHitbox.get() && hasLunge) continue;
+    private int getSmartSpearSlot(boolean requireLunge) {
+        int selectedSlot = mc.player.getInventory().getSelectedSlot();
+        if (isValidSpear(mc.player.getInventory().getItem(selectedSlot), requireLunge)) {
+            return selectedSlot;
+        }
 
-            return i;
+        for (int i = 0; i < 9; i++) {
+            if (i == selectedSlot) continue;
+            if (isValidSpear(mc.player.getInventory().getItem(i), requireLunge)) {
+                return i;
+            }
         }
 
         return -1;
     }
 
+    private boolean isValidSpear(ItemStack stack, boolean requireLunge) {
+        if (!stack.is(ItemTags.SPEARS)) return false;
+
+        boolean hasLunge = Utils.getEnchantmentLevel(stack, Enchantments.LUNGE) > 0;
+        if (requireLunge && !hasLunge) return false;
+        return requireLunge || !excludeLungeFromHitbox.get() || !hasLunge;
+    }
+
     private Entity getTargetEntity() {
         double maxDistance = 7;
         Vec3 start = mc.player.getEyePosition(1.0f);
@@ -465,10 +498,12 @@ private Entity getTargetEntity() {
 
         Entity target = null;
         double closestDistance = maxDistance * maxDistance;
+        Hitboxes hitboxes = Modules.get() != null ? Modules.get().get(Hitboxes.class) : null;
 
         for (Entity entity : mc.level.getEntities(mc.player, box, e -> !e.isSpectator() && e.isPickable())) {
             // expanding entity's hitbox by 0.15 to simulate spear's actual hitbox margin
-            AABB expandedBox = entity.getBoundingBox().inflate(0.150);
+            double extraMargin = hitboxes != null ? hitboxes.getEntityValue(entity) : 0;
+            AABB expandedBox = entity.getBoundingBox().inflate(0.150 + extraMargin);
 
             if (expandedBox.clip(start, end).isPresent()) {
                 double distSq = start.distanceToSqr(entity.getX(), entity.getY(), entity.getZ());