Users with Special badges can now set a color for each of them

FiguraMC · Oct 2, 2023 · 7d468bf · 7d468bf
1 parent df2a434
commit 7d468bf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/common/src/main/java/org/figuramc/figura/avatar/Avatar.java b/common/src/main/java/org/figuramc/figura/avatar/Avatar.java
@@ -98,6 +98,8 @@ public class Avatar {
     public String id;
     public int fileSize;
     public String color;
+    public Map<String, String> badgeToColor = new HashMap<>();
+
     public boolean minify;
 
     // Runtime data
@@ -183,6 +185,11 @@ public void load(CompoundTag nbt) {
                     color = metadata.getString("color");
                 if (metadata.contains("minify"))
                     minify = metadata.getBoolean("minify");
+                for (String key : metadata.getAllKeys()) {
+                    if (key.contains("badge_color_")) {
+                        badgeToColor.put(key.replace("badge_color_", ""), metadata.getString(key));
+                    }
+                }
                 fileSize = getFileSize();
                 versionStatus = getVersionStatus();
                 if (entityName.isBlank())

diff --git a/common/src/main/java/org/figuramc/figura/avatar/Badges.java b/common/src/main/java/org/figuramc/figura/avatar/Badges.java
@@ -86,17 +86,24 @@ else if (avatar.nbt != null) {
             }
         }
 
-        // -- special -- // 
-
-        // special badges
-        BitSet specialSet = pair.getSecond();
-        Special[] special = Special.values();
-        for (int i = special.length - 1; i >= 0; i--) {
-            if (specialSet.get(i))
-                badges.append(special[i].badge);
+        // -- special -- //
+        if (avatar != null) {
+            // special badges
+            BitSet specialSet = pair.getSecond();
+            Special[] specialValues = Special.values();
+            for (int i = specialValues.length - 1; i >= 0; i--) {
+                if (specialSet.get(i)) {
+                    Special special = specialValues[i];
+                    Integer color = special.color;
+                    if (avatar.badgeToColor.containsKey(special.name().toLowerCase())) {
+                        color = ColorUtils.rgbToInt(ColorUtils.userInputHex(avatar.badgeToColor.get(special.name().toLowerCase())));
+                    }
+                    Component badge = color != null ? special.badge.copy().withStyle(Style.EMPTY.withColor(color)) : special.badge;
+                    badges.append(badge);
+                }
+            }
         }
 
-
         // -- extra -- // 
 
 
@@ -204,6 +211,7 @@ public enum Special {
 
         public final Component badge;
         public final Component desc;
+        public final Integer color;
 
         Special(String unicode) {
             this(unicode, null);
@@ -213,6 +221,7 @@ public enum Special {
             this.desc = FiguraText.of("badges.special." + this.name().toLowerCase());
             Style style = Style.EMPTY.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, desc));
             if (color != null) style = style.withColor(color);
+            this.color = color;
             this.badge = Component.literal(unicode).withStyle(style);
         }
     }

diff --git a/common/src/main/java/org/figuramc/figura/commands/DebugCommand.java b/common/src/main/java/org/figuramc/figura/commands/DebugCommand.java
@@ -203,6 +203,9 @@ public static String fetchStatus(Avatar avatar) {
         aMeta.addProperty("hasLuaRuntime", avatar.luaRuntime != null);
         aMeta.addProperty("hasRenderer", avatar.renderer != null);
         aMeta.addProperty("hasData", avatar.nbt != null);
+        for (Map.Entry<String, String> entry: avatar.badgeToColor.entrySet()) {
+            aMeta.addProperty(entry.getKey(), entry.getValue());
+        }
 
         a.add("meta", aMeta);
 

diff --git a/common/src/main/java/org/figuramc/figura/parsers/AvatarMetadataParser.java b/common/src/main/java/org/figuramc/figura/parsers/AvatarMetadataParser.java
@@ -2,6 +2,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import net.minecraft.nbt.*;
 import org.figuramc.figura.FiguraMod;
 import org.figuramc.figura.config.Configs;
@@ -31,6 +33,14 @@ public static CompoundTag parse(String json, String filename) {
 
         // nbt
         CompoundTag nbt = new CompoundTag();
+        JsonElement jsonElement = JsonParser.parseString(json);
+        if (jsonElement != null && !jsonElement.isJsonNull() && !jsonElement.getAsJsonObject().asMap().isEmpty()) {
+            for (Map.Entry<String, JsonElement> jsonElementEntry : jsonElement.getAsJsonObject().entrySet()) {
+                if (jsonElementEntry.getKey() != null && !jsonElementEntry.getKey().isBlank() && jsonElementEntry.getKey().contains("badge_color_")) {
+                    nbt.putString(jsonElementEntry.getKey(), jsonElementEntry.getValue().getAsString());
+                }
+            }
+        }
 
         // version
         Version version = new Version(metadata.version);