Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-25 03:25:11 +01:00
Code Issues Projects Releases Wiki Activity

Fixup ComponentUtil#legacyToJsonString behavior on items with styles (#3868)

Browse Source
This commit is contained in:
EnZaXD 2024-05-21 11:30:57 +02:00 committed by GitHub
parent 659bee771b
commit 9547cf160d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import net.lenni0451.mcstructs.text.events.hover.AHoverEvent;
import net.lenni0451.mcstructs.text.events.hover.impl.TextHoverEvent; import net.lenni0451.mcstructs.text.events.hover.impl.TextHoverEvent;
import net.lenni0451.mcstructs.text.serializer.LegacyStringDeserializer; import net.lenni0451.mcstructs.text.serializer.LegacyStringDeserializer;
import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer; import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer;
import net.lenni0451.mcstructs.text.utils.TextUtils;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
@ -151,12 +152,18 @@ public final class ComponentUtil {
public static String legacyToJsonString(final String message, final boolean itemData) { public static String legacyToJsonString(final String message, final boolean itemData) {
final ATextComponent component = LegacyStringDeserializer.parse(message, true); final ATextComponent component = LegacyStringDeserializer.parse(message, true);
if (itemData) { if (itemData && hasStyle(component)) {
component.setParentStyle(new Style().setItalic(false)); component.setParentStyle(new Style().setItalic(false));
} }
return SerializerVersion.V1_12.toString(component); return SerializerVersion.V1_12.toString(component);
} }
public static boolean hasStyle(final ATextComponent component) {
final boolean[] hasStyle = {false};
TextUtils.iterateAll(component, c -> hasStyle[0] |= !c.getStyle().isEmpty());
return hasStyle[0];
}
public static String jsonToLegacy(final String value) { public static String jsonToLegacy(final String value) {
return TextComponentSerializer.V1_12.deserializeReader(value).asLegacyFormatString(); return TextComponentSerializer.V1_12.deserializeReader(value).asLegacyFormatString();
} }