Fixing merging problems.

.gitignore

@@ -0,0 +1 @@
+.idea/*

README.md

@@ -1,9 +1,10 @@
 <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/banner.png"></img>     
 <center><h1>PocketMine's Tomorrow's World Generator.</h1></center>
 Welcome user to the home of a new PocketMine World Generator which features 9 new/modified biomes:
+
 ------
-# Commun:
+# Common:
-### Commun structures to all biomes features:
+### Common structures to all biomes features:
 1. <h3>Mineshafts:</h3>      
     <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/Mineshaft.jpg" style="width: 500px"></img>
 2. <h3>Ravines:</h3>
@@ -12,8 +13,6 @@ Welcome user to the home of a new PocketMine World Generator which features 9 ne
     <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/cave.jpg" style="width: 500px"></img>
 4. <h3>Floating islands:</h3>
     <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/Island.jpg" style="width: 500px"></img>
-
-
 -----
 
 # [NEW BIOME] Sakura forests:
@@ -23,7 +22,7 @@ Welcome user to the home of a new PocketMine World Generator which features 9 ne
 -----
 
 # [NEW BIOMES] Mesa Mountains & Plains
-### These biomes are inspired (but not completly taken) from Minecraft PC.
+### These biomes are inspired (but not completely taken) from Minecraft PC.
 <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/mesa.png" style="width: 500px"></img>
 
 
@@ -31,13 +30,13 @@ Welcome user to the home of a new PocketMine World Generator which features 9 ne
 
 # Better Desert:
 ### The desert has been reworked and now includes the Minecraft PC's temples and wells ! 
-### Additionaly, deadbush, sugar cane and cactus are here too !
+### Additionally, deadbush, sugar cane and cactus are here too !
 <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/temple.png" style="width: 500px"></img>
 
 -----
 
 # Better Ice Plains
-### Ice plains got redisigned ! There is now snow instead of grass at it's bottom ! On the plus side, Igloos were imported from Minecraft PC !
+### Ice plains got redesigned ! There is now snow instead of grass at it's bottom ! On the plus side, Igloos were imported from Minecraft PC !
 <img src="https://raw.githubusercontent.com/Ad5001/BetterGen/master/imgs/igloo.jpg" style="width: 500px"></img>
 
 

plugin.yml

@@ -6,7 +6,7 @@
 #   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
 #    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
 #     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
-# Tommorow's pocketmine generator.
+# Tomorrow's pocketmine generator.
 # @author Ad5001
 # @link https://github.com/Ad5001/BetterGen
 name: BetterGen
@@ -24,9 +24,15 @@ commands:
         description: Teleports you to an another world
         usage: "/worldtp <world name>"
         permission: bettergen.cmd.worldtp
+    temple:
+        description: Spawns a temple for debugging
+        usage: "/temple"
+        permission: bettergen.cmd.debug
 permissions:
     bettergen.cmd.createworld:
         default: op
     bettergen.cmd.worldtp:
         default: op
+    bettergen.cmd.debug:
+        default: op
 ...

processingLoots.json

@@ -0,0 +1 @@
+[]

resources/loots/mineshaft.json

@@ -45,7 +45,7 @@
 		"id": 263,
 		"data": 0
 	},
-	"beethroot seeds": {
+	"beetroot seeds": {
 		"percentage": 32,
 		"minCount": 2,
 		"maxCount": 4,

src/Ad5001/BetterGen/Main.php

@@ -7,54 +7,61 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen;
 
-use pocketmine\plugin\PluginBase;
+use Ad5001\BetterGen\biome\BetterForest;
+use Ad5001\BetterGen\generator\BetterNormal;
+use Ad5001\BetterGen\loot\LootTable;
+use Ad5001\BetterGen\structure\Temple;
+use pocketmine\block\Block;
+use pocketmine\command\Command;
+use pocketmine\command\CommandSender;
+use pocketmine\command\ConsoleCommandSender;
+use pocketmine\event\block\BlockBreakEvent;
+use pocketmine\event\level\ChunkPopulateEvent;
+use pocketmine\event\Listener;
+use pocketmine\event\player\PlayerInteractEvent;
 use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\Generator;
-use pocketmine\level\generator\normal\Normal;
-use pocketmine\event\level\ChunkPopulateEvent;
-use Ad5001\BetterGen\generator\BetterNormal;
-use Ad5001\BetterGen\biome\BetterForest;
-use Ad5001\BetterGen\loot\LootTable;
-use pocketmine\utils\Config;
-use pocketmine\block\Block;
-use pocketmine\tile\Chest;
-use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\nbt\tag\IntTag;
+use pocketmine\Player;
+use pocketmine\plugin\PluginBase;
+use pocketmine\tile\Chest;
 use pocketmine\tile\Tile;
-use pocketmine\item\Item;
+use pocketmine\utils\Config;
-use pocketmine\event\player\PlayerInteractEvent;
+use pocketmine\utils\Random;
-use pocketmine\event\block\BlockBreakEvent;
 
-class Main extends PluginBase implements \pocketmine\event\Listener {
+class Main extends PluginBase implements Listener {
 	const PREFIX = "§l§o§b[§r§l§2Better§aGen§o§b]§r§f ";
 	const SAKURA_FOREST = 100; // Letting some place for future biomes.
 
 	/*
 	 * Called when the plugin enables
 	 */
-	public function onEnable() {
+
-		$this->getServer()->getPluginManager()->registerEvents($this, $this);
+	public static function registerBiome(int $id, Biome $biome) {
-		Generator::addGenerator(BetterNormal::class, "betternormal");
+		BetterNormal::registerBiome($biome);
-		if($this->isOtherNS()) $this->getLogger()->warning("Tesseract detected. Note that some parts of the generator could not work properly");
-		@mkdir($this->getDataFolder());
-		if(! file_exists(LootTable::getPluginFolder(). "processingLoots.json"))
-			file_put_contents(LootTable::getPluginFolder(). "processingLoots.json", "{}");
 	}
 
 	/*
 	 * Called when the plugin disables
 	 */
-	public function onDisable() {
+
+	public function onEnable() {
+		$this->getServer()->getPluginManager()->registerEvents($this, $this);
+		Generator::addGenerator(BetterNormal::class, "betternormal");
+		if ($this->isOtherNS()) $this->getLogger()->warning("Tesseract detected. Note that Tesseract is not up to date with the generation structure and some generation features may be limited or not working");
+		@mkdir($this->getDataFolder());
+		if (!file_exists(LootTable::getPluginFolder() . "processingLoots.json"))
+			file_put_contents(LootTable::getPluginFolder() . "processingLoots.json", "{}");
 	}
 
 	/*
@@ -65,10 +72,37 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 	 * @param $args array
 	 * return bool
 	 */
-	public function onCommand(\pocketmine\command\CommandSender $sender, \pocketmine\command\Command $cmd, $label, array $args): bool {
+
-		switch($cmd->getName()) {
+	public static function isOtherNS() {
-			case "createworld" : // /createworld <name> [generator = betternormal] [seed = rand()] [options(json)]
+		try {
-				switch(count($args)) {
+			return @class_exists("pocketmine\\level\\generator\\normal\\object\\OakTree");
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+
+	/*
+	 * Registers a forest type.
+	 * @param $name string
+	 * @param $treeClass string
+	 * @params $infos Array(temperature, rainfall)
+	 * @return bool
+	 */
+
+	public function onDisable() {
+	}
+
+	/*
+	 * Registers a biome for the normal generator. Normal means(Biome::register) doesn't allow biome to be generated
+	 * @param $id int
+	 * @param $biome Biome
+	 * @return void
+	 */
+
+	public function onCommand(CommandSender $sender, Command $cmd, $label, array $args): bool {
+		switch ($cmd->getName()) {
+			case "createworld": // /createworld <name> [generator = betternormal] [seed = rand()] [options(json)]
+				switch (count($args)) {
 					case 0 :
 						return false;
 						break;
@@ -77,50 +111,50 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 						$generator = Generator::getGenerator("betternormal");
 						$generatorName = "betternormal";
 						$seed = $this->generateRandomSeed();
-						$options = [ ];
+						$options = [];
 						break;
 					case 2 : // /createworld <name> [generator = betternormal]
 						$name = $args [0];
 						$generator = Generator::getGenerator($args [1]);
-						if(Generator::getGeneratorName($generator) !== strtolower($args [1])) {
+						if (Generator::getGeneratorName($generator) !== strtolower($args [1])) {
 							$sender->sendMessage(self::PREFIX . "§4Could not find generator {$args[1]}. Are you sure it is registered?");
 							return true;
 						}
 						$generatorName = strtolower($args [1]);
 						$seed = $this->generateRandomSeed();
-						$options = [ ];
+						$options = [];
 						break;
 					case 3 : // /createworld <name> [generator = betternormal] [seed = rand()]
 						$name = $args [0];
 						$generator = Generator::getGenerator($args [1]);
-						if(Generator::getGeneratorName($generator) !== strtolower($args [1])) {
+						if (Generator::getGeneratorName($generator) !== strtolower($args [1])) {
 							$sender->sendMessage(self::PREFIX . "§4Could not find generator {$args[1]}. Are you sure it is registered?");
 							return true;
 						}
 						$generatorName = strtolower($args [1]);
-						if(preg_match("[^\d]", $args [2]) !== false) {
+						if (preg_match("[^\d]", $args [2]) !== false) {
 							$parts = str_split($args [2]);
-							foreach($parts as $key => $str) {
+							foreach ($parts as $key => $str) {
 								$parts [$key] = ord($str);
 							}
 							$seed = implode("", $parts);
 						} else {
 							$seed = $args [2];
 						}
-						$options = [ ];
+						$options = [];
 						break;
 					default : // /createworld <name> [generator = betternormal] [seed = rand()] [options(json)]
 						$name = $args [0];
 						$generator = Generator::getGenerator($args [1]);
-						if(Generator::getGeneratorName($generator) !== strtolower($args [1])) {
+						if (Generator::getGeneratorName($generator) !== strtolower($args [1])) {
 							$sender->sendMessage(self::PREFIX . "§4Could not find generator {$args[1]}. Are you sure it is registered?");
 							return true;
 						}
 						$generatorName = strtolower($args [1]);
-						if($args[2] == "rand") $args[2] = $this->generateRandomSeed();
+						if ($args[2] == "rand") $args[2] = $this->generateRandomSeed();
-						if(preg_match("[^\d]", $args [2]) !== false) {
+						if (preg_match("[^\d]", $args [2]) !== false) {
 							$parts = str_split($args [2]);
-							foreach($parts as $key => $str) {
+							foreach ($parts as $key => $str) {
 								$parts [$key] = ord($str);
 							}
 							$seed = implode("", $parts);
@@ -129,14 +163,14 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 						}
 						unset($args [0], $args [1], $args [2]);
 						$options = json_decode($args [3], true);
-						if(! is_array($options)) {
+						if (!is_array($options)) {
 							$sender->sendMessage(Main::PREFIX . "§4Invalid JSON for options.");
 							return true;
 						}
 						break;
 				}
 				$options["preset"] = json_encode($options);
-				if((int) $seed == 0/*String*/){
+				if ((int)$seed == 0/*String*/) {
 					$seed = $this->generateRandomSeed();
 				}
 				$this->getServer()->broadcastMessage(Main::PREFIX . "§aGenerating level $name with generator $generatorName and seed $seed..");
@@ -144,7 +178,7 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 				$this->getServer()->loadLevel($name);
 				return true;
 				break;
-				case "worldtp":
+			case "worldtp":
 				if(isset($args[0])) {
 					if(is_null($this->getServer()->getLevelByName($args[0]))) {
 						$this->getServer()->loadLevel($args[0]);
@@ -160,42 +194,24 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 					return false;
 				}
 				break;
+			case 'temple':{
+				if($sender instanceof ConsoleCommandSender) return false;
+				/** @var Player $sender */
+				$temple = new Temple();
+				$temple->placeObject($sender->getLevel(), $sender->x, $sender->y, $sender->z, new Random(microtime()));
+				return true;
+			}
 		}
-	}
+		return false;
-	
-	/*
-	 * Registers a forest type.
-	 * @param $name string
-	 * @param $treeClass string
-	 * @params $infos Array(temperature, rainfall)
-	 * @return bool
-	 */
-	public function registerForest(string $name, string $treeClass, array $infos): bool {
-		if(! @class_exists($treeClass))
-			return false;
-		if(! @is_subclass_of($treeClass, "pocketmine\\level\\generator\\normal\\object\\Tree"))
-			return false;
-		if(count($infos) < 2 or ! is_float($infos [0]) or ! is_float($infos [1]))
-			return false;
-		return BetterForest::registerForest($name, $treeClass, $infos);
-	}
-	
-	/*
-	 * Registers a biome for the normal generator. Normal means(Biome::register) doesn't allow biome to be generated
-	 * @param $id int
-	 * @param $biome Biome
-	 * @return void
-	 */
-	public static function registerBiome(int $id, Biome $biome) {
-		BetterNormal::registerBiome($biome);
 	}
 
 	/*
 	 * Generates a(semi) random seed.
 	 * @return int
 	 */
+
 	public function generateRandomSeed(): int {
-		return (int) round(rand(0, round(time()) / memory_get_usage(true)) * (int) str_shuffle("127469453645108") / (int) str_shuffle("12746945364"));
+		return (int)round(rand(0, round(time()) / memory_get_usage(true)) * (int)str_shuffle("127469453645108") / (int)str_shuffle("12746945364"));
 	}
 
 	// Listener
@@ -205,11 +221,27 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 	 * @param $event pocketmine\event\level\ChunkPopulateEvent
 	 * @return int
 	 */
+
+	public function registerForest(string $name, string $treeClass, array $infos): bool {
+		if (!@class_exists($treeClass))
+			return false;
+		if (!@is_subclass_of($treeClass, "pocketmine\\level\\generator\\normal\\object\\Tree"))
+			return false;
+		if (count($infos) < 2 or !is_float($infos [0]) or !is_float($infos [1]))
+			return false;
+		return BetterForest::registerForest($name, $treeClass, $infos);
+	}
+
+
+	/*
+	 * Checks when a player interacts with a loot chest to create it.
+	 */
+
 	public function onChunkPopulate(ChunkPopulateEvent $event) {
 		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
-		foreach($cfg->getAll() as $key => $value) {
+		foreach ($cfg->getAll() as $key => $value) {
 			list($x, $y, $z) = explode(";", $key);
-			if($value["saveAs"] == "chest" && $event->getLevel()->getBlockIdAt($x, $y, $z) == Block::AIR ){
+			if ($value["saveAs"] == "chest" && $event->getLevel()->getBlockIdAt($x, $y, $z) == Block::AIR) {
 				$event->getLevel()->setBlockIdAt($x, $y, $z, Block::CHEST);
 			} else {
 				$cfg->remove($key);
@@ -219,63 +251,47 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 	}
 
 
-	/*
-	 * Checks when a player interacts with a loot chest to create it.
-	 */
-	public function onInteract(PlayerInteractEvent $event) {
-		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
-		if($event->getBlock()->getId() !== Block::CHEST) return;
-		if(!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
-		$chest = new \pocketmine\block\Chest(0);
-		$nbt = new CompoundTag("", [
-				new ListTag("Items", []),
-				new StringTag("id", Tile::CHEST),
-				new IntTag("x", $event->getBlock()->x),
-				new IntTag("y", $event->getBlock()->y),
-				new IntTag("z", $event->getBlock()->z)
-		]);
-		$chest->setLevel($event->getBlock()->getLevel());
-		$cItem = Item::get(Item::CHEST, 0);
-		$cItem->setCustomName("§k(Fake)§r Minecart chest");
-		$chest->place($cItem, $event->getBlock()->getLevel()->getBlock($event->getBlock()), $chest, 0, 0, 0, 0);
-		$inv = $event->getBlock()->getLevel()->getTile($event->getBlock());
-		LootTable::fillChest($inv->getInventory(), $event->getBlock());
-	}
-	
-	
 	/*
 	 * Checks when a player breaks a loot chest which is not created to create it
 	 */
-	public function onBlockBreak(BlockBreakEvent $event) {
+
+	public function onInteract(PlayerInteractEvent $event) {
 		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
-		if($event->getBlock()->getId() !== Block::CHEST) return;
+		if ($event->getBlock()->getId() !== Block::CHEST) return;
-		if(!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
+		if (!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
-		$chest = new \pocketmine\block\Chest(0);
 		$nbt = new CompoundTag("", [
-				new ListTag("Items", []),
+			new ListTag("Items", []),
-				new StringTag("id", Tile::CHEST),
+			new StringTag("id", Tile::CHEST),
-				new IntTag("x", $event->getBlock()->x),
+			new IntTag("x", $event->getBlock()->x),
-				new IntTag("y", $event->getBlock()->y),
+			new IntTag("y", $event->getBlock()->y),
-				new IntTag("z", $event->getBlock()->z)
+			new IntTag("z", $event->getBlock()->z)
 		]);
-		$chest->setLevel($event->getBlock()->getLevel());
+		/** @var Chest $chest */
-		$cItem = Item::get(Item::CHEST, 0);
+		$chest = Tile::createTile(Tile::CHEST, $event->getBlock()->getLevel(), $nbt);
-		$cItem->setCustomName("§k(Fake)§r Minecart chest");
+		$chest->setName("§k(Fake)§r Minecart chest");
-		$chest->place($cItem, $event->getBlock()->getLevel()->getBlock($event->getBlock()), $chest, 0, 0, 0, 0);
+		LootTable::fillChest($chest->getInventory(), $event->getBlock());
-		$inv = $event->getBlock()->getLevel()->getTile($event->getBlock());
-		LootTable::fillChest($inv->getInventory(), $event->getBlock());
-		$event->setCancelled();
 	}
 
 	/*
 	* Check if it's a Tesseract like namespace
 	* @return 	bool
 	*/
-	public static function isOtherNS() {
+
-		try {
+	public function onBlockBreak(BlockBreakEvent $event) {
-			return @class_exists("pocketmine\\level\\generator\\normal\\object\\OakTree");
+		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
-		} catch(\Exception $e) {
+		if ($event->getBlock()->getId() !== Block::CHEST) return;
-			return false;
+		if (!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
-		}
+		$nbt = new CompoundTag("", [
+			new ListTag("Items", []),
+			new StringTag("id", Tile::CHEST),
+			new IntTag("x", $event->getBlock()->x),
+			new IntTag("y", $event->getBlock()->y),
+			new IntTag("z", $event->getBlock()->z)
+		]);
+		/** @var Chest $chest */
+		$chest = Tile::createTile(Tile::CHEST, $event->getBlock()->getLevel(), $nbt);
+		$chest->setName("§k(Fake)§r Minecart chest");
+		LootTable::fillChest($chest->getInventory(), $event->getBlock());
+		// $event->setCancelled(); //i think nope. You want to break it with items
 	}
 }

src/Ad5001/BetterGen/biome/BetterDesert.php

@@ -7,23 +7,24 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use Ad5001\BetterGen\populator\TemplePopulator;
-use Ad5001\BetterGen\populator\WellPopulator;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
+use Ad5001\BetterGen\populator\TemplePopulator;
+use Ad5001\BetterGen\populator\WellPopulator;
+use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterDesert extends SandyBiome implements Mountainable {
 	public function __construct() {
+		parent::__construct();
 		$deadBush = new DeadbushPopulator ();
 		$deadBush->setBaseAmount(1);
 		$deadBush->setRandomAmount(2);

src/Ad5001/BetterGen/biome/BetterForest.php

@@ -8,19 +8,19 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\ForestBiome;
-use pocketmine\level\generator\biome\Biome;
 use Ad5001\BetterGen\Main;
-use Ad5001\BetterGen\populator\TreePopulator;
 use Ad5001\BetterGen\populator\BushPopulator;
 use Ad5001\BetterGen\populator\FallenTreePopulator;
+use Ad5001\BetterGen\populator\TreePopulator;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\ForestBiome;
 
 
 class BetterForest extends ForestBiome implements Mountainable {
@@ -67,18 +67,17 @@ class BetterForest extends ForestBiome implements Mountainable {
 		return str_ireplace(" ", "", self::$types[$this->type]);
 	}
 
-	/*
+	/**
-	 * Returns the ID relativly.
+	 * Returns the ID relatively.
+	 * @return int
 	 */
 	public function getId() {
 		return self::$ids [$this->type];
 	}
-	
+	/**
-	/*
+	 * @param string $name
-	 * Registers a forest type. Don't use this method directly use the one from the main class.
+	 * @param string $treeClass
-	 * @param $name string
+	 * @param array $infos
-	 * @param $treeClass string
-	 * @param
 	 * @return bool
 	 */
 	public static function registerForest(string $name, string $treeClass, array $infos): bool {
@@ -86,5 +85,6 @@ class BetterForest extends ForestBiome implements Mountainable {
 		TreePopulator::$types [] = $treeClass;
 		self::$ids [] = Main::SAKURA_FOREST + (count(self::$types ) - 2);
 		Main::register(Main::SAKURA_FOREST + (count(self::$types ) - 2), new BetterForest(count(self::$types ) - 1, $infos ));
+		return true;
 	}
 }

src/Ad5001/BetterGen/biome/BetterIcePlains.php

@@ -7,18 +7,18 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SnowyBiome;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use Ad5001\BetterGen\populator\IglooPopulator;
 use Ad5001\BetterGen\Main;
+use Ad5001\BetterGen\populator\IglooPopulator;
+use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\SnowyBiome;
 
 class BetterIcePlains extends SnowyBiome implements Mountainable {
 	public function __construct() {
@@ -46,8 +46,9 @@ class BetterIcePlains extends SnowyBiome implements Mountainable {
 		return "BetterIcePlains";
 	}
 	
-	/*
+	/**
-	 * Returns biome's id.
+	 * Returns the biomes' id.
+	 * @return int biome id
 	 */
 	public function getId() {
 		return Biome::ICE_PLAINS;

src/Ad5001/BetterGen/biome/BetterMesa.php

@@ -7,27 +7,25 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
-use pocketmine\level\generator\populator\Ore;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use pocketmine\block\GoldOre;
 use Ad5001\BetterGen\Main;
-use Ad5001\BetterGen\populator\TreePopulator;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
+use Ad5001\BetterGen\populator\TreePopulator;
+use pocketmine\block\Block;
+use pocketmine\block\GoldOre;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterMesa extends SandyBiome {
 	public function __construct() {
+		parent::__construct();
 		$deadBush = new DeadbushPopulator ();
 		$deadBush->setBaseAmount(1);
 		$deadBush->setRandomAmount(2);

src/Ad5001/BetterGen/biome/BetterMesaPlains.php

@@ -7,25 +7,24 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
+use Ad5001\BetterGen\Main;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use pocketmine\block\GoldOre;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
-use Ad5001\BetterGen\Main;
+use pocketmine\block\Block;
+use pocketmine\block\GoldOre;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterMesaPlains extends SandyBiome {
 	public function __construct() {
+		parent::__construct();
 		$deadBush = new DeadbushPopulator ();
 		$deadBush->setBaseAmount(1);
 		$deadBush->setRandomAmount(2);

src/Ad5001/BetterGen/biome/BetterRiver.php

@@ -7,15 +7,15 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
 
 class BetterRiver extends Biome {
 	public function __construct() {
@@ -45,7 +45,7 @@ class BetterRiver extends Biome {
 	}
 	
 	/*
-	 * Returns the ID relativly.
+	 * Returns the ID relatively.
 	 */
 	public function getId() {
 		return Biome::RIVER;

src/Ad5001/BetterGen/biome/Mountainable.php

@@ -7,13 +7,13 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
 
-// Class to iplement when the biome can be set as a mountain
+// Class to implement when the biome can be set as a mountain
 interface Mountainable {
 }

src/Ad5001/BetterGen/generator/BetterBiomeSelector.php

@@ -7,16 +7,16 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
 */
 namespace Ad5001\BetterGen\generator;
 
-use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\biome\Biome;
-use pocketmine\utils\Random;
+use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\noise\Simplex;
+use pocketmine\utils\Random;
 
 class BetterBiomeSelector extends BiomeSelector {
 	
@@ -30,9 +30,9 @@ class BetterBiomeSelector extends BiomeSelector {
 	
 	/** @var Biome[] */
 	private $biomes = [ ];
-	private $map = [ ];
 	private $lookup;
 	public function __construct(Random $random, callable $lookup, Biome $fallback) {
+		parent::__construct($random, $lookup, $fallback);
 		$this->fallback = $fallback;
 		$this->lookup = $lookup;
 		$this->temperature = new Simplex($random, 2, 1 / 16, 1 / 512);

src/Ad5001/BetterGen/generator/BetterNormal.php

@@ -7,21 +7,25 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
 */
 
 namespace Ad5001\BetterGen\generator;
 
-use pocketmine\level\ChunkManager;
+use Ad5001\BetterGen\biome\BetterDesert;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\biome\BetterForest;
-use pocketmine\level\generator\biome\Biome;
+use Ad5001\BetterGen\biome\BetterIcePlains;
-use pocketmine\level\generator\Generator;
+use Ad5001\BetterGen\biome\BetterMesa;
-use pocketmine\level\generator\noise\Simplex;
+use Ad5001\BetterGen\biome\BetterMesaPlains;
-use pocketmine\level\generator\object\OreType;
+use Ad5001\BetterGen\biome\BetterRiver;
-use pocketmine\level\generator\normal\object\OreType as OreType2;
+use Ad5001\BetterGen\biome\Mountainable;
-use pocketmine\level\generator\populator\Ore;
+use Ad5001\BetterGen\Main;
+use Ad5001\BetterGen\populator\CavePopulator;
+use Ad5001\BetterGen\populator\FloatingIslandPopulator;
+use Ad5001\BetterGen\populator\MineshaftPopulator;
+use Ad5001\BetterGen\populator\RavinePopulator;
 use pocketmine\block\Block;
 use pocketmine\block\CoalOre;
 use pocketmine\block\DiamondOre;
@@ -31,20 +35,15 @@ use pocketmine\block\Gravel;
 use pocketmine\block\IronOre;
 use pocketmine\block\LapisOre;
 use pocketmine\block\RedstoneOre;
+use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\Generator;
+use pocketmine\level\generator\noise\Simplex;
+use pocketmine\level\generator\normal\object\OreType as OreType2;
+use pocketmine\level\generator\object\OreType;
 use pocketmine\level\Level;
-use Ad5001\BetterGen\biome\BetterForest;
+use pocketmine\math\Vector3;
-use Ad5001\BetterGen\biome\BetterDesert;
+use pocketmine\utils\Random;
-use Ad5001\BetterGen\biome\BetterIcePlains;
-use Ad5001\BetterGen\biome\BetterMesa;
-use Ad5001\BetterGen\biome\BetterMesaPlains;
-use Ad5001\BetterGen\biome\BetterRiver;
-use Ad5001\BetterGen\biome\Mountainable;
-use Ad5001\BetterGen\populator\CavePopulator;
-use Ad5001\BetterGen\populator\RavinePopulator;
-use Ad5001\BetterGen\populator\LakePopulator;
-use Ad5001\BetterGen\populator\MineshaftPopulator;
-use Ad5001\BetterGen\populator\FloatingIslandPopulator;
-use Ad5001\BetterGen\Main;
 
 class BetterNormal extends Generator {
 	const NOT_OVERWRITABLE = [
@@ -60,12 +59,16 @@ class BetterNormal extends Generator {
 			Block::WATER,
 			Block::STILL_WATER 
 	];
+	/** @var BetterBiomeSelector */
 	protected $selector;
+	/** @var Level */
 	protected $level;
+	/** @var Random */
 	protected $random;
 	protected $populators = [ ];
 	protected $generationPopulators = [ ];
 	public static $biomes = [ ];
+	/** @var Biome[] */
 	public static $biomeById = [ ];
 	public static $levels = [ ];
 	protected static $GAUSSIAN_KERNEL = null; // From main class
@@ -75,6 +78,7 @@ class BetterNormal extends Generator {
 		]
 	];
 	protected $waterHeight = 63;
+	private $noiseBase;
 
 	/*
 	 * Picks a biome by X and Z
@@ -231,6 +235,7 @@ class BetterNormal extends Generator {
 	 * @param $rainfall float
 	 */
 	public static function getBiome($temperature, $rainfall) {
+		$ret = null;
 		if (! isset(self::$biomes [( string ) round($rainfall, 1 )] )) {
 			while(! isset(self::$biomes [( string ) round($rainfall, 1 )] ) ) {
 				if (abs($rainfall - round($rainfall, 1 ) ) >= 0.05)
@@ -252,9 +257,8 @@ class BetterNormal extends Generator {
 		}
 		if (is_string($ret )) {
 			$ret = new $ret ();
-		} else {
-			return $ret;
 		}
+			return $ret;
 	}
 	
 	/*
@@ -263,7 +267,7 @@ class BetterNormal extends Generator {
 	 * @return	Biome
 	 */
 	public function getBiomeById(int $id): Biome {
-		return self::$biomeById[$id] ?? self::$biomeById(Biome::OCEAN);
+		return self::$biomeById[$id] ?? self::$biomeById[Biome::OCEAN];
 	}
 	
 	/*
@@ -386,7 +390,7 @@ class BetterNormal extends Generator {
 	}
 	
 	/*
-	 * Generates the genration kernel based on smooth size (here 2)
+	 * Generates the generation kernel based on smooth size (here 2)
 	 */
 	private static function generateKernel() {
 		self::$GAUSSIAN_KERNEL = [ ];
@@ -434,7 +438,7 @@ class BetterNormal extends Generator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL) {
 				break;
@@ -443,6 +447,6 @@ class BetterNormal extends Generator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/loot/LootTable.php

@@ -7,23 +7,23 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\loot;
 
+use pocketmine\inventory\BaseInventory;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\NBT;
 use pocketmine\utils\Config;
 use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
-use pocketmine\item\Item;
-use pocketmine\inventory\BaseInventory;
-use pocketmine\nbt\NBT;
 
 /*
  * This class is used for loot setting.
- * Please note that they AREN'T as powerfull as PC ones due to some implementations limitations.
+ * Please note that they AREN'T as powerful as PC ones due to some implementations limitations.
  * Loot table format:
  * {
  * "max": Max number of loots (storable amount)
@@ -33,9 +33,9 @@ use pocketmine\nbt\NBT;
  * "maxCount": Maximal count
  * "id": Id of the item
  * "data": Item damage
- * "tags": {"display": {"Name": "Example NBT data"}}. This parameter is optionnal
+ * "tags": {"display": {"Name": "Example NBT data"}}. This parameter is optional
- * "minStacks": If choosen, the minimum amount of stacks that can be found
+ * "minStacks": If chosen, the minimum amount of stacks that can be found
- * "maxStacks": If choosen the maximum number of stacks that can be choosen
+ * "maxStacks": If chosen the maximum number of stacks that can be chosen
  * }
  * }
  */
@@ -55,7 +55,7 @@ class LootTable {
 	const LOOT_MINESHAFT = 2;
 	
 	/*
-	 * Asyncronous loot table choosing
+	 * Asynchronous loot table choosing
 	 * @param $place pocketmine\math\Vector3
 	 * @param $type int
 	 * @param $random pocketmine\utils\Random
@@ -80,7 +80,7 @@ class LootTable {
 	}
 	
 	/*
-	 * Syncronous inventory filling with loot table.
+	 * Synchronous inventory filling with loot table.
 	 * @param $inv pocketmine\inventory\BaseInventory
 	 * @param $pos pocketmine\math\Vector3
 	 * @return void
@@ -96,7 +96,7 @@ class LootTable {
 				for($i = 0; $i <= $randCount; $i++) {
 					$rand = rand(0, count($loots));
 					$items[$rand] = Item::get($loot["id"], $loot["data"], rand($loot["minCount"], $loot["maxCount"]));
-					if(isset($loot["tags"])) $items[$rand]->setCompoundTag(NBT::fromJSON($loot["tags"]));
+					if(isset($loot["tags"])) $items[$rand]->setCompoundTag(NBT::parseJSON($loot["tags"]));
 				}
 			}
 			$inv->setContents($items);

src/Ad5001/BetterGen/populator/AmountPopulator.php

@@ -7,15 +7,15 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
 use pocketmine\level\generator\populator\Populator;
+use pocketmine\utils\Random;
 
 abstract class AmountPopulator extends Populator {
 	protected $baseAmount = 0;

src/Ad5001/BetterGen/populator/BushPopulator.php

@@ -7,21 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Bush;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\TreePopulator;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\Bush;
 
 class BushPopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	protected $type;
 	
@@ -62,7 +62,7 @@ class BushPopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL) {
 				break;
@@ -71,6 +71,6 @@ class BushPopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/CactusPopulator.php

@@ -7,7 +7,7 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
@@ -15,13 +15,14 @@
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\Cactus;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\Cactus;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class CactusPopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	/*
 	 * Constructs the class
@@ -58,12 +59,12 @@ class CactusPopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y >= 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y >= 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b !== Block::AIR and $b !== Block::LEAVES and $b !== Block::LEAVES2) {
 				break;
 			}
 		}
-		return $y === 0 ? - 1 : $y++;
+		return $y === 0 ? - 1 : ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/CavePopulator.php

@@ -7,21 +7,22 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\math\Vector3;
-use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\utils\Random;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class CavePopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	const STOP = false;
 	const CONTINUE = true;
@@ -65,7 +66,7 @@ class CavePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL or $b === Block::SAND or $b === Block::SNOW_BLOCK or $b === Block::SANDSTONE) {
 				break;
@@ -74,7 +75,7 @@ class CavePopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 	
 	/*
@@ -91,7 +92,7 @@ class CavePopulator extends AmountPopulator {
 		foreach($gen = $this->generateBranch($x, $y, $z, 5, 3, 5, $random ) as $v3 ) {
 			$generatedBranches --;
 			if ($generatedBranches <= 0) {
-				$gen->send(self::STOP);
+				$gen->send(self::STOP); // send not found.. @Ad5001 what is that
 			} else {
 				$gen->send(self::CONTINUE);
 			}
@@ -121,7 +122,7 @@ class CavePopulator extends AmountPopulator {
 					$y --;
 				}
 				$z += round(($random->nextBoundedInt(round(30 * ($depth / 10) ) + 1 ) / 10 - 1));
-				return [ ];
+				return;
 			}
 		}
 		$repeat = $random->nextBoundedInt(25 ) + 15;

src/Ad5001/BetterGen/populator/DeadbushPopulator.php

@@ -7,19 +7,22 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\generator\BetterBiomeSelector;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class DeadbushPopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	
 	/*
@@ -35,26 +38,31 @@ class DeadbushPopulator extends AmountPopulator {
 		for($i = 0; $i < $amount; $i++) {
 			$x = $random->nextRange($chunkX * 16, $chunkX * 16 + 15);
 			$z = $random->nextRange($chunkZ * 16, $chunkZ * 16 + 15);
+			if(!in_array($level->getChunk($chunkX, $chunkZ)->getBiomeId(abs($x % 16), ($z % 16)), [40, 39, Biome::DESERT])) continue;
 			$y = $this->getHighestWorkableBlock($x, $z);
-			if ($y !== -1 && $level->getBlockIdAt($x, $y - 1, $z ) == Block::SAND) {
+			if ($y !== -1) {
-				$level->setBlockIdAt($x, $y + 1, $z, Block::DEAD_BUSH);
+				$level->setBlockIdAt($x, $y, $z, Block::DEAD_BUSH);
-				$level->setBlockDataAt($x, $y + 1, $z, 1);
+				$level->setBlockDataAt($x, $y, $z, 1);
 			}
 		}
 	}
 
-	/*
+	/**
 	 * Gets the top block (y) on an x and z axes
-	 * @param $x int
+	 * @param $x
-	 * @param $z int
+	 * @param $z
+	 * @return int
 	 */
-	protected function getHighestWorkableBlock($x, $z) {
+	private function getHighestWorkableBlock($x, $z){
-		for($y = 127; $y >= 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; --$y){
 			$b = $this->level->getBlockIdAt($x, $y, $z);
-			if ($b !== Block::AIR and $b !== Block::LEAVES and $b !== Block::LEAVES2) {
+			if($b === Block::DIRT or $b === Block::GRASS or $b === Block::SAND or $b === Block::SANDSTONE or $b === Block::HARDENED_CLAY or $b === Block::STAINED_HARDENED_CLAY){
 				break;
+			}elseif($b !== Block::AIR){
+				return -1;
 			}
 		}
-		return $y === 0 ? - 1 : $y++;
+
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/FallenTreePopulator.php

@@ -7,21 +7,22 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\FallenTree;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\FallenTree;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 
 class FallenTreePopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	protected $type;
 	/*
@@ -45,29 +46,35 @@ class FallenTreePopulator extends AmountPopulator {
 		$this->level = $level;
 		$amount = $this->getAmount($random);
 		$tree =  TreePopulator::$types[$this->type];
-		$fallenTree = new FallenTree(new $tree());
+		$fallenTree = new \Ad5001\BetterGen\structure\FallenTree(
+			new $tree()
+		);
 		for($i = 0; $i < $amount; $i++) {
 			$x = $random->nextRange($chunkX * 16, $chunkX * 16 + 15);
 			$z = $random->nextRange($chunkZ * 16, $chunkZ * 16 + 15);
 			$y = $this->getHighestWorkableBlock($x, $z);
 			if ($y !== -1 and $fallenTree->canPlaceObject($level, $x, $y + 1, $z, $random )) {
-				$fallenTree->placeObject($level, $x, $y + 1, $z, $random);
+				$fallenTree->placeObject($level, $x, $y + 1, $z);
 			}
 		}
 	}
 
-	/*
+	/**
 	 * Gets the top block (y) on an x and z axes
-	 * @param $x int
+	 * @param $x
-	 * @param $z int
+	 * @param $z
+	 * @return int
 	 */
-	protected function getHighestWorkableBlock($x, $z) {
+	private function getHighestWorkableBlock($x, $z){
-		for($y = 127; $y >= 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; --$y){
 			$b = $this->level->getBlockIdAt($x, $y, $z);
-			if ($b !== Block::AIR and $b !== Block::LEAVES and $b !== Block::LEAVES2) {
+			if($b === Block::DIRT or $b === Block::GRASS){
 				break;
+			}elseif($b !== Block::AIR and $b !== Block::SNOW_LAYER){
+				return -1;
 			}
 		}
-		return $y === 0 ? - 1 : $y++;
+
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/FloatingIslandPopulator.php

@@ -7,27 +7,28 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
 use Ad5001\BetterGen\generator\BetterNormal;
-use pocketmine\block\Block;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\normal\object\OreType as OreType2;
-use pocketmine\math\Vector3;
-use pocketmine\block\CoalOre;
-use pocketmine\block\IronOre;
-use pocketmine\block\RedstoneOre;
-use pocketmine\block\LapisOre;
-use pocketmine\block\GoldOre;
-use pocketmine\block\DiamondOre;
 use Ad5001\BetterGen\Main;
+use pocketmine\block\Block;
+use pocketmine\block\CoalOre;
+use pocketmine\block\DiamondOre;
+use pocketmine\block\GoldOre;
+use pocketmine\block\IronOre;
+use pocketmine\block\LapisOre;
+use pocketmine\block\RedstoneOre;
+use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\normal\object\OreType as OreType2;
+use pocketmine\level\generator\object\OreType;
+use pocketmine\level\Level;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 
 class FloatingIslandPopulator extends AmountPopulator {
@@ -39,6 +40,9 @@ class FloatingIslandPopulator extends AmountPopulator {
 	 * @param $chunkZ 	int
 	 * @param $random 	pocketmine\utils\Random
 	 */
+	/** @var ChunkManager */
+	private $level;
+
 	public function populate(ChunkManager $level, $chunkX, $chunkZ, Random $random) {
 		$this->level = $level;
 		if($this->getAmount($random) > 130) {
@@ -49,7 +53,7 @@ class FloatingIslandPopulator extends AmountPopulator {
 			$height = $this->buildIslandBottomShape($level, new Vector3($x, $y, $z), $radius, $random);
 			$this->populateOres($level, new Vector3($x, $y - 1, $z), $radius * 2, $height, $random);
 			$chunk = $level->getChunk($chunkX, $chunkZ);
-			$biome = BetterNormal::getBiomeById($chunk->getBiomeId($x % 16, $z % 16));
+			$biome = BetterNormal::$biomeById[$chunk->getBiomeId($x % 16, $z % 16)];
 			$populators = $biome->getPopulators();
 			foreach($populators as $populator) {
 				$populator->populate($level, $chunkX, $chunkZ, $random);
@@ -65,7 +69,7 @@ class FloatingIslandPopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL or $b === Block::SAND) {
 				break;
@@ -74,7 +78,7 @@ class FloatingIslandPopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 	
 	
@@ -85,14 +89,11 @@ class FloatingIslandPopulator extends AmountPopulator {
 	 * @param 	$pos 		pocketmine\math\Vector3
 	 * @param	$radius		int
 	 * @param 	$random 	pocketmine\utils\Random
-	 * @return 	void
+	 * @return 	int			lowest ore point
 	 */
 	public function buildIslandBottomShape(ChunkManager $level, Vector3 $pos, int $radius, Random $random) {
 		$pos = $pos->round();
-		$xx = $pos->x;
-		$zz = $z;
 		$currentLen = 1;
-		$isEdge = false;
 		$hBound = 0;
 		$current = 0;
 		for($y = $pos->y - 1; $radius > 0; $y--) {
@@ -105,7 +106,7 @@ class FloatingIslandPopulator extends AmountPopulator {
 					}
 					if(abs(abs($x - $pos->x) ** 2) + abs(abs($z - $pos->z) ** 2) <= ($radius ** 2) * 0.67 && $y < 128) { 
 						if($chunk = $level->getChunk($x >> 4, $z >> 4)) {
-							$biome = BetterNormal::getBiomeById($chunk->getBiomeId($x % 16, $z % 16));
+							$biome = BetterNormal::$biomeById[$chunk->getBiomeId($x % 16, $z % 16)];
 							$block = $biome->getGroundCover()[$pos->y - $y - 1] ?? Block::get(Block::STONE);
 							$block = $block->getId();
 						} elseif($random->nextBoundedInt(5) == 0 && $isEdge) {
@@ -121,7 +122,7 @@ class FloatingIslandPopulator extends AmountPopulator {
 			$oldHB = $hBound;
 			$hBound = $random->nextFloat();
 			if($current >= $currentLen + $hBound) {
-				if($radius == 0) return;
+				if($radius == 0) return $pos->y;
 				$current = 0;
 				$currentLen += 0.3 * ($random->nextFloat() + 0.5);
 				$radius--;
@@ -160,6 +161,6 @@ class FloatingIslandPopulator extends AmountPopulator {
 				new OreType(new GoldOre (), 2, 8, $pos->y - $height, $pos->y - round($height / 2)),
 				new OreType(new DiamondOre (), 1, 7, $pos->y - $height, $pos->y - round($height / 4))
 		]);
-		$ores->populate($level, $x >> 4, $z >> 4, $random);
+		$ores->populate($level, $pos->x >> 4, $pos->z >> 4, $random);//x z undefined
 	}
 }

src/Ad5001/BetterGen/populator/IglooPopulator.php

@@ -7,20 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Igloo;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\structure\Igloo;
+use pocketmine\utils\Random;
 
 class IglooPopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	
 	/*
@@ -48,7 +49,7 @@ class IglooPopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL) {
 				break;
@@ -57,6 +58,6 @@ class IglooPopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/LakePopulator.php

@@ -7,21 +7,22 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\math\Vector3;
-use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\utils\Random;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class LakePopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	
 	/*
@@ -57,7 +58,7 @@ class LakePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL) {
 				break;
@@ -66,6 +67,6 @@ class LakePopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/MineshaftPopulator.php

@@ -7,22 +7,23 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use Ad5001\BetterGen\utils\BuildingUtils;
-use pocketmine\math\Vector3;
-use pocketmine\block\Block;
 use Ad5001\BetterGen\loot\LootTable;
+use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\block\Block;
+use pocketmine\level\ChunkManager;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class MineshaftPopulator extends AmountPopulator {
 	protected $maxPath;
+	/** @var ChunkManager */
 	protected $level;
 	const DIR_XPLUS = 0;
 	const DIR_XMIN = 1;
@@ -70,14 +71,13 @@ class MineshaftPopulator extends AmountPopulator {
 		}
 	}
 
-	/*
+	/**
 	 * Builds a mineshaft part and return applicable directions
-	 * @param $x int
+	 * @param int $x
-	 * @param $y int
+	 * @param int $y
-	 * @param $z int
+	 * @param int $z
-	 * @param $dir int
+	 * @param int $dir
-	 * @param $random pocketmine\utils\Random
+	 * @param Random $random
-	 * @param $deepneth int
 	 */
 	public function generateMineshaftPart(int $x, int $y, int $z, int $dir, Random $random) {
 		if ($this->maxPath -- < 1)
@@ -91,18 +91,18 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x, $y, $z - 1 ), new Vector3($x + 4, $y + 2, $z + 1 ), Block::get(Block::AIR ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x + 4, $y - 1, $z + 1 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x + 4, $y - 1, $z + 1 ), function ($v3, ChunkManager $level) {
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x + 4, $y, $z ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x + 4, $y, $z ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 1);
 							}
 						}, $this->level, $random);
-						// After this, building the floor maintener (the wood structure)
+						// After this, building the floor maintainer (the wood structure)
 						$level->setBlockIdAt($x, $y, $z - 1, Block::FENCE);
 						$level->setBlockIdAt($x, $y, $z + 1, Block::FENCE);
 						$level->setBlockIdAt($x, $y + 1, $z - 1, Block::FENCE);
@@ -131,19 +131,19 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x, $y, $z - 1 ), new Vector3($x - 4, $y + 2, $z + 1 ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x - 4, $y - 1, $z + 1 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x - 4, $y - 1, $z + 1 ), function ($v3, ChunkManager $level) {
 							
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x - 4, $y, $z ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x - 4, $y, $z ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 1);
 							}
 						}, $this->level, $random);
-						// After this, building the floor maintener (the wood structure)
+						// After this, building the floor maintainer (the wood structure)
 						$level->setBlockIdAt($x, $y, $z - 1, Block::FENCE);
 						$level->setBlockIdAt($x, $y, $z + 1, Block::FENCE);
 						$level->setBlockIdAt($x, $y + 1, $z - 1, Block::FENCE);
@@ -162,7 +162,7 @@ class MineshaftPopulator extends AmountPopulator {
 							if ($direction2 == 0)
 								$direction2 = 2;
 							if ($direction2 == 1)
-								$direction2 = 
+								$direction2 = 4;
 							LootTable::buildLootTable(new Vector3($x - $direction2, $y, $z + $direction ), LootTable::LOOT_MINESHAFT, $random);
 						}
 						if ($random->nextBoundedInt(30 ) !== 0)
@@ -172,19 +172,19 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x - 1, $y, $z ), new Vector3($x + 1, $y + 2, $z + 4 ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z + 4 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z + 4 ), function ($v3, ChunkManager $level) {
 							
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z + 4 ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z + 4 ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 0);
 							}
 						}, $this->level, $random);
-						// After this, building the floor maintener (the wood structure)
+						// After this, building the floor maintainer (the wood structure)
 						$level->setBlockIdAt($x - 1, $y, $z, Block::FENCE);
 						$level->setBlockIdAt($x + 1, $y, $z, Block::FENCE);
 						$level->setBlockIdAt($x - 1, $y + 1, $z, Block::FENCE);
@@ -213,19 +213,19 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x - 1, $y, $z ), new Vector3($x + 1, $y + 2, $z - 4 ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z - 4 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z - 4 ), function ($v3, ChunkManager $level) {
 							
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z - 4 ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z - 4 ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 0);
 							}
 						}, $this->level, $random);
-						// After this, building the floor maintener (the wood structure)
+						// After this, building the floor maintainer (the wood structure)
 						$level->setBlockIdAt($x - 1, $y, $z, Block::FENCE);
 						$level->setBlockIdAt($x + 1, $y, $z, Block::FENCE);
 						$level->setBlockIdAt($x - 1, $y + 1, $z, Block::FENCE);
@@ -288,7 +288,7 @@ class MineshaftPopulator extends AmountPopulator {
 				}
 				
 				// Then, making sure the floor is solid.
-				BuildingUtils::fillCallback(new Vector3($x + 1, $y - 1, $z - 1 ), new Vector3($x - 1, $y - 1, $z + 1 ), function ($v3, $level) {
+				BuildingUtils::fillCallback(new Vector3($x + 1, $y - 1, $z - 1 ), new Vector3($x - 1, $y - 1, $z + 1 ), function ($v3, ChunkManager $level) {
 					
 					if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 						$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -310,12 +310,12 @@ class MineshaftPopulator extends AmountPopulator {
 								self::DIR_ZMIN 
 						] : [ ]) 
 				];
-				for($i = 7; $i > $newfloor; $i --) {
+				for($i = 7; $i > $newFloor; $i --) {
 					$chooseNew =(int ) $newFloor && $random->nextBoolean ();
 					$choose = $random->nextBoundedInt(4);
 					unset($possiblePathes [$chooseNew] [$choose]);
 				}
-				// Buidling pathes
+				// Building pathes
 				foreach($possiblePathes [0] as $path ) {
 					switch ($path) {
 						case self::DIR_XPLUS :
@@ -366,17 +366,17 @@ class MineshaftPopulator extends AmountPopulator {
 				}
 				// Building stairs
 				for($i = 0; $i < 4; $i ++) {
-					switch ($path) {
+					switch ($i) {
 						case self::DIR_XPLUS :
 							BuildingUtils::fill($this->level, new Vector3($x + $i, $y - $i - 1, $z - 2 ), new Vector3($x + $i, $y - $i + 3, $z + 2 ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x + $i, $y - $i - 2, $z - 2 ), new Vector3($x + $i, $y - $i - 2, $z + 2 ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x + $i, $y - $i - 2, $z - 2 ), new Vector3($x + $i, $y - $i - 2, $z + 2 ), function ($v3, ChunkManager $level) {
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 							}, $this->level);
 							break;
 						case self::DIR_XMIN :
 							BuildingUtils::fill($this->level, new Vector3($x - $i, $y - $i - 1, $z - 2 ), new Vector3($x - $i, $y - $i + 3, $z + 2 ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - $i, $y - $i - 2, $z - 2 ), new Vector3($x - $i, $y - $i - 2, $z + 2 ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - $i, $y - $i - 2, $z - 2 ), new Vector3($x - $i, $y - $i - 2, $z + 2 ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -384,7 +384,7 @@ class MineshaftPopulator extends AmountPopulator {
 							break;
 						case self::DIR_ZPLUS :
 							BuildingUtils::fill($this->level, new Vector3($x - 2, $y - $i - 1, $z + $i ), new Vector3($x + 2, $y - $i + 3, $z + $i ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z + $i ), new Vector3($x + 2, $y - $i - 2, $z + $i ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z + $i ), new Vector3($x + 2, $y - $i - 2, $z + $i ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -392,7 +392,7 @@ class MineshaftPopulator extends AmountPopulator {
 							break;
 						case self::DIR_ZMIN :
 							BuildingUtils::fill($this->level, new Vector3($x - 2, $y - $i - 1, $z - $i ), new Vector3($x + 2, $y - $i + 3, $z - $i ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z - $i ), new Vector3($x + 2, $y - $i - 2, $z - $i ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z - $i ), new Vector3($x + 2, $y - $i - 2, $z - $i ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -402,7 +402,7 @@ class MineshaftPopulator extends AmountPopulator {
 				}
 				
 				// Next one
-				switch ($path) {
+				switch ($i) {
 					case self::DIR_XPLUS :
 						$this->generateMineshaftPart($x + 4, $y - 4, $z, self::DIR_XPLUS, $random);
 						break;

src/Ad5001/BetterGen/populator/RavinePopulator.php

@@ -7,20 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\utils\Random;
 
 class RavinePopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	const NOISE = 250;
 	
@@ -74,7 +75,7 @@ class RavinePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL or $b === Block::SAND or $b === Block::SNOW_BLOCK or $b === Block::SANDSTONE) {
 				break;
@@ -83,7 +84,7 @@ class RavinePopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 	
 	/*

src/Ad5001/BetterGen/populator/SugarCanePopulator.php

@@ -7,20 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\SugarCane;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\SugarCane;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class SugarCanePopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	/*
 	 * Constructs the class
@@ -57,12 +58,12 @@ class SugarCanePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y >= 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y >= 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b !== Block::AIR and $b !== Block::LEAVES and $b !== Block::LEAVES2) {
 				break;
 			}
 		}
-		return $y === 0 ? - 1 : $y++;
+		return $y === 0 ? - 1 : ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/TemplePopulator.php

@@ -7,20 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Temple;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\Temple;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\utils\Random;
 
 class TemplePopulator extends AmountPopulator {
+	/** @var  Level */
 	protected $level;
 	
 	/*
@@ -48,13 +49,13 @@ class TemplePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::SAND) {
 				break;
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/TreePopulator.php

@@ -7,27 +7,29 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\Main;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\SakuraTree;
+use pocketmine\level\generator\object\Tree;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\Main;
+use pocketmine\utils\Random;
 
 
 class TreePopulator extends AmountPopulator {
+	/** @var Tree[] */
 	static $types = [ 
 			"pocketmine\\level\\generator\\object\\OakTree",
 			"pocketmine\\level\\generator\\object\\BirchTree",
 			"Ad5001\\BetterGen\\structure\\SakuraTree" 
 	];
+	/** @var ChunkManager */
 	protected $level;
 	protected $type;
 	
@@ -63,7 +65,8 @@ class TreePopulator extends AmountPopulator {
 				continue;
 			}
 			$treeC = self::$types [$this->type];
-			$tree = new  $treeC();
+			/** @var Tree $tree */
+			$tree = new $treeC();
 			$tree->placeObject($level, $x, $y, $z, $random);
 		}
 	}
@@ -74,7 +77,7 @@ class TreePopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::DIRT or $b === Block::GRASS or $b === Block::PODZOL) {
 				break;
@@ -83,6 +86,6 @@ class TreePopulator extends AmountPopulator {
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/populator/WellPopulator.php

@@ -7,20 +7,21 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Well;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\Well;
+use pocketmine\level\Level;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\utils\Random;
 
 class WellPopulator extends AmountPopulator {
+	/** @var ChunkManager */
 	protected $level;
 	
 	/*
@@ -48,13 +49,13 @@ class WellPopulator extends AmountPopulator {
 	 * @param $z int
 	 */
 	protected function getHighestWorkableBlock($x, $z) {
-		for($y = 127; $y > 0; -- $y) {
+		for($y = Level::Y_MAX - 1; $y > 0; -- $y) {
 			$b = $this->level->getBlockIdAt($x, $y, $z);
 			if ($b === Block::SAND) {
 				break;
 			}
 		}
 		
-		return $y++;
+		return ++$y;
 	}
 }

src/Ad5001/BetterGen/structure/Bush.php

@@ -7,19 +7,18 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\structure;
 
-use pocketmine\block\Leaves;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
 use pocketmine\level\generator\object\Object;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class Bush extends Object {
 	public $overridable = [

src/Ad5001/BetterGen/structure/Cactus.php

@@ -7,7 +7,7 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
@@ -15,9 +15,9 @@
 namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
-use pocketmine\utils\Random;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class Cactus extends Object {
 	
@@ -29,10 +29,12 @@ class Cactus extends Object {
 	 * @param $z int
 	 * @param $random pocketmine\utils\Random
 	 */
+	private $totalHeight;
+
 	public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random): bool {
 		$this->totalHeight = 1 + $random->nextBoundedInt(3);
 		$below = $level->getBlockIdAt($x, $y - 1, $z);
-		for($yy = $y; $yy <= $y + $totalHeight; $yy ++) {
+		for($yy = $y; $yy <= $y + $this->totalHeight; $yy ++) {
 			if ($level->getBlockIdAt($x, $yy, $z ) !== Block::AIR || ($below !== Block::SAND && $below !== Block::CACTUS) || ($level->getBlockIdAt($x - 1, $yy, $z ) !== Block::AIR || $level->getBlockIdAt($x + 1, $yy, $z ) !== Block::AIR || $level->getBlockIdAt($x, $yy, $z - 1 ) !== Block::AIR || $level->getBlockIdAt($x, $yy, $z + 1 ) !== Block::AIR)) {
 				return false;
 			}

src/Ad5001/BetterGen/structure/FallenTree.php

@@ -7,20 +7,20 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\structure;
 
-use pocketmine\block\Leaves;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
 use pocketmine\level\generator\object\Object;
-use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\level\generator\object\Tree as ObjectTree;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 
 class FallenTree extends Object {
@@ -39,13 +39,14 @@ class FallenTree extends Object {
 	protected $tree;
 	protected $direction;
 	protected $random;
+	private $length = 0;
 
 	/*
 	 * Constructs the class
-	 * @param 	$tree 	Tree
+	 * @param 	$tree 	ObjectTree
 	 * @throws 	Exeption
 	 */
-	public function __construct(Tree $tree) {
+	public function __construct(ObjectTree $tree) {
 		$this->tree = $tree;
 	}
 
@@ -60,10 +61,10 @@ class FallenTree extends Object {
 	public function canPlaceObject(ChunkManager $level, $x, $y, $z, Random $random) {
 		echo "Checking at $x $y $z FallenTree\n";
 		$randomHeight = round($random->nextBoundedInt(6) - 3);
-		$this->length = $this->tree->trunkHeight + $randomHeight;
+		$this->length = ($this->tree->trunkHeight??5) + $randomHeight;
 		$this->direction = $random->nextBoundedInt(4);
 		$this->random = $random;
-		switch($this->direction) {
+		switch ($this->direction) {
 			case 0:
 			case 1:// Z+
 			$return = BuildingUtils::fillCallback(new Vector3($x, $y, $z), new Vector3($x, $y, $z + $this->length), function($v3, $level) {
@@ -101,34 +102,36 @@ class FallenTree extends Object {
 	 */
 	public function placeObject(ChunkManager $level, $x, $y, $z) {
 		echo "Placing at $x $y $z FallenTree\n";
-		switch($this->direction) {
+		switch ($this->direction) {
 			case 0:
-			$level->setBlockIdAt($x, $y, $z, $this->tree->trunkBlock);
+				$level->setBlockIdAt($x, $y, $z, $this->tree->trunkBlock);
-			$level->setBlockDataAt($x, $y, $z, $this->tree->type);
+				$level->setBlockDataAt($x, $y, $z, $this->tree->type);
-			$z += 2;
+				$z += 2;
+				break;
 			case 1:// Z+
-			BuildingUtils::fill($level, new Vector3($x, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get($this->tree->trunkBlock, $this->tree->type + 4));
+				BuildingUtils::fill($level, new Vector3($x, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get($this->tree->trunkBlock, $this->tree->type + 4));
-			BuildingUtils::fillRandom($level, new Vector3($x + 1, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get(Block::VINE), $this->random);
+				BuildingUtils::fillRandom($level, new Vector3($x + 1, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get(Block::VINE), $this->random);
-			BuildingUtils::fillRandom($level, new Vector3($x - 1, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get(Block::VINE), $this->random);
+				BuildingUtils::fillRandom($level, new Vector3($x - 1, $y, $z), new Vector3($x, $y, $z + $this->length), Block::get(Block::VINE), $this->random);
-			break;
+				break;
 			case 2:
-			$level->setBlockIdAt($x, $y, $z, $this->tree->trunkBlock);
+				$level->setBlockIdAt($x, $y, $z, $this->tree->trunkBlock);
-			$level->setBlockDataAt($x, $y, $z, $this->tree->type);
+				$level->setBlockDataAt($x, $y, $z, $this->tree->type);
-			$x += 2;
+				$x += 2;
+				break;
 			case 3: // X+
-			BuildingUtils::fill($level, new Vector3($x, $y, $z), new Vector3($x + $this->length, $y, $z), Block::get($this->tree->trunkBlock, $this->tree->type + 8));
+				BuildingUtils::fill($level, new Vector3($x, $y, $z), new Vector3($x + $this->length, $y, $z), Block::get($this->tree->trunkBlock, $this->tree->type + 8));
-			BuildingUtils::fillRandom($level, new Vector3($x, $y, $z + 1), new Vector3($x + $this->length, $y, $z), Block::get(Block::VINE), $this->random);
+				BuildingUtils::fillRandom($level, new Vector3($x, $y, $z + 1), new Vector3($x + $this->length, $y, $z), Block::get(Block::VINE), $this->random);
-			BuildingUtils::fillRandom($level, new Vector3($x, $y, $z - 1), new Vector3($x + $this->length, $y, $z), Block::get(Block::VINE), $this->random);
+				BuildingUtils::fillRandom($level, new Vector3($x, $y, $z - 1), new Vector3($x + $this->length, $y, $z), Block::get(Block::VINE), $this->random);
-			break;
+				break;
 		}
 		// Second call to build the last wood block
-		switch($this->direction) {
+		switch ($this->direction) {
 			case 1:
-			$level->setBlockIdAt($x, $y, $z + $this->length + 2, $this->tree->trunkBlock);
+				$level->setBlockIdAt($x, $y, $z + $this->length + 2, $this->tree->trunkBlock);
-			break;
+				break;
 			case 3:
-			$level->setBlockIdAt($x + $this->length + 2, $y, $z, $this->tree->trunkBlock);
+				$level->setBlockIdAt($x + $this->length + 2, $y, $z, $this->tree->trunkBlock);
-			break;
+				break;
 		}
 	}
 

src/Ad5001/BetterGen/structure/Igloo.php

@@ -7,7 +7,7 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
@@ -16,8 +16,8 @@ namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class Igloo extends Object {
 	public $overridable = [ 
@@ -59,7 +59,7 @@ class Igloo extends Object {
 							if (! isset($this->overridable [$level->getBlockIdAt($xx, $yy, $zz )] ))
 								return false;
 				break;
-			case 2 : // Entrence is z+
+			case 2 : // Entrance is z+
 				for($xx = $x - 3; $xx <= $x + 3; $xx ++)
 					for($yy = $y + 1; $yy <= $y + 4; $yy ++)
 						for($zz = $z - 3; $zz <= $z + 4; $zz ++)
@@ -84,6 +84,7 @@ class Igloo extends Object {
 	 * @param $y int
 	 * @param $z int
 	 * @param $random pocketmine\utils\Random
+	 * @return bool placed
 	 */
 	public function placeObject(ChunkManager $level, $x, $y, $z, Random $random) {
 		if (! isset($this->direction ) && ! $this->canPlaceObject($level, $x, $y, $z, $random ))
@@ -150,7 +151,7 @@ class Igloo extends Object {
 						$level->setBlockIdAt($xx, $y + 1, $zz, Block::CARPET);
 					}
 				
-				// Other furnitures
+				// Other furniture
 				// Bed
 				$level->setBlockIdAt($x - 1, $y + 1, $z + 2, Block::BED_BLOCK);
 				$level->setBlockIdAt($x, $y + 1, $z + 2, Block::BED_BLOCK);
@@ -225,7 +226,7 @@ class Igloo extends Object {
 						$level->setBlockIdAt($xx, $y + 1, $zz, Block::CARPET);
 					}
 				
-				// Other furnitures
+				// Other furniture
 				// Bed
 				$level->setBlockIdAt($x + 1, $y + 1, $z + 2, Block::BED_BLOCK);
 				$level->setBlockIdAt($x, $y + 1, $z + 2, Block::BED_BLOCK);
@@ -238,7 +239,7 @@ class Igloo extends Object {
 				break;
 			
 			// Third direction
-			case 2 : // Entrence is z+
+			case 2 : // Entrance is z+
 			        // Ground
 				for($xx = $x - 3; $xx <= $x + 3; $xx ++)
 					for($zz = $z - 3; $zz <= $z + 4; $zz ++)
@@ -299,7 +300,7 @@ class Igloo extends Object {
 						$level->setBlockIdAt($xx, $y + 1, $zz, Block::CARPET);
 					}
 				
-				// Other furnitures
+				// Other furniture
 				// Bed
 				$level->setBlockIdAt($x + 2, $y + 1, $z - 1, Block::BED_BLOCK);
 				$level->setBlockIdAt($x + 2, $y + 1, $z, Block::BED_BLOCK);
@@ -373,7 +374,7 @@ class Igloo extends Object {
 						$level->setBlockIdAt($xx, $y + 1, $zz, Block::CARPET);
 					}
 				
-				// Other furnitures
+				// Other furniture
 				// Bed
 				$level->setBlockIdAt($x + 2, $y + 1, $z + 1, Block::BED_BLOCK);
 				$level->setBlockIdAt($x + 2, $y + 1, $z, Block::BED_BLOCK);
@@ -385,5 +386,6 @@ class Igloo extends Object {
 				$level->setBlockIdAt($x - 2, $y + 1, $z + 1, Block::FURNACE);
 				break;
 		}
+		return true;
 	}
 }

src/Ad5001/BetterGen/structure/SugarCane.php

@@ -7,7 +7,7 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
@@ -16,9 +16,9 @@
 namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
-use pocketmine\utils\Random;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class SugarCane extends Object {
 	
@@ -30,6 +30,8 @@ class SugarCane extends Object {
 	 * @param $z int
 	 * @param $random pocketmine\utils\Random
 	 */
+	private $totalHeight;
+
 	public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random): bool {
 		$this->totalHeight = 1 + $random->nextBoundedInt(3);
 		$below = $level->getBlockIdAt($x, $y - 1, $z);

src/Ad5001/BetterGen/structure/Well.php

@@ -7,7 +7,7 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
@@ -17,11 +17,13 @@ namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 
 class Well extends Object {
+	/** @var ChunkManager */
+	private $level;
 	public $overridable = [ 
 			Block::AIR => true,
 			6 => true,
@@ -55,14 +57,15 @@ class Well extends Object {
 
 	/*
 	 * Checks if a well is placeable
-	 * @param $level pocketmine\level\ChunkManager
+	 * @param $level ChunkManager
 	 * @param $x int
 	 * @param $y int
 	 * @param $z int
-	 * @param $random pocketmine\utils\Random
+	 * @param $random Random
 	 * @return bool
 	 */
 	public function canPlaceObject(ChunkManager $level, $x, $y, $z, Random $random) {
+		$this->level = $level;
 		for($xx = $x - 2; $xx <= $x + 2; $xx ++)
 			for($yy = $y; $yy <= $y + 3; $yy ++)
 				for($zz = $z - 2; $zz <= $z + 2; $zz ++)
@@ -73,16 +76,16 @@ class Well extends Object {
 	
 	/*
 	 * Places a well
-	 * @param $level pocketmine\level\ChunkManager
+	 * @param $level ChunkManager
 	 * @param $x int
 	 * @param $y int
 	 * @param $z int
-	 * @param $random pocketmine\utils\Random
+	 * @param $random Random
 	 */
 	public function placeObject(ChunkManager $level, $x, $y, $z, Random $random) {
 		$this->level = $level;
 		foreach($this->directions as $direction ) {
-			// Building pillard
+			// Building pillars
 			for($yy = $y; $yy < $y + 3; $yy ++)
 				$this->placeBlock($x + $direction [0], $yy, $z + $direction [1], Block::SANDSTONE);
 			
@@ -92,32 +95,20 @@ class Well extends Object {
 			$this->placeBlock($x + ($direction [0] * 2), $y, $z + ($direction [1] * 2), Block::SANDSTONE);
 			
 			// Building slabs on the sides. Places two times due to all directions.
-			$this->placeSlab($x + ($direction [0] * 2), $y, $z);
+			$this->placeBlock($x + ($direction [0] * 2), $y, $z, Block::SANDSTONE, 1);
-			$this->placeSlab($x, $y, $z + ($direction [1] * 2));
+			$this->placeBlock($x, $y, $z + ($direction [1] * 2), Block::SANDSTONE, 1);
 			
 			// Placing water.Places two times due to all directions.
 			$this->placeBlock($x + $direction [0], $y, $z, Block::WATER);
 			$this->placeBlock($x, $y, $z + $direction [1], Block::WATER);
 		}
 		
-		// Finitions
+		// Final things
 		for($xx = $x - 1; $xx <= $x + 1; $xx ++)
 			for($zz = $z - 1; $zz <= $z + 1; $zz ++)
-				$this->placeSlab($xx, $y + 3, $zz);
+				$this->placeBlock($xx, $y + 3, $zz);
-		$this->placeSlab($x, $y + 3, $z, Block::SANDSTONE);
+		$this->placeBlock($x, $y + 3, $z, Block::SANDSTONE, 1);
-		$this->placeSlab($x, $y, $z, Block::WATER);
+		$this->placeBlock($x, $y, $z, Block::WATER);
-	}
-	
-	/*
-	 * Places a slab
-	 * @param $x int
-	 * @param $y int
-	 * @param $z int
-	 * @return void
-	 */
-	public function placeSlab($x, $y, $z) {
-		$this->level->setBlockIdAt($x, $y, $z, 44);
-		$this->level->setBlockDataAt($x, $y, $z, 1);
 	}
 	
 	/*
@@ -128,7 +119,8 @@ class Well extends Object {
 	 * @param $id int
 	 * @return void
 	 */
-	public function placeBlock($x, $y, $z, $id) {
+	public function placeBlock($x, $y, $z, $id = 0, $meta = 0) {
 		$this->level->setBlockIdAt($x, $y, $z, $id);
+		$this->level->setBlockDataAt($x, $y, $z, $meta);
 	}
 }

src/Ad5001/BetterGen/utils/BuildingUtils.php

@@ -7,16 +7,16 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
 */
 
 namespace Ad5001\BetterGen\utils;
 
-use pocketmine\math\Vector3;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\math\Vector3;
 use pocketmine\utils\Random;
 
 class BuildingUtils {

src/Ad5001/BetterGen/utils/CommonUtils.php

@@ -7,17 +7,17 @@
  *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
- * Tommorow's pocketmine generator.
+ * Tomorrow's pocketmine generator.
  * @author Ad5001
  * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\utils;
- # Communs utils under no namespace made for a specific usage
+ # Common utils under no namespace made for a specific usage
 
 class CommonUtils {
     /**
-     * Searches case insensitivly array $haystack for $needle.
+     * Searches case insensitively array $haystack for $needle.
      * src: http://php.net/manual/en/function.in-array.php#89256
      * @param		mixed		$needle
      * @param		array		$haystack