Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-10-03 00:47:28 +02:00
Code Issues Projects Releases Wiki Activity

Fixed palette

Browse Source
This commit is contained in:
themode 2020-11-11 17:30:18 +01:00
parent 55cddf6b78
commit babc6e35ba
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minestom/server/instance/palette/PaletteStorage.java
View File

@ -8,16 +8,19 @@ import static net.minestom.server.instance.Chunk.*;
public class PaletteStorage {
private final static int PALETTE_MAXIMUM_BITS = 8;
private int bitsPerEntry;
private int valuesPerLong;
private boolean hasPalette;
private long[][] sectionBlocks = new long[CHUNK_SECTION_COUNT][0];
// palette index = block id
private Short2ShortLinkedOpenHashMap paletteBlockMap = new Short2ShortLinkedOpenHashMap(CHUNK_SECTION_SIZE, 2);
private Short2ShortLinkedOpenHashMap paletteBlockMap = new Short2ShortLinkedOpenHashMap(CHUNK_SECTION_SIZE);
// block id = palette index
private Short2ShortOpenHashMap blockPaletteMap = new Short2ShortOpenHashMap(CHUNK_SECTION_SIZE, 2);
private Short2ShortOpenHashMap blockPaletteMap = new Short2ShortOpenHashMap(CHUNK_SECTION_SIZE);
{
// Default value
@ -28,9 +31,14 @@ public class PaletteStorage {
public PaletteStorage(int bitsPerEntry) {
this.bitsPerEntry = bitsPerEntry;
this.valuesPerLong = Long.SIZE / bitsPerEntry;
this.hasPalette = bitsPerEntry <= PALETTE_MAXIMUM_BITS;
}
private short getPaletteIndex(short blockId) {
private synchronized short getPaletteIndex(short blockId) {
if (!hasPalette) {
return blockId;
}
if (!blockPaletteMap.containsKey(blockId)) {
final short paletteIndex = (short) (paletteBlockMap.lastShortKey() + 1);
this.paletteBlockMap.put(paletteIndex, blockId);
@ -160,7 +168,7 @@ public class PaletteStorage {
}
public short[] getPalette() {
return paletteBlockMap.keySet().toShortArray();
return paletteBlockMap.values().toShortArray();
}
public long[][] getSectionBlocks() {

2
src/test/java/demo/PlayerInit.java
View File

@ -43,7 +43,7 @@ public class PlayerInit {
NoiseTestGenerator noiseTestGenerator = new NoiseTestGenerator();
instanceContainer = MinecraftServer.getInstanceManager().createInstanceContainer(DimensionType.OVERWORLD);
instanceContainer.enableAutoChunkLoad(true);
instanceContainer.setChunkGenerator(chunkGeneratorDemo);
instanceContainer.setChunkGenerator(noiseTestGenerator);
// Load some chunks beforehand
final int loopStart = -3;