Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-02 12:51:22 +01:00
Code Issues Projects Releases Wiki Activity

Add component types in conversion

Browse Source
This commit is contained in:
Nassim Jahnke 2023-12-06 10:55:12 +01:00
parent d44d89099b
commit 1ad65d1bb0
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
View File

@ -391,10 +391,12 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
return null; return null;
} else if (element.isJsonObject()) { } else if (element.isJsonObject()) {
final CompoundTag tag = new CompoundTag(); final CompoundTag tag = new CompoundTag();
for (final Map.Entry<String, JsonElement> entry : element.getAsJsonObject().entrySet()) { final JsonObject jsonObject = element.getAsJsonObject();
// Not strictly needed, but might as well make it more compact for (final Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
convertObjectEntry(entry.getKey(), entry.getValue(), tag); convertObjectEntry(entry.getKey(), entry.getValue(), tag);
} }
addComponentType(jsonObject, tag);
return tag; return tag;
} else if (element.isJsonArray()) { } else if (element.isJsonArray()) {
return convertJsonArray(element); return convertJsonArray(element);
@ -420,6 +422,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
} else if (number instanceof Float) { } else if (number instanceof Float) {
return new FloatTag(number.floatValue()); return new FloatTag(number.floatValue());
} else if (number instanceof LazilyParsedNumber) { } else if (number instanceof LazilyParsedNumber) {
// TODO: This might need better handling
return new IntTag(number.intValue()); return new IntTag(number.intValue());
} }
return new IntTag(number.intValue()); // ??? return new IntTag(number.intValue()); // ???
@ -427,6 +430,28 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
throw new IllegalArgumentException("Unhandled json type " + element.getClass().getSimpleName() + " with value " + element.getAsString()); throw new IllegalArgumentException("Unhandled json type " + element.getClass().getSimpleName() + " with value " + element.getAsString());
} }
private static void addComponentType(final JsonObject object, final CompoundTag tag) {
if (object.has("type")) {
return;
}
// Add the type to speed up deserialization and make DFU errors slightly more useful
// Order is important
if (object.has("text")) {
tag.put("type", new StringTag("text"));
} else if (object.has("translate")) {
tag.put("type", new StringTag("translatable"));
} else if (object.has("score")) {
tag.put("type", new StringTag("score"));
} else if (object.has("selector")) {
tag.put("type", new StringTag("selector"));
} else if (object.has("keybind")) {
tag.put("type", new StringTag("keybind"));
} else if (object.has("nbt")) {
tag.put("type", new StringTag("nbt"));
}
}
private static ListTag convertJsonArray(final JsonElement element) { private static ListTag convertJsonArray(final JsonElement element) {
// TODO Number arrays? // TODO Number arrays?
final ListTag listTag = new ListTag(); final ListTag listTag = new ListTag();
@ -457,29 +482,38 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
// Wrap all entries in compound tags as lists can only consist of one type of tag // Wrap all entries in compound tags as lists can only consist of one type of tag
final CompoundTag compoundTag = new CompoundTag(); final CompoundTag compoundTag = new CompoundTag();
compoundTag.put("type", new StringTag("text"));
compoundTag.put("text", new StringTag()); compoundTag.put("text", new StringTag());
compoundTag.put("extra", convertedTag); compoundTag.put("extra", convertedTag);
} }
return processedListTag; return processedListTag;
} }
private static void convertObjectEntry(final String key, final JsonElement element, final CompoundTag tag) { /**
if ((key.equals("contents")) && element.isJsonObject()) { * Converts a json object entry to a tag entry.
*
* @param key key of the entry
* @param value value of the entry
* @param tag the resulting compound tag
*/
private static void convertObjectEntry(final String key, final JsonElement value, final CompoundTag tag) {
if ((key.equals("contents")) && value.isJsonObject()) {
// Store show_entity id as int array instead of uuid string // Store show_entity id as int array instead of uuid string
final JsonObject hoverEvent = element.getAsJsonObject(); // Not really required, but we might as well make it more compact
final JsonObject hoverEvent = value.getAsJsonObject();
final JsonElement id = hoverEvent.get("id"); final JsonElement id = hoverEvent.get("id");
final UUID uuid; final UUID uuid;
if (id != null && id.isJsonPrimitive() && (uuid = parseUUID(id.getAsString())) != null) { if (id != null && id.isJsonPrimitive() && (uuid = parseUUID(id.getAsString())) != null) {
hoverEvent.remove("id"); hoverEvent.remove("id");
final CompoundTag convertedTag = (CompoundTag) convertToTag(element); final CompoundTag convertedTag = (CompoundTag) convertToTag(value);
convertedTag.put("id", new IntArrayTag(UUIDIntArrayType.uuidToIntArray(uuid))); convertedTag.put("id", new IntArrayTag(UUIDIntArrayType.uuidToIntArray(uuid)));
tag.put(key, convertedTag); tag.put(key, convertedTag);
return; return;
} }
} }
tag.put(key, convertToTag(element)); tag.put(key, convertToTag(value));
} }
private static @Nullable UUID parseUUID(final String uuidString) { private static @Nullable UUID parseUUID(final String uuidString) {