serializable drawable implements IJsonSerializable

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/IJsonSerializable.java

@@ -0,0 +1,23 @@
+package com.cleanroommc.modularui.api;
+
+import com.google.gson.JsonObject;
+
+public interface IJsonSerializable {
+
+    /**
+     * Reads extra json data after this drawable is created.
+     *
+     * @param json json to read from
+     */
+    default void loadFromJson(JsonObject json) {}
+
+    /**
+     * Writes all json data necessary so that deserializing it results in the same drawable.
+     *
+     * @param json json to write to
+     * @return if the drawable was serialized
+     */
+    default boolean saveToJson(JsonObject json) {
+        return false;
+    }
+}

src/main/java/com/cleanroommc/modularui/api/drawable/IDrawable.java

@@ -137,23 +137,6 @@ default Icon asIcon() {
         return new Icon(this);
     }
 
-    /**
-     * Reads extra json data after this drawable is created.
-     *
-     * @param json json to read from
-     */
-    default void loadFromJson(JsonObject json) {}
-
-    /**
-     * Writes all json data necessary so that deserializing it results in the same drawable.
-     *
-     * @param json json to write to
-     * @return if the drawable was serialized
-     */
-    default boolean saveToJson(JsonObject json) {
-        return false;
-    }
-
     /**
      * An empty drawable. Does nothing.
      */

src/main/java/com/cleanroommc/modularui/api/drawable/IKey.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.api.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.drawable.Icon;
 import com.cleanroommc.modularui.drawable.text.*;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
@@ -21,7 +22,7 @@
 /**
  * This represents a piece of text in a GUI.
  */
-public interface IKey extends IDrawable {
+public interface IKey extends IDrawable, IJsonSerializable {
 
     int TEXT_COLOR = 0xFF404040;
 

src/main/java/com/cleanroommc/modularui/drawable/Circle.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -12,7 +13,7 @@
 import com.google.gson.JsonObject;
 import org.jetbrains.annotations.Contract;
 
-public class Circle implements IDrawable {
+public class Circle implements IDrawable, IJsonSerializable {
 
     private int colorInner, colorOuter, segments;
 

src/main/java/com/cleanroommc/modularui/drawable/DrawableArray.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -9,7 +10,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class DrawableArray implements IDrawable {
+public class DrawableArray implements IDrawable, IJsonSerializable {
 
     public static final IDrawable[] EMPTY_BACKGROUND = {};
 

src/main/java/com/cleanroommc/modularui/drawable/DrawableSerialization.java

@@ -1,6 +1,7 @@
 package com.cleanroommc.modularui.drawable;
 
 import com.cleanroommc.modularui.ModularUI;
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.utils.JsonHelper;
@@ -37,7 +38,7 @@ public static String getTextureId(UITexture texture) {
         return REVERSE_TEXTURES.get(texture);
     }
 
-    public static <T extends IDrawable> void registerDrawableType(String id, Class<T> type, Function<@NotNull JsonObject, @NotNull T> creator) {
+    public static <T extends IDrawable & IJsonSerializable> void registerDrawableType(String id, Class<T> type, Function<@NotNull JsonObject, @NotNull T> creator) {
         if (DRAWABLE_TYPES.containsKey(id)) {
             throw new IllegalArgumentException("Drawable type '" + id + "' already exists!");
         }
@@ -49,14 +50,11 @@ public static <T extends IDrawable> void registerDrawableType(String id, Class<T
 
     @ApiStatus.Internal
     public static void init() {
-        registerDrawableType("empty", IDrawable.class, json -> IDrawable.EMPTY);
-        registerDrawableType("null", null, json -> IDrawable.EMPTY);
-        registerDrawableType("none", null, json -> IDrawable.NONE);
+        // empty, none and text are special cases
         registerDrawableType("texture", UITexture.class, UITexture::parseFromJson);
-        registerDrawableType("color", null, json -> new Rectangle());
+        registerDrawableType("color", Rectangle.class, json -> new Rectangle());
         registerDrawableType("rectangle", Rectangle.class, json -> new Rectangle());
         registerDrawableType("ellipse", Circle.class, json -> new Circle());
-        registerDrawableType("text", IKey.class, DrawableSerialization::parseText);
         registerDrawableType("item", ItemDrawable.class, ItemDrawable::ofJson);
         registerDrawableType("icon", Icon.class, Icon::ofJson);
     }
@@ -107,12 +105,17 @@ public IDrawable deserialize(JsonElement element, Type typeOfT, JsonDeserializat
             return IDrawable.EMPTY;
         }
         String type = JsonHelper.getString(json, "empty", "type");
+        if ("text".equals(type)) {
+            IKey key = parseText(json);
+            key.loadFromJson(json);
+            return key;
+        }
         if (!DRAWABLE_TYPES.containsKey(type)) {
-            ModularUI.LOGGER.throwing(new JsonParseException("Drawable type '" + type + "' is either not specified or invalid!"));
+            ModularUI.LOGGER.throwing(new JsonParseException("Drawable type '" + type + "' is either not json serializable!"));
             return IDrawable.EMPTY;
         }
         IDrawable drawable = DRAWABLE_TYPES.get(type).apply(json);
-        drawable.loadFromJson(json);
+        ((IJsonSerializable) drawable).loadFromJson(json);
         return drawable;
     }
 
@@ -128,8 +131,12 @@ public JsonElement serialize(IDrawable src, Type typeOfSrc, JsonSerializationCon
             return jsonArray;
         }
         JsonObject json = new JsonObject();
-        if (src instanceof IKey) {
+        if (src instanceof IKey key) {
             json.addProperty("type", "text");
+            // TODO serialize text properly
+            json.addProperty("text", key.getFormatted());
+        } else if (!(src instanceof IJsonSerializable)) {
+            throw new IllegalArgumentException("Can't serialize IDrawable which doesn't implement IJsonSerializable!");
         } else {
             Class<?> type = src.getClass();
             String key = REVERSE_DRAWABLE_TYPES.get(type);
@@ -142,10 +149,9 @@ public JsonElement serialize(IDrawable src, Type typeOfSrc, JsonSerializationCon
                 return JsonNull.INSTANCE;
             }
             json.addProperty("type", key);
-        }
-
-        if (!src.saveToJson(json)) {
-            ModularUI.LOGGER.error("Serialization of drawable {} failed!", src.getClass().getSimpleName());
+            if (!((IJsonSerializable) src).saveToJson(json)) {
+                ModularUI.LOGGER.error("Serialization of drawable {} failed!", src.getClass().getSimpleName());
+            }
         }
         return json;
     }

src/main/java/com/cleanroommc/modularui/drawable/Icon.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
@@ -16,7 +17,7 @@
 /**
  * A {@link IDrawable} wrapper with a fixed size and an alignment.
  */
-public class Icon implements IIcon {
+public class Icon implements IIcon, IJsonSerializable {
 
     private final IDrawable drawable;
     private int width = 0, height = 0;

src/main/java/com/cleanroommc/modularui/drawable/IngredientDrawable.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -10,7 +11,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class IngredientDrawable implements IDrawable {
+public class IngredientDrawable implements IDrawable, IJsonSerializable {
 
     private ItemStack[] items;
 

src/main/java/com/cleanroommc/modularui/drawable/ItemDrawable.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -24,7 +25,7 @@
 
 import java.util.NoSuchElementException;
 
-public class ItemDrawable implements IDrawable {
+public class ItemDrawable implements IDrawable, IJsonSerializable {
 
     private ItemStack item = ItemStack.EMPTY;
 

src/main/java/com/cleanroommc/modularui/drawable/Rectangle.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.IJsonSerializable;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -14,7 +15,7 @@
 
 import java.util.function.IntConsumer;
 
-public class Rectangle implements IDrawable {
+public class Rectangle implements IDrawable, IJsonSerializable {
 
     public static final double PI_2 = Math.PI / 2;