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

anti-indrit-cringe

Browse Source
This commit is contained in:
Leijurv 2020-08-17 16:03:04 -07:00
parent f0d2bae3d1
commit 9851623557
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,19 +62,17 @@ public final class Settings {
public final Setting<Boolean> allowInventory = new Setting<>(false); public final Setting<Boolean> allowInventory = new Setting<>(false);
/** /**
* Allow player to decide if to use auto tool or not * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
* <p>
* Specifically, path calculation will still assume that an auto tool wil run at execution time, even though
* Baritone itself will not do that.
*/ */
public final Setting<Boolean> autoTool = new Setting<>(true); public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);
/** /**
* Should movement cost calculation ignore the cost of breaking blocks with current slot, and assume best possible * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time
* item in the hotbar?
*
* Only use this if actually necessary, make sure to put this back to original state (false), or it
* might mess up pathing in some combinations with auto tool setting. (just fall back to original settings if any
* problems occurs)
*/ */
public final Setting<Boolean> ignoreAutoToolMovementCost = new Setting<>(false); public final Setting<Boolean> disableAutoTool = new Setting<>(false);
/** /**
* It doesn't actually take twenty ticks to place a block, this cost is so high * It doesn't actually take twenty ticks to place a block, this cost is so high

2
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@ -432,7 +432,7 @@ public interface MovementHelper extends ActionCosts, Helper {
* @param ts previously calculated ToolSet * @param ts previously calculated ToolSet
*/ */
static void switchToBestToolFor(IPlayerContext ctx, IBlockState b, ToolSet ts, boolean preferSilkTouch) { static void switchToBestToolFor(IPlayerContext ctx, IBlockState b, ToolSet ts, boolean preferSilkTouch) {
if (Baritone.settings().autoTool.value) { if (!Baritone.settings().disableAutoTool.value && !Baritone.settings().assumeExternalAutoTool.value) {
ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock(), preferSilkTouch); ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock(), preferSilkTouch);
} }
} }

4
src/main/java/baritone/utils/ToolSet.java
View File

@ -111,9 +111,9 @@ public class ToolSet {
/* /*
If we actually want know what efficiency our held item has instead of the best one If we actually want know what efficiency our held item has instead of the best one
possible, this lets us make pathing depending on the actual tool used (if auto tool is disabled) possible, this lets us make pathing depend on the actual tool to be used (if auto tool is disabled)
*/ */
if (!Baritone.settings().ignoreAutoToolMovementCost.value && pathingCalculation) { if (Baritone.settings().disableAutoTool.value && pathingCalculation) {
return player.inventory.currentItem; return player.inventory.currentItem;
} }