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

cleanup to cachedregion

Browse Source
This commit is contained in:
Leijurv 2018-08-23 13:47:01 -07:00
parent cacd2096ec
commit c4cc0c6cdf
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/baritone/chunk/CachedRegion.java
View File

@ -26,7 +26,6 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.*;
import java.util.function.Consumer;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
@ -71,7 +70,7 @@ public final class CachedRegion implements IBlockTypeAccess {
@Override @Override
public final IBlockState getBlock(int x, int y, int z) { public final IBlockState getBlock(int x, int y, int z) {
CachedChunk chunk = this.getChunk(x >> 4, z >> 4); CachedChunk chunk = chunks[x >> 4][z >> 4];
if (chunk != null) { if (chunk != null) {
return chunk.getBlock(x & 15, y, z & 15); return chunk.getBlock(x & 15, y, z & 15);
} }
@ -97,27 +96,13 @@ public final class CachedRegion implements IBlockTypeAccess {
return res; return res;
} }
final void updateCachedChunk(int chunkX, int chunkZ, CachedChunk chunk) { final synchronized void updateCachedChunk(int chunkX, int chunkZ, CachedChunk chunk) {
this.chunks[chunkX][chunkZ] = chunk; this.chunks[chunkX][chunkZ] = chunk;
hasUnsavedChanges = true; hasUnsavedChanges = true;
} }
private CachedChunk getChunk(int chunkX, int chunkZ) {
return this.chunks[chunkX][chunkZ];
}
public void forEachChunk(Consumer<CachedChunk> consumer) { public synchronized final void save(String directory) {
for (int x = 0; x < 32; x++) {
for (int z = 0; z < 32; z++) {
CachedChunk chunk = getChunk(x, z);
if (chunk != null) {
consumer.accept(chunk);
}
}
}
}
public final void save(String directory) {
if (!hasUnsavedChanges) { if (!hasUnsavedChanges) {
return; return;
} }
@ -184,7 +169,7 @@ public final class CachedRegion implements IBlockTypeAccess {
} }
} }
public void load(String directory) { public synchronized void load(String directory) {
try { try {
Path path = Paths.get(directory); Path path = Paths.get(directory);
if (!Files.exists(path)) if (!Files.exists(path))
@ -285,15 +270,6 @@ public final class CachedRegion implements IBlockTypeAccess {
} }
} }
private static boolean isAllZeros(final byte[] array) {
for (byte b : array) {
if (b != 0) {
return false;
}
}
return true;
}
/** /**
* @return The region x coordinate * @return The region x coordinate
*/ */