From 11ed8a2f21b9fa9078411cd2e8a1677e254eb0dd Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 16 Oct 2018 20:05:18 -0700 Subject: [PATCH] rearrange fields and constructors --- .../baritone/api/utils/RayTraceUtils.java | 7 ++--- .../baritone/api/utils/RotationUtils.java | 4 +-- src/api/java/baritone/api/utils/VecUtils.java | 30 ++++++++----------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/api/java/baritone/api/utils/RayTraceUtils.java b/src/api/java/baritone/api/utils/RayTraceUtils.java index 6c35e816..1444c7e1 100644 --- a/src/api/java/baritone/api/utils/RayTraceUtils.java +++ b/src/api/java/baritone/api/utils/RayTraceUtils.java @@ -30,14 +30,13 @@ import java.util.Optional; * @since 8/25/2018 */ public final class RayTraceUtils { - - private RayTraceUtils() {} - /** * The {@link Minecraft} instance */ private static final Minecraft mc = Minecraft.getMinecraft(); + private RayTraceUtils() {} + /** * Simulates a "vanilla" raytrace. A RayTraceResult returned by this method * will be that of the next render pass given that the local player's yaw and @@ -46,7 +45,7 @@ public final class RayTraceUtils { * thing to achieve the desired outcome (whether it is hitting and entity or placing * a block) can be done just by modifying user input. * - * @param yaw The yaw to raytrace with + * @param yaw The yaw to raytrace with * @param pitch The pitch to raytrace with * @return The calculated raytrace result */ diff --git a/src/api/java/baritone/api/utils/RotationUtils.java b/src/api/java/baritone/api/utils/RotationUtils.java index fc1b0297..bea16fc7 100644 --- a/src/api/java/baritone/api/utils/RotationUtils.java +++ b/src/api/java/baritone/api/utils/RotationUtils.java @@ -31,8 +31,6 @@ import java.util.Optional; */ public final class RotationUtils { - private RotationUtils() {} - /** * The {@link Minecraft} instance */ @@ -60,6 +58,8 @@ public final class RotationUtils { new Vec3d(1, 0.5, 0.5) // East }; + private RotationUtils() {} + /** * Clamps the specified pitch value between -90 and 90. * diff --git a/src/api/java/baritone/api/utils/VecUtils.java b/src/api/java/baritone/api/utils/VecUtils.java index 51279474..831e0937 100644 --- a/src/api/java/baritone/api/utils/VecUtils.java +++ b/src/api/java/baritone/api/utils/VecUtils.java @@ -30,21 +30,19 @@ import net.minecraft.util.math.Vec3d; * @since 10/13/2018 */ public final class VecUtils { - - private VecUtils() {} - /** * The {@link Minecraft} instance */ private static final Minecraft mc = Minecraft.getMinecraft(); + private VecUtils() {} + /** * Calculates the center of the block at the specified position's bounding box * - * @see #getBlockPosCenter(BlockPos) - * * @param pos The block position * @return The center of the block's bounding box + * @see #getBlockPosCenter(BlockPos) */ public static Vec3d calculateBlockCenter(BlockPos pos) { IBlockState b = mc.world.getBlockState(pos); @@ -68,10 +66,9 @@ public final class VecUtils { *

* TODO: We may want to consider replacing many usages of this method with #calculateBlockCenter(BlockPos) * - * @see #calculateBlockCenter(BlockPos) - * * @param pos The block position * @return The assumed center of the position + * @see #calculateBlockCenter(BlockPos) */ public static Vec3d getBlockPosCenter(BlockPos pos) { return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); @@ -80,13 +77,12 @@ public final class VecUtils { /** * Gets the distance from the specified position to the assumed center of the specified block position. * - * @see #getBlockPosCenter(BlockPos) - * * @param pos The block position - * @param x The x pos - * @param y The y pos - * @param z The z pos + * @param x The x pos + * @param y The y pos + * @param z The z pos * @return The distance from the assumed block center to the position + * @see #getBlockPosCenter(BlockPos) */ public static double distanceToCenter(BlockPos pos, double x, double y, double z) { Vec3d center = getBlockPosCenter(pos); @@ -100,11 +96,10 @@ public final class VecUtils { * Gets the distance from the specified entity's position to the assumed * center of the specified block position. * - * @see #getBlockPosCenter(BlockPos) - * * @param entity The entity - * @param pos The block position + * @param pos The block position * @return The distance from the entity to the block's assumed center + * @see #getBlockPosCenter(BlockPos) */ public static double entityDistanceToCenter(Entity entity, BlockPos pos) { return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ); @@ -114,11 +109,10 @@ public final class VecUtils { * Gets the distance from the specified entity's position to the assumed * center of the specified block position, ignoring the Y axis. * - * @see #getBlockPosCenter(BlockPos) - * * @param entity The entity - * @param pos The block position + * @param pos The block position * @return The horizontal distance from the entity to the block's assumed center + * @see #getBlockPosCenter(BlockPos) */ public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) { return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);