diff --git a/src/main/java/baritone/bot/Settings.java b/src/main/java/baritone/bot/Settings.java index f7f2ccb6..efeb186e 100644 --- a/src/main/java/baritone/bot/Settings.java +++ b/src/main/java/baritone/bot/Settings.java @@ -17,6 +17,9 @@ package baritone.bot; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; + import java.lang.reflect.Field; import java.util.*; @@ -37,6 +40,11 @@ public class Settings { public Setting chatControl = new Setting<>(true); // probably false in impact public Setting fadePath = new Setting<>(false); // give this a better name in the UI, like "better path fps" idk public Setting slowPath = new Setting<>(false); + public Setting> acceptableThrowAwayItems = new Setting<>(Arrays.asList( + Item.getItemFromBlock(Blocks.DIRT), + Item.getItemFromBlock(Blocks.COBBLESTONE), + Item.getItemFromBlock(Blocks.NETHERRACK) + )); public final Map> byName; public final List> allSettings; diff --git a/src/main/java/baritone/bot/pathing/movement/MovementHelper.java b/src/main/java/baritone/bot/pathing/movement/MovementHelper.java index 4872e2fa..1e7e1868 100644 --- a/src/main/java/baritone/bot/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/bot/pathing/movement/MovementHelper.java @@ -29,14 +29,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import java.util.Arrays; -import java.util.List; import java.util.Optional; /** @@ -46,12 +43,6 @@ import java.util.Optional; */ public interface MovementHelper extends ActionCosts, Helper { - List ACCEPTABLE_THROWAWAY_ITEMS = Arrays.asList( - Item.getItemFromBlock(Blocks.DIRT), - Item.getItemFromBlock(Blocks.COBBLESTONE), - Item.getItemFromBlock(Blocks.NETHERRACK) - ); - static boolean avoidBreaking(BlockPos pos) { Block b = BlockStateInterface.getBlock(pos); BlockPos below = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); @@ -200,7 +191,7 @@ public interface MovementHelper extends ActionCosts, Helper { NonNullList inv = p.inventory.mainInventory; for (byte i = 0; i < 9; i++) { ItemStack item = inv.get(i); - if (ACCEPTABLE_THROWAWAY_ITEMS.contains(item.getItem())) { + if (Baritone.settings().acceptableThrowAwayItems.get().contains(item.getItem())) { if (select) { p.inventory.currentItem = i; }