Generator: Moved generator registering things to a separate GeneratorManager class

this isolates the concerns of the Generator class, and also removes cyclic dependencies between the Generator class and its descendents.

src/pocketmine/level/generator/Generator.php

@@ -27,61 +27,10 @@ declare(strict_types=1);
 namespace pocketmine\level\generator;
 
 use pocketmine\level\ChunkManager;
-use pocketmine\level\generator\hell\Nether;
-use pocketmine\level\generator\normal\Normal;
 use pocketmine\math\Vector3;
 use pocketmine\utils\Random;
 
 abstract class Generator{
-	private static $list = [];
-
-	public static function registerDefaultGenerators() : void{
-		self::addGenerator(Flat::class, "flat");
-		self::addGenerator(Normal::class, "normal");
-		self::addGenerator(Normal::class, "default");
-		self::addGenerator(Nether::class, "hell");
-		self::addGenerator(Nether::class, "nether");
-	}
-
-	public static function addGenerator($object, $name) : bool{
-		if(is_subclass_of($object, Generator::class) and !isset(Generator::$list[$name = strtolower($name)])){
-			Generator::$list[$name] = $object;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public static function getGeneratorList() : array{
-		return array_keys(Generator::$list);
-	}
-
-	/**
-	 * @param $name
-	 *
-	 * @return string|Generator Name of class that extends Generator (not an actual Generator object)
-	 */
-	public static function getGenerator($name){
-		if(isset(Generator::$list[$name = strtolower($name)])){
-			return Generator::$list[$name];
-		}
-
-		return Normal::class;
-	}
-
-	public static function getGeneratorName($class){
-		foreach(Generator::$list as $name => $c){
-			if($c === $class){
-				return $name;
-			}
-		}
-
-		return "unknown";
-	}
 
 	abstract public function __construct(array $settings = []);
 

src/pocketmine/level/generator/GeneratorManager.php

@@ -0,0 +1,84 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\level\generator;
+
+use pocketmine\level\generator\hell\Nether;
+use pocketmine\level\generator\normal\Normal;
+
+final class GeneratorManager{
+
+	private static $list = [];
+
+	public static function registerDefaultGenerators() : void{
+		self::addGenerator(Flat::class, "flat");
+		self::addGenerator(Normal::class, "normal");
+		self::addGenerator(Normal::class, "default");
+		self::addGenerator(Nether::class, "hell");
+		self::addGenerator(Nether::class, "nether");
+	}
+
+	public static function addGenerator($object, $name) : bool{
+		if(is_subclass_of($object, Generator::class) and !isset(self::$list[$name = strtolower($name)])){
+			self::$list[$name] = $object;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getGeneratorList() : array{
+		return array_keys(self::$list);
+	}
+
+	/**
+	 * @param $name
+	 *
+	 * @return string|Generator Name of class that extends Generator (not an actual Generator object)
+	 */
+	public static function getGenerator($name){
+		if(isset(self::$list[$name = strtolower($name)])){
+			return self::$list[$name];
+		}
+
+		return Normal::class;
+	}
+
+	public static function getGeneratorName($class){
+		foreach(self::$list as $name => $c){
+			if($c === $class){
+				return $name;
+			}
+		}
+
+		return "unknown";
+	}
+
+	private function __construct(){
+		//NOOP
+	}
+}