Biome: Moved biome classes from level\generator\* to level\biome

src/pocketmine/Server.php

@@ -47,9 +47,9 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\lang\BaseLang;
 use pocketmine\lang\TextContainer;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\format\io\LevelProvider;
 use pocketmine\level\format\io\LevelProviderManager;
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\Generator;
 use pocketmine\level\Level;
 use pocketmine\level\LevelException;

src/pocketmine/level/biome/Biome.php

@@ -21,20 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\level\generator\normal\biome\DesertBiome;
-use pocketmine\level\generator\normal\biome\ForestBiome;
-use pocketmine\level\generator\normal\biome\IcePlainsBiome;
-use pocketmine\level\generator\normal\biome\MountainsBiome;
-use pocketmine\level\generator\normal\biome\OceanBiome;
-use pocketmine\level\generator\normal\biome\PlainBiome;
-use pocketmine\level\generator\normal\biome\RiverBiome;
-use pocketmine\level\generator\normal\biome\SmallMountainsBiome;
-use pocketmine\level\generator\normal\biome\SwampBiome;
-use pocketmine\level\generator\normal\biome\TaigaBiome;
 use pocketmine\level\generator\populator\Populator;
 use pocketmine\utils\Random;
 

src/pocketmine/level/biome/DesertBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 
 class DesertBiome extends SandyBiome{

src/pocketmine/level/biome/ForestBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Sapling;
 use pocketmine\level\generator\populator\TallGrass;

src/pocketmine/level/biome/GrassyBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;

src/pocketmine/level/biome/HellBiome.php

@@ -21,9 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\hell;
+namespace pocketmine\level\biome;
-
-use pocketmine\level\generator\biome\Biome;
 
 class HellBiome extends Biome{
 

src/pocketmine/level/biome/IcePlainsBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\level\generator\populator\TallGrass;
 

src/pocketmine/level/biome/MountainsBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\level\generator\populator\TallGrass;
 use pocketmine\level\generator\populator\Tree;

src/pocketmine/level/biome/NormalBiome.php

@@ -21,9 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
-
-use pocketmine\level\generator\biome\Biome;
 
 abstract class NormalBiome extends Biome{
 

src/pocketmine/level/biome/OceanBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\level\generator\populator\TallGrass;
 

src/pocketmine/level/biome/PlainBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\level\generator\populator\TallGrass;
 

src/pocketmine/level/biome/RiverBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\level\generator\populator\TallGrass;
 

src/pocketmine/level/biome/SandyBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;

src/pocketmine/level/biome/SmallMountainsBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 
 class SmallMountainsBiome extends MountainsBiome{

src/pocketmine/level/biome/SnowyBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;

src/pocketmine/level/biome/SwampBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 class SwampBiome extends GrassyBiome{
 

src/pocketmine/level/biome/TaigaBiome.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\level\generator\normal\biome;
+namespace pocketmine\level\biome;
 
 use pocketmine\block\Sapling;
 use pocketmine\level\generator\populator\TallGrass;

src/pocketmine/level/generator/GeneratorRegisterTask.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\level\generator;
 
 use pocketmine\block\BlockFactory;
-use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\Level;
 use pocketmine\level\SimpleChunkManager;
 use pocketmine\scheduler\AsyncTask;

src/pocketmine/level/generator/biome/BiomeSelector.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\level\generator\biome;
 
+use pocketmine\level\biome\Biome;
 use pocketmine\level\generator\noise\Simplex;
 use pocketmine\utils\Random;
 

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

@@ -24,8 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\level\generator\hell;
 
 use pocketmine\block\Block;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\ChunkManager;
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\Generator;
 use pocketmine\level\generator\noise\Simplex;

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

@@ -25,8 +25,8 @@ namespace pocketmine\level\generator\normal;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\ChunkManager;
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\Generator;
 use pocketmine\level\generator\noise\Simplex;

src/pocketmine/level/generator/populator/GroundCover.php

@@ -24,8 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\level\generator\populator;
 
 use pocketmine\block\BlockFactory;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\ChunkManager;
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\utils\Random;
 
 class GroundCover extends Populator{