From aeeb00120559a72f2123a11880375291b3c575cd Mon Sep 17 00:00:00 2001 From: Brady Date: Thu, 6 Jul 2023 19:02:13 -0700 Subject: [PATCH] Fix some codacy issues --- src/main/java/baritone/behavior/ElytraBehavior.java | 8 +++++--- src/main/java/baritone/behavior/InventoryBehavior.java | 2 -- .../baritone/behavior/elytra/NetherPathfinderContext.java | 7 ++++--- .../java/baritone/command/defaults/ElytraCommand.java | 1 - .../command/defaults/ExecutionControlCommands.java | 1 - .../baritone/command/defaults/ForceCancelCommand.java | 1 - src/main/java/baritone/utils/BaritoneMath.java | 4 ++-- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java index f22a3151d..fb8747bb2 100644 --- a/src/main/java/baritone/behavior/ElytraBehavior.java +++ b/src/main/java/baritone/behavior/ElytraBehavior.java @@ -1041,12 +1041,13 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H } private List simulate(final ITickableAimProcessor aimProcessor, final Vec3d goalDelta, final float pitch, - final int ticks, int ticksBoosted, final int ticksBoostDelay, final boolean ignoreLava) { + final int ticks, final int ticksBoosted, final int ticksBoostDelay, final boolean ignoreLava) { Vec3d delta = goalDelta; Vec3d motion = ctx.playerMotion(); AxisAlignedBB hitbox = ctx.player().getEntityBoundingBox(); List displacement = new ArrayList<>(ticks + 1); displacement.add(Vec3d.ZERO); + int remainingTicksBoosted = ticksBoosted; for (int i = 0; i < ticks; i++) { final double cx = hitbox.minX + (hitbox.maxX - hitbox.minX) * 0.5D; @@ -1081,7 +1082,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H hitbox = hitbox.offset(motion); displacement.add(displacement.get(displacement.size() - 1).add(motion)); - if (i >= ticksBoostDelay && ticksBoosted-- > 0) { + if (i >= ticksBoostDelay && remainingTicksBoosted-- > 0) { // See EntityFireworkRocket motion = motion.add( lookDirection.x * 0.1 + (lookDirection.x * 1.5 - motion.x) * 0.5, @@ -1348,8 +1349,9 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H return "Begin flying"; case FLYING: return "Flying"; + default: + return "Unknown"; } - return "Unknown"; }; return "Elytra - " + status.get(); } diff --git a/src/main/java/baritone/behavior/InventoryBehavior.java b/src/main/java/baritone/behavior/InventoryBehavior.java index 1ab31eb53..93dc200cc 100644 --- a/src/main/java/baritone/behavior/InventoryBehavior.java +++ b/src/main/java/baritone/behavior/InventoryBehavior.java @@ -25,10 +25,8 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ClickType; import net.minecraft.item.*; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; diff --git a/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java b/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java index f0197ca78..8e9a862c0 100644 --- a/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java +++ b/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java @@ -104,8 +104,9 @@ public final class NetherPathfinderContext { return NetherPathfinder.isVisibleMulti(this.context, true, count, src, dst, true) == -1; case Visibility.ANY: return NetherPathfinder.isVisibleMulti(this.context, true, count, src, dst, true) != -1; + default: + throw new IllegalArgumentException("lol"); } - throw new IllegalArgumentException("lol"); } public void raytrace(final int count, final double[] src, final double[] dst, final boolean[] hitsOut, final double[] hitPosOut) { @@ -166,10 +167,10 @@ public final class NetherPathfinderContext { public static final class Visibility { - private Visibility() {} - public static final int ALL = 0; public static final int NONE = 1; public static final int ANY = 2; + + private Visibility() {} } } diff --git a/src/main/java/baritone/command/defaults/ElytraCommand.java b/src/main/java/baritone/command/defaults/ElytraCommand.java index 3414c7bb3..93c4c2544 100644 --- a/src/main/java/baritone/command/defaults/ElytraCommand.java +++ b/src/main/java/baritone/command/defaults/ElytraCommand.java @@ -17,7 +17,6 @@ package baritone.command.defaults; -import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.argument.IArgConsumer; diff --git a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java index e7f7c9497..43adca19f 100644 --- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java +++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java @@ -17,7 +17,6 @@ package baritone.command.defaults; -import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.argument.IArgConsumer; diff --git a/src/main/java/baritone/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/command/defaults/ForceCancelCommand.java index bc6dbd0a4..ad19f168c 100644 --- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java @@ -17,7 +17,6 @@ package baritone.command.defaults; -import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.behavior.IPathingBehavior; import baritone.api.command.Command; diff --git a/src/main/java/baritone/utils/BaritoneMath.java b/src/main/java/baritone/utils/BaritoneMath.java index 944fc899e..be546f248 100644 --- a/src/main/java/baritone/utils/BaritoneMath.java +++ b/src/main/java/baritone/utils/BaritoneMath.java @@ -22,11 +22,11 @@ package baritone.utils; */ public final class BaritoneMath { - private BaritoneMath() {} - private static final double FLOOR_DOUBLE_D = 1_073_741_824.0; private static final int FLOOR_DOUBLE_I = 1_073_741_824; + private BaritoneMath() {} + public static int fastFloor(final double v) { return (int) (v + FLOOR_DOUBLE_D) - FLOOR_DOUBLE_I; }