Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 07:28:19 +01:00
Code Issues Projects Releases Wiki Activity

Palette misc

Browse Source
This commit is contained in:
themode 2022-03-29 16:50:16 +02:00
parent 244f8785ff
commit c81b0c0125
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/net/minestom/server/instance/palette/FlexiblePalette.java
View File

@ -64,9 +64,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
final long[] values = this.values; final long[] values = this.values;
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry];
final int dimension = dimension(); final int sectionIdentifier = getSectionIndex(x, y, z);
final int sectionIdentifier = getSectionIndex(x % dimension, y % dimension, z % dimension);
final int index = sectionIdentifier / valuesPerLong; final int index = sectionIdentifier / valuesPerLong;
final int bitIndex = sectionIdentifier % valuesPerLong * bitsPerEntry; final int bitIndex = sectionIdentifier % valuesPerLong * bitsPerEntry;
final short value = (short) (values[index] >> bitIndex & MAGIC_MASKS[bitsPerEntry]); final short value = (short) (values[index] >> bitIndex & MAGIC_MASKS[bitsPerEntry]);
@ -86,35 +84,26 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
@Override @Override
public void set(int x, int y, int z, int value) { public void set(int x, int y, int z, int value) {
final boolean placedAir = value == 0; value = getPaletteIndex(value);
if (!placedAir) value = getPaletteIndex(value);
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry];
final int dimension = dimension();
final long[] values = this.values; final long[] values = this.values;
// Change to palette value // Change to palette value
final int sectionIndex = getSectionIndex(x % dimension, y % dimension, z % dimension); final int sectionIndex = getSectionIndex(x, y, z);
final int index = sectionIndex / valuesPerLong; final int index = sectionIndex / valuesPerLong;
final int bitIndex = (sectionIndex % valuesPerLong) * bitsPerEntry; final int bitIndex = (sectionIndex % valuesPerLong) * bitsPerEntry;
long block = values[index]; long block = values[index];
{ final long clear = MAGIC_MASKS[bitsPerEntry];
final long clear = MAGIC_MASKS[bitsPerEntry]; final long oldBlock = block >> bitIndex & clear;
if (oldBlock == value)
final long oldBlock = block >> bitIndex & clear; return; // Trying to place the same block
if (oldBlock == value) values[index] = block & ~(clear << bitIndex) | (value & clear) << bitIndex;
return; // Trying to place the same block // Check if block count needs to be updated
final boolean currentAir = oldBlock == 0; final boolean currentAir = oldBlock == 0;
if (currentAir != (value == 0)) {
final long indexClear = clear << bitIndex; if (currentAir) count++;
block &= ~indexClear; else count--;
block |= (long) value << bitIndex;
if (currentAir != placedAir) {
// Block count changed
this.count += currentAir ? 1 : -1;
}
values[index] = block;
} }
} }
@ -251,7 +240,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
final int size = maxSize(); final int size = maxSize();
final int dimensionMinus = dimension - 1; final int dimensionMinus = dimension - 1;
final int[] ids = hasPalette() ? paletteToValueList.elements() : null; final int[] ids = hasPalette() ? paletteToValueList.elements() : null;
final int dimensionBitCount = MathUtils.bitsToRepresent(dimension - 1); final int dimensionBitCount = MathUtils.bitsToRepresent(dimensionMinus);
final int shiftedDimensionBitCount = dimensionBitCount << 1; final int shiftedDimensionBitCount = dimensionBitCount << 1;
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
final long value = values[i]; final long value = values[i];
@ -336,7 +325,11 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
} }
int getSectionIndex(int x, int y, int z) { int getSectionIndex(int x, int y, int z) {
final int dimensionBitCount = MathUtils.bitsToRepresent(dimension() - 1); final int dimensionMask = dimension() - 1;
y &= dimensionMask;
z &= dimensionMask;
x &= dimensionMask;
final int dimensionBitCount = MathUtils.bitsToRepresent(dimensionMask);
return y << (dimensionBitCount << 1) | z << dimensionBitCount | x; return y << (dimensionBitCount << 1) | z << dimensionBitCount | x;
} }