improve mod icon matching

ModFest · Jul 7, 2024 · c4d106f · c4d106f
1 parent 233804e
commit c4d106f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,6 @@ org.gradle.configureondemand=true
 # Enable advanced multi-module optimizations (share tiny-remaper instance between projects)
 fabric.loom.multiProjectOptimisation=true
 # Mod Properties
-baseVersion = 0.1.1
+baseVersion = 0.1.2
 defaultBranch = 1.21
 branch = 1.21
diff --git a/src/main/java/net/modfest/ballotbox/client/VotingScreen.java b/src/main/java/net/modfest/ballotbox/client/VotingScreen.java
@@ -184,16 +184,17 @@ public VotingOptionButtonWidget(Position position, int width, int height, Voting
             selected = selections.containsEntry(category.id(), option.id());
             this.prohibited = prohibited;
             if (!modIconChecked.contains(option.id())) {
-                FabricLoader.getInstance().getModContainer(option.id()).ifPresent(mod -> {
-                    mod.getMetadata().getIconPath(16).ifPresent(iconPath -> mod.findPath(iconPath).ifPresent(path -> {
+                FabricLoader.getInstance().getModContainer(option.id())
+                    .or(() -> FabricLoader.getInstance().getModContainer(option.id().replace('_', '-')))
+                    .or(() -> FabricLoader.getInstance().getModContainer(option.id().replace("_", "")))
+                    .ifPresent(mod -> mod.getMetadata().getIconPath(16).ifPresent(iconPath -> mod.findPath(iconPath).ifPresent(path -> {
                         try (InputStream inputStream = Files.newInputStream(path)) {
                             Identifier textureId = Identifier.of(BallotBox.ID, mod.getMetadata().getId() + "_icon");
                             modIconCache.put(option.id(), textureId);
                             this.client.getTextureManager().registerTexture(textureId, new NativeImageBackedTexture(NativeImage.read(inputStream)));
                         } catch (IOException ignored) {
                         }
-                    }));
-                });
+                    })));
                 modIconChecked.add(option.id());
             }
             texture = modIconCache.get(option.id());

diff --git a/src/main/resources/test/categories.json b/src/main/resources/test/categories.json
@@ -26,25 +26,5 @@
     "description": "Mods pushing the medium with fresh, surprising ideas.",
     "type": "community",
     "limit": 3
-  },
-  {
-    "id": "most_polished",
-    "name": "Most Polished",
-    "description": "Mods with a polished, complete sheen.",
-    "type": "community",
-    "prohibitions": [
-      "most_potential"
-    ],
-    "limit": 3
-  },
-  {
-    "id": "most_potential",
-    "name": "Most Potential",
-    "description": "Mods whose best features lay in their future.",
-    "type": "community",
-    "prohibitions": [
-      "most_polished"
-    ],
-    "limit": 3
   }
 ]