mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Generator: Moved generator registering things to a separate GeneratorManager class

Browse Source 
this isolates the concerns of the Generator class, and also removes cyclic dependencies between the Generator class and its descendents.
This commit is contained in:
Dylan K. Taylor 2018-06-07 13:48:01 +01:00
parent 0bca3cd481
commit 5eec683110
6 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/Server.php
View File

@ -51,6 +51,7 @@ use pocketmine\level\biome\Biome;
use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\Level;
use pocketmine\level\LevelException;
use pocketmine\metadata\EntityMetadataStore;
@ -1074,7 +1075,7 @@ class Server{
}
if(!($generator !== null and class_exists($generator, true) and is_subclass_of($generator, Generator::class))){
$generator = Generator::getGenerator($this->getLevelType());
$generator = GeneratorManager::getGenerator($this->getLevelType());
}
if(($providerClass = LevelProviderManager::getProviderByName($this->getProperty("level-settings.default-format", "pmanvil"))) === null){
@ -1662,7 +1663,7 @@ class Server{
$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
}
Generator::registerDefaultGenerators();
GeneratorManager::registerDefaultGenerators();
foreach((array) $this->getProperty("worlds", []) as $name => $options){
if(!is_array($options)){
@ -1678,12 +1679,12 @@ class Server{
if(isset($options["generator"])){
$generatorOptions = explode(":", $options["generator"]);
$generator = Generator::getGenerator(array_shift($generatorOptions));
$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
if(count($options) > 0){
$options["preset"] = implode(":", $generatorOptions);
}
}else{
$generator = Generator::getGenerator("default");
$generator = GeneratorManager::getGenerator("default");
}
$this->generateLevel($name, $seed, $generator, $options);

3
src/pocketmine/level/Level.php
View File

@ -51,6 +51,7 @@ use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkRequestTask;
use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\generator\GeneratorRegisterTask;
use pocketmine\level\generator\GeneratorUnregisterTask;
use pocketmine\level\generator\PopulationTask;
@ -331,7 +332,7 @@ class Level implements ChunkManager, Metadatable{
$this->worldHeight = $this->provider->getWorldHeight();
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.preparing", [$this->displayName]));
$this->generator = Generator::getGenerator($this->provider->getGenerator());
$this->generator = GeneratorManager::getGenerator($this->provider->getGenerator());
$this->folderName = $name;

4
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -29,7 +29,7 @@ use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\format\io\exception\UnsupportedChunkFormatException;
use pocketmine\level\format\SubChunk;
use pocketmine\level\generator\Flat;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\Level;
use pocketmine\level\LevelException;
use pocketmine\nbt\LittleEndianNBTStream;
@ -212,7 +212,7 @@ class LevelDB extends BaseLevelProvider{
//Additional PocketMine-MP fields
new CompoundTag("GameRules", []),
new ByteTag("hardcore", ($options["hardcore"] ?? false) === true ? 1 : 0),
new StringTag("generatorName", Generator::getGeneratorName($generator)),
new StringTag("generatorName", GeneratorManager::getGeneratorName($generator)),
new StringTag("generatorOptions", $options["preset"] ?? "")
]);

4
src/pocketmine/level/format/io/region/McRegion.php
View File

@ -28,7 +28,7 @@ use pocketmine\level\format\ChunkException;
use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\format\SubChunk;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\Level;
use pocketmine\nbt\BigEndianNBTStream;
use pocketmine\nbt\NBT;
@ -242,7 +242,7 @@ class McRegion extends BaseLevelProvider{
new LongTag("RandomSeed", $seed),
new LongTag("SizeOnDisk", 0),
new LongTag("Time", 0),
new StringTag("generatorName", Generator::getGeneratorName($generator)),
new StringTag("generatorName", GeneratorManager::getGeneratorName($generator)),
new StringTag("generatorOptions", $options["preset"] ?? ""),
new StringTag("LevelName", $name),
new CompoundTag("GameRules", [])

51
src/pocketmine/level/generator/Generator.php
View File

@ -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 = []);

84
src/pocketmine/level/generator/GeneratorManager.php Normal file
View File

@ -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
}
}