Fix deserialization for ClickEvent and HoverEvent

Author: UnderscoreTud

src/main/java/org/machinemc/scriptive/events/ClickEvent.java

@@ -2,6 +2,7 @@
 
 import org.machinemc.scriptive.Contents;
 
+import java.util.Locale;
 import java.util.Map;
 
 public record ClickEvent(Action action, String value) implements Contents {
@@ -22,6 +23,19 @@ public Map<String, Object> asMap() {
         );
     }
 
+    public static ClickEvent deserialize(Map<String, String> map) {
+        Action action;
+        try {
+            action = map.containsKey("action") ? Action.valueOf(map.get("action").toUpperCase(Locale.ENGLISH)) : null;
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+        String value = map.get("action");
+        if (value == null)
+            return null;
+        return new ClickEvent(action, value);
+    }
+
     public enum Action {
         OPEN_URL,
         RUN_COMMAND,

src/main/java/org/machinemc/scriptive/events/HoverEvent.java

@@ -3,6 +3,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.machinemc.scriptive.Contents;
 import org.machinemc.scriptive.components.Component;
+import org.machinemc.scriptive.components.TextComponent;
+import org.machinemc.scriptive.serialization.ComponentSerializer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,6 +32,13 @@ public Map<String, Object> asMap() {
         );
     }
 
+    @SuppressWarnings("unchecked")
+    public static <V extends Value> HoverEvent<?> deserialize(ComponentSerializer serializer, Map<String, Object> map) {
+        HoverEvent.Action<V> action = (Action<V>) Action.byName(map.get("action") + "");
+        if (action == null) return null;
+        return new HoverEvent<>(action, action.parseValue(serializer, map.get("contents")));
+    }
+
     public static final class Action<V extends Value> {
 
         public static final Action<Text> SHOW_TEXT = new Action<>("show_text", Text.class);
@@ -52,6 +61,41 @@ public Class<V> type() {
             return type;
         }
 
+        @SuppressWarnings("unchecked")
+        public V parseValue(ComponentSerializer serializer, Object value) {
+            if (value == null || (this != SHOW_TEXT && !(value instanceof Map<?, ?>))) return null;
+            if (this == SHOW_TEXT) {
+                if (value instanceof String string)
+                    return (V) new Text(TextComponent.of(string));
+                if (!(value instanceof Map<?, ?> map)) return null;
+                return serializer.deserialize((Map<String, Object>) map);
+            } else if (this == SHOW_ITEM) {
+                Map<String, Object> map = (Map<String, Object>) value;
+                if (!map.containsKey("id") || !map.containsKey("count")) return null;
+                String id = map.get("id") + "";
+                int count = Integer.parseInt(map.get("count") + "");
+                String tag = map.containsKey("tag") ? map.get("tag") + "" : null;
+                return (V) new Item(id, count, tag);
+            } else if (this == SHOW_ENTITY) {
+                Map<String, Object> map = (Map<String, Object>) value;
+                UUID id = map.containsKey("id") ? UUID.fromString(map.get("id") + "") : null;
+                if (id == null) return null;
+                String type = map.containsKey("type") ? map.get("type") + "" : null;
+                String name = map.containsKey("name") ? map.get("name") + "" : null;
+                return (V) new Entity(id, type, name);
+            }
+            throw new UnsupportedOperationException();
+        }
+
+        public static Action<?> byName(String name) {
+            return switch (name) {
+                case "show_text" -> SHOW_TEXT;
+                case "show_item" -> SHOW_ITEM;
+                case "show_entity" -> SHOW_ENTITY;
+                default -> null;
+            };
+        }
+
         @SuppressWarnings("unchecked")
         public static <V extends Value> Action<V> ofValue(V value) {
             return (Action<V>) switch (value) {
@@ -61,6 +105,10 @@ public static <V extends Value> Action<V> ofValue(V value) {
             };
         }
 
+        public static Action<?>[] values() {
+            return new Action[]{SHOW_TEXT, SHOW_ITEM, SHOW_ENTITY};
+        }
+
     }
 
     public interface ValueHolder<V extends Value> {

src/main/java/org/machinemc/scriptive/serialization/ComponentSerializerImpl.java

@@ -10,6 +10,7 @@
 import org.machinemc.scriptive.style.HexColor;
 
 import java.util.*;
+import java.util.function.Function;
 
 @SuppressWarnings("unchecked")
 public class ComponentSerializerImpl implements ComponentSerializer {
@@ -78,14 +79,15 @@ public <C extends Component> C deserialize(Map<String, Object> map) {
                 .map(String::valueOf)
                 .ifPresent(component::setInsertion);
 
-        // TODO fix deserialization of these two
         Optional.ofNullable(map.get("clickEvent"))
-                .filter(o -> o instanceof ClickEvent)
-                .map(o -> (ClickEvent) o)
+                .filter(o -> o instanceof Map<?, ?>)
+                .map(o -> (Map<String, String>) o)
+                .map(ClickEvent::deserialize)
                 .ifPresent(component::setClickEvent);
         Optional.ofNullable(map.get("hoverEvent"))
-                .filter(o -> o instanceof HoverEvent<?>)
-                .map(o -> (HoverEvent<?>) o)
+                .filter(o -> o instanceof Map<?, ?>)
+                .map(o -> (Map<String, Object>) o)
+                .map(hoverEventMap -> HoverEvent.deserialize(this, hoverEventMap))
                 .ifPresent(component::setHoverEvent);
 
         if (map.containsKey("extra")) {

src/main/java/org/machinemc/scriptive/util/StringReader.java

@@ -51,16 +51,6 @@ public char read() {
         return input.charAt(cursor++);
     }
 
-    public char next() {
-        skipWhitespace();
-        return read();
-    }
-
-    public void skipWhitespace() {
-        while (canRead() && Character.isWhitespace(peek()))
-            read();
-    }
-
     public void reset() {
         cursor = 0;
     }