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

fix performance issues with explore

Browse Source
This commit is contained in:
Leijurv 2019-04-27 16:16:36 -07:00
parent 783a7cedc3
commit 0927e0e017
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/baritone/process/ExploreProcess.java
View File

@ -47,6 +47,8 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
private IChunkFilter filter; private IChunkFilter filter;
private int distanceCompleted;
public ExploreProcess(Baritone baritone) { public ExploreProcess(Baritone baritone) {
super(baritone); super(baritone);
} }
@ -59,6 +61,7 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
@Override @Override
public void explore(int centerX, int centerZ) { public void explore(int centerX, int centerZ) {
explorationOrigin = new BlockPos(centerX, 0, centerZ); explorationOrigin = new BlockPos(centerX, 0, centerZ);
distanceCompleted = 0;
} }
@Override @Override
@ -102,12 +105,15 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
int chunkZ = center.getZ() >> 4; int chunkZ = center.getZ() >> 4;
int count = Math.min(filter.countRemain(), Baritone.settings().exploreChunkSetMinimumSize.value); int count = Math.min(filter.countRemain(), Baritone.settings().exploreChunkSetMinimumSize.value);
List<BlockPos> centers = new ArrayList<>(); List<BlockPos> centers = new ArrayList<>();
for (int dist = 0; ; dist++) { int renderDistance = Baritone.settings().worldExploringChunkOffset.value;
for (int dist = distanceCompleted; ; dist++) {
for (int dx = -dist; dx <= dist; dx++) { for (int dx = -dist; dx <= dist; dx++) {
for (int dz = -dist; dz <= dist; dz++) { int zval = dist - Math.abs(dx);
for (int mult = 0; mult < 2; mult++) {
int dz = (mult * 2 - 1) * zval; // dz can be either -zval or zval
int trueDist = Math.abs(dx) + Math.abs(dz); int trueDist = Math.abs(dx) + Math.abs(dz);
if (trueDist != dist) { if (trueDist != dist) {
continue; // not considering this one just yet in our expanding search throw new IllegalStateException();
} }
switch (filter.isAlreadyExplored(chunkX + dx, chunkZ + dz)) { switch (filter.isAlreadyExplored(chunkX + dx, chunkZ + dz)) {
case UNKNOWN: case UNKNOWN:
@ -119,7 +125,7 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
} }
int centerX = ((chunkX + dx) << 4) + 8; int centerX = ((chunkX + dx) << 4) + 8;
int centerZ = ((chunkZ + dz) << 4) + 8; int centerZ = ((chunkZ + dz) << 4) + 8;
int offset = Baritone.settings().worldExploringChunkOffset.value << 4; int offset = renderDistance << 4;
if (dx < 0) { if (dx < 0) {
centerX -= offset; centerX -= offset;
} else { } else {
@ -136,6 +142,11 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
if (centers.size() >= count) { if (centers.size() >= count) {
return centers.stream().map(pos -> createGoal(pos.getX(), pos.getZ())).toArray(Goal[]::new); return centers.stream().map(pos -> createGoal(pos.getX(), pos.getZ())).toArray(Goal[]::new);
} }
if (centers.isEmpty()) {
// we have explored everything from 0 to dist inclusive
// next time we should start our check at dist+1
distanceCompleted = dist + 1;
}
} }
} }
@ -271,6 +282,6 @@ public class ExploreProcess extends BaritoneProcessHelper implements IExplorePro
@Override @Override
public String displayName0() { public String displayName0() {
return "Exploring around " + explorationOrigin + ", currently going to " + new GoalComposite(closestUncachedChunks(explorationOrigin, calcFilter())); return "Exploring around " + explorationOrigin + ", distance completed " + distanceCompleted + ", currently going to " + new GoalComposite(closestUncachedChunks(explorationOrigin, calcFilter()));
} }
} }