diff --git a/src/main/java/net/frankheijden/serverutils/commands/CommandPlugins.java b/src/main/java/net/frankheijden/serverutils/commands/CommandPlugins.java index 8a41a54..59bad66 100644 --- a/src/main/java/net/frankheijden/serverutils/commands/CommandPlugins.java +++ b/src/main/java/net/frankheijden/serverutils/commands/CommandPlugins.java @@ -18,15 +18,21 @@ public class CommandPlugins extends BaseCommand { @CommandPermission("serverutils.plugins") @Description("Shows the plugins of this server.") public void onPlugins(CommandSender sender) { - sendPlugins(sender, plugin -> Messenger.getMessage("serverutils.plugins.format", "%plugin%", plugin.getName())); + sendPlugins(sender, pl -> { + String format = "serverutils.plugins.format" + (pl.isEnabled() ? "" : "_disabled"); + return Messenger.getMessage(format, "%plugin%", pl.getName()); + }); } @Subcommand("-v") @CommandPermission("serverutils.plugins.version") @Description("Shows the plugins of this server with version.") public void onPluginsWithVersion(CommandSender sender) { - sendPlugins(sender, plugin -> Messenger.getMessage("serverutils.plugins.format", "%plugin%", plugin.getName()) - + Messenger.getMessage("serverutils.plugins.version", "%version%", plugin.getDescription().getVersion())); + sendPlugins(sender, pl -> { + String format = "serverutils.plugins.format" + (pl.isEnabled() ? "" : "_disabled"); + String version = Messenger.getMessage("serverutils.plugins.version", "%version%", pl.getDescription().getVersion()); + return Messenger.getMessage(format, "%plugin%", pl.getName()) + version; + }); } private static void sendPlugins(CommandSender sender, ListFormat pluginFormat) { diff --git a/src/main/java/net/frankheijden/serverutils/config/Messenger.java b/src/main/java/net/frankheijden/serverutils/config/Messenger.java index 98dcee0..68675ba 100644 --- a/src/main/java/net/frankheijden/serverutils/config/Messenger.java +++ b/src/main/java/net/frankheijden/serverutils/config/Messenger.java @@ -42,6 +42,7 @@ public class Messenger { "plugins", Defaults.of( "header", "&8&m------------=&r&8[ &b&lServerUtils Plugins&r &8]&m=-------------", "format", "&3%plugin%", + "format_disabled", "&c%plugin%", "seperator", "&b, ", "last_seperator", " &band ", "version", " &8(&a%version%&8)",