Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-09 17:50:23 +01:00
Code Issues Releases Aktivität

Use methods for palette rewriting, fix "value already present"

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Gerrygames 2018-11-12 16:08:01 +01:00
Ursprung 41ef4f6284
Commit bb2b8bc538
6 geänderte Dateien mit 30 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

18
common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/ChunkSection.java
Datei anzeigen

@ -78,6 +78,24 @@ public class ChunkSection {
return blocks[idx]; return blocks[idx];
} }
public int getPaletteSize() {
return palette.size();
}
public int getPaletteEntry(int index) {
if (index < 0 || index >= palette.size()) throw new IndexOutOfBoundsException();
return palette.inverse().get(index);
}
public void setPaletteEntry(int index, int id) {
if (index < 0 || index >= palette.size()) throw new IndexOutOfBoundsException();
palette.forcePut(id, index);
}
public void replacePaletteEntry(int oldId, int newId) {
if (palette.containsKey(oldId)) palette.put(newId, palette.remove(oldId));
}
/** /**
* Set a block state in the chunk * Set a block state in the chunk
* This method will not update non-air blocks count * This method will not update non-air blocks count

6
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
Datei anzeigen

@ -1,6 +1,5 @@
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;
@ -29,9 +28,8 @@ public class WorldPackets {
for (ChunkSection section : chunk.getSections()) { for (ChunkSection section : chunk.getSections()) {
if (section == null) continue; if (section == null) continue;
BiMap<Integer, Integer> inverse = section.getPalette().inverse(); for (int i = 0; i < section.getPaletteSize(); i++) {
for (int i = 0; i < inverse.size(); i++) { section.setPaletteEntry(i, Protocol1_13_1To1_13.getNewBlockStateId(section.getPaletteEntry(i)));
inverse.put(i, Protocol1_13_1To1_13.getNewBlockStateId(inverse.get(i)));
} }
} }
} }

7
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
Datei anzeigen

@ -242,14 +242,13 @@ public class WorldPackets {
boolean willStoreAnyBlock = false; boolean willStoreAnyBlock = false;
BiMap<Integer, Integer> inverse = section.getPalette().inverse(); for (int p = 0; p < section.getPaletteSize(); p++) {
for (int p = 0; p < inverse.size(); p++) { int old = section.getPaletteEntry(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;
} }
inverse.put(p, newId); section.setPaletteEntry(p, newId);
} }
if (willStoreAnyBlock) { if (willStoreAnyBlock) {

7
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
Datei anzeigen

@ -111,14 +111,13 @@ public class WorldPackets {
for (ChunkSection section : chunk.getSections()) { for (ChunkSection section : chunk.getSections()) {
if (section == null) continue; if (section == null) continue;
boolean hasBlock = false; boolean hasBlock = false;
BiMap<Integer, Integer> inverse = section.getPalette().inverse(); for (int i = 0; i < section.getPaletteSize(); i++) {
for (int i = 0; i < inverse.size(); i++) { int old = section.getPaletteEntry(i);
int old = inverse.get(i);
int newId = Protocol1_14To1_13_2.getNewBlockStateId(old); int newId = Protocol1_14To1_13_2.getNewBlockStateId(old);
if (!hasBlock && newId != AIR && newId != VOID_AIR && newId != CAVE_AIR) { // air, void_air, cave_air if (!hasBlock && newId != AIR && newId != VOID_AIR && newId != CAVE_AIR) { // air, void_air, cave_air
hasBlock = true; hasBlock = true;
} }
inverse.put(i, newId); section.setPaletteEntry(i, newId);
} }
if (!hasBlock) { if (!hasBlock) {
section.setNonAirBlocksCount(0); section.setNonAirBlocksCount(0);

4
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
Datei anzeigen

@ -54,8 +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 && section.getPalette().containsKey(36)) { if (replacePistons) {
section.getPalette().put(replacementId, section.getPalette().remove(36)); section.replacePaletteEntry(36, replacementId);
} }
} }

4
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/Chunk1_9to1_8Type.java
Datei anzeigen

@ -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().containsKey(36)) { if (replacePistons) {
section.getPalette().put(replacementId, section.getPalette().remove(36)); section.replacePaletteEntry(36, replacementId);
} }
} }