From bcbe69d24c15ef34373842b944065e0f4d67a428 Mon Sep 17 00:00:00 2001 From: Gero Date: Sat, 20 Apr 2024 22:44:22 +0200 Subject: [PATCH] Fix ITEM_NAME component to tag conversion --- .../rewriter/StructuredDataConverter.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java index 4d2490294..c26653395 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java @@ -65,6 +65,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; import java.util.Arrays; +import java.util.Collections; import java.util.Map; import org.checkerframework.checker.nullness.qual.Nullable; @@ -105,9 +106,13 @@ public final class StructuredDataConverter { }); register(StructuredDataKey.CUSTOM_NAME, (data, tag) -> getDisplayTag(tag).putString("Name", ComponentUtil.tagToJsonString(data))); register(StructuredDataKey.ITEM_NAME, (data, tag) -> { - final CompoundTag displayTag = tag.getCompoundTag("display"); - if (displayTag != null && !displayTag.contains("Name")) { - displayTag.putString("Name", ComponentUtil.tagToJsonString(data)); + final CompoundTag displayTag = getDisplayTag(tag); + if (!displayTag.contains("Name")) { + CompoundTag name = new CompoundTag(); + name.putBoolean("italic", false); + name.putString("text", ""); + name.put("extra", new ListTag<>(Collections.singletonList(data))); + displayTag.putString("Name", ComponentUtil.tagToJsonString(name)); } }); register(StructuredDataKey.LORE, (data, tag) -> {