From eb738d1d724fcac46119ab9d5989a7db95dd00f6 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 26 Jul 2018 19:31:18 +0100
Subject: [PATCH] Apply more typehints to generator namespace

---
 .../level/generator/GeneratorRegisterTask.php          |  2 +-
 .../level/generator/GeneratorUnregisterTask.php        |  2 +-
 src/pocketmine/level/generator/PopulationTask.php      |  4 ++--
 src/pocketmine/level/generator/biome/BiomeSelector.php |  2 +-
 src/pocketmine/level/generator/object/BirchTree.php    |  2 +-
 src/pocketmine/level/generator/object/OakTree.php      |  2 +-
 src/pocketmine/level/generator/object/Ore.php          |  2 +-
 src/pocketmine/level/generator/object/SpruceTree.php   |  2 +-
 src/pocketmine/level/generator/object/TallGrass.php    |  2 +-
 src/pocketmine/level/generator/object/Tree.php         |  7 +++----
 .../level/generator/populator/GroundCover.php          |  2 +-
 src/pocketmine/level/generator/populator/Ore.php       |  4 ++--
 src/pocketmine/level/generator/populator/Populator.php | 10 ++++------
 src/pocketmine/level/generator/populator/TallGrass.php |  6 +++---
 src/pocketmine/level/generator/populator/Tree.php      |  8 ++++----
 15 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/pocketmine/level/generator/GeneratorRegisterTask.php b/src/pocketmine/level/generator/GeneratorRegisterTask.php
index 1c608a7e1..c1c0f6a8e 100644
--- a/src/pocketmine/level/generator/GeneratorRegisterTask.php
+++ b/src/pocketmine/level/generator/GeneratorRegisterTask.php
@@ -46,7 +46,7 @@ class GeneratorRegisterTask extends AsyncTask{
 		$this->worldHeight = $level->getWorldHeight();
 	}
 
-	public function onRun(){
+	public function onRun() : void{
 		BlockFactory::init();
 		Biome::init();
 		$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
diff --git a/src/pocketmine/level/generator/GeneratorUnregisterTask.php b/src/pocketmine/level/generator/GeneratorUnregisterTask.php
index 780268cac..54aa2fb48 100644
--- a/src/pocketmine/level/generator/GeneratorUnregisterTask.php
+++ b/src/pocketmine/level/generator/GeneratorUnregisterTask.php
@@ -34,7 +34,7 @@ class GeneratorUnregisterTask extends AsyncTask{
 		$this->levelId = $level->getId();
 	}
 
-	public function onRun(){
+	public function onRun() : void{
 		$this->removeFromThreadStore("generation.level{$this->levelId}.manager");
 		$this->removeFromThreadStore("generation.level{$this->levelId}.generator");
 	}
diff --git a/src/pocketmine/level/generator/PopulationTask.php b/src/pocketmine/level/generator/PopulationTask.php
index 007a6f87f..af94ffd8e 100644
--- a/src/pocketmine/level/generator/PopulationTask.php
+++ b/src/pocketmine/level/generator/PopulationTask.php
@@ -55,7 +55,7 @@ class PopulationTask extends AsyncTask{
 		}
 	}
 
-	public function onRun(){
+	public function onRun() : void{
 		/** @var SimpleChunkManager $manager */
 		$manager = $this->getFromThreadStore("generation.level{$this->levelId}.manager");
 		/** @var Generator $generator */
@@ -135,7 +135,7 @@ class PopulationTask extends AsyncTask{
 		}
 	}
 
-	public function onCompletion(Server $server){
+	public function onCompletion(Server $server) : void{
 		$level = $server->getLevel($this->levelId);
 		if($level !== null){
 			if(!$this->state){
diff --git a/src/pocketmine/level/generator/biome/BiomeSelector.php b/src/pocketmine/level/generator/biome/BiomeSelector.php
index 5d80d607e..0af35246e 100644
--- a/src/pocketmine/level/generator/biome/BiomeSelector.php
+++ b/src/pocketmine/level/generator/biome/BiomeSelector.php
@@ -52,7 +52,7 @@ abstract class BiomeSelector{
 	 */
 	abstract protected function lookup(float $temperature, float $rainfall) : int;
 
-	public function recalculate(){
+	public function recalculate() : void{
 		$this->map = new \SplFixedArray(64 * 64);
 
 		for($i = 0; $i < 64; ++$i){
diff --git a/src/pocketmine/level/generator/object/BirchTree.php b/src/pocketmine/level/generator/object/BirchTree.php
index 18a3cc9f5..1dedf230d 100644
--- a/src/pocketmine/level/generator/object/BirchTree.php
+++ b/src/pocketmine/level/generator/object/BirchTree.php
@@ -39,7 +39,7 @@ class BirchTree extends Tree{
 		$this->superBirch = $superBirch;
 	}
 
-	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
+	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : void{
 		$this->treeHeight = $random->nextBoundedInt(3) + 5;
 		if($this->superBirch){
 			$this->treeHeight += 5;
diff --git a/src/pocketmine/level/generator/object/OakTree.php b/src/pocketmine/level/generator/object/OakTree.php
index 47865de7e..27d24326d 100644
--- a/src/pocketmine/level/generator/object/OakTree.php
+++ b/src/pocketmine/level/generator/object/OakTree.php
@@ -36,7 +36,7 @@ class OakTree extends Tree{
 		$this->type = Wood::OAK;
 	}
 
-	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
+	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : void{
 		$this->treeHeight = $random->nextBoundedInt(3) + 4;
 		parent::placeObject($level, $x, $y, $z, $random);
 	}
diff --git a/src/pocketmine/level/generator/object/Ore.php b/src/pocketmine/level/generator/object/Ore.php
index c8b2ea33d..27e7a15f9 100644
--- a/src/pocketmine/level/generator/object/Ore.php
+++ b/src/pocketmine/level/generator/object/Ore.php
@@ -47,7 +47,7 @@ class Ore{
 		return $level->getBlockIdAt($x, $y, $z) === Block::STONE;
 	}
 
-	public function placeObject(ChunkManager $level, int $x, int $y, int $z){
+	public function placeObject(ChunkManager $level, int $x, int $y, int $z) : void{
 		$clusterSize = $this->type->clusterSize;
 		$angle = $this->random->nextFloat() * M_PI;
 		$offset = VectorMath::getDirection2D($angle)->multiply($clusterSize / 8);
diff --git a/src/pocketmine/level/generator/object/SpruceTree.php b/src/pocketmine/level/generator/object/SpruceTree.php
index 30ac7315e..eb09978c5 100644
--- a/src/pocketmine/level/generator/object/SpruceTree.php
+++ b/src/pocketmine/level/generator/object/SpruceTree.php
@@ -38,7 +38,7 @@ class SpruceTree extends Tree{
 		$this->treeHeight = 10;
 	}
 
-	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
+	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : void{
 		$this->treeHeight = $random->nextBoundedInt(4) + 6;
 
 		$topSize = $this->treeHeight - (1 + $random->nextBoundedInt(2));
diff --git a/src/pocketmine/level/generator/object/TallGrass.php b/src/pocketmine/level/generator/object/TallGrass.php
index bb60682a3..cfa8098b1 100644
--- a/src/pocketmine/level/generator/object/TallGrass.php
+++ b/src/pocketmine/level/generator/object/TallGrass.php
@@ -30,7 +30,7 @@ use pocketmine\utils\Random;
 
 class TallGrass{
 
-	public static function growGrass(ChunkManager $level, Vector3 $pos, Random $random, int $count = 15, int $radius = 10){
+	public static function growGrass(ChunkManager $level, Vector3 $pos, Random $random, int $count = 15, int $radius = 10) : void{
 		$arr = [
 			[Block::DANDELION, 0],
 			[Block::POPPY, 0],
diff --git a/src/pocketmine/level/generator/object/Tree.php b/src/pocketmine/level/generator/object/Tree.php
index 27b810729..e79dd6cb9 100644
--- a/src/pocketmine/level/generator/object/Tree.php
+++ b/src/pocketmine/level/generator/object/Tree.php
@@ -45,7 +45,7 @@ abstract class Tree{
 	public $leafBlock = Block::LEAVES;
 	public $treeHeight = 7;
 
-	public static function growTree(ChunkManager $level, int $x, int $y, int $z, Random $random, int $type = 0){
+	public static function growTree(ChunkManager $level, int $x, int $y, int $z, Random $random, int $type = Sapling::OAK) : void{
 		switch($type){
 			case Sapling::SPRUCE:
 				$tree = new SpruceTree();
@@ -96,8 +96,7 @@ abstract class Tree{
 		return true;
 	}
 
-	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
-
+	public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random) : void{
 		$this->placeTrunk($level, $x, $y, $z, $random, $this->treeHeight - 1);
 
 		for($yy = $y - 3 + $this->treeHeight; $yy <= $y + $this->treeHeight; ++$yy){
@@ -119,7 +118,7 @@ abstract class Tree{
 		}
 	}
 
-	protected function placeTrunk(ChunkManager $level, int $x, int $y, int $z, Random $random, int $trunkHeight){
+	protected function placeTrunk(ChunkManager $level, int $x, int $y, int $z, Random $random, int $trunkHeight) : void{
 		// The base dirt block
 		$level->setBlockIdAt($x, $y - 1, $z, Block::DIRT);
 
diff --git a/src/pocketmine/level/generator/populator/GroundCover.php b/src/pocketmine/level/generator/populator/GroundCover.php
index 70e7e0945..1410beb0a 100644
--- a/src/pocketmine/level/generator/populator/GroundCover.php
+++ b/src/pocketmine/level/generator/populator/GroundCover.php
@@ -31,7 +31,7 @@ use pocketmine\utils\Random;
 
 class GroundCover extends Populator{
 
-	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
+	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random) : void{
 		$chunk = $level->getChunk($chunkX, $chunkZ);
 		for($x = 0; $x < 16; ++$x){
 			for($z = 0; $z < 16; ++$z){
diff --git a/src/pocketmine/level/generator/populator/Ore.php b/src/pocketmine/level/generator/populator/Ore.php
index a5b472fa5..0b7f982e8 100644
--- a/src/pocketmine/level/generator/populator/Ore.php
+++ b/src/pocketmine/level/generator/populator/Ore.php
@@ -32,7 +32,7 @@ class Ore extends Populator{
 	/** @var OreType[] */
 	private $oreTypes = [];
 
-	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
+	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random) : void{
 		foreach($this->oreTypes as $type){
 			$ore = new ObjectOre($random, $type);
 			for($i = 0; $i < $ore->type->clusterCount; ++$i){
@@ -49,7 +49,7 @@ class Ore extends Populator{
 	/**
 	 * @param OreType[] $types
 	 */
-	public function setOreTypes(array $types){
+	public function setOreTypes(array $types) : void{
 		$this->oreTypes = $types;
 	}
 }
diff --git a/src/pocketmine/level/generator/populator/Populator.php b/src/pocketmine/level/generator/populator/Populator.php
index 50fb35919..c913e7a61 100644
--- a/src/pocketmine/level/generator/populator/Populator.php
+++ b/src/pocketmine/level/generator/populator/Populator.php
@@ -33,11 +33,9 @@ abstract class Populator{
 
 	/**
 	 * @param ChunkManager $level
-	 * @param int $chunkX
-	 * @param int $chunkZ
-	 * @param Random $random
-	 *
-	 * @return mixed
+	 * @param int          $chunkX
+	 * @param int          $chunkZ
+	 * @param Random       $random
 	 */
-	abstract public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random);
+	abstract public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random) : void;
 }
diff --git a/src/pocketmine/level/generator/populator/TallGrass.php b/src/pocketmine/level/generator/populator/TallGrass.php
index a60179946..3532bc568 100644
--- a/src/pocketmine/level/generator/populator/TallGrass.php
+++ b/src/pocketmine/level/generator/populator/TallGrass.php
@@ -33,15 +33,15 @@ class TallGrass extends Populator{
 	private $randomAmount;
 	private $baseAmount;
 
-	public function setRandomAmount($amount){
+	public function setRandomAmount(int $amount) : void{
 		$this->randomAmount = $amount;
 	}
 
-	public function setBaseAmount($amount){
+	public function setBaseAmount(int $amount) : void{
 		$this->baseAmount = $amount;
 	}
 
-	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
+	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random) : void{
 		$this->level = $level;
 		$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
 		for($i = 0; $i < $amount; ++$i){
diff --git a/src/pocketmine/level/generator/populator/Tree.php b/src/pocketmine/level/generator/populator/Tree.php
index cbe8e6bce..6250aa41a 100644
--- a/src/pocketmine/level/generator/populator/Tree.php
+++ b/src/pocketmine/level/generator/populator/Tree.php
@@ -37,19 +37,19 @@ class Tree extends Populator{
 
 	private $type;
 
-	public function __construct($type = Sapling::OAK){
+	public function __construct(int $type = Sapling::OAK){
 		$this->type = $type;
 	}
 
-	public function setRandomAmount($amount){
+	public function setRandomAmount(int $amount) : void{
 		$this->randomAmount = $amount;
 	}
 
-	public function setBaseAmount($amount){
+	public function setBaseAmount(int $amount) : void{
 		$this->baseAmount = $amount;
 	}
 
-	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
+	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random) : void{
 		$this->level = $level;
 		$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
 		for($i = 0; $i < $amount; ++$i){