Paper/Spigot-API-Patches/0066-Make-plugins-list-alphabetical.patch

55 lines
2.0 KiB
Diff
Raw Normal View History

From 665b880ec9616fbc2aea0aee0d2d2dbf2a3613e8 Mon Sep 17 00:00:00 2001
2017-07-31 09:09:13 +02:00
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
2017-11-10 23:31:39 +01:00
index e40b03a7..b1d384e8 100644
2017-07-31 09:09:13 +02:00
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
2017-11-10 23:31:39 +01:00
@@ -3,6 +3,8 @@ package org.bukkit.command.defaults;
2017-07-31 09:09:13 +02:00
import java.util.Arrays;
2017-11-10 23:31:39 +01:00
import java.util.Collections;
import java.util.List;
2017-07-31 09:09:13 +02:00
+import java.util.Map;
+import java.util.TreeMap;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
2017-11-10 23:31:39 +01:00
@@ -32,19 +34,24 @@ public class PluginsCommand extends BukkitCommand {
2017-07-31 09:09:13 +02:00
}
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
}
2017-11-10 23:31:39 +01:00
}
2017-07-31 09:09:13 +02:00
--
2.15.1
2017-07-31 09:09:13 +02:00