RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

👌 appease leijurv

This commit is contained in:
Brady 2023-06-12 16:50:02 -05:00
parent 7da802a238
commit 5bdd5b0c0d
No known key found for this signature in database
GPG Key ID: 73A788379A197567
11 changed files with 95 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/java/baritone/api/pathing/goals/GoalBlock.java
View File

@ -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

8
src/api/java/baritone/api/pathing/goals/GoalComposite.java
View File

@ -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);

14
src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
View File

@ -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

8
src/api/java/baritone/api/pathing/goals/GoalInverted.java
View File

@ -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);

16
src/api/java/baritone/api/pathing/goals/GoalNear.java
View File

@ -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

14
src/api/java/baritone/api/pathing/goals/GoalRunAway.java
View File

@ -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

18
src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
View File

@ -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

14
src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
View File

@ -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

11
src/api/java/baritone/api/pathing/goals/GoalXZ.java
View File

@ -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

8
src/api/java/baritone/api/pathing/goals/GoalYLevel.java
View File

@ -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;

20
src/main/java/baritone/process/BuilderProcess.java
View File

@ -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