Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no gravity entities with correct trajectory and accurate multishot crossbow trajectories #3818

Merged
merged 7 commits into from
Jul 12, 2023
Merged

no gravity entities with correct trajectory and accurate multishot crossbow trajectories #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fccbb6
no gravity trajectories being displayed correctly and crossbow with m…
xNasuni Jul 8, 2023
969f299
no gravity trajectories being displayed correctly and crossbow with m…
xNasuni Jul 8, 2023
2ed8f58
proper constant naming, removed duplicated code and better gravity check
xNasuni Jul 11, 2023
7d9cbf9
Merge branch 'MeteorDevelopment:master' into master
xNasuni Jul 11, 2023
693aa62
the last commit i did at night and i wasn't thinking right i basicall…
xNasuni Jul 12, 2023
c0b8850
Merge remote-tracking branch 'origin/master'
xNasuni Jul 12, 2023
4127161
there's no way i can mess this up further
xNasuni Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/render/Trajectories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public class Trajectories extends Module {
private final Pool<Vector3d> vec3s = new Pool<>(Vector3d::new);
private final List<Path> paths = new ArrayList<>();

private static final double MULTISHOT_OFFSET = Math.toRadians(10); // accurate-ish offset of crossbow multishot in radians (10° degrees)

public Trajectories() {
super(Categories.Render, "trajectories", "Predicts the trajectory of throwable items.");
}
Expand Down Expand Up @@ -146,10 +148,10 @@ private void calculatePath(PlayerEntity player, double tickDelta) {
getEmptyPath().calculate();

if (itemStack.getItem() instanceof CrossbowItem && EnchantmentHelper.getLevel(Enchantments.MULTISHOT, itemStack) > 0) {
if (!simulator.set(player, itemStack, -10, accurate.get(), tickDelta)) return;
if (!simulator.set(player, itemStack, MULTISHOT_OFFSET, accurate.get(), tickDelta)) return; // left multishot arrow
getEmptyPath().calculate();

if (!simulator.set(player, itemStack, 10, accurate.get(), tickDelta)) return;
if (!simulator.set(player, itemStack, -MULTISHOT_OFFSET, accurate.get(), tickDelta)) return; // right multishot arrow
getEmptyPath().calculate();
}
}
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/utils/entity/ProjectileEntitySimulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,14 @@ public boolean set(Entity entity, boolean accurate, double tickDelta) {
set(entity, 0.5, 0.05, 0.8, accurate, tickDelta);
} else if (entity instanceof WitherSkullEntity || entity instanceof FireballEntity || entity instanceof DragonFireballEntity) {
set(entity, 0.95, 0, 0.8, accurate, tickDelta);
}
else {
} else {
return false;
xNasuni marked this conversation as resolved.
Show resolved Hide resolved
}

if (entity.hasNoGravity()) {
this.gravity = 0;
}

return true;
}

Expand Down