level/generator: populate missing return type information

This commit is contained in:
Dylan K. Taylor 2020-01-19 18:07:54 +00:00
parent 31e8efa6d1
commit aa7d55e21d
14 changed files with 118 additions and 0 deletions

View File

@ -52,6 +52,9 @@ abstract class BiomeSelector{
*/
abstract protected function lookup(float $temperature, float $rainfall) : int;
/**
* @return void
*/
public function recalculate(){
$this->map = new \SplFixedArray(64 * 64);

View File

@ -405,6 +405,8 @@ abstract class Noise{
* @param float $x
* @param float $y
* @param float $z
*
* @return void
*/
public function setOffset($x, $y, $z){
$this->offsetX = $x;

View File

@ -35,6 +35,15 @@ class BigTree extends Tree{
return false;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
}

View File

@ -40,6 +40,15 @@ class BirchTree extends Tree{
$this->superBirch = $superBirch;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
$this->treeHeight = $random->nextBoundedInt(3) + 5;
if($this->superBirch){

View File

@ -36,6 +36,15 @@ class OakTree extends Tree{
$this->type = Wood::OAK;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
$this->treeHeight = $random->nextBoundedInt(3) + 4;
parent::placeObject($level, $x, $y, $z, $random);

View File

@ -49,6 +49,14 @@ class Ore{
return $level->getBlockIdAt($x, $y, $z) === Block::STONE;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z){
$clusterSize = $this->type->clusterSize;
$angle = $this->random->nextFloat() * M_PI;

View File

@ -43,6 +43,12 @@ class Pond{
return false;
}
/**
* @param ChunkManager $level
* @param Vector3 $pos
*
* @return void
*/
public function placeObject(ChunkManager $level, Vector3 $pos){
}

View File

@ -39,6 +39,15 @@ class SpruceTree extends Tree{
$this->treeHeight = 10;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
$this->treeHeight = $random->nextBoundedInt(4) + 6;

View File

@ -31,6 +31,15 @@ use function count;
class TallGrass{
/**
* @param ChunkManager $level
* @param Vector3 $pos
* @param Random $random
* @param int $count
* @param int $radius
*
* @return void
*/
public static function growGrass(ChunkManager $level, Vector3 $pos, Random $random, int $count = 15, int $radius = 10){
$arr = [
[Block::DANDELION, 0],

View File

@ -49,6 +49,16 @@ abstract class Tree{
/** @var int */
public $treeHeight = 7;
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
* @param int $type
*
* @return void
*/
public static function growTree(ChunkManager $level, int $x, int $y, int $z, Random $random, int $type = 0){
switch($type){
case Sapling::SPRUCE:
@ -100,6 +110,15 @@ abstract class Tree{
return true;
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
*
* @return void
*/
public function placeObject(ChunkManager $level, int $x, int $y, int $z, Random $random){
$this->placeTrunk($level, $x, $y, $z, $random, $this->treeHeight - 1);
@ -123,6 +142,16 @@ abstract class Tree{
}
}
/**
* @param ChunkManager $level
* @param int $x
* @param int $y
* @param int $z
* @param Random $random
* @param int $trunkHeight
*
* @return void
*/
protected function placeTrunk(ChunkManager $level, int $x, int $y, int $z, Random $random, int $trunkHeight){
// The base dirt block
$level->setBlockIdAt($x, $y - 1, $z, Block::DIRT);

View File

@ -48,6 +48,8 @@ class Ore extends Populator{
/**
* @param OreType[] $types
*
* @return void
*/
public function setOreTypes(array $types){
$this->oreTypes = $types;

View File

@ -49,14 +49,29 @@ class Pond extends Populator{
}
}
/**
* @param int $waterOdd
*
* @return void
*/
public function setWaterOdd(int $waterOdd){
$this->waterOdd = $waterOdd;
}
/**
* @param int $lavaOdd
*
* @return void
*/
public function setLavaOdd(int $lavaOdd){
$this->lavaOdd = $lavaOdd;
}
/**
* @param int $lavaSurfaceOdd
*
* @return void
*/
public function setLavaSurfaceOdd(int $lavaSurfaceOdd){
$this->lavaSurfaceOdd = $lavaSurfaceOdd;
}

View File

@ -37,6 +37,8 @@ class TallGrass extends Populator{
/**
* @param int $amount
*
* @return void
*/
public function setRandomAmount($amount){
$this->randomAmount = $amount;
@ -44,6 +46,8 @@ class TallGrass extends Populator{
/**
* @param int $amount
*
* @return void
*/
public function setBaseAmount($amount){
$this->baseAmount = $amount;

View File

@ -49,6 +49,8 @@ class Tree extends Populator{
/**
* @param int $amount
*
* @return void
*/
public function setRandomAmount($amount){
$this->randomAmount = $amount;
@ -56,6 +58,8 @@ class Tree extends Populator{
/**
* @param int $amount
*
* @return void
*/
public function setBaseAmount($amount){
$this->baseAmount = $amount;