From c3eec804f0497b4d523771c42ec90b3c73bb2554 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes Pueyo <shoghicp@gmail.com>
Date: Mon, 24 Dec 2012 13:33:50 +0100
Subject: [PATCH] Added option to specify Generator name in server.properties

---
 classes/API/ServerAPI.php                                   | 6 +++++-
 ...aultGenerator.class.php => SuperflatGenerator.class.php} | 2 +-
 common/default.properties                                   | 1 +
 common/dependencies.php                                     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename classes/{DefaultGenerator.class.php => SuperflatGenerator.class.php} (99%)

diff --git a/classes/API/ServerAPI.php b/classes/API/ServerAPI.php
index 9b99e143d..5640c4961 100644
--- a/classes/API/ServerAPI.php
+++ b/classes/API/ServerAPI.php
@@ -124,7 +124,11 @@ class ServerAPI extends stdClass{ //Yay! I can add anything to this class in run
 				$this->server->mapName = "world";
 			}
 			$this->server->mapDir = FILE_PATH."data/maps/".$this->server->mapName."/";
-			$this->gen = new Generator("DefaultGenerator", $this->server->seed);
+			$generator = "SuperflatGenerator";
+			if($this->getProperty("generator") !== false and class_exists($this->getProperty("generator"))){
+				$generator = $this->getProperty("generator");
+			}
+			$this->gen = new Generator($generator, $this->server->seed);
 			if($this->getProperty("generator-settings") !== false){
 				$this->gen->set("preset", $this->getProperty("generator-settings"));
 			}
diff --git a/classes/DefaultGenerator.class.php b/classes/SuperflatGenerator.class.php
similarity index 99%
rename from classes/DefaultGenerator.class.php
rename to classes/SuperflatGenerator.class.php
index 40b0adeb6..986bb0c20 100644
--- a/classes/DefaultGenerator.class.php
+++ b/classes/SuperflatGenerator.class.php
@@ -26,7 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 
-class DefaultGenerator{
+class SuperflatGenerator{
 	private $config, $spawn, $structure;
 	public function __construct($seed){
 		$this->config = array(
diff --git a/common/default.properties b/common/default.properties
index 01153a908..9eadc7176 100644
--- a/common/default.properties
+++ b/common/default.properties
@@ -13,6 +13,7 @@ server-type=normal
 time-per-second=20
 gamemode=1
 difficulty=1
+generator=
 generator-settings=
 level-name=false
 server-id=false
\ No newline at end of file
diff --git a/common/dependencies.php b/common/dependencies.php
index d07b38ae4..4ed0e72c1 100644
--- a/common/dependencies.php
+++ b/common/dependencies.php
@@ -72,7 +72,7 @@ if($errors > 0){
 require_once("classes/Data.class.php");
 require_once("classes/Player.class.php");
 require_once("classes/Generator.class.php");
-require_once("classes/DefaultGenerator.class.php");
+require_once("classes/SuperflatGenerator.class.php");
 require_once("classes/Utils.class.php");
 require_once("classes/UDPSocket.class.php");
 require_once("classes/Packet.class.php");