From f348a200350ed9fcfe773dacd23e35b4eebae862 Mon Sep 17 00:00:00 2001 From: ZacSharp <68165024+ZacSharp@users.noreply.github.com> Date: Sun, 4 Apr 2021 03:34:10 +0200 Subject: [PATCH] invert disableAutoTool to autoTool --- src/api/java/baritone/api/Settings.java | 2 +- src/main/java/baritone/pathing/movement/MovementHelper.java | 2 +- src/main/java/baritone/utils/ToolSet.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java index ad0d487f..a3a767a8 100644 --- a/src/api/java/baritone/api/Settings.java +++ b/src/api/java/baritone/api/Settings.java @@ -72,7 +72,7 @@ public final class Settings { /** * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time */ - public final Setting disableAutoTool = new Setting<>(false); + public final Setting autoTool = new Setting<>(true); /** * It doesn't actually take twenty ticks to place a block, this cost is so high diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 6438ae2f..69e846a2 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -432,7 +432,7 @@ public interface MovementHelper extends ActionCosts, Helper { * @param ts previously calculated ToolSet */ static void switchToBestToolFor(IPlayerContext ctx, IBlockState b, ToolSet ts, boolean preferSilkTouch) { - if (!Baritone.settings().disableAutoTool.value && !Baritone.settings().assumeExternalAutoTool.value) { + if (Baritone.settings().autoTool.value && !Baritone.settings().assumeExternalAutoTool.value) { ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock(), preferSilkTouch); } } diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java index c05dc187..0e153e77 100644 --- a/src/main/java/baritone/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -114,7 +114,7 @@ public class ToolSet { If we actually want know what efficiency our held item has instead of the best one possible, this lets us make pathing depend on the actual tool to be used (if auto tool is disabled) */ - if (Baritone.settings().disableAutoTool.value && pathingCalculation) { + if (!Baritone.settings().autoTool.value && pathingCalculation) { return player.inventory.currentItem; }