Make badges data driven

src/main/java/com/terraformersmc/modmenu/ModMenu.java

@@ -230,7 +230,7 @@ public static String getDisplayedModCount() {
                     return false;
                 }
 
-                boolean isLibrary = mod.getBadges().contains(Mod.Badge.LIBRARY);
+                boolean isLibrary = mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library());
                 if (!includeLibraries && isLibrary) {
                     return false;
                 }

src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java

@@ -99,8 +99,8 @@ public enum LibraryVisibility {
         public boolean hideMod(Mod mod, boolean hasConfig) {
             return switch (this) {
                 case TRUE -> false;
-                case FALSE -> mod.getBadges().contains(Mod.Badge.LIBRARY);
-                case WITH_CONFIG -> mod.getBadges().contains(Mod.Badge.LIBRARY) && !hasConfig;
+                case FALSE -> mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library());
+                case WITH_CONFIG -> mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library()) && !hasConfig;
             };
         }
 

src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java

@@ -7,10 +7,12 @@
 import com.terraformersmc.modmenu.gui.ModsScreen;
 import com.terraformersmc.modmenu.gui.widget.ModMenuButtonWidget;
 import com.terraformersmc.modmenu.util.UpdateCheckerUtil;
+import com.terraformersmc.modmenu.util.mod.BadgeManager;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -22,6 +24,7 @@
 import net.minecraft.network.chat.ComponentContents;
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.Identifier;
+import net.minecraft.server.packs.PackType;
 
 import java.util.Arrays;
 import java.util.List;
@@ -38,6 +41,11 @@ public static void register() {
         ));
         ClientTickEvents.END_CLIENT_TICK.register(ModMenuEventHandler::onClientEndTick);
         ScreenEvents.AFTER_INIT.register(ModMenuEventHandler::afterScreenInit);
+        ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloadListener(
+                Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "badge_manager"),
+                BadgeManager.INSTANCE
+        );
+
     }
 
     public static void afterScreenInit(Minecraft client, Screen screen, int scaledWidth, int scaledHeight) {

src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java

@@ -473,15 +473,15 @@ public void extractRenderState(GuiGraphicsExtractor drawContext, int mouseX, int
     private Component computeModCountText(boolean includeLibs, boolean onInit) {
         int[] rootMods = formatModCount(ModMenu.ROOT_MODS.values()
                 .stream()
-                .filter(mod -> !mod.isHidden() && !mod.getBadges().contains(Mod.Badge.LIBRARY))
+                .filter(mod -> !mod.isHidden() && !mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library()))
                 .map(Mod::getId)
                 .collect(Collectors.toSet()), onInit);
         if (includeLibs && !onInit) {
             var visibility = ModMenuConfig.SHOW_LIBRARIES.getValue();
 
             int[] rootLibs = formatModCount(ModMenu.ROOT_MODS.values()
                     .stream()
-                    .filter(mod -> !mod.isHidden() && mod.getBadges().contains(Mod.Badge.LIBRARY) && !visibility.hideMod(mod, getModHasConfigScreen(mod.getId())))
+                    .filter(mod -> !mod.isHidden() && mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library()) && !visibility.hideMod(mod, getModHasConfigScreen(mod.getId())))
                     .map(Mod::getId)
                     .collect(Collectors.toSet()), false);
 
@@ -498,7 +498,7 @@ private Component computeLibraryCountText(boolean onInit) {
         if (!onInit) {
             int[] rootLibs = formatModCount(ModMenu.ROOT_MODS.values()
                     .stream()
-                    .filter(mod -> !mod.isHidden() && mod.getBadges().contains(Mod.Badge.LIBRARY) && !visibility.hideMod(mod, this.getModHasConfigScreen(mod.getId())))
+                    .filter(mod -> !mod.isHidden() && mod.getBadges().stream().anyMatch(badgeHolder -> badgeHolder.badge().library()) && !visibility.hideMod(mod, this.getModHasConfigScreen(mod.getId())))
                     .map(Mod::getId)
                     .collect(Collectors.toSet()), false);
             return TranslationUtil.translateNumeric("modmenu.showingLibraries", rootLibs);

src/main/java/com/terraformersmc/modmenu/util/mod/BadgeHolder.java

@@ -0,0 +1,21 @@
+package com.terraformersmc.modmenu.util.mod;
+
+import net.minecraft.resources.Identifier;
+
+public record BadgeHolder(Identifier id, Mod.Badge badge) {
+
+    @Override
+    public boolean equals(final Object obj) {
+        return this == obj || obj instanceof BadgeHolder holder && this.id == holder.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return this.id.toString();
+    }
+}

src/main/java/com/terraformersmc/modmenu/util/mod/BadgeManager.java

@@ -0,0 +1,35 @@
+package com.terraformersmc.modmenu.util.mod;
+
+import com.mojang.logging.LogUtils;
+import com.terraformersmc.modmenu.ModMenu;
+import net.minecraft.resources.FileToIdConverter;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
+import net.minecraft.util.profiling.ProfilerFiller;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class BadgeManager extends SimpleJsonResourceReloadListener<Mod.Badge> {
+    private static final FileToIdConverter ASSET_LISTER = FileToIdConverter.json("modmenu/badge");
+    public static final BadgeManager INSTANCE = new BadgeManager();
+    private Map<Identifier, BadgeHolder> badges = Map.of();
+
+    protected BadgeManager() {
+        super(Mod.Badge.CODEC, ASSET_LISTER);
+    }
+
+    @Override
+    protected void apply(Map<Identifier, Mod.Badge> preparations, ResourceManager manager, ProfilerFiller profiler) {
+        badges = preparations.entrySet()
+                .stream()
+                .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, entry -> new BadgeHolder(entry.getKey(), entry.getValue())));
+
+        ModMenu.MODS.values().forEach(Mod::recalculateBadges);
+    }
+
+    public static BadgeHolder getBadge(Identifier id) {
+        return INSTANCE.badges.get(id);
+    }
+}

src/main/java/com/terraformersmc/modmenu/util/mod/Mod.java

@@ -1,5 +1,7 @@
 package com.terraformersmc.modmenu.util.mod;
 
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.modmenu.ModMenu;
 import com.terraformersmc.modmenu.TextPlaceholderApiCompat;
 import com.terraformersmc.modmenu.api.UpdateChecker;
@@ -9,6 +11,9 @@
 import eu.pb4.placeholders.api.ParserContext;
 import net.fabricmc.loader.api.metadata.ContactInformation;
 import net.minecraft.locale.Language;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.ExtraCodecs;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -95,7 +100,7 @@ default Component getFormattedDescription() {
      */
     @NotNull SortedMap<String, Set<String>> getCredits();
 
-    @NotNull Set<Badge> getBadges();
+    @NotNull Set<BadgeHolder> getBadges();
 
     @Nullable String getWebsite();
 
@@ -140,55 +145,26 @@ default boolean hasUpdate() {
 
     boolean isHidden();
 
-    enum Badge {
-        LIBRARY(
-                "modmenu.badge.library",
-                0xFF107454,
-                0xFF093929,
-                "library"
-        ),
-        CLIENT(
-                "modmenu.badge.clientsideOnly",
-                0xFF2b4b7c,
-                0xFF0e2a55,
-                null
-        ),
-        DEPRECATED(
-                "modmenu.badge.deprecated",
-                0xFF841426,
-                0xFF530C17,
-                "deprecated"
-        ),
-        PATCHWORK_FORGE(
-                "modmenu.badge.forge",
-                0xFF1f2d42,
-                0xFF101721,
-                null
-        ),
-        MODPACK(
-                "modmenu.badge.modpack",
-                0xFF7a2b7c,
-                0xFF510d54,
-                null
-        ),
-        MINECRAFT(
-                "modmenu.badge.minecraft",
-                0xFF6f6c6a,
-                0xFF31302f,
-                null
-        );
-
-        private final Component text;
-        private final int outlineColor, fillColor;
-        private final String key;
-        private static final Map<String, Badge> KEY_MAP = new HashMap<>();
-
-        Badge(String translationKey, int outlineColor, int fillColor, String key) {
-            this.text = Component.translatable(translationKey);
-            this.outlineColor = outlineColor;
-            this.fillColor = fillColor;
-            this.key = key;
-        }
+    void recalculateBadges();
+
+    record Badge(Component text, int outlineColor, int fillColor, int textColor, Optional<String> searchTerms, boolean library) {
+
+        public static final Identifier LIBRARY = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "library");
+        public static final Identifier CLIENT = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "clientside_only");
+        public static final Identifier DEPRECATED = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "deprecated");
+        public static final Identifier PATCHWORK_FORGE = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "patchwork_forge");
+        public static final Identifier MODPACK = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "modpack");
+        public static final Identifier MINECRAFT = Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, "minecraft");
+
+        public static final Codec<Badge> CODEC = RecordCodecBuilder.create(instance ->
+                instance.group(
+                        ComponentSerialization.CODEC.fieldOf("text").forGetter(Badge::getText),
+                        ExtraCodecs.STRING_ARGB_COLOR.fieldOf("outline_color").forGetter(Badge::outlineColor),
+                        ExtraCodecs.STRING_ARGB_COLOR.fieldOf("fill_color").forGetter(Badge::fillColor),
+                        ExtraCodecs.STRING_ARGB_COLOR.optionalFieldOf("text_color", 0xFFCACACA).forGetter(Badge::textColor),
+                        Codec.STRING.optionalFieldOf("search_terms").forGetter(Badge::searchTerms),
+                        Codec.BOOL.optionalFieldOf("library", false).forGetter(Badge::library)
+                ).apply(instance, Badge::new));
 
         public Component getText() {
             return this.text;
@@ -202,18 +178,15 @@ public int getFillColor() {
             return this.fillColor;
         }
 
-        public static Set<Badge> convert(Set<String> badgeKeys, String modId) {
+        public static Set<BadgeHolder> convert(Set<Identifier> badgeKeys, String modId) {
             return badgeKeys.stream().map(key -> {
-                if (!KEY_MAP.containsKey(key)) {
+                BadgeHolder badgeHolder = BadgeManager.getBadge(key);
+                if (badgeHolder == null) {
                     ModMenu.LOGGER.warn("Skipping unknown badge key '{}' specified by mod '{}'", key, modId);
                 }
 
-                return KEY_MAP.get(key);
+                return badgeHolder;
             }).filter(Objects::nonNull).collect(Collectors.toSet());
         }
-
-        static {
-            Arrays.stream(values()).forEach(badge -> KEY_MAP.put(badge.key, badge));
-        }
     }
 }

src/main/java/com/terraformersmc/modmenu/util/mod/ModBadgeRenderer.java

@@ -27,8 +27,8 @@ public ModBadgeRenderer(int startX, int startY, int endX, Mod mod, ModsScreen sc
     public void draw(GuiGraphicsExtractor drawContext, int mouseX, int mouseY) {
         this.badgeX = startX;
         this.badgeY = startY;
-        Set<Mod.Badge> badges = mod.getBadges();
-        badges.forEach(badge -> drawBadge(drawContext, badge, mouseX, mouseY));
+        Set<BadgeHolder> badges = mod.getBadges();
+        badges.forEach(badge -> drawBadge(drawContext, badge.badge(), mouseX, mouseY));
     }
 
     public void drawBadge(GuiGraphicsExtractor drawContext, Mod.Badge badge, int mouseX, int mouseY) {
@@ -37,6 +37,7 @@ public void drawBadge(GuiGraphicsExtractor drawContext, Mod.Badge badge, int mou
                 badge.getText().getVisualOrderText(),
                 badge.getOutlineColor(),
                 badge.getFillColor(),
+                badge.textColor(),
                 mouseX,
                 mouseY
         );
@@ -47,12 +48,13 @@ public void drawBadge(
             FormattedCharSequence text,
             int outlineColor,
             int fillColor,
+            int textColor,
             int mouseX,
             int mouseY
     ) {
         int width = client.font.width(text) + 6;
         if (badgeX + width < badgeMax) {
-            DrawingUtil.drawBadge(drawContext, badgeX, badgeY, width, text, outlineColor, fillColor, 0xFFCACACA);
+            DrawingUtil.drawBadge(drawContext, badgeX, badgeY, width, text, outlineColor, fillColor, textColor);
             badgeX += width + 3;
         }
     }

src/main/java/com/terraformersmc/modmenu/util/mod/ModSearch.java

@@ -39,11 +39,6 @@ private static int passesFilters(ModsScreen screen, Mod mod, String query) {
         String modDescription = mod.getDescription();
         String modSummary = mod.getSummary();
 
-        String library = I18n.get("modmenu.searchTerms.library");
-        String patchwork = I18n.get("modmenu.searchTerms.patchwork");
-        String modpack = I18n.get("modmenu.searchTerms.modpack");
-        String deprecated = I18n.get("modmenu.searchTerms.deprecated");
-        String clientside = I18n.get("modmenu.searchTerms.clientside");
         String configurable = I18n.get("modmenu.searchTerms.configurable");
         String hasUpdate = I18n.get("modmenu.searchTerms.hasUpdate");
 
@@ -63,13 +58,8 @@ private static int passesFilters(ModsScreen screen, Mod mod, String query) {
         if (modDescription.toLowerCase(Locale.ROOT).contains(query) // Search default mod description
                 || modSummary.toLowerCase(Locale.ROOT).contains(query) // Search mod summary
                 || authorMatches(mod, query) // Search via author
-                || library.contains(query) && mod.getBadges().contains(Mod.Badge.LIBRARY) // Search for lib mods
-                || patchwork.contains(query) && mod.getBadges()
-                .contains(Mod.Badge.PATCHWORK_FORGE) // Search for patchwork mods
-                || modpack.contains(query) && mod.getBadges().contains(Mod.Badge.MODPACK) // Search for modpack mods
-                || deprecated.contains(query) && mod.getBadges()
-                .contains(Mod.Badge.DEPRECATED) // Search for deprecated mods
-                || clientside.contains(query) && mod.getBadges().contains(Mod.Badge.CLIENT) // Search for clientside mods
+                || mod.getBadges().stream().anyMatch(badgeHolder ->
+                badgeHolder.badge().searchTerms().map(key -> I18n.get(key).contains(query)).orElse(false)) // Search for badges
                 || configurable.contains(query) && screen.getModHasConfigScreen(modId) // Search for mods that can be configured
                 || hasUpdate.contains(query) && mod.hasUpdate() // Search for mods that have updates
         ) {

src/main/java/com/terraformersmc/modmenu/util/mod/fabric/CustomValueUtil.java

@@ -1,7 +1,9 @@
 package com.terraformersmc.modmenu.util.mod.fabric;
 
+import com.terraformersmc.modmenu.ModMenu;
 import net.fabricmc.loader.api.metadata.CustomValue;
 import net.fabricmc.loader.api.metadata.ModMetadata;
+import net.minecraft.resources.Identifier;
 
 import java.util.*;
 
@@ -64,6 +66,32 @@ public static Optional<Set<String>> getStringSet(String key, CustomValue.CvObjec
         return Optional.empty();
     }
 
+    public static Optional<Set<Identifier>> getIdentifierSet(String key, CustomValue.CvObject object) {
+        if (object.containsKey(key)) {
+            Set<Identifier> ids = new HashSet<>();
+            for (CustomValue value : object.get(key).getAsArray()) {
+                ids.add(bySeparatorModMenuId(value.getAsString(), ':'));
+            }
+            return Optional.of(ids);
+        }
+        return Optional.empty();
+    }
+
+    private static Identifier bySeparatorModMenuId(final String identifier, final char separator) {
+        int separatorIndex = identifier.indexOf(separator);
+        if (separatorIndex >= 0) {
+            String path = identifier.substring(separatorIndex + 1);
+            if (separatorIndex != 0) {
+                String namespace = identifier.substring(0, separatorIndex);
+                return Identifier.fromNamespaceAndPath(namespace, path);
+            } else {
+                return Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, path);
+            }
+        } else {
+            return Identifier.fromNamespaceAndPath(ModMenu.MOD_ID, identifier);
+        }
+    }
+
     public static Optional<Map<String, String>> getStringMap(String key, CustomValue.CvObject object) {
         if (object.containsKey(key)) {
             Map<String, String> strings = new HashMap<>();