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

lazy chunk loading

Browse Source
This commit is contained in:
Leijurv 2018-08-21 11:54:55 -07:00
parent 7f578bc3bf
commit a64e07685b
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/bot/chunk/CachedWorld.java
View File

@ -53,7 +53,7 @@ public final class CachedWorld implements ICachedChunkAccess {
@Override @Override
public final PathingBlockType getBlockType(int x, int y, int z) { public final PathingBlockType getBlockType(int x, int y, int z) {
CachedRegion region = getRegion(x >> 9, z >> 9); CachedRegion region = getOrCreateRegion(x >> 9, z >> 9);
if (region != null) { if (region != null) {
return region.getBlockType(x & 511, y, z & 511); return region.getBlockType(x & 511, y, z & 511);
} }

19
src/main/java/baritone/bot/chunk/CachedWorldProvider.java
View File

@ -31,8 +31,6 @@ import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* @author Brady * @author Brady
@ -42,8 +40,6 @@ public enum CachedWorldProvider implements Helper {
INSTANCE; INSTANCE;
private static final Pattern REGION_REGEX = Pattern.compile("r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.bcr");
private final Map<String, CachedWorld> singlePlayerWorldCache = new HashMap<>(); private final Map<String, CachedWorld> singlePlayerWorldCache = new HashMap<>();
private CachedWorld currentWorld; private CachedWorld currentWorld;
@ -68,21 +64,6 @@ public enum CachedWorldProvider implements Helper {
} }
this.currentWorld = this.singlePlayerWorldCache.computeIfAbsent(dir.toString(), CachedWorld::new); this.currentWorld = this.singlePlayerWorldCache.computeIfAbsent(dir.toString(), CachedWorld::new);
try {
Files.list(dir).forEach(path -> {
String file = path.getFileName().toString();
Matcher matcher = REGION_REGEX.matcher(file);
if (matcher.matches()) {
int rx = Integer.parseInt(matcher.group(1));
int ry = Integer.parseInt(matcher.group(2));
// Recognize the region for when we load from file
this.currentWorld.getOrCreateRegion(rx, ry);
}
});
} catch (Exception ignored) {}
this.currentWorld.load();
} }
// TODO: Store server worlds // TODO: Store server worlds
} }