mirror of
https://github.com/ViaVersion/ViaVersion.git
synced 2024-09-24 20:42:41 +02:00
Use BiHashMap as palette
This commit is contained in:
parent
ce65c7f583
commit
9a87adf51b
@ -1,12 +1,11 @@
|
|||||||
package us.myles.ViaVersion.api.minecraft.chunks;
|
package us.myles.ViaVersion.api.minecraft.chunks;
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.BiMap;
|
||||||
|
import com.google.common.collect.HashBiMap;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class ChunkSection {
|
public class ChunkSection {
|
||||||
/**
|
/**
|
||||||
* Size (dimensions) of blocks in a chunks section.
|
* Size (dimensions) of blocks in a chunks section.
|
||||||
@ -17,7 +16,7 @@ public class ChunkSection {
|
|||||||
*/
|
*/
|
||||||
public static final int LIGHT_LENGTH = 16 * 16 * 16 / 2; // size * size * size / 2 (nibble bit count)
|
public static final int LIGHT_LENGTH = 16 * 16 * 16 / 2; // size * size * size / 2 (nibble bit count)
|
||||||
@Getter
|
@Getter
|
||||||
private final List<Integer> palette = Lists.newArrayList();
|
private BiMap<Integer, Integer> palette = HashBiMap.create();
|
||||||
private final int[] blocks;
|
private final int[] blocks;
|
||||||
private NibbleArray blockLight;
|
private NibbleArray blockLight;
|
||||||
private NibbleArray skyLight;
|
private NibbleArray skyLight;
|
||||||
@ -28,11 +27,12 @@ public class ChunkSection {
|
|||||||
public ChunkSection() {
|
public ChunkSection() {
|
||||||
this.blocks = new int[SIZE];
|
this.blocks = new int[SIZE];
|
||||||
this.blockLight = new NibbleArray(SIZE);
|
this.blockLight = new NibbleArray(SIZE);
|
||||||
palette.add(0); // AIR
|
palette.put(0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a block in the chunks
|
* Set a block in the chunks
|
||||||
|
* This method will not update non-air blocks count
|
||||||
*
|
*
|
||||||
* @param x Block X
|
* @param x Block X
|
||||||
* @param y Block Y
|
* @param y Block Y
|
||||||
@ -58,12 +58,12 @@ public class ChunkSection {
|
|||||||
|
|
||||||
public int getFlatBlock(int x, int y, int z) {
|
public int getFlatBlock(int x, int y, int z) {
|
||||||
int index = blocks[index(x, y, z)];
|
int index = blocks[index(x, y, z)];
|
||||||
return palette.get(index);
|
return palette.inverse().get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getFlatBlock(int idx) {
|
public int getFlatBlock(int idx) {
|
||||||
int index = blocks[idx];
|
int index = blocks[idx];
|
||||||
return palette.get(index);
|
return palette.inverse().get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBlock(int idx, int type, int data) {
|
public void setBlock(int idx, int type, int data) {
|
||||||
@ -71,24 +71,24 @@ public class ChunkSection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setPaletteIndex(int idx, int index) {
|
public void setPaletteIndex(int idx, int index) {
|
||||||
blocks[idx] = index;
|
blocks[idx] = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getPaletteIndex(int idx) {
|
public int getPaletteIndex(int idx) {
|
||||||
return blocks[idx];
|
return blocks[idx];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a block in the chunks based on the index
|
* Set a block state in the chunk
|
||||||
|
* This method will not update non-air blocks count
|
||||||
*
|
*
|
||||||
* @param idx Index
|
* @param idx Index
|
||||||
* @param id The raw or flat id of the block
|
* @param id The raw or flat id of the block
|
||||||
*/
|
*/
|
||||||
public void setFlatBlock(int idx, int id) {
|
public void setFlatBlock(int idx, int id) {
|
||||||
int index = palette.indexOf(id);
|
Integer index = palette.get(id);
|
||||||
if (index == -1) {
|
if (index == null) {
|
||||||
index = palette.size();
|
palette.put(id, index = palette.size());
|
||||||
palette.add(id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
blocks[idx] = index;
|
blocks[idx] = index;
|
||||||
|
@ -1,114 +1,113 @@
|
|||||||
package us.myles.ViaVersion.api.type.types.version;
|
package us.myles.ViaVersion.api.type.types.version;
|
||||||
|
|
||||||
|
import com.google.common.collect.BiMap;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||||
import us.myles.ViaVersion.api.type.Type;
|
import us.myles.ViaVersion.api.type.Type;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||||
|
|
||||||
public ChunkSectionType1_13() {
|
public ChunkSectionType1_13() {
|
||||||
super("Chunk Section Type", ChunkSection.class);
|
super("Chunk Section Type", ChunkSection.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||||
ChunkSection chunkSection = new ChunkSection();
|
ChunkSection chunkSection = new ChunkSection();
|
||||||
List<Integer> palette = chunkSection.getPalette();
|
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||||
palette.clear();
|
palette.clear();
|
||||||
|
|
||||||
// Reaad bits per block
|
// Reaad bits per block
|
||||||
int bitsPerBlock = buffer.readUnsignedByte();
|
int bitsPerBlock = buffer.readUnsignedByte();
|
||||||
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
||||||
|
|
||||||
if (bitsPerBlock == 0) {
|
if (bitsPerBlock == 0) {
|
||||||
bitsPerBlock = 14;
|
bitsPerBlock = 14;
|
||||||
}
|
}
|
||||||
if (bitsPerBlock < 4) {
|
if (bitsPerBlock < 4) {
|
||||||
bitsPerBlock = 4;
|
bitsPerBlock = 4;
|
||||||
}
|
}
|
||||||
if (bitsPerBlock > 8) {
|
if (bitsPerBlock > 8) {
|
||||||
bitsPerBlock = 14;
|
bitsPerBlock = 14;
|
||||||
}
|
}
|
||||||
int paletteLength = bitsPerBlock == 14 ? 0 : Type.VAR_INT.read(buffer);
|
int paletteLength = bitsPerBlock == 14 ? 0 : Type.VAR_INT.read(buffer);
|
||||||
// Read palette
|
// Read palette
|
||||||
for (int i = 0; i < paletteLength; i++) {
|
for (int i = 0; i < paletteLength; i++) {
|
||||||
palette.add(Type.VAR_INT.read(buffer));
|
palette.put(Type.VAR_INT.read(buffer), palette.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read blocks
|
// Read blocks
|
||||||
long[] blockData = new long[Type.VAR_INT.read(buffer)];
|
long[] blockData = new long[Type.VAR_INT.read(buffer)];
|
||||||
if (blockData.length > 0) {
|
if (blockData.length > 0) {
|
||||||
for (int i = 0; i < blockData.length; i++) {
|
for (int i = 0; i < blockData.length; i++) {
|
||||||
blockData[i] = buffer.readLong();
|
blockData[i] = buffer.readLong();
|
||||||
}
|
}
|
||||||
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
||||||
int bitIndex = i * bitsPerBlock;
|
int bitIndex = i * bitsPerBlock;
|
||||||
int startIndex = bitIndex / 64;
|
int startIndex = bitIndex / 64;
|
||||||
int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
|
int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
|
||||||
int startBitSubIndex = bitIndex % 64;
|
int startBitSubIndex = bitIndex % 64;
|
||||||
int val;
|
int val;
|
||||||
if (startIndex == endIndex) {
|
if (startIndex == endIndex) {
|
||||||
val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
|
val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
|
||||||
} else {
|
} else {
|
||||||
int endBitSubIndex = 64 - startBitSubIndex;
|
int endBitSubIndex = 64 - startBitSubIndex;
|
||||||
val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
|
val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bitsPerBlock == 14) {
|
if (bitsPerBlock == 14) {
|
||||||
chunkSection.setFlatBlock(i, val);
|
chunkSection.setFlatBlock(i, val);
|
||||||
} else {
|
} else {
|
||||||
chunkSection.setPaletteIndex(i, val);
|
chunkSection.setPaletteIndex(i, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return chunkSection;
|
return chunkSection;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||||
List<Integer> palette = chunkSection.getPalette();
|
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||||
|
|
||||||
int bitsPerBlock = 4;
|
int bitsPerBlock = 4;
|
||||||
while (palette.size() > 1 << bitsPerBlock) {
|
while (palette.size() > 1 << bitsPerBlock) {
|
||||||
bitsPerBlock += 1;
|
bitsPerBlock += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bitsPerBlock > 8) {
|
if (bitsPerBlock > 8) {
|
||||||
bitsPerBlock = 14;
|
bitsPerBlock = 14;
|
||||||
}
|
}
|
||||||
|
|
||||||
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
||||||
buffer.writeByte(bitsPerBlock);
|
buffer.writeByte(bitsPerBlock);
|
||||||
|
|
||||||
|
|
||||||
// Write pallet (or not)
|
// Write pallet (or not)
|
||||||
if (bitsPerBlock != 14) {
|
if (bitsPerBlock != 14) {
|
||||||
Type.VAR_INT.write(buffer, palette.size());
|
Type.VAR_INT.write(buffer, palette.size());
|
||||||
for (int mappedId : palette) {
|
for (int i = 0; i < palette.size(); i++) {
|
||||||
Type.VAR_INT.write(buffer, mappedId);
|
Type.VAR_INT.write(buffer, palette.inverse().get(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = (int) Math.ceil(ChunkSection.SIZE * bitsPerBlock / 64.0);
|
int length = (int) Math.ceil(ChunkSection.SIZE * bitsPerBlock / 64.0);
|
||||||
Type.VAR_INT.write(buffer, length);
|
Type.VAR_INT.write(buffer, length);
|
||||||
long[] data = new long[length];
|
long[] data = new long[length];
|
||||||
for (int index = 0; index < ChunkSection.SIZE; index++) {
|
for (int index = 0; index < ChunkSection.SIZE; index++) {
|
||||||
int value = bitsPerBlock == 14 ? chunkSection.getFlatBlock(index) : chunkSection.getPaletteIndex(index);
|
int value = bitsPerBlock == 14 ? chunkSection.getFlatBlock(index) : chunkSection.getPaletteIndex(index);
|
||||||
int bitIndex = index * bitsPerBlock;
|
int bitIndex = index * bitsPerBlock;
|
||||||
int startIndex = bitIndex / 64;
|
int startIndex = bitIndex / 64;
|
||||||
int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
|
int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
|
||||||
int startBitSubIndex = bitIndex % 64;
|
int startBitSubIndex = bitIndex % 64;
|
||||||
data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
|
data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
|
||||||
if (startIndex != endIndex) {
|
if (startIndex != endIndex) {
|
||||||
int endBitSubIndex = 64 - startBitSubIndex;
|
int endBitSubIndex = 64 - startBitSubIndex;
|
||||||
data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
|
data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (long l : data) {
|
for (long l : data) {
|
||||||
buffer.writeLong(l);
|
buffer.writeLong(l);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,43 +1,40 @@
|
|||||||
package us.myles.ViaVersion.api.type.types.version;
|
package us.myles.ViaVersion.api.type.types.version;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
|
|
||||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||||
import us.myles.ViaVersion.api.type.Type;
|
import us.myles.ViaVersion.api.type.Type;
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
import java.nio.ShortBuffer;
|
import java.nio.ShortBuffer;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class ChunkSectionType1_8 extends Type<ChunkSection> {
|
public class ChunkSectionType1_8 extends Type<ChunkSection> {
|
||||||
|
|
||||||
public ChunkSectionType1_8() {
|
public ChunkSectionType1_8() {
|
||||||
super("Chunk Section Type", ChunkSection.class);
|
super("Chunk Section Type", ChunkSection.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||||
ChunkSection chunkSection = new ChunkSection();
|
ChunkSection chunkSection = new ChunkSection();
|
||||||
List<Integer> palette = chunkSection.getPalette();
|
chunkSection.getPalette().clear();
|
||||||
palette.clear();
|
|
||||||
|
|
||||||
byte[] blockData = new byte[ChunkSection.SIZE * 2];
|
byte[] blockData = new byte[ChunkSection.SIZE * 2];
|
||||||
buffer.readBytes(blockData);
|
buffer.readBytes(blockData);
|
||||||
ShortBuffer blockBuf = ByteBuffer.wrap(blockData).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
|
ShortBuffer blockBuf = ByteBuffer.wrap(blockData).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
|
||||||
|
|
||||||
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
||||||
int mask = blockBuf.get();
|
int mask = blockBuf.get();
|
||||||
int type = mask >> 4;
|
int type = mask >> 4;
|
||||||
int data = mask & 0xF;
|
int data = mask & 0xF;
|
||||||
chunkSection.setBlock(i, type, data);
|
chunkSection.setBlock(i, type, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
return chunkSection;
|
return chunkSection;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||||
throw new NotImplementedException();
|
throw new UnsupportedOperationException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,110 +1,109 @@
|
|||||||
package us.myles.ViaVersion.api.type.types.version;
|
package us.myles.ViaVersion.api.type.types.version;
|
||||||
|
|
||||||
|
import com.google.common.collect.BiMap;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||||
import us.myles.ViaVersion.api.type.Type;
|
import us.myles.ViaVersion.api.type.Type;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||||
|
|
||||||
public ChunkSectionType1_9() {
|
public ChunkSectionType1_9() {
|
||||||
super("Chunk Section Type", ChunkSection.class);
|
super("Chunk Section Type", ChunkSection.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||||
ChunkSection chunkSection = new ChunkSection();
|
ChunkSection chunkSection = new ChunkSection();
|
||||||
List<Integer> palette = chunkSection.getPalette();
|
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||||
palette.clear();
|
palette.clear();
|
||||||
|
|
||||||
// Reaad bits per block
|
// Reaad bits per block
|
||||||
int bitsPerBlock = buffer.readUnsignedByte();
|
int bitsPerBlock = buffer.readUnsignedByte();
|
||||||
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
||||||
|
|
||||||
if (bitsPerBlock == 0) {
|
if (bitsPerBlock == 0) {
|
||||||
bitsPerBlock = 13;
|
bitsPerBlock = 13;
|
||||||
}
|
}
|
||||||
if (bitsPerBlock < 4) {
|
if (bitsPerBlock < 4) {
|
||||||
bitsPerBlock = 4;
|
bitsPerBlock = 4;
|
||||||
}
|
}
|
||||||
if (bitsPerBlock > 8) {
|
if (bitsPerBlock > 8) {
|
||||||
bitsPerBlock = 13;
|
bitsPerBlock = 13;
|
||||||
}
|
}
|
||||||
int paletteLength = Type.VAR_INT.read(buffer);
|
int paletteLength = Type.VAR_INT.read(buffer);
|
||||||
// Read palette
|
// Read palette
|
||||||
for (int i = 0; i < paletteLength; i++) {
|
for (int i = 0; i < paletteLength; i++) {
|
||||||
if (bitsPerBlock != 13) {
|
if (bitsPerBlock != 13) {
|
||||||
palette.add(Type.VAR_INT.read(buffer));
|
palette.put(Type.VAR_INT.read(buffer), palette.size());
|
||||||
} else {
|
} else {
|
||||||
Type.VAR_INT.read(buffer);
|
Type.VAR_INT.read(buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read blocks
|
// Read blocks
|
||||||
long[] blockData = new long[Type.VAR_INT.read(buffer)];
|
long[] blockData = new long[Type.VAR_INT.read(buffer)];
|
||||||
if (blockData.length > 0) {
|
if (blockData.length > 0) {
|
||||||
for (int i = 0; i < blockData.length; i++) {
|
for (int i = 0; i < blockData.length; i++) {
|
||||||
blockData[i] = buffer.readLong();
|
blockData[i] = buffer.readLong();
|
||||||
}
|
}
|
||||||
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
for (int i = 0; i < ChunkSection.SIZE; i++) {
|
||||||
int bitIndex = i * bitsPerBlock;
|
int bitIndex = i * bitsPerBlock;
|
||||||
int startIndex = bitIndex / 64;
|
int startIndex = bitIndex / 64;
|
||||||
int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
|
int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
|
||||||
int startBitSubIndex = bitIndex % 64;
|
int startBitSubIndex = bitIndex % 64;
|
||||||
int val;
|
int val;
|
||||||
if (startIndex == endIndex) {
|
if (startIndex == endIndex) {
|
||||||
val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
|
val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
|
||||||
} else {
|
} else {
|
||||||
int endBitSubIndex = 64 - startBitSubIndex;
|
int endBitSubIndex = 64 - startBitSubIndex;
|
||||||
val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
|
val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bitsPerBlock == 13) {
|
if (bitsPerBlock == 13) {
|
||||||
chunkSection.setBlock(i, val >> 4, val & 0xF);
|
chunkSection.setBlock(i, val >> 4, val & 0xF);
|
||||||
} else {
|
} else {
|
||||||
chunkSection.setPaletteIndex(i, val);
|
chunkSection.setPaletteIndex(i, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return chunkSection;
|
return chunkSection;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||||
List<Integer> palette = chunkSection.getPalette();
|
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||||
|
|
||||||
int bitsPerBlock = 4;
|
int bitsPerBlock = 4;
|
||||||
while (palette.size() > 1 << bitsPerBlock) {
|
while (palette.size() > 1 << bitsPerBlock) {
|
||||||
bitsPerBlock += 1;
|
bitsPerBlock += 1;
|
||||||
}
|
}
|
||||||
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
long maxEntryValue = (1L << bitsPerBlock) - 1;
|
||||||
buffer.writeByte(bitsPerBlock);
|
buffer.writeByte(bitsPerBlock);
|
||||||
|
|
||||||
// Write pallet
|
// Write pallet
|
||||||
Type.VAR_INT.write(buffer, palette.size());
|
Type.VAR_INT.write(buffer, palette.size());
|
||||||
for (int mappedId : palette) {
|
for (int i = 0; i < palette.size(); i++) {
|
||||||
Type.VAR_INT.write(buffer, mappedId);
|
Type.VAR_INT.write(buffer, palette.inverse().get(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = (int) Math.ceil(ChunkSection.SIZE * bitsPerBlock / 64.0);
|
int length = (int) Math.ceil(ChunkSection.SIZE * bitsPerBlock / 64.0);
|
||||||
Type.VAR_INT.write(buffer, length);
|
Type.VAR_INT.write(buffer, length);
|
||||||
long[] data = new long[length];
|
long[] data = new long[length];
|
||||||
for (int index = 0; index < ChunkSection.SIZE; index++) {
|
for (int index = 0; index < ChunkSection.SIZE; index++) {
|
||||||
int value = chunkSection.getPaletteIndex(index);
|
int value = chunkSection.getPaletteIndex(index);
|
||||||
int bitIndex = index * bitsPerBlock;
|
int bitIndex = index * bitsPerBlock;
|
||||||
int startIndex = bitIndex / 64;
|
int startIndex = bitIndex / 64;
|
||||||
int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
|
int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
|
||||||
int startBitSubIndex = bitIndex % 64;
|
int startBitSubIndex = bitIndex % 64;
|
||||||
data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
|
data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
|
||||||
if (startIndex != endIndex) {
|
if (startIndex != endIndex) {
|
||||||
int endBitSubIndex = 64 - startBitSubIndex;
|
int endBitSubIndex = 64 - startBitSubIndex;
|
||||||
data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
|
data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (long l : data) {
|
for (long l : data) {
|
||||||
buffer.writeLong(l);
|
buffer.writeLong(l);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package us.myles.ViaVersion.protocols.protocol1_13_1to1_13.packets;
|
package us.myles.ViaVersion.protocols.protocol1_13_1to1_13.packets;
|
||||||
|
|
||||||
|
import com.google.common.collect.BiMap;
|
||||||
import us.myles.ViaVersion.api.PacketWrapper;
|
import us.myles.ViaVersion.api.PacketWrapper;
|
||||||
import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;
|
import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;
|
||||||
import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
|
import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
|
||||||
@ -27,16 +28,12 @@ public class WorldPackets {
|
|||||||
Chunk chunk = wrapper.passthrough(new Chunk1_13Type(clientWorld));
|
Chunk chunk = wrapper.passthrough(new Chunk1_13Type(clientWorld));
|
||||||
|
|
||||||
for (ChunkSection section : chunk.getSections()) {
|
for (ChunkSection section : chunk.getSections()) {
|
||||||
if (section != null) {
|
if (section == null) continue;
|
||||||
for (int i = 0; i < section.getPalette().size(); i++) {
|
BiMap<Integer, Integer> inverse = section.getPalette().inverse();
|
||||||
section.getPalette().set(
|
for (int i = 0; i < inverse.size(); i++) {
|
||||||
i,
|
inverse.put(i, Protocol1_13_1To1_13.getNewBlockStateId(inverse.get(i)));
|
||||||
Protocol1_13_1To1_13.getNewBlockStateId(section.getPalette().get(i))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets;
|
|||||||
|
|
||||||
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
|
import com.google.common.collect.BiMap;
|
||||||
import us.myles.ViaVersion.api.PacketWrapper;
|
import us.myles.ViaVersion.api.PacketWrapper;
|
||||||
import us.myles.ViaVersion.api.Via;
|
import us.myles.ViaVersion.api.Via;
|
||||||
import us.myles.ViaVersion.api.data.UserConnection;
|
import us.myles.ViaVersion.api.data.UserConnection;
|
||||||
@ -241,13 +242,14 @@ public class WorldPackets {
|
|||||||
|
|
||||||
boolean willStoreAnyBlock = false;
|
boolean willStoreAnyBlock = false;
|
||||||
|
|
||||||
for (int p = 0; p < section.getPalette().size(); p++) {
|
BiMap<Integer, Integer> inverse = section.getPalette().inverse();
|
||||||
int old = section.getPalette().get(p);
|
for (int p = 0; p < inverse.size(); p++) {
|
||||||
|
int old = inverse.get(p);
|
||||||
int newId = toNewId(old);
|
int newId = toNewId(old);
|
||||||
if (storage.isWelcome(newId)) {
|
if (storage.isWelcome(newId)) {
|
||||||
willStoreAnyBlock = true;
|
willStoreAnyBlock = true;
|
||||||
}
|
}
|
||||||
section.getPalette().set(p, newId);
|
inverse.put(p, newId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (willStoreAnyBlock) {
|
if (willStoreAnyBlock) {
|
||||||
|
@ -54,10 +54,8 @@ public class Chunk1_9_1_2Type extends PartialType<Chunk, ClientWorld> {
|
|||||||
if (world.getEnvironment() == Environment.NORMAL) {
|
if (world.getEnvironment() == Environment.NORMAL) {
|
||||||
section.readSkyLight(input);
|
section.readSkyLight(input);
|
||||||
}
|
}
|
||||||
if (replacePistons) {
|
if (replacePistons && section.getPalette().containsKey(36)) {
|
||||||
if (section.getPalette().contains(36)) {
|
section.getPalette().put(replacementId, section.getPalette().remove(36));
|
||||||
section.getPalette().set(section.getPalette().indexOf(36), replacementId);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,8 +89,8 @@ public class Chunk1_9to1_8Type extends PartialType<Chunk, ClientChunks> {
|
|||||||
ChunkSection section = Types1_8.CHUNK_SECTION.read(input);
|
ChunkSection section = Types1_8.CHUNK_SECTION.read(input);
|
||||||
sections[i] = section;
|
sections[i] = section;
|
||||||
|
|
||||||
if (replacePistons && section.getPalette().contains(36)) {
|
if (replacePistons && section.getPalette().containsKey(36)) {
|
||||||
section.getPalette().set(section.getPalette().indexOf(36), replacementId);
|
section.getPalette().put(replacementId, section.getPalette().remove(36));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user