Sort contributors within roles

TerraformersMC · Apr 21, 2024 · 666ced5 · 666ced5
1 parent da857ce
commit 666ced5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/Mod.java b/src/main/java/com/terraformersmc/modmenu/util/mod/Mod.java
@@ -78,7 +78,7 @@ default String getTranslatedDescription() {
 	 * @return a mapping of roles to each contributor with that role.
 	 */
 	@NotNull
-	SortedMap<String, Collection<String>> getCredits();
+	SortedMap<String, SortedSet<String>> getCredits();
 
 	@NotNull
 	Set<Badge> getBadges();

diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricDummyParentMod.java b/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricDummyParentMod.java
@@ -94,7 +94,7 @@ public FabricDummyParentMod(FabricMod host, String id) {
 	}
 
 	@Override
-	public @NotNull SortedMap<String, Collection<String>> getCredits() {
+	public @NotNull SortedMap<String, SortedSet<String>> getCredits() {
 		return new TreeMap<>();
 	}
 

diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricMod.java b/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricMod.java
@@ -222,21 +222,20 @@ public FabricMod(ModContainer modContainer, Set<String> modpackMods) {
 	}
 
 	@Override
-	public @NotNull SortedMap<String, Collection<String>> getCredits() {
-		SortedMap<String, Collection<String>> credits = new TreeMap<>();
+	public @NotNull SortedMap<String, SortedSet<String>> getCredits() {
+		SortedMap<String, SortedSet<String>> credits = new TreeMap<>();
 
 		var authors = this.getAuthors();
+		var contributors = this.getContributors();
 
 		if (!authors.isEmpty()) {
-			credits.put("Author", authors);
+			contributors.put("Author", authors);
 		}
 
-		var contributors = this.getContributors();
-
 		for (var contributor : contributors.entrySet()) {
 			for (var role : contributor.getValue()) {
-				credits.computeIfAbsent(role, key -> new ArrayList<>());
-				credits.get(role).add(contributor.getKey()); // Add name
+				credits.computeIfAbsent(role, key -> new TreeSet<>(String.CASE_INSENSITIVE_ORDER));
+				credits.get(role).add(contributor.getKey());
 			}
 		}
 

diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/quilt/QuiltMod.java b/src/main/java/com/terraformersmc/modmenu/util/mod/quilt/QuiltMod.java
@@ -23,7 +23,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.SortedSet;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 public class QuiltMod extends FabricMod {
@@ -68,15 +70,15 @@ public QuiltMod(net.fabricmc.loader.api.ModContainer fabricModContainer, Set<Str
 	}
 
 	@Override
-	public @NotNull SortedMap<String, Collection<String>> getCredits() {
-		SortedMap<String, Collection<String>> credits = new TreeMap<>();
+	public @NotNull SortedMap<String, SortedSet<String>> getCredits() {
+		SortedMap<String, SortedSet<String>> credits = new TreeMap<>();
 
 		var contributors = this.getContributors();
 
 		for (var contributor : contributors.entrySet()) {
 			for (var role : contributor.getValue()) {
-				credits.computeIfAbsent(role, key -> new ArrayList<>());
-				credits.get(role).add(contributor.getKey()); // Add name
+				credits.computeIfAbsent(role, key -> new TreeSet<>(String.CASE_INSENSITIVE_ORDER));
+				credits.get(role).add(contributor.getKey());
 			}
 		}