diff --git a/src/main/java/baritone/pathing/goals/GoalXZ.java b/src/main/java/baritone/pathing/goals/GoalXZ.java index de48da83..8abfb221 100644 --- a/src/main/java/baritone/pathing/goals/GoalXZ.java +++ b/src/main/java/baritone/pathing/goals/GoalXZ.java @@ -20,6 +20,7 @@ package baritone.pathing.goals; import baritone.Baritone; import baritone.utils.Utils; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; /** @@ -88,9 +89,9 @@ public class GoalXZ implements Goal { } public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) { - double theta = Utils.degToRad(yaw); - double x = origin.x - Math.sin(theta) * distance; - double z = origin.z + Math.cos(theta) * distance; + float theta = (float) Utils.degToRad(yaw); + double x = origin.x - MathHelper.sin(theta) * distance; + double z = origin.z + MathHelper.cos(theta) * distance; return new GoalXZ((int) x, (int) z); } diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index 1ec5373b..6fd3466e 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -34,6 +34,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import java.awt.*; import java.util.Collection; @@ -188,7 +189,7 @@ public final class PathRenderer implements Helper { maxX = goalPos.getX() + 1 - 0.002 - renderPosX; minZ = goalPos.getZ() + 0.002 - renderPosZ; maxZ = goalPos.getZ() + 1 - 0.002 - renderPosZ; - double y = Math.sin(((float) (System.nanoTime() / 1000000L) % 2000L) / 2000F * Math.PI * 2); + double y = MathHelper.sin((float) (((float) (System.nanoTime() / 1000000L) % 2000L) / 2000F * Math.PI * 2)); y1 = 1 + y + goalPos.getY() - renderPosY; y2 = 1 - y + goalPos.getY() - renderPosY; minY = goalPos.getY() - renderPosY; diff --git a/src/main/java/baritone/utils/Utils.java b/src/main/java/baritone/utils/Utils.java index eea18643..9f1ac3b3 100755 --- a/src/main/java/baritone/utils/Utils.java +++ b/src/main/java/baritone/utils/Utils.java @@ -54,9 +54,9 @@ public final class Utils { */ public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) { double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z}; - double yaw = Math.atan2(delta[0], -delta[2]); + double yaw = MathHelper.atan2(delta[0], -delta[2]); double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]); - double pitch = Math.atan2(delta[1], dist); + double pitch = MathHelper.atan2(delta[1], dist); return new Rotation( (float) radToDeg(yaw), (float) radToDeg(pitch)