Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-09-17 01:23:43 +02:00
Use BiHashMap as palette
Dieser Commit ist enthalten in:
Gerrygames
Ursprung
ce65c7f583
Commit
9a87adf51b
@ -1,12 +1,11 @@
|
||||
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 lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ChunkSection {
|
||||
/**
|
||||
* 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)
|
||||
@Getter
|
||||
private final List<Integer> palette = Lists.newArrayList();
|
||||
private BiMap<Integer, Integer> palette = HashBiMap.create();
|
||||
private final int[] blocks;
|
||||
private NibbleArray blockLight;
|
||||
private NibbleArray skyLight;
|
||||
@ -28,11 +27,12 @@ public class ChunkSection {
|
||||
public ChunkSection() {
|
||||
this.blocks = new int[SIZE];
|
||||
this.blockLight = new NibbleArray(SIZE);
|
||||
palette.add(0); // AIR
|
||||
palette.put(0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a block in the chunks
|
||||
* This method will not update non-air blocks count
|
||||
*
|
||||
* @param x Block X
|
||||
* @param y Block Y
|
||||
@ -58,12 +58,12 @@ public class ChunkSection {
|
||||
|
||||
public int getFlatBlock(int x, int y, int z) {
|
||||
int index = blocks[index(x, y, z)];
|
||||
return palette.get(index);
|
||||
return palette.inverse().get(index);
|
||||
}
|
||||
|
||||
public int getFlatBlock(int idx) {
|
||||
int index = blocks[idx];
|
||||
return palette.get(index);
|
||||
return palette.inverse().get(index);
|
||||
}
|
||||
|
||||
public void setBlock(int idx, int type, int data) {
|
||||
@ -79,16 +79,16 @@ public class ChunkSection {
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 id The raw or flat id of the block
|
||||
*/
|
||||
public void setFlatBlock(int idx, int id) {
|
||||
int index = palette.indexOf(id);
|
||||
if (index == -1) {
|
||||
index = palette.size();
|
||||
palette.add(id);
|
||||
Integer index = palette.get(id);
|
||||
if (index == null) {
|
||||
palette.put(id, index = palette.size());
|
||||
}
|
||||
|
||||
blocks[idx] = index;
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
package us.myles.ViaVersion.api.type.types.version;
|
||||
|
||||
import com.google.common.collect.BiMap;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||
|
||||
public ChunkSectionType1_13() {
|
||||
@ -15,7 +14,7 @@ public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||
@Override
|
||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||
ChunkSection chunkSection = new ChunkSection();
|
||||
List<Integer> palette = chunkSection.getPalette();
|
||||
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||
palette.clear();
|
||||
|
||||
// Reaad bits per block
|
||||
@ -34,7 +33,7 @@ public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||
int paletteLength = bitsPerBlock == 14 ? 0 : Type.VAR_INT.read(buffer);
|
||||
// Read palette
|
||||
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
|
||||
@ -69,7 +68,7 @@ public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||
List<Integer> palette = chunkSection.getPalette();
|
||||
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||
|
||||
int bitsPerBlock = 4;
|
||||
while (palette.size() > 1 << bitsPerBlock) {
|
||||
@ -87,8 +86,8 @@ public class ChunkSectionType1_13 extends Type<ChunkSection> {
|
||||
// Write pallet (or not)
|
||||
if (bitsPerBlock != 14) {
|
||||
Type.VAR_INT.write(buffer, palette.size());
|
||||
for (int mappedId : palette) {
|
||||
Type.VAR_INT.write(buffer, mappedId);
|
||||
for (int i = 0; i < palette.size(); i++) {
|
||||
Type.VAR_INT.write(buffer, palette.inverse().get(i));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
package us.myles.ViaVersion.api.type.types.version;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
|
||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.ShortBuffer;
|
||||
import java.util.List;
|
||||
|
||||
public class ChunkSectionType1_8 extends Type<ChunkSection> {
|
||||
|
||||
@ -19,8 +17,7 @@ public class ChunkSectionType1_8 extends Type<ChunkSection> {
|
||||
@Override
|
||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||
ChunkSection chunkSection = new ChunkSection();
|
||||
List<Integer> palette = chunkSection.getPalette();
|
||||
palette.clear();
|
||||
chunkSection.getPalette().clear();
|
||||
|
||||
byte[] blockData = new byte[ChunkSection.SIZE * 2];
|
||||
buffer.readBytes(blockData);
|
||||
@ -38,6 +35,6 @@ public class ChunkSectionType1_8 extends Type<ChunkSection> {
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||
throw new NotImplementedException();
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
package us.myles.ViaVersion.api.type.types.version;
|
||||
|
||||
import com.google.common.collect.BiMap;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||
|
||||
public ChunkSectionType1_9() {
|
||||
@ -15,7 +14,7 @@ public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||
@Override
|
||||
public ChunkSection read(ByteBuf buffer) throws Exception {
|
||||
ChunkSection chunkSection = new ChunkSection();
|
||||
List<Integer> palette = chunkSection.getPalette();
|
||||
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||
palette.clear();
|
||||
|
||||
// Reaad bits per block
|
||||
@ -35,7 +34,7 @@ public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||
// Read palette
|
||||
for (int i = 0; i < paletteLength; i++) {
|
||||
if (bitsPerBlock != 13) {
|
||||
palette.add(Type.VAR_INT.read(buffer));
|
||||
palette.put(Type.VAR_INT.read(buffer), palette.size());
|
||||
} else {
|
||||
Type.VAR_INT.read(buffer);
|
||||
}
|
||||
@ -73,7 +72,7 @@ public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, ChunkSection chunkSection) throws Exception {
|
||||
List<Integer> palette = chunkSection.getPalette();
|
||||
BiMap<Integer, Integer> palette = chunkSection.getPalette();
|
||||
|
||||
int bitsPerBlock = 4;
|
||||
while (palette.size() > 1 << bitsPerBlock) {
|
||||
@ -84,8 +83,8 @@ public class ChunkSectionType1_9 extends Type<ChunkSection> {
|
||||
|
||||
// Write pallet
|
||||
Type.VAR_INT.write(buffer, palette.size());
|
||||
for (int mappedId : palette) {
|
||||
Type.VAR_INT.write(buffer, mappedId);
|
||||
for (int i = 0; i < palette.size(); i++) {
|
||||
Type.VAR_INT.write(buffer, palette.inverse().get(i));
|
||||
}
|
||||
|
||||
int length = (int) Math.ceil(ChunkSection.SIZE * bitsPerBlock / 64.0);
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
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.minecraft.BlockChangeRecord;
|
||||
import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
|
||||
@ -27,17 +28,13 @@ public class WorldPackets {
|
||||
Chunk chunk = wrapper.passthrough(new Chunk1_13Type(clientWorld));
|
||||
|
||||
for (ChunkSection section : chunk.getSections()) {
|
||||
if (section != null) {
|
||||
for (int i = 0; i < section.getPalette().size(); i++) {
|
||||
section.getPalette().set(
|
||||
i,
|
||||
Protocol1_13_1To1_13.getNewBlockStateId(section.getPalette().get(i))
|
||||
);
|
||||
if (section == null) continue;
|
||||
BiMap<Integer, Integer> inverse = section.getPalette().inverse();
|
||||
for (int i = 0; i < inverse.size(); i++) {
|
||||
inverse.put(i, Protocol1_13_1To1_13.getNewBlockStateId(inverse.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.google.common.base.Optional;
|
||||
import com.google.common.collect.BiMap;
|
||||
import us.myles.ViaVersion.api.PacketWrapper;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
@ -241,13 +242,14 @@ public class WorldPackets {
|
||||
|
||||
boolean willStoreAnyBlock = false;
|
||||
|
||||
for (int p = 0; p < section.getPalette().size(); p++) {
|
||||
int old = section.getPalette().get(p);
|
||||
BiMap<Integer, Integer> inverse = section.getPalette().inverse();
|
||||
for (int p = 0; p < inverse.size(); p++) {
|
||||
int old = inverse.get(p);
|
||||
int newId = toNewId(old);
|
||||
if (storage.isWelcome(newId)) {
|
||||
willStoreAnyBlock = true;
|
||||
}
|
||||
section.getPalette().set(p, newId);
|
||||
inverse.put(p, newId);
|
||||
}
|
||||
|
||||
if (willStoreAnyBlock) {
|
||||
|
||||
@ -54,10 +54,8 @@ public class Chunk1_9_1_2Type extends PartialType<Chunk, ClientWorld> {
|
||||
if (world.getEnvironment() == Environment.NORMAL) {
|
||||
section.readSkyLight(input);
|
||||
}
|
||||
if (replacePistons) {
|
||||
if (section.getPalette().contains(36)) {
|
||||
section.getPalette().set(section.getPalette().indexOf(36), replacementId);
|
||||
}
|
||||
if (replacePistons && section.getPalette().containsKey(36)) {
|
||||
section.getPalette().put(replacementId, section.getPalette().remove(36));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -89,8 +89,8 @@ public class Chunk1_9to1_8Type extends PartialType<Chunk, ClientChunks> {
|
||||
ChunkSection section = Types1_8.CHUNK_SECTION.read(input);
|
||||
sections[i] = section;
|
||||
|
||||
if (replacePistons && section.getPalette().contains(36)) {
|
||||
section.getPalette().set(section.getPalette().indexOf(36), replacementId);
|
||||
if (replacePistons && section.getPalette().containsKey(36)) {
|
||||
section.getPalette().put(replacementId, section.getPalette().remove(36));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren