From 511b07fec5efedabe5d0690e6c8e8d2787cf2c87 Mon Sep 17 00:00:00 2001 From: 0xf8 <0xf8.dev@proton.me> Date: Thu, 8 Jun 2023 21:10:34 -0400 Subject: [PATCH] Modify censorship, improve thing, also make bridging kinda more safe --- src/api/java/baritone/api/utils/SettingsUtil.java | 2 +- src/main/java/baritone/cache/WorldData.java | 2 +- src/main/java/baritone/cache/WorldProvider.java | 2 +- .../baritone/pathing/movement/movements/MovementTraverse.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/java/baritone/api/utils/SettingsUtil.java b/src/api/java/baritone/api/utils/SettingsUtil.java index f47f515a..f4a48e1f 100644 --- a/src/api/java/baritone/api/utils/SettingsUtil.java +++ b/src/api/java/baritone/api/utils/SettingsUtil.java @@ -159,7 +159,7 @@ public class SettingsUtil { public static String maybeCensor(int coord) { if (BaritoneAPI.getSettings().censorCoordinates.value) { - return ""; + return "####"; } return Integer.toString(coord); diff --git a/src/main/java/baritone/cache/WorldData.java b/src/main/java/baritone/cache/WorldData.java index 5a9ab389..0fbf5d08 100644 --- a/src/main/java/baritone/cache/WorldData.java +++ b/src/main/java/baritone/cache/WorldData.java @@ -46,7 +46,7 @@ public class WorldData implements IWorldData { public void onClose() { Baritone.getExecutor().execute(() -> { - System.out.println("Started saving the world in a new thread"); + System.out.println("Baritone: Started saving the world in a new thread"); cache.save(); }); } diff --git a/src/main/java/baritone/cache/WorldProvider.java b/src/main/java/baritone/cache/WorldProvider.java index 97b15a13..225959d7 100644 --- a/src/main/java/baritone/cache/WorldProvider.java +++ b/src/main/java/baritone/cache/WorldProvider.java @@ -100,7 +100,7 @@ public class WorldProvider implements IWorldProvider, Helper { // lol wtf is this baritone folder in my minecraft save? try (FileOutputStream out = new FileOutputStream(new File(readme, "readme.txt"))) { // good thing we have a readme - out.write("https://github.com/cabaletta/baritone\n".getBytes()); + out.write("This folder is used for chunk caching and waypoints\n\nhttps://git.psf.lt/0xf8/baritone\n".getBytes()); } catch (IOException ignored) {} // We will actually store the world data in a subfolder: "DIM" diff --git a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java index 1d79b051..d39bfa83 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java @@ -290,7 +290,7 @@ public class MovementTraverse extends Movement { } double dist1 = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D))); PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false, true); - if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) { + if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.45) && !Baritone.settings().assumeSafeWalk.value) { state.setInput(Input.SNEAK, true); } switch (p) {