Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-09-28 06:31:06 +02:00
Code Issues Releases Aktivität

Fix compressed id overlap in legacy block item rewriter (#874)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EnZaXD 2024-08-20 16:12:19 +02:00 committet von GitHub
Ursprung 0b3a792a51
Commit 24f67ffe80
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
1 geänderte Dateien mit 13 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

21
common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java
Datei anzeigen

@ -103,9 +103,9 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S
// Include data // Include data
short unmappedData = Short.parseShort(key.substring(dataSeparatorIndex + 1)); short unmappedData = Short.parseShort(key.substring(dataSeparatorIndex + 1));
unmappedId = Integer.parseInt(key.substring(0, dataSeparatorIndex)); unmappedId = Integer.parseInt(key.substring(0, dataSeparatorIndex));
unmappedId = IdAndData.toRawData(unmappedId, unmappedData); unmappedId = compress(unmappedId, unmappedData);
} else { } else {
unmappedId = IdAndData.toRawData(Integer.parseInt(key), -1); unmappedId = compress(Integer.parseInt(key), -1);
} }
mappings.put(unmappedId, new MappedLegacyBlockItem(id, data, name, type)); mappings.put(unmappedId, new MappedLegacyBlockItem(id, data, name, type));
@ -120,12 +120,12 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S
// Special block color handling // Special block color handling
if (name != null && name.contains("%color%")) { if (name != null && name.contains("%color%")) {
for (int i = from; i <= to; i++) { for (int i = from; i <= to; i++) {
mappings.put(IdAndData.toRawData(i, -1), new MappedLegacyBlockItem(id, data, name.replace("%color%", BlockColors1_11_1.get(i - from)), type)); mappings.put(compress(i, -1), new MappedLegacyBlockItem(id, data, name.replace("%color%", BlockColors1_11_1.get(i - from)), type));
} }
} else { } else {
MappedLegacyBlockItem mappedBlockItem = new MappedLegacyBlockItem(id, data, name, type); MappedLegacyBlockItem mappedBlockItem = new MappedLegacyBlockItem(id, data, name, type);
for (int i = from; i <= to; i++) { for (int i = from; i <= to; i++) {
mappings.put(IdAndData.toRawData(i, -1), mappedBlockItem); mappings.put(compress(i, -1), mappedBlockItem);
} }
} }
} }
@ -360,13 +360,13 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S
} }
private @Nullable MappedLegacyBlockItem getMappedBlock(int id, int data) { private @Nullable MappedLegacyBlockItem getMappedBlock(int id, int data) {
MappedLegacyBlockItem mapping = blockReplacements.get(IdAndData.toRawData(id, data)); MappedLegacyBlockItem mapping = blockReplacements.get(compress(id, data));
return mapping != null ? mapping : blockReplacements.get(IdAndData.toRawData(id, -1)); return mapping != null ? mapping : blockReplacements.get(compress(id, -1));
} }
private @Nullable MappedLegacyBlockItem getMappedItem(int id, int data) { private @Nullable MappedLegacyBlockItem getMappedItem(int id, int data) {
MappedLegacyBlockItem mapping = itemReplacements.get(IdAndData.toRawData(id, data)); MappedLegacyBlockItem mapping = itemReplacements.get(compress(id, data));
return mapping != null ? mapping : itemReplacements.get(IdAndData.toRawData(id, -1)); return mapping != null ? mapping : itemReplacements.get(compress(id, -1));
} }
private @Nullable MappedLegacyBlockItem getMappedBlock(int rawId) { private @Nullable MappedLegacyBlockItem getMappedBlock(int rawId) {
@ -379,6 +379,11 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S
return BackwardsMappingDataLoader.INSTANCE.loadFromDataDir(name); return BackwardsMappingDataLoader.INSTANCE.loadFromDataDir(name);
} }
protected int compress(final int id, final int data) {
// Using IdAndData for the internal storage can cause id overlaps in edge cases and would lead to wrong data
return (id << 16) | (data & 0xFFFF);
}
private record Pos(int x, short y, int z) { private record Pos(int x, short y, int z) {
public Pos(int x, int y, int z) { public Pos(int x, int y, int z) {