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

add renderSelectionBoxes, fixes #378

Browse Source
This commit is contained in:
Leijurv
2019-04-08 20:32:47 -08:00
parent e54652941b
commit 6b6eea2d8c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,11 @@ public final class Settings {
*/ */
public final Setting<Boolean> renderGoal = new Setting<>(true); public final Setting<Boolean> renderGoal = new Setting<>(true);
/**
* Render selection boxes
*/
public final Setting<Boolean> renderSelectionBoxes = new Setting<>(true);
/** /**
* Ignore depth when rendering the goal * Ignore depth when rendering the goal
*/ */

16
src/main/java/baritone/utils/PathRenderer.java
View File

@@ -83,6 +83,14 @@ public final class PathRenderer implements Helper {
if (goal != null && Baritone.settings().renderGoal.value) { if (goal != null && Baritone.settings().renderGoal.value) {
drawDankLitGoalBox(renderView, goal, partialTicks, Baritone.settings().colorGoalBox.value); drawDankLitGoalBox(renderView, goal, partialTicks, Baritone.settings().colorGoalBox.value);
} }
PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
if (current != null && Baritone.settings().renderSelectionBoxes.value) {
drawManySelectionBoxes(renderView, current.toBreak(), Baritone.settings().colorBlocksToBreak.value);
drawManySelectionBoxes(renderView, current.toPlace(), Baritone.settings().colorBlocksToPlace.value);
drawManySelectionBoxes(renderView, current.toWalkInto(), Baritone.settings().colorBlocksToWalkInto.value);
}
if (!Baritone.settings().renderPath.value) { if (!Baritone.settings().renderPath.value) {
return; return;
} }
@@ -91,9 +99,6 @@ public final class PathRenderer implements Helper {
//long start = System.nanoTime(); //long start = System.nanoTime();
PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
// Render the current path, if there is one // Render the current path, if there is one
if (current != null && current.getPath() != null) { if (current != null && current.getPath() != null) {
int renderBegin = Math.max(current.getPosition() - 3, 0); int renderBegin = Math.max(current.getPosition() - 3, 0);
@@ -104,11 +109,6 @@ public final class PathRenderer implements Helper {
} }
//long split = System.nanoTime(); //long split = System.nanoTime();
if (current != null) {
drawManySelectionBoxes(renderView, current.toBreak(), Baritone.settings().colorBlocksToBreak.value);
drawManySelectionBoxes(renderView, current.toPlace(), Baritone.settings().colorBlocksToPlace.value);
drawManySelectionBoxes(renderView, current.toWalkInto(), Baritone.settings().colorBlocksToWalkInto.value);
}
// If there is a path calculation currently running, render the path calculation process // If there is a path calculation currently running, render the path calculation process
behavior.getInProgress().ifPresent(currentlyRunning -> { behavior.getInProgress().ifPresent(currentlyRunning -> {