From 9c5b811de4f4e79105739fa9cd7166ab38c5971e Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sat, 28 Sep 2013 10:12:16 -0700 Subject: [PATCH] Add configuration for Server name. Adds SPOUT-33 Abstrct class shouldn't define implementation specific names. Added Server.getName() so Server objects don't need to be cast into engine objects. Signed-off-by: Nick Minkler --- api/src/main/java/org/spout/api/Server.java | 6 ++++++ .../src/main/java/org/spout/engine/SpoutConfiguration.java | 1 + engine/src/main/java/org/spout/engine/SpoutEngine.java | 5 ----- engine/src/main/java/org/spout/engine/SpoutServer.java | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/org/spout/api/Server.java b/api/src/main/java/org/spout/api/Server.java index 3cce73846a..087bcd01e5 100644 --- a/api/src/main/java/org/spout/api/Server.java +++ b/api/src/main/java/org/spout/api/Server.java @@ -329,4 +329,10 @@ public interface Server extends Engine { public File getWorldFolder(); public ServerSession newSession(Channel c); + + /** + * Gets the server's name + * @return server name + */ + public String getName(); } diff --git a/engine/src/main/java/org/spout/engine/SpoutConfiguration.java b/engine/src/main/java/org/spout/engine/SpoutConfiguration.java index 79565b7567..b4fadef1c4 100644 --- a/engine/src/main/java/org/spout/engine/SpoutConfiguration.java +++ b/engine/src/main/java/org/spout/engine/SpoutConfiguration.java @@ -36,6 +36,7 @@ public class SpoutConfiguration extends ConfigurationHolderConfiguration { // General + public static final ConfigurationHolder SERVER_NAME = new ConfigurationHolder("A Spout Server", "general", "server-name"); public static final ConfigurationHolder MAXIMUM_PLAYERS = new ConfigurationHolder(20, "general", "maximum-players"); public static final ConfigurationHolder DEFAULT_WORLD = new ConfigurationHolder("world", "general", "default-world"); public static final ConfigurationHolder WHITELIST_ENABLED = new ConfigurationHolder(false, "general", "whitelist-enabled"); diff --git a/engine/src/main/java/org/spout/engine/SpoutEngine.java b/engine/src/main/java/org/spout/engine/SpoutEngine.java index 4018cb154f..0482b9e924 100644 --- a/engine/src/main/java/org/spout/engine/SpoutEngine.java +++ b/engine/src/main/java/org/spout/engine/SpoutEngine.java @@ -241,11 +241,6 @@ private void enablePlugins() { } } - @Override - public String getName() { - return "Spout Engine"; - } - @Override public String getVersion() { return getClass().getPackage().getImplementationVersion(); diff --git a/engine/src/main/java/org/spout/engine/SpoutServer.java b/engine/src/main/java/org/spout/engine/SpoutServer.java index 683063b350..d7e9d6b547 100644 --- a/engine/src/main/java/org/spout/engine/SpoutServer.java +++ b/engine/src/main/java/org/spout/engine/SpoutServer.java @@ -368,7 +368,7 @@ public Platform getPlatform() { @Override public String getName() { - return "Spout Server"; + return SpoutConfiguration.SERVER_NAME.getString(); } private UpnpService getUPnPService() {