From 86a5a50330c5555e71aba73e5192a29f979de465 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 4 Apr 2019 17:53:25 +0100 Subject: [PATCH] Generator: remove more useless functions these are red herrings for plugin developers since they are not used. --- src/pocketmine/level/generator/Flat.php | 5 ----- src/pocketmine/level/generator/Generator.php | 7 ------- src/pocketmine/level/generator/hell/Nether.php | 5 ----- src/pocketmine/level/generator/normal/Normal.php | 5 ----- 4 files changed, 22 deletions(-) diff --git a/src/pocketmine/level/generator/Flat.php b/src/pocketmine/level/generator/Flat.php index 2ca909db6..1b41e6093 100644 --- a/src/pocketmine/level/generator/Flat.php +++ b/src/pocketmine/level/generator/Flat.php @@ -31,7 +31,6 @@ use pocketmine\level\format\Chunk; use pocketmine\level\generator\object\OreType; use pocketmine\level\generator\populator\Ore; use pocketmine\level\generator\populator\Populator; -use pocketmine\math\Vector3; use function array_map; use function count; use function explode; @@ -185,8 +184,4 @@ class Flat extends Generator{ } } - - public function getSpawn() : Vector3{ - return new Vector3(128, $this->floorLevel, 128); - } } diff --git a/src/pocketmine/level/generator/Generator.php b/src/pocketmine/level/generator/Generator.php index 89767c9ae..8357a8e6f 100644 --- a/src/pocketmine/level/generator/Generator.php +++ b/src/pocketmine/level/generator/Generator.php @@ -27,7 +27,6 @@ declare(strict_types=1); namespace pocketmine\level\generator; use pocketmine\level\ChunkManager; -use pocketmine\math\Vector3; use pocketmine\utils\Random; use pocketmine\utils\Utils; use function ctype_digit; @@ -80,10 +79,4 @@ abstract class Generator{ abstract public function generateChunk(int $chunkX, int $chunkZ) : void; abstract public function populateChunk(int $chunkX, int $chunkZ) : void; - - public function getSettings() : array{ - return $this->options; - } - - abstract public function getSpawn() : Vector3; } diff --git a/src/pocketmine/level/generator/hell/Nether.php b/src/pocketmine/level/generator/hell/Nether.php index c73931d74..bb89cfedb 100644 --- a/src/pocketmine/level/generator/hell/Nether.php +++ b/src/pocketmine/level/generator/hell/Nether.php @@ -31,7 +31,6 @@ use pocketmine\level\generator\Generator; use pocketmine\level\generator\InvalidGeneratorOptionsException; use pocketmine\level\generator\noise\Simplex; use pocketmine\level\generator\populator\Populator; -use pocketmine\math\Vector3; use function abs; class Nether extends Generator{ @@ -128,8 +127,4 @@ class Nether extends Generator{ $biome = Biome::getBiome($chunk->getBiomeId(7, 7)); $biome->populateChunk($this->level, $chunkX, $chunkZ, $this->random); } - - public function getSpawn() : Vector3{ - return new Vector3(127.5, 128, 127.5); - } } diff --git a/src/pocketmine/level/generator/normal/Normal.php b/src/pocketmine/level/generator/normal/Normal.php index b5a2307a6..c6141d36a 100644 --- a/src/pocketmine/level/generator/normal/Normal.php +++ b/src/pocketmine/level/generator/normal/Normal.php @@ -36,7 +36,6 @@ use pocketmine\level\generator\populator\GroundCover; use pocketmine\level\generator\populator\Ore; use pocketmine\level\generator\populator\Populator; use pocketmine\level\Level; -use pocketmine\math\Vector3; use function exp; class Normal extends Generator{ @@ -246,8 +245,4 @@ class Normal extends Generator{ $biome = Biome::getBiome($chunk->getBiomeId(7, 7)); $biome->populateChunk($this->level, $chunkX, $chunkZ, $this->random); } - - public function getSpawn() : Vector3{ - return new Vector3(127.5, 128, 127.5); - } }