From 49bc96dc7ea80c1ef854ee5b128f4535a0388dea Mon Sep 17 00:00:00 2001 From: scorbett123 Date: Sun, 1 Nov 2020 16:12:38 +0000 Subject: [PATCH] add useSwordToMine setting. Signed-off-by: scorbett123 --- src/api/java/baritone/api/Settings.java | 5 +++++ src/main/java/baritone/utils/ToolSet.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java index 96e4c5790..7e009b376 100644 --- a/src/api/java/baritone/api/Settings.java +++ b/src/api/java/baritone/api/Settings.java @@ -1108,6 +1108,11 @@ public final class Settings { */ public final Setting renderSelectionCorners = new Setting<>(true); + /** + * Use sword to mine. + */ + public final Setting useSwordToMine = new Setting<>(true); + /** * Desktop notifications */ diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java index aa8819cef..1cc5ca4c5 100644 --- a/src/main/java/baritone/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -26,6 +26,7 @@ import net.minecraft.init.Enchantments; import net.minecraft.init.MobEffects; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.item.ItemTool; import java.util.HashMap; @@ -124,6 +125,8 @@ public class ToolSet { IBlockState blockState = b.getDefaultState(); for (int i = 0; i < 9; i++) { ItemStack itemStack = player.inventory.getStackInSlot(i); + if (!Baritone.settings().useSwordToMine.value && itemStack.getItem() instanceof ItemSword) + continue; double speed = calculateSpeedVsBlock(itemStack, blockState); boolean silkTouch = hasSilkTouch(itemStack); if (speed > highestSpeed) {