diff --git a/src/main/java/net/frankheijden/serverutils/commands/CommandServerUtils.java b/src/main/java/net/frankheijden/serverutils/commands/CommandServerUtils.java index 479e0e0..ad070b0 100644 --- a/src/main/java/net/frankheijden/serverutils/commands/CommandServerUtils.java +++ b/src/main/java/net/frankheijden/serverutils/commands/CommandServerUtils.java @@ -149,9 +149,12 @@ public class CommandServerUtils extends BaseCommand { PluginDescriptionFile description = plugin.getDescription(); String format = Messenger.getMessage("serverutils.plugininfo.format"); + String listFormatString = Messenger.getMessage("serverutils.plugininfo.list_format"); String seperator = Messenger.getMessage("serverutils.plugininfo.seperator"); String lastSeperator = Messenger.getMessage("serverutils.plugininfo.last_seperator"); + ListFormat listFormat = str -> listFormatString.replace("%value%", str); + Messenger.sendMessage(sender, "serverutils.plugininfo.header"); FormatBuilder builder = FormatBuilder.create(format) @@ -161,7 +164,8 @@ public class CommandServerUtils extends BaseCommand { .add("Version", description.getVersion()); if (MINOR >= 13) builder.add( "API Version", description.getAPIVersion()); builder.add("Website", description.getWebsite()) - .add("Authors", ListBuilder.createStrings(description.getAuthors()) + .add("Authors", ListBuilder.create(description.getAuthors()) + .format(listFormat) .seperator(seperator) .lastSeperator(lastSeperator) .toString()) @@ -169,19 +173,23 @@ public class CommandServerUtils extends BaseCommand { .add("Main", description.getMain()) .add("Prefix", description.getPrefix()) .add("Load Order", description.getLoad().name()) - .add("Load Before", ListBuilder.createStrings(description.getLoadBefore()) + .add("Load Before", ListBuilder.create(description.getLoadBefore()) + .format(listFormat) .seperator(seperator) .lastSeperator(lastSeperator) .toString()) - .add("Depend", ListBuilder.createStrings(description.getDepend()) + .add("Depend", ListBuilder.create(description.getDepend()) + .format(listFormat) .seperator(seperator) .lastSeperator(lastSeperator) .toString()) - .add("Soft Depend", ListBuilder.createStrings(description.getSoftDepend()) + .add("Soft Depend", ListBuilder.create(description.getSoftDepend()) + .format(listFormat) .seperator(seperator) .lastSeperator(lastSeperator) .toString()); - if (MINOR >= 15) builder.add("Provides", ListBuilder.createStrings(description.getProvides()) + if (MINOR >= 15) builder.add("Provides", ListBuilder.create(description.getProvides()) + .format(listFormat) .seperator(seperator) .lastSeperator(lastSeperator) .toString()); diff --git a/src/main/java/net/frankheijden/serverutils/config/Messenger.java b/src/main/java/net/frankheijden/serverutils/config/Messenger.java index 003cfd7..61fe579 100644 --- a/src/main/java/net/frankheijden/serverutils/config/Messenger.java +++ b/src/main/java/net/frankheijden/serverutils/config/Messenger.java @@ -37,6 +37,7 @@ public class Messenger { "plugininfo", Defaults.of( "header", "&8&m-----------=&r&8[ &b&lServerUtils PluginInfo&r &8]&m=-----------", "format", " &3%key%&8: &b%value%", + "list_format", "&b%value%", "seperator", "&8, ", "last_seperator", " &8and ", "footer", "&8&m-------------------------------------------------"