Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use correct deserialization method in SerializerVersion#toComponent 

MCStructs has multiple methods for parsing jsons depending on the version, we should use them correctly in our wrapper to support all possible cases of components.
This commit is contained in:
FlorianMichael 2024-04-19 14:19:21 +02:00
parent 4302dd61aa
commit 94a217053b
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
View File

@ -93,11 +93,11 @@ public final class ComponentUtil {
}
public static @Nullable JsonElement convertJson(@Nullable final JsonElement element, final SerializerVersion from, final SerializerVersion to) {
return element != null ? convert(from, to, from.jsonSerializer.deserialize(element)) : null;
return element != null ? convert(from, to, from.toComponent(element)) : null;
}
public static @Nullable JsonElement convertJson(@Nullable final String json, final SerializerVersion from, final SerializerVersion to) {
return json != null ? convert(from, to, from.jsonSerializer.deserializeReader(json)) : null;
return json != null ? convert(from, to, from.toComponent(json)) : null;
}
private static JsonElement convert(final SerializerVersion from, final SerializerVersion to, final ATextComponent component) {

8
common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java
View File

@ -77,7 +77,13 @@ public enum SerializerVersion {
}
public ATextComponent toComponent(final String json) {
return jsonSerializer.deserializeReader(json);
if (ordinal() >= SerializerVersion.V1_20_3.ordinal()) {
return jsonSerializer.deserializeParser(json);
} else if (ordinal() >= SerializerVersion.V1_9.ordinal()) {
return jsonSerializer.deserializeReader(json);
} else {
return jsonSerializer.deserialize(json);
}
}
public ATextComponent toComponent(final Tag tag) {