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

1.20.1 Use pose system for calculating the height of crouching instead of hardcoded values #4485

Open
wants to merge 7 commits into
base: 1.20.1
Choose a base branch
from
Open

1.20.1 Use pose system for calculating the height of crouching instead of hardcoded values #4485

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
ae59870
test changing to direct eye height lookup
Happyrobot33 Aug 28, 2024
6cf82ee
use a setting instead
Happyrobot33 Aug 28, 2024
6300036
try something else
Happyrobot33 Aug 28, 2024
24a5320
try rolling it into the place its used entirely
Happyrobot33 Aug 28, 2024
a5639c6
Update RayTraceUtils.java
Happyrobot33 Aug 28, 2024
ed2042a
try using the direct pose system
Happyrobot33 Aug 28, 2024
228eed5
introduce it as deprecated instead
Happyrobot33 Sep 2, 2024
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
8 changes: 8 additions & 0 deletions src/api/java/baritone/api/utils/IPlayerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ default Rotation playerRotations() {
return new Rotation(player().getYRot(), player().getXRot());
}

/**
* Returns the player's eye height, taking into account whether or not the player is sneaking.
*
* @param ifSneaking Whether or not the player is sneaking
* @return The player's eye height
* @deprecated Use entity.getEyeHeight(Pose.CROUCHING) instead
*/
@Deprecated
static double eyeHeight(boolean ifSneaking) {
return ifSneaking ? 1.27 : 1.62;
}
Expand Down
3 changes: 2 additions & 1 deletion src/api/java/baritone/api/utils/RayTraceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package baritone.api.utils;

import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
Expand Down Expand Up @@ -62,6 +63,6 @@ public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double
}

public static Vec3 inferSneakingEyePosition(Entity entity) {
return new Vec3(entity.getX(), entity.getY() + IPlayerContext.eyeHeight(true), entity.getZ());
return new Vec3(entity.getX(), entity.getY() + (entity.getEyeHeight(Pose.CROUCHING)), entity.getZ());
}
}