Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-19 14:30:16 +01:00
Code Issues Releases Aktivität

Add missing checks in item id conversions

Quellcode durchsuchen
Dieser Commit ist enthalten in:
FlorianMichael 2024-04-08 13:36:58 +02:00
Ursprung 5f685884ff
Commit 9f1ee27afc
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: C2FB87E71C425126
1 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
Datei anzeigen

@ -84,8 +84,10 @@ public final class StructuredDataConverter {
private static final String ITEM_BACKUP_TAG_KEY = "VV|id"; private static final String ITEM_BACKUP_TAG_KEY = "VV|id";
private final Map<StructuredDataKey<?>, DataConverter<?>> rewriters = new Reference2ObjectOpenHashMap<>(); private final Map<StructuredDataKey<?>, DataConverter<?>> rewriters = new Reference2ObjectOpenHashMap<>();
private final boolean backupInconvertibleData;
public StructuredDataConverter(final boolean backupInconvertibleData) { public StructuredDataConverter(final boolean backupInconvertibleData) {
this.backupInconvertibleData = backupInconvertibleData;
register(StructuredDataKey.CUSTOM_DATA, (data, tag) -> { register(StructuredDataKey.CUSTOM_DATA, (data, tag) -> {
// Handled manually // Handled manually
}); });
@ -460,7 +462,7 @@ public final class StructuredDataConverter {
materialTag.putString("asset_name", material.assetName()); materialTag.putString("asset_name", material.assetName());
final String ingredientName = toMappedItemName(material.itemId()); final String ingredientName = toMappedItemName(material.itemId());
if (ingredientName.isEmpty()) { if (backupInconvertibleData && ingredientName.isEmpty()) {
getBackupTag(materialTag).putInt(ITEM_BACKUP_TAG_KEY, material.itemId()); getBackupTag(materialTag).putInt(ITEM_BACKUP_TAG_KEY, material.itemId());
} }
materialTag.putString("ingredient", ingredientName); materialTag.putString("ingredient", ingredientName);
@ -486,7 +488,7 @@ public final class StructuredDataConverter {
patternTag.putString("assetId", pattern.assetName()); patternTag.putString("assetId", pattern.assetName());
final String itemName = toMappedItemName(pattern.itemId()); final String itemName = toMappedItemName(pattern.itemId());
if (itemName.isEmpty()) { if (backupInconvertibleData && itemName.isEmpty()) {
getBackupTag(patternTag).putInt(ITEM_BACKUP_TAG_KEY, pattern.itemId()); getBackupTag(patternTag).putInt(ITEM_BACKUP_TAG_KEY, pattern.itemId());
} }
patternTag.putString("templateItem", itemName); patternTag.putString("templateItem", itemName);
@ -660,7 +662,9 @@ public final class StructuredDataConverter {
final HolderSet holders = predicate.holderSet(); final HolderSet holders = predicate.holderSet();
if (holders == null) { if (holders == null) {
// Can't do (nicely) // Can't do (nicely)
if (backupInconvertibleData) {
// TODO Backup // TODO Backup
}
continue; continue;
} }
if (holders.hasTagKey()) { if (holders.hasTagKey()) {
@ -669,7 +673,7 @@ public final class StructuredDataConverter {
} else { } else {
for (final int id : holders.ids()) { for (final int id : holders.ids()) {
final String name = toMappedItemName(id); final String name = toMappedItemName(id);
if (name.isEmpty()) { if (backupInconvertibleData && name.isEmpty()) {
// TODO HANDLE // TODO HANDLE
continue; continue;
} }
@ -730,7 +734,7 @@ public final class StructuredDataConverter {
final CompoundTag savedItem = new CompoundTag(); final CompoundTag savedItem = new CompoundTag();
final String name = toMappedItemName(item.identifier()); final String name = toMappedItemName(item.identifier());
savedItem.putString("id", name); savedItem.putString("id", name);
if (name.isEmpty()) { if (backupInconvertibleData && name.isEmpty()) {
savedItem.putInt(ITEM_BACKUP_TAG_KEY, item.identifier()); savedItem.putInt(ITEM_BACKUP_TAG_KEY, item.identifier());
} }
savedItem.putByte("Count", (byte) item.amount()); savedItem.putByte("Count", (byte) item.amount());