feat: update spectator's configurate serializers

Misat11 · Misat11 · commit c1861d1db673 · 2025-03-26T21:42:50.000+01:00
diff --git a/nbt/src/test/java/org/screamingsandals/lib/test/nbt/SNBTSerializerTest.java b/nbt/src/test/java/org/screamingsandals/lib/test/nbt/SNBTSerializerTest.java
@@ -352,4 +352,17 @@ public void testNEscapeSequence() {
 
         assertEquals(expected, actual);
     }
+
+    @Test
+    public void testNEscapeSequence2() {
+        var serializer = SNBTSerializer.builder().build();
+
+        var string = "\"\\N{Snowman}OtherString\"";
+
+        var actual = serializer.deserialize(string);
+
+        var expected = new StringTag("\u2603OtherString");
+
+        assertEquals(expected, actual);
+    }
 }
diff --git a/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ClickEventSerializer.java b/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ClickEventSerializer.java
@@ -32,11 +32,24 @@ public class ClickEventSerializer implements TypeSerializer<ClickEvent> {
     private static final @NotNull String ACTION_KEY = "action";
     private static final @NotNull String VALUE_KEY = "value";
 
+    private static final @NotNull String URL_KEY = "url";
+    private static final @NotNull String COMMAND_KEY = "command";
+    private static final @NotNull String PAGE_KEY = "page";
+
     @Override
     public @NotNull ClickEvent deserialize(@NotNull Type type, @NotNull ConfigurationNode node) throws SerializationException {
         try {
             var action = ClickEvent.Action.valueOf(node.node(ACTION_KEY).getString("open_url").toUpperCase(Locale.ROOT));
-            var value = node.node(VALUE_KEY).getString("");
+            String value;
+            if (action == ClickEvent.Action.OPEN_URL && node.hasChild(URL_KEY)) {
+                value = node.node(URL_KEY).getString("");
+            } else if ((action == ClickEvent.Action.RUN_COMMAND || action == ClickEvent.Action.SUGGEST_COMMAND) && node.hasChild(COMMAND_KEY)) {
+                value = node.node(COMMAND_KEY).getString("");
+            } else if (action == ClickEvent.Action.CHANGE_PAGE && node.hasChild(PAGE_KEY)) {
+                value = node.node(PAGE_KEY).getString("");
+            } else {
+                value = node.node(VALUE_KEY).getString("");
+            }
             return ClickEvent.builder()
                     .action(action)
                     .value(value)
@@ -54,6 +67,19 @@ public void serialize(@NotNull Type type, @Nullable ClickEvent obj, @NotNull Con
         }
 
         node.node(ACTION_KEY).set(obj.action().name().toLowerCase(Locale.ROOT));
-        node.node(VALUE_KEY).set(obj.value());
+        switch (obj.action()) {
+            case OPEN_URL:
+                node.node(URL_KEY).set(obj.value());
+                break;
+            case RUN_COMMAND:
+            case SUGGEST_COMMAND:
+                node.node(COMMAND_KEY).set(obj.value());
+                break;
+            case CHANGE_PAGE:
+                node.node(PAGE_KEY).set(obj.value());
+                break;
+            default:
+                node.node(VALUE_KEY).set(obj.value());
+        }
     }
 }
diff --git a/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ComponentSerializer.java b/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ComponentSerializer.java
@@ -81,16 +81,18 @@ public class ComponentSerializer implements TypeSerializer<Component> {
     // Shared content & Formatting
     private static final @NotNull String EXTRA_KEY = "extra";
     private static final @NotNull String COLOR_KEY = "color";
-    private static final @NotNull String SHADOW_COLOR_KEY = "shadowColor";
+    private static final @NotNull String SHADOW_COLOR_KEY = "shadow_color";
     private static final @NotNull String FONT_KEY = "font";
     private static final @NotNull String BOLD_KEY = "bold";
     private static final @NotNull String ITALIC_KEY = "italic";
     private static final @NotNull String UNDERLINED_KEY = "underlined";
     private static final @NotNull String STRIKETHROUGH_KEY = "strikethrough";
     private static final @NotNull String OBFUSCATED_KEY = "obfuscated";
     private static final @NotNull String INSERTION_KEY = "insertion";
-    private static final @NotNull String CLICK_EVENT_KEY = "clickEvent";
-    private static final @NotNull String HOVER_EVENT_KEY = "hoverEvent";
+    private static final @NotNull String CLICK_EVENT_KEY = "click_event";
+    private static final @NotNull String CLICK_EVENT_KEY_OLD = "clickEvent";
+    private static final @NotNull String HOVER_EVENT_KEY = "hover_event";
+    private static final @NotNull String HOVER_EVENT_KEY_OLD = "hoverEvent";
 
     // Types
     private static final @NotNull String TYPE_KEY = "type";
@@ -257,10 +259,14 @@ public class ComponentSerializer implements TypeSerializer<Component> {
 
             if (node.hasChild(CLICK_EVENT_KEY)) {
                 builder.clickEvent(node.node(CLICK_EVENT_KEY).get(ClickEvent.class));
+            } else if (node.hasChild(CLICK_EVENT_KEY_OLD)) {
+                builder.clickEvent(node.node(CLICK_EVENT_KEY_OLD).get(ClickEvent.class));
             }
 
             if (node.hasChild(HOVER_EVENT_KEY)) {
                 builder.hoverEvent(node.node(HOVER_EVENT_KEY).get(HoverEvent.class));
+            } else if (node.hasChild(HOVER_EVENT_KEY_OLD)) {
+                builder.hoverEvent(node.node(HOVER_EVENT_KEY_OLD).get(HoverEvent.class));
             }
 
             return builder.build();
diff --git a/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/EntityContentSerializer.java b/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/EntityContentSerializer.java
@@ -32,14 +32,29 @@ public class EntityContentSerializer implements TypeSerializer<EntityContent> {
     public static final @NotNull EntityContentSerializer INSTANCE = new EntityContentSerializer();
 
     private static final @NotNull String TYPE_KEY = "type";
-    private static final @NotNull String ID_KEY = "id";
+    private static final @NotNull String ID_KEY = "id"; // repurposed since 1.21.5
     private static final @NotNull String NAME_KEY = "name";
 
+    // New
+    private static final @NotNull String UUID_KEY = "uuid";
+
     @Override
     public @NotNull EntityContent deserialize(@NotNull Type type, @NotNull ConfigurationNode node) throws SerializationException {
         try {
-            var entityType = ResourceLocation.of(node.node(TYPE_KEY).getString("minecraft:pig"));
-            var idNode = node.node(ID_KEY);
+            String typeKey;
+            String idKey;
+            if (node.hasChild(UUID_KEY)) {
+                // 1.21.5+
+                idKey = UUID_KEY;
+                typeKey = ID_KEY;
+            } else {
+                typeKey = TYPE_KEY;
+                idKey = ID_KEY;
+            }
+
+            var entityType = ResourceLocation.of(node.node(typeKey).getString("minecraft:pig"));
+
+            var idNode = node.node(idKey);
             var id = idNode.isList() ? deserializeUuidFromListOrRandom(idNode) : idNode.get(UUID.class, UUID.randomUUID());
             @Nullable var name = node.node(NAME_KEY).get(Component.class);
 
@@ -68,8 +83,8 @@ public void serialize(@NotNull Type type, @Nullable EntityContent obj, @NotNull
             return;
         }
 
-        node.node(TYPE_KEY).set(obj.type().asString());
-        node.node(ID_KEY).set(UUID.class, obj.id());
+        node.node(ID_KEY).set(obj.type().asString());
+        node.node(UUID_KEY).set(UUID.class, obj.id());
         node.node(NAME_KEY).set(Component.class, obj.name());
     }
 }
diff --git a/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/HoverEventSerializer.java b/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/HoverEventSerializer.java
@@ -53,7 +53,7 @@ public class HoverEventSerializer implements TypeSerializer<HoverEvent> {
                     default:
                         content = value.get(Component.class);
                 }
-            } else {
+            } else if (node.hasChild(CONTENTS_KEY)) {
                 var contents = node.node(CONTENTS_KEY);
                 switch (action) {
                     case SHOW_ITEM:
@@ -65,6 +65,12 @@ public class HoverEventSerializer implements TypeSerializer<HoverEvent> {
                     default:
                         content = contents.get(Component.class);
                 }
+            } else if (action == HoverEvent.Action.SHOW_ITEM) {
+                content = node.get(ItemContent.class);
+            } else if (action == HoverEvent.Action.SHOW_ENTITY) {
+                content = node.get(EntityContent.class);
+            } else {
+                content = null;
             }
             Preconditions.checkNotNull(content);
             return HoverEvent.builder()
@@ -83,16 +89,16 @@ public void serialize(@NotNull Type type, @Nullable HoverEvent obj, @NotNull Con
             return;
         }
 
-        node.node(ACTION_KEY).set(obj.action().name().toLowerCase(Locale.ROOT)); // lower case to match vanilla keys
         switch (obj.action()) {
             case SHOW_ITEM:
-                node.node(CONTENTS_KEY).set(ItemContent.class, (ItemContent) obj.content());
+                node.set(ItemContent.class, (ItemContent) obj.content());
                 break;
             case SHOW_ENTITY:
-                node.node(CONTENTS_KEY).set(EntityContent.class, (EntityContent) obj.content());
+                node.set(EntityContent.class, (EntityContent) obj.content());
                 break;
             default:
-                node.node(CONTENTS_KEY).set(Component.class, (Component) obj.content());
+                node.node(VALUE_KEY).set(Component.class, (Component) obj.content());
         }
+        node.node(ACTION_KEY).set(obj.action().name().toLowerCase(Locale.ROOT)); // lower case to match vanilla keys
     }
 }
diff --git a/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ItemContentSerializer.java b/spectator/common/src/main/java/org/screamingsandals/lib/spectator/configurate/ItemContentSerializer.java
@@ -45,6 +45,7 @@ public class ItemContentSerializer implements TypeSerializer<ItemContent> {
             var count = node.node(COUNT_KEY).getInt(1);
             var tag = node.node(TAG_KEY);
             CompoundTag compoundTag;
+            // TODO: load components
             if (!tag.empty()) {
                 if (tag.isMap()) {
                     compoundTag = (CompoundTag) TagSerializer.INSTANCE.deserialize(Tag.class, tag);
@@ -73,6 +74,7 @@ public void serialize(@NotNull Type type, @Nullable ItemContent obj, @NotNull Co
 
         node.node(ID_KEY).set(obj.id().asString());
         node.node(COUNT_KEY).set(obj.count());
+        // TODO: save components
         node.node(TAG_KEY).set(obj.tag());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public class ItemContentSerializer implements TypeSerializer<ItemContent> {`
`45`	`45`	`var count = node.node(COUNT_KEY).getInt(1);`
`46`	`46`	`var tag = node.node(TAG_KEY);`
`47`	`47`	`CompoundTag compoundTag;`
	`48`	`+ // TODO: load components`
`48`	`49`	`if (!tag.empty()) {`
`49`	`50`	`if (tag.isMap()) {`
`50`	`51`	`compoundTag = (CompoundTag) TagSerializer.INSTANCE.deserialize(Tag.class, tag);`
`@@ -73,6 +74,7 @@ public void serialize(@NotNull Type type, @Nullable ItemContent obj, @NotNull Co`
`73`	`74`
`74`	`75`	`node.node(ID_KEY).set(obj.id().asString());`
`75`	`76`	`node.node(COUNT_KEY).set(obj.count());`
	`77`	`+ // TODO: save components`
`76`	`78`	`node.node(TAG_KEY).set(obj.tag());`
`77`	`79`	`}`
`78`	`80`	`}`