Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 23:17:59 +02:00
Code Issues Projects Releases Wiki Activity

Reuse palette code

Browse Source
This commit is contained in:
TheMode 2021-06-18 14:50:10 +02:00
parent 7032645c63
commit d7fd079288
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/instance/palette/Palette.java
View File

@ -94,7 +94,7 @@ public class Palette implements PublicCloneable<Palette> {
final long value = block >> bitIndex & clear; final long value = block >> bitIndex & clear;
final boolean isCurrentAir = Block.fromStateId(hasPalette ? paletteBlockMap.get((short) value) : (short) value).isAir(); final boolean isCurrentAir = Block.fromStateId(fromPalette((short) value)).isAir();
block |= clear << bitIndex; block |= clear << bitIndex;
block ^= clear << bitIndex; block ^= clear << bitIndex;
@ -124,9 +124,7 @@ public class Palette implements PublicCloneable<Palette> {
final long value = blocks[index] >> bitIndex & MAGIC_MASKS[bitsPerEntry]; final long value = blocks[index] >> bitIndex & MAGIC_MASKS[bitsPerEntry];
// Change to palette value and return // Change to palette value and return
return hasPalette ? return fromPalette((short) value);
paletteBlockMap.get((short) value) :
(short) value;
} }
/** /**
@ -252,6 +250,10 @@ public class Palette implements PublicCloneable<Palette> {
return 1 << bitsPerEntry; return 1 << bitsPerEntry;
} }
private short fromPalette(short value) {
return hasPalette ? paletteBlockMap.get(value) : value;
}
private static Short2ShortLinkedOpenHashMap createPaletteBlockMap() { private static Short2ShortLinkedOpenHashMap createPaletteBlockMap() {
Short2ShortLinkedOpenHashMap map = new Short2ShortLinkedOpenHashMap(CHUNK_SECTION_SIZE); Short2ShortLinkedOpenHashMap map = new Short2ShortLinkedOpenHashMap(CHUNK_SECTION_SIZE);
map.put((short) 0, (short) 0); map.put((short) 0, (short) 0);