👌 appease leijurv

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalBlock goal = (GoalBlock) o;
-        if (x != goal.x) return false;
+        return x == goal.x
-        if (y != goal.y) return false;
+                && y != goal.y
-        return z == goal.z;
+                && z == goal.z;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalComposite goal = (GoalComposite) o;
         return Arrays.equals(goals, goal.goals);

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalGetToBlock goal = (GoalGetToBlock) o;
-        if (x != goal.x) return false;
+        return x == goal.x
-        if (y != goal.y) return false;
+                && y == goal.y
-        return z == goal.z;
+                && z == goal.z;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalInverted goal = (GoalInverted) o;
         return Objects.equals(origin, goal.origin);

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalNear goal = (GoalNear) o;
-        if (x != goal.x) return false;
+        return x == goal.x
-        if (y != goal.y) return false;
+                && y == goal.y
-        if (z != goal.z) return false;
+                && z == goal.z
-        return rangeSq == goal.rangeSq;
+                && rangeSq == goal.rangeSq;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalRunAway goal = (GoalRunAway) o;
-        if (distanceSq != goal.distanceSq) return false;
+        return distanceSq == goal.distanceSq
-        if (!Arrays.equals(from, goal.from)) return false;
+                && Arrays.equals(from, goal.from)
-        return Objects.equals(maintainY, goal.maintainY);
+                && Objects.equals(maintainY, goal.maintainY);
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalStrictDirection goal = (GoalStrictDirection) o;
-        if (x != goal.x) return false;
+        return x == goal.x
-        if (y != goal.y) return false;
+                && y != goal.y
-        if (z != goal.z) return false;
+                && z == goal.z
-        if (dx != goal.dx) return false;
+                && dx == goal.dx
-        return dz == goal.dz;
+                && dz == goal.dz;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalTwoBlocks goal = (GoalTwoBlocks) o;
-        if (x != goal.x) return false;
+        return x == goal.x
-        if (y != goal.y) return false;
+                && y == goal.y
-        return z == goal.z;
+                && z == goal.z;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalXZ goal = (GoalXZ) o;
-        if (x != goal.x) return false;
+        return x == goal.x && z == goal.z;
-        return z == goal.z;
     }
 
     @Override

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 (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         GoalYLevel goal = (GoalYLevel) o;
         return level == goal.level;

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 (this == o) {
-            if (o == null || getClass() != o.getClass()) return false;
+                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(primary, goal.primary)
-            return Objects.equals(fallback, goal.fallback);
+                    && 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 allowSameLevel == goal.allowSameLevel
-            return Objects.equals(no, goal.no);
+                    && Objects.equals(no, goal.no);
         }
 
         @Override