diff --git a/src/main/java/baritone/bot/behavior/impl/LookBehavior.java b/src/main/java/baritone/bot/behavior/impl/LookBehavior.java index e1897e92..b0e9a7b6 100644 --- a/src/main/java/baritone/bot/behavior/impl/LookBehavior.java +++ b/src/main/java/baritone/bot/behavior/impl/LookBehavior.java @@ -1,7 +1,7 @@ package baritone.bot.behavior.impl; import baritone.bot.behavior.Behavior; -import net.minecraft.util.Tuple; +import baritone.bot.utils.Rotation; import java.util.Optional; @@ -9,7 +9,7 @@ public class LookBehavior extends Behavior { public static final LookBehavior INSTANCE = new LookBehavior(); - public LookBehavior() { + private LookBehavior() { target = Optional.empty(); } @@ -19,9 +19,9 @@ public class LookBehavior extends Behavior { * getFirst() -> yaw * getSecond() -> pitch */ - private Optional> target; + private Optional target; - public void updateTarget(Tuple target) { + public void updateTarget(Rotation target) { this.target = Optional.of(target); } diff --git a/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java b/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java index 8c9c14c5..3eb7d221 100644 --- a/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java +++ b/src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java @@ -5,7 +5,6 @@ import baritone.bot.utils.Helper; import baritone.bot.utils.Rotation; import baritone.bot.utils.Utils; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.Tuple; import net.minecraft.util.math.*; import java.util.Optional; @@ -27,7 +26,7 @@ public final class LookBehaviorUtils implements Helper{ * @param rotation {@link LookBehavior#target} * @return vector of the rotation */ - public static Vec3d calcVec3dFromRotation(Tuple rotation) { + public static Vec3d calcVec3dFromRotation(Rotation rotation) { float f = MathHelper.cos(-rotation.getFirst() * 0.017453292F - (float) Math.PI); float f1 = MathHelper.sin(-rotation.getFirst() * 0.017453292F - (float) Math.PI); float f2 = -MathHelper.cos(-rotation.getSecond() * 0.017453292F); @@ -57,7 +56,7 @@ public final class LookBehaviorUtils implements Helper{ return Optional.empty(); } - private static RayTraceResult raytraceTowards(Tuple rotation) { + private static RayTraceResult raytraceTowards(Rotation rotation) { double blockReachDistance = (double) mc.playerController.getBlockReachDistance(); Vec3d vec3 = mc.player.getPositionEyes(1.0F); Vec3d vec31 = calcVec3dFromRotation(rotation); diff --git a/src/main/java/baritone/bot/utils/Utils.java b/src/main/java/baritone/bot/utils/Utils.java index 6e62f1bf..081e2599 100755 --- a/src/main/java/baritone/bot/utils/Utils.java +++ b/src/main/java/baritone/bot/utils/Utils.java @@ -1,8 +1,6 @@ package baritone.bot.utils; -import baritone.bot.behavior.impl.LookBehavior; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.Tuple; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -14,7 +12,7 @@ import net.minecraft.world.World; */ public final class Utils { - public static Tuple calcRotationFromCoords(BlockPos orig, BlockPos dest) { + public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) { return calcRotationFromVec3d(vec3dFromBlockPos(orig), vec3dFromBlockPos(dest)); } @@ -23,7 +21,7 @@ public final class Utils { * * @param orig * @param dest - * @return Rotation Tuple {@link LookBehavior#target} + * @return Rotation {@link Rotation} */ public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) { double yaw = Math.atan2(orig.x - dest.x, -orig.z + dest.z);