0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename to allowBreakAnyway

Browse Source
This commit is contained in:
Wagyourtail 2022-03-24 17:34:31 -07:00
parent 4e6b6d97ce
commit bf450b7d68
No known key found for this signature in database
GPG Key ID: B3A2A4A58244B050
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/baritone/api/Settings.java
View File

@ -52,7 +52,7 @@ public final class Settings {
/** /**
* Blocks that baritone will be allowed to break even with allowBreak set to false * Blocks that baritone will be allowed to break even with allowBreak set to false
*/ */
public final Setting<List<Block>> forceAllowBreak = new Setting<>(new ArrayList<>()); public final Setting<List<Block>> allowBreakAnyway = new Setting<>(new ArrayList<>());
/** /**
* Allow Baritone to sprint * Allow Baritone to sprint

6
src/main/java/baritone/pathing/movement/CalculationContext.java
View File

@ -58,7 +58,7 @@ public class CalculationContext {
public final boolean canSprint; public final boolean canSprint;
protected final double placeBlockCost; // protected because you should call the function instead protected final double placeBlockCost; // protected because you should call the function instead
public final boolean allowBreak; public final boolean allowBreak;
public final List<Block> forceAllowBreak; public final List<Block> allowBreakAnyway;
public final boolean allowParkour; public final boolean allowParkour;
public final boolean allowParkourPlace; public final boolean allowParkourPlace;
public final boolean allowJumpAt256; public final boolean allowJumpAt256;
@ -93,7 +93,7 @@ public class CalculationContext {
this.canSprint = Baritone.settings().allowSprint.value && player.getFoodStats().getFoodLevel() > 6; this.canSprint = Baritone.settings().allowSprint.value && player.getFoodStats().getFoodLevel() > 6;
this.placeBlockCost = Baritone.settings().blockPlacementPenalty.value; this.placeBlockCost = Baritone.settings().blockPlacementPenalty.value;
this.allowBreak = Baritone.settings().allowBreak.value; this.allowBreak = Baritone.settings().allowBreak.value;
this.forceAllowBreak = new ArrayList<>(Baritone.settings().forceAllowBreak.value); this.allowBreakAnyway = new ArrayList<>(Baritone.settings().allowBreakAnyway.value);
this.allowParkour = Baritone.settings().allowParkour.value; this.allowParkour = Baritone.settings().allowParkour.value;
this.allowParkourPlace = Baritone.settings().allowParkourPlace.value; this.allowParkourPlace = Baritone.settings().allowParkourPlace.value;
this.allowJumpAt256 = Baritone.settings().allowJumpAt256.value; this.allowJumpAt256 = Baritone.settings().allowJumpAt256.value;
@ -155,7 +155,7 @@ public class CalculationContext {
public double breakCostMultiplierAt(int x, int y, int z, IBlockState current) { public double breakCostMultiplierAt(int x, int y, int z, IBlockState current) {
if (!allowBreak) { if (!allowBreak) {
if (!forceAllowBreak.contains(current.getBlock())) { if (!allowBreakAnyway.contains(current.getBlock())) {
return COST_INF; return COST_INF;
} }
} }

2
src/main/java/baritone/process/BuilderProcess.java
View File

@ -948,7 +948,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
@Override @Override
public double breakCostMultiplierAt(int x, int y, int z, IBlockState current) { public double breakCostMultiplierAt(int x, int y, int z, IBlockState current) {
if (!allowBreak) { if (!allowBreak) {
if (!forceAllowBreak.contains(current.getBlock())) { if (!allowBreakAnyway.contains(current.getBlock())) {
return COST_INF; return COST_INF;
} }
} }