Merge pull request #822 from BillyGalbreath/Plugins-list-alphabatized

Make /plugins list alphabetical
This commit is contained in:
kashike 2017-07-31 19:39:42 -07:00 committed by GitHub
commit 2e157dd1b4

View file

@ -0,0 +1,55 @@
From fcaf4875363c340138dd0f7111ece67e1982e078 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 02:08:55 -0500
Subject: [PATCH] Make /plugins list alphabetical
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index e21d1679..e2274fa2 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -1,6 +1,8 @@
package org.bukkit.command.defaults;
import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -25,20 +27,25 @@ public class PluginsCommand extends BukkitCommand {
}
private String getPluginList() {
- StringBuilder pluginList = new StringBuilder();
- Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
+ // Paper start
+ TreeMap<String, ChatColor> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+
+ for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+ plugins.put(plugin.getDescription().getName(), plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ }
- for (Plugin plugin : plugins) {
+ StringBuilder pluginList = new StringBuilder();
+ for (Map.Entry<String, ChatColor> entry : plugins.entrySet()) {
if (pluginList.length() > 0) {
pluginList.append(ChatColor.WHITE);
pluginList.append(", ");
}
-
- pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName());
+ pluginList.append(entry.getValue());
+ pluginList.append(entry.getKey());
}
- return "(" + plugins.length + "): " + pluginList.toString();
+ return "(" + plugins.size() + "): " + pluginList.toString();
+ // Paper end
}
// Spigot Start
--
2.11.0