fix formatting

Author: ghzdude

src/main/java/gregtech/api/mui/serialize/KeySerializer.java

@@ -1,5 +1,8 @@
 package gregtech.api.mui.serialize;
 
+import com.cleanroommc.modularui.drawable.text.FormattingState;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+
 import net.minecraft.util.text.TextFormatting;
 
 import com.cleanroommc.modularui.api.drawable.IKey;
@@ -14,9 +17,17 @@
 import com.google.gson.JsonSerializationContext;
 import org.apache.commons.lang3.ArrayUtils;
 
+import java.util.Map;
+
 public class KeySerializer implements JsonHandler<IKey> {
 
-    // todo fix formatting
+    private static final Map<String, TextFormatting> FORMATTING_MAP = new Object2ObjectOpenHashMap<>();
+
+    static {
+        for (var tf : TextFormatting.values()) {
+            FORMATTING_MAP.put(tf.toString(), tf);
+        }
+    }
 
     @Override
     public IKey deserialize(JsonElement json, JsonDeserializationContext context)
@@ -26,11 +37,10 @@ public IKey deserialize(JsonElement json, JsonDeserializationContext context)
             return IKey.str(object.get("string").getAsString());
         } else if (object.has("lang")) {
             String lang = context.deserialize(object.get("lang"), String.class);
-            // FormattingState formatting = new FormattingState();
-            // formatting.parseFrom(object.get("format").getAsString());
+            TextFormatting[] formatting = deserializeArray(object.getAsJsonArray("format"), context, TextFormatting[]::new);
             Object[] args = deserializeArray(
                     object.getAsJsonArray("args"), context, Object[]::new);
-            return IKey.lang(lang, args);
+            return IKey.lang(lang, args).style(formatting);
         } else if (object.has("keys")) {
             IKey[] keys = deserializeArray(
                     object.getAsJsonArray("keys"), context, IKey[]::new);
@@ -48,16 +58,25 @@ public JsonElement serialize(IKey src, JsonSerializationContext context) {
             obj.add("string", context.serialize(src.getFormatted()));
         } else if (src instanceof LangKey langKey) {
             obj.add("lang", context.serialize(langKey.getKeySupplier().get()));
-            // var formatting = langKey.getFormatting();
-            // if (formatting != null)
-            // obj.addProperty("format", formatting.toString());
+            TextFormatting[] formattings = convert(langKey.getFormatting());
+             obj.add("format", serializeArray(formattings, context));
             Object[] args = langKey.getArgsSupplier().get();
             if (!ArrayUtils.isEmpty(args))
                 obj.add("args", serializeArray(args, context));
         } else if (src instanceof CompoundKey compoundKey) {
             obj.add("keys", serializeArray(compoundKey.getKeys(), context));
-            // obj.add("format", context.serialize(compoundKey.getFormatting()));
+            obj.add("format", serializeArray(convert(compoundKey.getFormatting()), context));
         }
         return obj;
     }
+
+    public static TextFormatting[] convert(FormattingState state) {
+        if (state == null) return new TextFormatting[0];
+        String s = state.getFormatting();
+        TextFormatting[] formattings = new TextFormatting[s.length() / 2];
+        for (int i = 0; i < s.length(); i += 2) {
+            formattings[i / 2] = FORMATTING_MAP.get(s.substring(i, i + 2));
+        }
+        return formattings;
+    }
 }