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

hopefully actually fix backtracking

This commit is contained in:
Leijurv 2023-08-22 13:28:11 -07:00
parent 301ad40350
commit f2679bea29
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/baritone/process/elytra/ElytraBehavior.java
View File

@ -98,7 +98,7 @@ public final class ElytraBehavior implements Helper {
private BlockStateInterface bsi; private BlockStateInterface bsi;
private final BlockStateOctreeInterface boi; private final BlockStateOctreeInterface boi;
public final BlockPos destination; public final BetterBlockPos destination;
private final boolean appendDestination; private final boolean appendDestination;
private final ExecutorService solverExecutor; private final ExecutorService solverExecutor;
@ -119,7 +119,7 @@ public final class ElytraBehavior implements Helper {
this.blockedLines = new CopyOnWriteArrayList<>(); this.blockedLines = new CopyOnWriteArrayList<>();
this.pathManager = this.new PathManager(); this.pathManager = this.new PathManager();
this.process = process; this.process = process;
this.destination = destination; this.destination = new BetterBlockPos(destination);
this.appendDestination = appendDestination; this.appendDestination = appendDestination;
this.solverExecutor = Executors.newSingleThreadExecutor(); this.solverExecutor = Executors.newSingleThreadExecutor();
this.nextTickBoostCounter = new int[2]; this.nextTickBoostCounter = new int[2];
@ -188,16 +188,16 @@ public final class ElytraBehavior implements Helper {
}); });
} }
public CompletableFuture<Void> pathRecalcSegment(final int upToIncl) { public CompletableFuture<Void> pathRecalcSegment(final OptionalInt upToIncl) {
if (this.recalculating) { if (this.recalculating) {
throw new IllegalStateException("already recalculating"); throw new IllegalStateException("already recalculating");
} }
this.recalculating = true; this.recalculating = true;
final List<BetterBlockPos> after = this.path.subList(upToIncl + 1, this.path.size()); final List<BetterBlockPos> after = upToIncl.isPresent() ? this.path.subList(upToIncl.getAsInt() + 1, this.path.size()) : Collections.emptyList();
final boolean complete = this.completePath; final boolean complete = this.completePath;
return this.path0(ctx.playerFeet(), this.path.get(upToIncl), segment -> segment.append(after.stream(), complete)) return this.path0(ctx.playerFeet(), upToIncl.isPresent() ? this.path.get(upToIncl.getAsInt()) : ElytraBehavior.this.destination, segment -> segment.append(after.stream(), complete || (segment.isFinished() && !upToIncl.isPresent())))
.whenComplete((result, ex) -> { .whenComplete((result, ex) -> {
this.recalculating = false; this.recalculating = false;
if (ex != null) { if (ex != null) {
@ -315,7 +315,7 @@ public final class ElytraBehavior implements Helper {
} }
if (ElytraBehavior.this.process.state != ElytraProcess.State.LANDING && this.ticksNearUnchanged > 100) { if (ElytraBehavior.this.process.state != ElytraProcess.State.LANDING && this.ticksNearUnchanged > 100) {
this.pathRecalcSegment(rangeEndExcl - 1) this.pathRecalcSegment(OptionalInt.of(rangeEndExcl - 1))
.thenRun(() -> { .thenRun(() -> {
logDirect("Recalculating segment, no progress in last 100 ticks"); logDirect("Recalculating segment, no progress in last 100 ticks");
}); });
@ -331,15 +331,15 @@ public final class ElytraBehavior implements Helper {
if (!ElytraBehavior.this.clearView(this.path.getVec(i), this.path.getVec(i + 1), false)) { if (!ElytraBehavior.this.clearView(this.path.getVec(i), this.path.getVec(i + 1), false)) {
// obstacle. where do we return to pathing? // obstacle. where do we return to pathing?
// if the end of render distance is closer to goal, then that's fine, otherwise we'd be "digging our hole deeper" and making an already bad backtrack worse // if the end of render distance is closer to goal, then that's fine, otherwise we'd be "digging our hole deeper" and making an already bad backtrack worse
int rejoinMainPathAt; OptionalInt rejoinMainPathAt;
if (this.path.get(rangeEndExcl - 1).distanceSq(this.path.get(path.size() - 1)) < ctx.playerFeet().distanceSq(this.path.get(path.size() - 1))) { if (this.path.get(rangeEndExcl - 1).distanceSq(ElytraBehavior.this.destination) < ctx.playerFeet().distanceSq(ElytraBehavior.this.destination)) {
rejoinMainPathAt = rangeEndExcl - 1; // rejoin after current render distance rejoinMainPathAt = OptionalInt.of(rangeEndExcl - 1); // rejoin after current render distance
} else { } else {
rejoinMainPathAt = path.size() - 1; // large backtrack detected. ignore render distance, rejoin later on rejoinMainPathAt = OptionalInt.empty(); // large backtrack detected. ignore render distance, rejoin later on
} }
final BetterBlockPos blockage = this.path.get(i); final BetterBlockPos blockage = this.path.get(i);
final double distance = ctx.playerFeet().distanceTo(this.path.get(rejoinMainPathAt)); final double distance = ctx.playerFeet().distanceTo(this.path.get(rejoinMainPathAt.orElse(path.size() - 1)));
final long start = System.nanoTime(); final long start = System.nanoTime();
this.pathRecalcSegment(rejoinMainPathAt) this.pathRecalcSegment(rejoinMainPathAt)
@ -356,7 +356,7 @@ public final class ElytraBehavior implements Helper {
} }
} }
if (!canSeeAny && rangeStartIncl < rangeEndExcl - 2 && process.state != ElytraProcess.State.GET_TO_JUMP) { if (!canSeeAny && rangeStartIncl < rangeEndExcl - 2 && process.state != ElytraProcess.State.GET_TO_JUMP) {
this.pathRecalcSegment(rangeEndExcl - 1).thenRun(() -> logDirect("Recalculated segment since no path points were visible")); this.pathRecalcSegment(OptionalInt.of(rangeEndExcl - 1)).thenRun(() -> logDirect("Recalculated segment since no path points were visible"));
} }
} }