Merge branch '3.5'

src/pocketmine/level/Level.php

@@ -367,6 +367,7 @@ class Level implements ChunkManager, Metadatable{
 
 		$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.preparing", [$this->displayName]));
 		$this->generator = GeneratorManager::getGenerator($this->provider->getLevelData()->getGenerator());
+		//TODO: validate generator options
 
 		$this->folderName = $name;
 

src/pocketmine/level/generator/Flat.php

@@ -32,10 +32,11 @@ use pocketmine\level\generator\object\OreType;
 use pocketmine\level\generator\populator\Ore;
 use pocketmine\level\generator\populator\Populator;
 use pocketmine\math\Vector3;
+use function array_map;
 use function count;
 use function explode;
+use function preg_match;
 use function preg_match_all;
-use function str_replace;
 
 class Flat extends Generator{
 	/** @var Chunk */
@@ -55,6 +56,13 @@ class Flat extends Generator{
 		return "flat";
 	}
 
+	/**
+	 * @param ChunkManager $level
+	 * @param int          $seed
+	 * @param array        $options
+	 *
+	 * @throws InvalidGeneratorOptionsException
+	 */
 	public function __construct(ChunkManager $level, int $seed, array $options = []){
 		parent::__construct($level, $seed, $options);
 
@@ -85,13 +93,28 @@ class Flat extends Generator{
 		$this->generateBaseChunk();
 	}
 
+	/**
+	 * @param string $layers
+	 *
+	 * @return int[][]
+	 * @throws InvalidGeneratorOptionsException
+	 */
 	public static function parseLayers(string $layers) : array{
 		$result = [];
-		preg_match_all('#^(([0-9]*x|)([0-9]{1,3})(|:[0-9]{0,2}))$#m', str_replace(",", "\n", $layers), $matches);
+		$split = array_map('\trim', explode(',', $layers));
 		$y = 0;
-		foreach($matches[3] as $i => $b){
+		foreach($split as $line){
-			$b = ItemFactory::fromString($b . $matches[4][$i])->getBlock();
+			preg_match('#^(?:(\d+)x)?(.+)$#', $line, $matches);
-			$cnt = $matches[2][$i] === "" ? 1 : (int) $matches[2][$i];
+			if(count($matches) !== 3){
+				throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\"");
+			}
+
+			$cnt = $matches[1] !== "" ? (int) $matches[1] : 1;
+			try{
+				$b = ItemFactory::fromString($matches[2])->getBlock();
+			}catch(\InvalidArgumentException $e){
+				throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\": " . $e->getMessage(), 0, $e);
+			}
 			for($cY = $y, $y += $cnt; $cY < $y; ++$cY){
 				$result[$cY] = [$b->getId(), $b->getDamage()];
 			}
@@ -109,6 +132,7 @@ class Flat extends Generator{
 
 		$this->floorLevel = count($this->structure);
 
+		//TODO: more error checking
 		preg_match_all('#(([0-9a-z_]{1,})\(?([0-9a-z_ =:]{0,})\)?),?#', $options, $matches);
 		foreach($matches[2] as $i => $option){
 			$params = true;

src/pocketmine/level/generator/Generator.php

@@ -63,6 +63,13 @@ abstract class Generator{
 	/** @var Random */
 	protected $random;
 
+	/**
+	 * @param ChunkManager $level
+	 * @param int          $seed
+	 * @param array        $options
+	 *
+	 * @throws InvalidGeneratorOptionsException
+	 */
 	public function __construct(ChunkManager $level, int $seed, array $options = []){
 		$this->level = $level;
 		$this->seed = $seed;

src/pocketmine/level/generator/InvalidGeneratorOptionsException.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\level\generator;
+
+class InvalidGeneratorOptionsException extends \UnexpectedValueException{
+
+}

src/pocketmine/level/generator/hell/Nether.php

@@ -27,6 +27,7 @@ use pocketmine\block\Block;
 use pocketmine\level\biome\Biome;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\Generator;
+use pocketmine\level\generator\InvalidGeneratorOptionsException;
 use pocketmine\level\generator\noise\Simplex;
 use pocketmine\level\generator\populator\Populator;
 use pocketmine\math\Vector3;
@@ -50,6 +51,13 @@ class Nether extends Generator{
 	/** @var Simplex */
 	private $noiseBase;
 
+	/**
+	 * @param ChunkManager $level
+	 * @param int          $seed
+	 * @param array        $options
+	 *
+	 * @throws InvalidGeneratorOptionsException
+	 */
 	public function __construct(ChunkManager $level, int $seed, array $options = []){
 		parent::__construct($level, $seed, $options);
 

src/pocketmine/level/generator/normal/Normal.php

@@ -29,6 +29,7 @@ use pocketmine\level\biome\Biome;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\Generator;
+use pocketmine\level\generator\InvalidGeneratorOptionsException;
 use pocketmine\level\generator\noise\Simplex;
 use pocketmine\level\generator\object\OreType;
 use pocketmine\level\generator\populator\GroundCover;
@@ -56,6 +57,13 @@ class Normal extends Generator{
 	private static $GAUSSIAN_KERNEL = null;
 	private static $SMOOTH_SIZE = 2;
 
+	/**
+	 * @param ChunkManager $level
+	 * @param int          $seed
+	 * @param array        $options
+	 *
+	 * @throws InvalidGeneratorOptionsException
+	 */
 	public function __construct(ChunkManager $level, int $seed, array $options = []){
 		parent::__construct($level, $seed, $options);
 		if(self::$GAUSSIAN_KERNEL === null){