Add option to pull server setting from the server.properties file

This commit is contained in:
Luck
2017-12-11 19:40:39 +00:00
Unverified
parent a765be0a6f
commit e5ce64266f
7 changed files with 34 additions and 7 deletions
@@ -55,7 +55,7 @@ public class InfoCommand extends SingleCommand {
Message.INFO_TOP.send(sender,
plugin.getVersion(),
plugin.getServerType().getFriendlyName(),
plugin.getServerName(),
plugin.getServerBrand(),
plugin.getServerVersion()
);
@@ -68,7 +68,16 @@ public class ConfigKeys {
/**
* The name of the server
*/
public static final ConfigKey<String> SERVER = LowercaseStringKey.of("server", "global");
public static final ConfigKey<String> SERVER = AbstractKey.of(c -> {
if (c.getBoolean("use-server-properties-name", false)) {
String serverName = c.getPlugin().getServerName();
if (serverName != null && !serverName.equals("Unknown Server")) {
return serverName.toLowerCase();
}
}
return c.getString("server", "global").toLowerCase();
});
/**
* How many minutes to wait between syncs. A value <= 0 will disable syncing.
@@ -230,7 +230,7 @@ public interface LuckPermsPlugin {
*
* @return the server brand
*/
String getServerName();
String getServerBrand();
/**
* Gets the version of the running platform
@@ -239,6 +239,15 @@ public interface LuckPermsPlugin {
*/
String getServerVersion();
/**
* Gets the name associated with this server
*
* @return the server name
*/
default String getServerName() {
return null;
}
/**
* Gets the time when the plugin first started in millis.
*
@@ -394,7 +403,7 @@ public interface LuckPermsPlugin {
sender.sendMessage(CommandUtils.color("&b | | | / ` |__/ &3|__) |__ |__) |\\/| /__` "));
sender.sendMessage(CommandUtils.color("&b |___ \\__/ \\__, | \\ &3| |___ | \\ | | .__/ "));
sender.sendMessage(CommandUtils.color(" "));
sender.sendMessage(CommandUtils.color("&2 Loading version &bv" + plugin.getVersion() + "&2 on " + plugin.getServerType().getFriendlyName() + " - " + plugin.getServerName()));
sender.sendMessage(CommandUtils.color("&2 Loading version &bv" + plugin.getVersion() + "&2 on " + plugin.getServerType().getFriendlyName() + " - " + plugin.getServerBrand()));
sender.sendMessage(CommandUtils.color("&8 Running on server version " + plugin.getServerVersion()));
sender.sendMessage(CommandUtils.color(" "));
}