Merge pull request #2257 from Sleaker/master

Add configuration for Server name. Adds SPOUT-33
spoutdev · Sep 28, 2013 · db7e09f · db7e09f
2 parents 39865b6 + 9c5b811
commit db7e09f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -368,7 +368,7 @@ public Platform getPlatform() {
 
 	@Override
 	public String getName() {
-		return "Spout Server";
+		return SpoutConfiguration.SERVER_NAME.getString();
 	}
 
 	private UpnpService getUPnPService() {