Merge branch 'censoring' into commands

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

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

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

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 {

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

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

src/api/java/baritone/api/pathing/goals/GoalXZ.java

@@ -68,8 +68,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)
         );
     }
 

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

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

src/api/java/baritone/api/utils/SettingsUtil.java

@@ -146,7 +146,7 @@ public class SettingsUtil {
         return settingValueToString(setting, setting.defaultValue);
     }
 
-    public static String possiblyCensorCoordinate(int coord) {
+    public static String maybeCensor(int coord) {
         if (BaritoneAPI.getSettings().censorCoordinates.value) {
             return "<censored>";
         }