From 9038310150fde19fb08a0db397af4f8bd708f10c Mon Sep 17 00:00:00 2001 From: Logan Darklock Date: Sun, 1 Sep 2019 10:06:50 -0700 Subject: [PATCH] Rename SettingsUtil.possiblyCensorCoordinate to maybeCensor --- src/api/java/baritone/api/pathing/goals/GoalBlock.java | 6 +++--- .../baritone/api/pathing/goals/GoalGetToBlock.java | 6 +++--- src/api/java/baritone/api/pathing/goals/GoalNear.java | 6 +++--- .../java/baritone/api/pathing/goals/GoalRunAway.java | 2 +- .../api/pathing/goals/GoalStrictDirection.java | 10 +++++----- .../java/baritone/api/pathing/goals/GoalTwoBlocks.java | 6 +++--- src/api/java/baritone/api/pathing/goals/GoalXZ.java | 4 ++-- .../java/baritone/api/pathing/goals/GoalYLevel.java | 2 +- src/api/java/baritone/api/utils/BetterBlockPos.java | 6 +++--- src/api/java/baritone/api/utils/SettingsUtil.java | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/api/java/baritone/api/pathing/goals/GoalBlock.java b/src/api/java/baritone/api/pathing/goals/GoalBlock.java index 55385f467..836b47dfc 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java @@ -70,9 +70,9 @@ public class GoalBlock implements Goal, IGoalRenderPos { public String toString() { return String.format( "GoalBlock{x=%s,y=%s,z=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } diff --git a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java index 6bf4d026e..7fe64a4fd 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java @@ -64,9 +64,9 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos { public String toString() { return String.format( "GoalGetToBlock{x=%s,y=%s,z=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalNear.java b/src/api/java/baritone/api/pathing/goals/GoalNear.java index 94a02ba57..1482b9046 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalNear.java +++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java @@ -59,9 +59,9 @@ public class GoalNear implements Goal, IGoalRenderPos { public String toString() { return String.format( "GoalNear{x=%s, y=%s, z=%s, rangeSq=%d}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z), + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z), rangeSq ); } diff --git a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java index 85e294a35..fa9c29fc9 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java +++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java @@ -85,7 +85,7 @@ public class GoalRunAway implements Goal { if (maintainY != null) { return String.format( "GoalRunAwayFromMaintainY y=%s, %s", - SettingsUtil.possiblyCensorCoordinate(maintainY), + SettingsUtil.maybeCensor(maintainY), Arrays.asList(from) ); } else { diff --git a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java index 167a00a65..3f14bf244 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java +++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java @@ -67,11 +67,11 @@ public class GoalStrictDirection implements Goal { public String toString() { return String.format( "GoalStrictDirection{x=%s, y=%s, z=%s, dx=%s, dz=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z), - SettingsUtil.possiblyCensorCoordinate(dx), - SettingsUtil.possiblyCensorCoordinate(dz) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z), + SettingsUtil.maybeCensor(dx), + SettingsUtil.maybeCensor(dz) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java index d0b51e175..52286dd09 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java +++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java @@ -76,9 +76,9 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos { public String toString() { return String.format( "GoalTwoBlocks{x=%s,y=%s,z=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalXZ.java b/src/api/java/baritone/api/pathing/goals/GoalXZ.java index 44e58a602..65d506f80 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java +++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java @@ -62,8 +62,8 @@ public class GoalXZ implements Goal { public String toString() { return String.format( "GoalXZ{x=%s,z=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(z) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(z) ); } diff --git a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java index fed62c749..84b4cefe4 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java +++ b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java @@ -62,7 +62,7 @@ public class GoalYLevel implements Goal, ActionCosts { public String toString() { return String.format( "GoalYLevel{y=%s}", - SettingsUtil.possiblyCensorCoordinate(level) + SettingsUtil.maybeCensor(level) ); } } diff --git a/src/api/java/baritone/api/utils/BetterBlockPos.java b/src/api/java/baritone/api/utils/BetterBlockPos.java index b0f536e53..6a462d0c3 100644 --- a/src/api/java/baritone/api/utils/BetterBlockPos.java +++ b/src/api/java/baritone/api/utils/BetterBlockPos.java @@ -204,9 +204,9 @@ public final class BetterBlockPos extends BlockPos { public String toString() { return String.format( "BetterBlockPos{x=%s,y=%s,z=%s}", - SettingsUtil.possiblyCensorCoordinate(x), - SettingsUtil.possiblyCensorCoordinate(y), - SettingsUtil.possiblyCensorCoordinate(z) + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/utils/SettingsUtil.java b/src/api/java/baritone/api/utils/SettingsUtil.java index 882c80968..a562f7686 100644 --- a/src/api/java/baritone/api/utils/SettingsUtil.java +++ b/src/api/java/baritone/api/utils/SettingsUtil.java @@ -121,7 +121,7 @@ public class SettingsUtil { return modified; } - public static String possiblyCensorCoordinate(int coord) { + public static String maybeCensor(int coord) { if (BaritoneAPI.getSettings().censorCoordinates.value) { return ""; }