Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add an asterisk to plugins onEnable and in command
Easy visual indicator for server admins to tell which plugins are operating under the legacy compat mode, and which have been updated.
- Loading branch information
Zach Brown
committed
Jul 19, 2018
1 parent
493df9e
commit 613db95
Showing
1 changed file
with
66 additions
and
0 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
Spigot-API-Patches/0123-Add-an-asterisk-to-legacy-API-plugins.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
From a91f4cbb8c66889302966caa04d7fbbd3ad265cc Mon Sep 17 00:00:00 2001 | ||
From: Zach Brown <zach.brown@destroystokyo.com> | ||
Date: Thu, 19 Jul 2018 15:07:02 -0500 | ||
Subject: [PATCH] Add an asterisk to legacy API plugins | ||
|
||
Not here to name and shame, only so server admins can be aware of which | ||
plugins have and haven't been updated. | ||
|
||
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java | ||
index 20b3a9ee..c4083b4f 100644 | ||
--- a/src/main/java/org/bukkit/UnsafeValues.java | ||
+++ b/src/main/java/org/bukkit/UnsafeValues.java | ||
@@ -64,4 +64,10 @@ public interface UnsafeValues { | ||
* @return true if a file matching this key was found and deleted | ||
*/ | ||
boolean removeAdvancement(NamespacedKey key); | ||
+ | ||
+ // Paper start - Add legacy check util | ||
+ static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) { | ||
+ return !("1.13".equals(plugin.getDescription().getAPIVersion())); | ||
+ } | ||
+ // Paper end | ||
} | ||
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java | ||
index b1d384e8..72c0c0bc 100644 | ||
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java | ||
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java | ||
@@ -38,7 +38,14 @@ public class PluginsCommand extends BukkitCommand { | ||
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); | ||
+ // Paper start - Add an asterisk to legacy plugins (so admins are aware) | ||
+ String pluginName = plugin.getDescription().getName(); | ||
+ if (org.bukkit.UnsafeValues.isLegacyPlugin(plugin)) { | ||
+ pluginName += "*"; | ||
+ } | ||
+ | ||
+ plugins.put(pluginName, plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED); | ||
+ // Paper end | ||
} | ||
|
||
StringBuilder pluginList = new StringBuilder(); | ||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | ||
index 3cff01b6..2b9aad0a 100644 | ||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | ||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | ||
@@ -303,7 +303,14 @@ public final class JavaPluginLoader implements PluginLoader { | ||
Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader"); | ||
|
||
if (!plugin.isEnabled()) { | ||
- plugin.getLogger().info("Enabling " + plugin.getDescription().getFullName()); | ||
+ // Paper start - Add an asterisk to legacy plugins (so admins are aware) | ||
+ String enableMsg = "Enabling " + plugin.getDescription().getFullName(); | ||
+ if (org.bukkit.UnsafeValues.isLegacyPlugin(plugin)) { | ||
+ enableMsg += "*"; | ||
+ } | ||
+ | ||
+ plugin.getLogger().info(enableMsg); | ||
+ // Paper end | ||
|
||
JavaPlugin jPlugin = (JavaPlugin) plugin; | ||
|
||
-- | ||
2.17.1 | ||
|