PaperMC/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch

61 lines
2.4 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 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
index e8a7f435fb30da3506b2b4fa8c5675c829edc105..4a75997f93f5c33f19200994562aaff99bdd422f 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
2019-04-23 06:47:07 +02:00
@@ -3,6 +3,9 @@ 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;
2019-04-23 06:47:07 +02:00
+
2017-07-31 09:09:13 +02:00
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
2019-04-23 06:47:07 +02:00
import org.bukkit.command.CommandSender;
@@ -49,24 +52,33 @@ public class PluginsCommand extends BukkitCommand {
2017-07-31 09:09:13 +02:00
@NotNull
2017-07-31 09:09:13 +02:00
private String getPluginList() {
- StringBuilder pluginList = new StringBuilder();
- Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
+ // Paper start
+ TreeMap<String, Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- for (Plugin plugin : plugins) {
2017-07-31 09:09:13 +02:00
+ for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+ plugins.put(plugin.getDescription().getName(), plugin);
2017-07-31 09:09:13 +02:00
+ }
+
2017-07-31 09:09:13 +02:00
+ StringBuilder pluginList = new StringBuilder();
+ for (Map.Entry<String, Plugin> entry : plugins.entrySet()) {
2017-07-31 09:09:13 +02:00
if (pluginList.length() > 0) {
pluginList.append(ChatColor.WHITE);
pluginList.append(", ");
}
2017-07-31 09:09:13 +02:00
- pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName());
+ Plugin plugin = entry.getValue();
if (plugin.getDescription().getProvides().size() > 0) {
pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
}
+
+
+ pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ pluginList.append(plugin.getDescription().getName());
2017-07-31 09:09:13 +02:00
}
- return "(" + plugins.length + "): " + pluginList.toString();
+ return "(" + plugins.size() + "): " + pluginList.toString();
+ // Paper end
}
// Spigot start