caskd
/
baritone
forked from RepoMirrors/baritone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

performance improvement and no allocation promise

This commit is contained in:
Leijurv 2019-03-04 20:39:22 -08:00
parent 2133ab39b7
commit 826f3788d0
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/baritone/cache/CachedChunk.java vendored
View File

@ -18,6 +18,7 @@
package baritone.cache;
import baritone.utils.pathing.PathingBlockType;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
@ -119,7 +120,7 @@ public final class CachedChunk {
*/
private final BitSet data;
private final BitSet special;
private final Int2ObjectOpenHashMap<String> special;
/**
* The block names of each surface level block for generating an overview
@ -142,16 +143,15 @@ public final class CachedChunk {
this.heightMap = new int[256];
this.specialBlockLocations = specialBlockLocations;
this.cacheTimestamp = cacheTimestamp;
this.special = new BitSet();
this.special = new Int2ObjectOpenHashMap<>();
calculateHeightMap();
setSpecial();
}
private final void setSpecial() {
for (List<BlockPos> list : specialBlockLocations.values()) {
for (BlockPos pos : list) {
System.out.println("Turning on bit");
special.set(getPositionIndex(pos.getX(), pos.getY(), pos.getZ()) >> 1);
for (Map.Entry<String, List<BlockPos>> entry : specialBlockLocations.entrySet()) {
for (BlockPos pos : entry.getValue()) {
special.put(getPositionIndex(pos.getX(), pos.getY(), pos.getZ()), entry.getKey());
}
}
}
@ -170,15 +170,9 @@ public final class CachedChunk {
}*/
return overview[internalPos];
}
if (special.get(index >> 1)) {
// this block is special
for (Map.Entry<String, List<BlockPos>> entry : specialBlockLocations.entrySet()) {
for (BlockPos pos : entry.getValue()) {
if (pos.getX() == x && pos.getY() == y && pos.getZ() == z) {
return ChunkPacker.stringToBlock(entry.getKey()).getDefaultState();
}
}
}
String str = special.get(index);
if (str != null) {
return ChunkPacker.stringToBlock(str).getDefaultState();
}
if (type == PathingBlockType.SOLID && y == 127 && dimension == -1) {