Assorted improvements to bow aimbot, bow spam and the trajectories modules

Author: Wide-Cat

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

@@ -24,6 +24,7 @@
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ArrowItem;
+import net.minecraft.item.BowItem;
 import net.minecraft.item.Items;
 import net.minecraft.util.math.Vec3d;
 
@@ -130,23 +131,16 @@ private boolean itemInHand() {
         return InvUtils.testInMainHand(Items.BOW, Items.CROSSBOW);
     }
 
-    private void aim(double tickDelta) {
+    private void aim(float tickDelta) {
         // Velocity based on bow charge.
-        float velocity = (mc.player.getItemUseTime() - mc.player.getItemUseTimeLeft()) / 20f;
-        velocity = (velocity * velocity + velocity * 2) / 3;
-        if (velocity > 1) velocity = 1;
+        float velocity = BowItem.getPullProgress(mc.player.getItemUseTime());
 
         // Positions
-        double posX = target.getPos().getX() + (target.getPos().getX() - target.prevX) * tickDelta;
-        double posY = target.getPos().getY() + (target.getPos().getY() - target.prevY) * tickDelta;
-        double posZ = target.getPos().getZ() + (target.getPos().getZ() - target.prevZ) * tickDelta;
+        Vec3d pos = target.getLerpedPos(tickDelta);
 
-        // Adjusting for hitbox heights
-        posY -= 1.9f - target.getHeight();
-
-        double relativeX = posX - mc.player.getX();
-        double relativeY = posY - mc.player.getY();
-        double relativeZ = posZ - mc.player.getZ();
+        double relativeX = pos.x - mc.player.getX();
+        double relativeY = pos.y + (target.getHeight() / 2) - mc.player.getEyeY();
+        double relativeZ = pos.z - mc.player.getZ();
 
         // Calculate the pitch
         double hDistance = Math.sqrt(relativeX * relativeX + relativeZ * relativeZ);
@@ -159,7 +153,7 @@ private void aim(double tickDelta) {
         if (Float.isNaN(pitch)) {
             Rotations.rotate(Rotations.getYaw(target), Rotations.getPitch(target));
         } else {
-            Rotations.rotate(Rotations.getYaw(new Vec3d(posX, posY, posZ)), pitch);
+            Rotations.rotate(Rotations.getYaw(new Vec3d(pos.x, pos.y, pos.z)), pitch);
         }
     }
 

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

@@ -67,7 +67,6 @@ private void onTick(TickEvent.Post event) {
             if (!isBow) return;
 
             if (mc.player.getItemUseTime() >= charge.get()) {
-                mc.player.stopUsingItem();
                 mc.interactionManager.stopUsingItem(mc.player);
             } else {
                 setPressed(true);

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

@@ -167,7 +167,7 @@ private Path getEmptyPath() {
         return path;
     }
 
-    private void calculatePath(PlayerEntity player, double tickDelta) {
+    private void calculatePath(PlayerEntity player, float tickDelta) {
         // Clear paths
         for (Path path : paths) path.clear();
 

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

@@ -10,6 +10,7 @@
 import meteordevelopment.meteorclient.mixininterface.IVec3d;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.misc.MissHitResult;
+import meteordevelopment.meteorclient.utils.player.Rotations;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.ChargedProjectilesComponent;
 import net.minecraft.entity.Entity;
@@ -44,7 +45,7 @@ public class ProjectileEntitySimulator {
 
     // held items
 
-    public boolean set(Entity user, ItemStack itemStack, double simulated, boolean accurate, double tickDelta) {
+    public boolean set(Entity user, ItemStack itemStack, double simulated, boolean accurate, float tickDelta) {
         Item item = itemStack.getItem();
 
         switch (item) {
@@ -82,11 +83,19 @@ public boolean set(Entity user, ItemStack itemStack, double simulated, boolean a
         return true;
     }
 
-    public void set(Entity user, double roll, double speed, double simulated, double gravity, double waterDrag, boolean accurate, double tickDelta, EntityType<?> type) {
+    public void set(Entity user, double roll, double speed, double simulated, double gravity, double waterDrag, boolean accurate, float tickDelta, EntityType<?> type) {
         Utils.set(pos, user, tickDelta).add(0, user.getEyeHeight(user.getPose()), 0);
 
-        double yaw = MathHelper.lerp(tickDelta, user.prevYaw, user.getYaw());
-        double pitch = MathHelper.lerp(tickDelta, user.prevPitch, user.getPitch());
+        double yaw;
+        double pitch;
+
+        if (user == mc.player && Rotations.rotating) {
+            yaw = Rotations.serverYaw;
+            pitch = Rotations.serverPitch;
+        } else {
+            yaw = user.getYaw(tickDelta);
+            pitch = user.getPitch(tickDelta);
+        }
 
         double x, y, z;
 
@@ -178,9 +187,17 @@ public void set(Entity entity, double gravity, double waterDrag, boolean accurat
         this.height = entity.getHeight();
     }
 
-    public void setFishingBobber(Entity user, double tickDelta) {
-        double yaw = MathHelper.lerp(tickDelta, user.prevYaw, user.getYaw());
-        double pitch = MathHelper.lerp(tickDelta, user.prevPitch, user.getPitch());
+    public void setFishingBobber(Entity user, float tickDelta) {
+        double yaw;
+        double pitch;
+
+        if (user == mc.player && Rotations.rotating) {
+            yaw = Rotations.serverYaw;
+            pitch = Rotations.serverPitch;
+        } else {
+            yaw = user.getYaw(tickDelta);
+            pitch = user.getPitch(tickDelta);
+        }
 
         double h = Math.cos(-yaw * 0.017453292F - 3.1415927F);
         double i = Math.sin(-yaw * 0.017453292F - 3.1415927F);

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

@@ -15,7 +15,7 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public enum SortPriority implements Comparator<Entity> {
-    LowestDistance((e1, e2) -> Double.compare(PlayerUtils.squaredDistanceTo(e1), PlayerUtils.squaredDistanceTo(e2))),
+    LowestDistance(Comparator.comparingDouble(PlayerUtils::squaredDistanceTo)),
     HighestDistance((e1, e2) -> Double.compare(PlayerUtils.squaredDistanceTo(e2), PlayerUtils.squaredDistanceTo(e1))),
     LowestHealth(SortPriority::sortHealth),
     HighestHealth((e1, e2) -> sortHealth(e2, e1)),