RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

don't render parts of the path you've already finished

This commit is contained in:
Leijurv 2018-08-09 13:08:56 -07:00
parent 28ee485a87
commit d3891a8f11
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
View File

@ -178,7 +178,10 @@ public class PathingBehavior extends Behavior {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
// Render the current path, if there is one // Render the current path, if there is one
getPath().ifPresent(path -> drawPath(path, player(), partialTicks, Color.RED)); if (current != null && current.getPath() != null) {
int renderBegin = Math.max(current.getPosition() - 3, 0);
drawPath(current.getPath(), renderBegin, player(), partialTicks, Color.RED);
}
long split = System.currentTimeMillis(); long split = System.currentTimeMillis();
getPath().ifPresent(path -> { getPath().ifPresent(path -> {
for (Movement m : path.movements()) { for (Movement m : path.movements()) {
@ -193,9 +196,9 @@ public class PathingBehavior extends Behavior {
// 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
AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(currentlyRunning -> { AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(currentlyRunning -> {
currentlyRunning.bestPathSoFar().ifPresent(p -> { currentlyRunning.bestPathSoFar().ifPresent(p -> {
drawPath(p, player(), partialTicks, Color.BLUE); drawPath(p, 0, player(), partialTicks, Color.BLUE);
currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> { currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
drawPath(mr, player(), partialTicks, Color.CYAN); drawPath(mr, 0, player(), partialTicks, Color.CYAN);
drawSelectionBox(player(), mr.getDest(), partialTicks, Color.CYAN); drawSelectionBox(player(), mr.getDest(), partialTicks, Color.CYAN);
}); });
}); });
@ -209,7 +212,7 @@ public class PathingBehavior extends Behavior {
return new BlockPos(a.getX() - b.getX(), a.getY() - b.getY(), a.getZ() - b.getZ()); return new BlockPos(a.getX() - b.getX(), a.getY() - b.getY(), a.getZ() - b.getZ());
} }
public void drawPath(IPath path, EntityPlayerSP player, float partialTicks, Color color) { public void drawPath(IPath path, int startIndex, EntityPlayerSP player, float partialTicks, Color color) {
GlStateManager.enableBlend(); GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
@ -221,7 +224,7 @@ public class PathingBehavior extends Behavior {
List<BlockPos> positions = path.positions(); List<BlockPos> positions = path.positions();
int next; int next;
for (int i = 0; i < positions.size() - 1; i = next) { for (int i = startIndex; i < positions.size() - 1; i = next) {
BlockPos start = positions.get(i); BlockPos start = positions.get(i);
next = i + 1; next = i + 1;

4
src/main/java/baritone/bot/pathing/path/PathExecutor.java
View File

@ -177,6 +177,10 @@ public class PathExecutor extends Behavior {
} }
} }
public int getPosition() {
return pathPosition;
}
public IPath getPath() { public IPath getPath() {
return path; return path;
} }