Skip to content

Commit d3c170a

Browse files
authored
Merge pull request cabaletta#4958 from rfresh2/elytra-getpath-api
elytra path accessor api
2 parents 670dba0 + 5d4408d commit d3c170a

3 files changed

Lines changed: 22 additions & 0 deletions

File tree

src/api/java/baritone/api/process/IElytraProcess.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
package baritone.api.process;
1919

2020
import baritone.api.pathing.goals.Goal;
21+
import baritone.api.utils.BetterBlockPos;
2122
import net.minecraft.core.BlockPos;
2223

24+
import java.util.List;
25+
2326
public interface IElytraProcess extends IBaritoneProcess {
2427

2528
void repackChunks();
@@ -29,6 +32,11 @@ public interface IElytraProcess extends IBaritoneProcess {
2932
*/
3033
BlockPos currentDestination();
3134

35+
/**
36+
* @return Current active path, empty if not active or no path has been calculated yet
37+
*/
38+
List<BetterBlockPos> getPath();
39+
3240
void pathTo(BlockPos destination);
3341

3442
void pathTo(Goal destination);

src/main/java/baritone/process/ElytraProcess.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,11 @@ public BlockPos currentDestination() {
316316
return this.behavior != null ? this.behavior.destination : null;
317317
}
318318

319+
@Override
320+
public List<BetterBlockPos> getPath() {
321+
return this.behavior != null ? behavior.pathManager.getPath() : Collections.emptyList();
322+
}
323+
319324
@Override
320325
public void pathTo(BlockPos destination) {
321326
this.pathTo0(destination, false);

src/main/java/baritone/process/elytra/NullElytraProcess.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@
2121
import baritone.api.pathing.goals.Goal;
2222
import baritone.api.process.IElytraProcess;
2323
import baritone.api.process.PathingCommand;
24+
import baritone.api.utils.BetterBlockPos;
2425
import baritone.utils.BaritoneProcessHelper;
2526
import net.minecraft.core.BlockPos;
2627

28+
import java.util.Collections;
29+
import java.util.List;
30+
2731
/**
2832
* @author Brady
2933
*/
@@ -43,6 +47,11 @@ public BlockPos currentDestination() {
4347
return null;
4448
}
4549

50+
@Override
51+
public List<BetterBlockPos> getPath() {
52+
return Collections.emptyList();
53+
}
54+
4655
@Override
4756
public void pathTo(BlockPos destination) {
4857
throw new UnsupportedOperationException("Called pathTo() on NullElytraBehavior");

0 commit comments

Comments
 (0)