From 5dcb8cd73a3166de4170f625a6966c13a2016327 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 25 Mar 2017 19:48:17 +0000
Subject: [PATCH] Output group/track lists in alphabetical order

---
 .../luckperms/common/commands/impl/group/ListGroups.java   | 6 +++---
 .../luckperms/common/commands/impl/track/ListTracks.java   | 4 ++--
 .../me/lucko/luckperms/common/commands/utils/Util.java     | 3 ++-
 .../lucko/luckperms/sponge/commands/SpongeMainCommand.java | 7 ++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/group/ListGroups.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/group/ListGroups.java
index 0bd5a9fb0..53d82a221 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/group/ListGroups.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/group/ListGroups.java
@@ -32,7 +32,6 @@ import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,9 +49,10 @@ public class ListGroups extends SingleCommand {
 
         Message.GROUPS_LIST.send(
                 sender,
-                Util.listToCommaSep(new ArrayList<>(plugin.getGroupManager().getAll().values().stream()
+                Util.toCommaSep(plugin.getGroupManager().getAll().values().stream()
                         .map(Group::getDisplayName)
-                        .collect(Collectors.toList()))
+                        .sorted()
+                        .collect(Collectors.toList())
                 )
         );
         return CommandResult.SUCCESS;
diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/track/ListTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/track/ListTracks.java
index 3562628ab..382b593f5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/track/ListTracks.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/track/ListTracks.java
@@ -31,8 +31,8 @@ import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ListTracks extends SingleCommand {
     public ListTracks() {
@@ -46,7 +46,7 @@ public class ListTracks extends SingleCommand {
             return CommandResult.LOADING_ERROR;
         }
 
-        Message.TRACKS_LIST.send(sender, Util.listToCommaSep(new ArrayList<>(plugin.getTrackManager().getAll().keySet())));
+        Message.TRACKS_LIST.send(sender, Util.toCommaSep(plugin.getTrackManager().getAll().keySet().stream().sorted().collect(Collectors.toList())));
         return CommandResult.SUCCESS;
     }
 }
diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/utils/Util.java b/common/src/main/java/me/lucko/luckperms/common/commands/utils/Util.java
index 07ae780b7..85f9c9732 100644
--- a/common/src/main/java/me/lucko/luckperms/common/commands/utils/Util.java
+++ b/common/src/main/java/me/lucko/luckperms/common/commands/utils/Util.java
@@ -42,6 +42,7 @@ import io.github.mkremins.fanciful.ChatColor;
 import io.github.mkremins.fanciful.FancyMessage;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
@@ -414,7 +415,7 @@ public class Util {
         }
     }
 
-    public static String listToCommaSep(List<String> strings) {
+    public static String toCommaSep(Collection<String> strings) {
         if (strings.isEmpty()) return "&bNone";
 
         StringBuilder sb = new StringBuilder();
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java
index 3ee96a23f..65ff42720 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java
@@ -97,8 +97,9 @@ public class SpongeMainCommand extends Command<Void, LPSubjectData> {
 
         if (args.size() < 1) {
             Util.sendPluginMessage(sender, "&aCurrent Subject Collections:\n" +
-                    Util.listToCommaSep(service.getCollections().keySet().stream()
+                    Util.toCommaSep(service.getCollections().keySet().stream()
                             .filter(s -> !s.equalsIgnoreCase("user") && !s.equalsIgnoreCase("group"))
+                            .sorted()
                             .collect(Collectors.toList())
                     )
             );
@@ -127,9 +128,9 @@ public class SpongeMainCommand extends Command<Void, LPSubjectData> {
                 List<String> extra = subjects.subList(50, subjects.size());
                 int overflow = extra.size();
                 extra.clear();
-                Util.sendPluginMessage(sender, "&aCurrent Subjects:\n" + Util.listToCommaSep(subjects) + "&b ... and &a" + overflow + " &bmore.");
+                Util.sendPluginMessage(sender, "&aCurrent Subjects:\n" + Util.toCommaSep(subjects) + "&b ... and &a" + overflow + " &bmore.");
             } else {
-                Util.sendPluginMessage(sender, "&aCurrent Subjects:\n" + Util.listToCommaSep(subjects));
+                Util.sendPluginMessage(sender, "&aCurrent Subjects:\n" + Util.toCommaSep(subjects));
             }
 
             return CommandResult.SUCCESS;