From 5bdd5b0c0d095797021481a8816600c954883335 Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 12 Jun 2023 16:50:02 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20appease=20leijurv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baritone/api/pathing/goals/GoalBlock.java | 14 ++++++++----- .../api/pathing/goals/GoalComposite.java | 8 ++++++-- .../api/pathing/goals/GoalGetToBlock.java | 14 ++++++++----- .../api/pathing/goals/GoalInverted.java | 8 ++++++-- .../baritone/api/pathing/goals/GoalNear.java | 16 +++++++++------ .../api/pathing/goals/GoalRunAway.java | 14 ++++++++----- .../pathing/goals/GoalStrictDirection.java | 18 ++++++++++------- .../api/pathing/goals/GoalTwoBlocks.java | 14 ++++++++----- .../baritone/api/pathing/goals/GoalXZ.java | 11 ++++++---- .../api/pathing/goals/GoalYLevel.java | 8 ++++++-- .../java/baritone/process/BuilderProcess.java | 20 ++++++++++++------- 11 files changed, 95 insertions(+), 50 deletions(-) diff --git a/src/api/java/baritone/api/pathing/goals/GoalBlock.java b/src/api/java/baritone/api/pathing/goals/GoalBlock.java index ad2c3eadb..68d783aa3 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java @@ -68,13 +68,17 @@ public class GoalBlock implements Goal, IGoalRenderPos { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalBlock goal = (GoalBlock) o; - if (x != goal.x) return false; - if (y != goal.y) return false; - return z == goal.z; + return x == goal.x + && y != goal.y + && z == goal.z; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalComposite.java b/src/api/java/baritone/api/pathing/goals/GoalComposite.java index f407fe733..d64f8e33e 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalComposite.java +++ b/src/api/java/baritone/api/pathing/goals/GoalComposite.java @@ -69,8 +69,12 @@ public class GoalComposite implements Goal { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalComposite goal = (GoalComposite) o; return Arrays.equals(goals, goal.goals); diff --git a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java index 3d2c0713a..b5caafa48 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java @@ -62,13 +62,17 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalGetToBlock goal = (GoalGetToBlock) o; - if (x != goal.x) return false; - if (y != goal.y) return false; - return z == goal.z; + return x == goal.x + && y == goal.y + && z == goal.z; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalInverted.java b/src/api/java/baritone/api/pathing/goals/GoalInverted.java index acfdd68b2..e559088ef 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java +++ b/src/api/java/baritone/api/pathing/goals/GoalInverted.java @@ -54,8 +54,12 @@ public class GoalInverted implements Goal { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalInverted goal = (GoalInverted) o; return Objects.equals(origin, goal.origin); diff --git a/src/api/java/baritone/api/pathing/goals/GoalNear.java b/src/api/java/baritone/api/pathing/goals/GoalNear.java index 44f0ab040..166138ff4 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalNear.java +++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java @@ -88,14 +88,18 @@ public class GoalNear implements Goal, IGoalRenderPos { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalNear goal = (GoalNear) o; - if (x != goal.x) return false; - if (y != goal.y) return false; - if (z != goal.z) return false; - return rangeSq == goal.rangeSq; + return x == goal.x + && y == goal.y + && z == goal.z + && rangeSq == goal.rangeSq; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java index 3d7caa734..166ad5a98 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java +++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java @@ -127,13 +127,17 @@ public class GoalRunAway implements Goal { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalRunAway goal = (GoalRunAway) o; - if (distanceSq != goal.distanceSq) return false; - if (!Arrays.equals(from, goal.from)) return false; - return Objects.equals(maintainY, goal.maintainY); + return distanceSq == goal.distanceSq + && Arrays.equals(from, goal.from) + && Objects.equals(maintainY, goal.maintainY); } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java index 86208f0ca..3d9909ad1 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java +++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java @@ -71,15 +71,19 @@ public class GoalStrictDirection implements Goal { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalStrictDirection goal = (GoalStrictDirection) o; - if (x != goal.x) return false; - if (y != goal.y) return false; - if (z != goal.z) return false; - if (dx != goal.dx) return false; - return dz == goal.dz; + return x == goal.x + && y != goal.y + && z == goal.z + && dx == goal.dx + && dz == goal.dz; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java index 4df65f609..d6fff33a2 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java +++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java @@ -74,13 +74,17 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalTwoBlocks goal = (GoalTwoBlocks) o; - if (x != goal.x) return false; - if (y != goal.y) return false; - return z == goal.z; + return x == goal.x + && y == goal.y + && z == goal.z; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalXZ.java b/src/api/java/baritone/api/pathing/goals/GoalXZ.java index c77743389..2c551d395 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java +++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java @@ -66,12 +66,15 @@ public class GoalXZ implements Goal { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalXZ goal = (GoalXZ) o; - if (x != goal.x) return false; - return z == goal.z; + return x == goal.x && z == goal.z; } @Override diff --git a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java index 8fc7850b9..37745e8de 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java +++ b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java @@ -60,8 +60,12 @@ public class GoalYLevel implements Goal, ActionCosts { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } GoalYLevel goal = (GoalYLevel) o; return level == goal.level; diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java index f9514fb95..69368282d 100644 --- a/src/main/java/baritone/process/BuilderProcess.java +++ b/src/main/java/baritone/process/BuilderProcess.java @@ -763,12 +763,16 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } JankyGoalComposite goal = (JankyGoalComposite) o; - if (!Objects.equals(primary, goal.primary)) return false; - return Objects.equals(fallback, goal.fallback); + return Objects.equals(primary, goal.primary) + && Objects.equals(fallback, goal.fallback); } @Override @@ -870,11 +874,13 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil @Override public boolean equals(Object o) { - if (!super.equals(o)) return false; + if (!super.equals(o)) { + return false; + } GoalAdjacent goal = (GoalAdjacent) o; - if (allowSameLevel != goal.allowSameLevel) return false; - return Objects.equals(no, goal.no); + return allowSameLevel == goal.allowSameLevel + && Objects.equals(no, goal.no); } @Override