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

Apply some typehints to generators

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-07 20:22:35 +01:00
parent 45f940681a
commit 8fca7cc68d
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/level/generator/Flat.php
View File

@ -141,7 +141,7 @@ class Flat extends Generator{
} }
} }
public function generateChunk(int $chunkX, int $chunkZ){ public function generateChunk(int $chunkX, int $chunkZ) : void{
if($this->chunk === null){ if($this->chunk === null){
if(isset($this->options["preset"]) and $this->options["preset"] != ""){ if(isset($this->options["preset"]) and $this->options["preset"] != ""){
$this->generateBaseChunk($this->options["preset"]); $this->generateBaseChunk($this->options["preset"]);
@ -155,7 +155,7 @@ class Flat extends Generator{
$this->level->setChunk($chunkX, $chunkZ, $chunk); $this->level->setChunk($chunkX, $chunkZ, $chunk);
} }
public function populateChunk(int $chunkX, int $chunkZ){ public function populateChunk(int $chunkX, int $chunkZ) : void{
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){ foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random); $populator->populate($this->level, $chunkX, $chunkZ, $this->random);

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

@ -60,14 +60,14 @@ abstract class Generator{
abstract public function __construct(array $settings = []); abstract public function __construct(array $settings = []);
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random) : void{
$this->level = $level; $this->level = $level;
$this->random = $random; $this->random = $random;
} }
abstract public function generateChunk(int $chunkX, int $chunkZ); abstract public function generateChunk(int $chunkX, int $chunkZ) : void;
abstract public function populateChunk(int $chunkX, int $chunkZ); abstract public function populateChunk(int $chunkX, int $chunkZ) : void;
abstract public function getSettings() : array; abstract public function getSettings() : array;

6
src/pocketmine/level/generator/hell/Nether.php
View File

@ -62,7 +62,7 @@ class Nether extends Generator{
return []; return [];
} }
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random) : void{
parent::init($level, $random); parent::init($level, $random);
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 64); $this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 64);
@ -82,7 +82,7 @@ class Nether extends Generator{
$this->populators[] = $ores;*/ $this->populators[] = $ores;*/
} }
public function generateChunk(int $chunkX, int $chunkZ){ public function generateChunk(int $chunkX, int $chunkZ) : void{
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
$noise = $this->noiseBase->getFastNoise3D(16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16); $noise = $this->noiseBase->getFastNoise3D(16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16);
@ -117,7 +117,7 @@ class Nether extends Generator{
} }
} }
public function populateChunk(int $chunkX, int $chunkZ){ public function populateChunk(int $chunkX, int $chunkZ) : void{
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){ foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random); $populator->populate($this->level, $chunkX, $chunkZ, $this->random);

10
src/pocketmine/level/generator/normal/Normal.php
View File

@ -62,7 +62,7 @@ class Normal extends Generator{
} }
} }
private static function generateKernel(){ private static function generateKernel() : void{
self::$GAUSSIAN_KERNEL = []; self::$GAUSSIAN_KERNEL = [];
$bellSize = 1 / self::$SMOOTH_SIZE; $bellSize = 1 / self::$SMOOTH_SIZE;
@ -87,7 +87,7 @@ class Normal extends Generator{
return []; return [];
} }
private function pickBiome(int $x, int $z){ private function pickBiome(int $x, int $z) : Biome{
$hash = $x * 2345803 ^ $z * 9236449 ^ $this->level->getSeed(); $hash = $x * 2345803 ^ $z * 9236449 ^ $this->level->getSeed();
$hash *= $hash + 223; $hash *= $hash + 223;
$xNoise = $hash >> 20 & 3; $xNoise = $hash >> 20 & 3;
@ -102,7 +102,7 @@ class Normal extends Generator{
return $this->selector->pickBiome($x + $xNoise - 1, $z + $zNoise - 1); return $this->selector->pickBiome($x + $xNoise - 1, $z + $zNoise - 1);
} }
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random) : void{
parent::init($level, $random); parent::init($level, $random);
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 32); $this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 32);
@ -177,7 +177,7 @@ class Normal extends Generator{
$this->populators[] = $ores; $this->populators[] = $ores;
} }
public function generateChunk(int $chunkX, int $chunkZ){ public function generateChunk(int $chunkX, int $chunkZ) : void{
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
$noise = $this->noiseBase->getFastNoise3D(16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16); $noise = $this->noiseBase->getFastNoise3D(16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16);
@ -244,7 +244,7 @@ class Normal extends Generator{
} }
} }
public function populateChunk(int $chunkX, int $chunkZ){ public function populateChunk(int $chunkX, int $chunkZ) : void{
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
foreach($this->populators as $populator){ foreach($this->populators as $populator){
$populator->populate($this->level, $chunkX, $chunkZ, $this->random); $populator->populate($this->level, $chunkX, $chunkZ, $this->random);