more closely match the existing docs and add discourageBreaking

This commit is contained in:
wagyourtail
2021-10-15 17:58:13 -06:00
parent 4dc4795cb7
commit 1ca736692d
3 changed files with 12 additions and 4 deletions

View File

@@ -50,7 +50,8 @@ public interface MovementHelper extends ActionCosts, Helper {
static boolean avoidBreaking(BlockStateInterface bsi, int x, int y, int z, IBlockState state) {
Block b = state.getBlock();
return b == Blocks.ICE // ice becomes water, and water can mess up the path
return Baritone.settings().blocksToAvoidBreaking.value.contains(b)
|| b == Blocks.ICE // ice becomes water, and water can mess up the path
|| b instanceof BlockSilverfish // obvious reasons
// call context.get directly with x,y,z. no need to make 5 new BlockPos for no reason
|| avoidAdjacentBreaking(bsi, x, y + 1, z, true)

View File

@@ -165,7 +165,7 @@ public class ToolSet {
}
private double avoidanceMultiplier(Block b) {
return Baritone.settings().blocksToAvoidBreaking.value.contains(b) ? Baritone.settings().avoidBreakingMeansNever.value ? 0 : 0.1 : 1;
return Baritone.settings().blocksToDiscourageBreaking.value.contains(b) ? Baritone.settings().discourageBreakingMultiplier.value : 1;
}
/**