diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 1428b74e6..a04801ffb 100644 --- a/src/pocketmine/Server.php +++ b/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; diff --git a/src/pocketmine/level/generator/biome/Biome.php b/src/pocketmine/level/biome/Biome.php similarity index 86% rename from src/pocketmine/level/generator/biome/Biome.php rename to src/pocketmine/level/biome/Biome.php index 8911ecdb0..d16a5c979 100644 --- a/src/pocketmine/level/generator/biome/Biome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/DesertBiome.php b/src/pocketmine/level/biome/DesertBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/DesertBiome.php rename to src/pocketmine/level/biome/DesertBiome.php index 7a228a81c..d520ad585 100644 --- a/src/pocketmine/level/generator/normal/biome/DesertBiome.php +++ b/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{ diff --git a/src/pocketmine/level/generator/normal/biome/ForestBiome.php b/src/pocketmine/level/biome/ForestBiome.php similarity index 96% rename from src/pocketmine/level/generator/normal/biome/ForestBiome.php rename to src/pocketmine/level/biome/ForestBiome.php index 22fca09b8..30ec1475f 100644 --- a/src/pocketmine/level/generator/normal/biome/ForestBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/GrassyBiome.php b/src/pocketmine/level/biome/GrassyBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/GrassyBiome.php rename to src/pocketmine/level/biome/GrassyBiome.php index f68a446d0..5b7861456 100644 --- a/src/pocketmine/level/generator/normal/biome/GrassyBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/hell/HellBiome.php b/src/pocketmine/level/biome/HellBiome.php similarity index 90% rename from src/pocketmine/level/generator/hell/HellBiome.php rename to src/pocketmine/level/biome/HellBiome.php index c5774c4d4..4fcb76192 100644 --- a/src/pocketmine/level/generator/hell/HellBiome.php +++ b/src/pocketmine/level/biome/HellBiome.php @@ -21,9 +21,7 @@ declare(strict_types=1); -namespace pocketmine\level\generator\hell; - -use pocketmine\level\generator\biome\Biome; +namespace pocketmine\level\biome; class HellBiome extends Biome{ diff --git a/src/pocketmine/level/generator/normal/biome/IcePlainsBiome.php b/src/pocketmine/level/biome/IcePlainsBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/IcePlainsBiome.php rename to src/pocketmine/level/biome/IcePlainsBiome.php index 12fdb7889..5d61c9ce6 100644 --- a/src/pocketmine/level/generator/normal/biome/IcePlainsBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/MountainsBiome.php b/src/pocketmine/level/biome/MountainsBiome.php similarity index 96% rename from src/pocketmine/level/generator/normal/biome/MountainsBiome.php rename to src/pocketmine/level/biome/MountainsBiome.php index 60911c331..da3585b6d 100644 --- a/src/pocketmine/level/generator/normal/biome/MountainsBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/NormalBiome.php b/src/pocketmine/level/biome/NormalBiome.php similarity index 89% rename from src/pocketmine/level/generator/normal/biome/NormalBiome.php rename to src/pocketmine/level/biome/NormalBiome.php index 1c1c86c76..01e4f4e2d 100644 --- a/src/pocketmine/level/generator/normal/biome/NormalBiome.php +++ b/src/pocketmine/level/biome/NormalBiome.php @@ -21,9 +21,7 @@ declare(strict_types=1); -namespace pocketmine\level\generator\normal\biome; - -use pocketmine\level\generator\biome\Biome; +namespace pocketmine\level\biome; abstract class NormalBiome extends Biome{ diff --git a/src/pocketmine/level/generator/normal/biome/OceanBiome.php b/src/pocketmine/level/biome/OceanBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/OceanBiome.php rename to src/pocketmine/level/biome/OceanBiome.php index c079470ab..e5d063469 100644 --- a/src/pocketmine/level/generator/normal/biome/OceanBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/PlainBiome.php b/src/pocketmine/level/biome/PlainBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/PlainBiome.php rename to src/pocketmine/level/biome/PlainBiome.php index fabe6bdde..d9d303c39 100644 --- a/src/pocketmine/level/generator/normal/biome/PlainBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/RiverBiome.php b/src/pocketmine/level/biome/RiverBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/RiverBiome.php rename to src/pocketmine/level/biome/RiverBiome.php index ed6de1bcf..361de5494 100644 --- a/src/pocketmine/level/generator/normal/biome/RiverBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/SandyBiome.php b/src/pocketmine/level/biome/SandyBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/SandyBiome.php rename to src/pocketmine/level/biome/SandyBiome.php index e415ba02d..1cc6c178b 100644 --- a/src/pocketmine/level/generator/normal/biome/SandyBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php b/src/pocketmine/level/biome/SmallMountainsBiome.php similarity index 94% rename from src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php rename to src/pocketmine/level/biome/SmallMountainsBiome.php index dac0893ee..12a9b5229 100644 --- a/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php +++ b/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{ diff --git a/src/pocketmine/level/generator/normal/biome/SnowyBiome.php b/src/pocketmine/level/biome/SnowyBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/SnowyBiome.php rename to src/pocketmine/level/biome/SnowyBiome.php index f6ffd1fd7..8d46f0487 100644 --- a/src/pocketmine/level/generator/normal/biome/SnowyBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/biome/SwampBiome.php b/src/pocketmine/level/biome/SwampBiome.php similarity index 95% rename from src/pocketmine/level/generator/normal/biome/SwampBiome.php rename to src/pocketmine/level/biome/SwampBiome.php index 7d5dba0bc..e80dc72e9 100644 --- a/src/pocketmine/level/generator/normal/biome/SwampBiome.php +++ b/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{ diff --git a/src/pocketmine/level/generator/normal/biome/TaigaBiome.php b/src/pocketmine/level/biome/TaigaBiome.php similarity index 96% rename from src/pocketmine/level/generator/normal/biome/TaigaBiome.php rename to src/pocketmine/level/biome/TaigaBiome.php index ec75afb21..90ac60b61 100644 --- a/src/pocketmine/level/generator/normal/biome/TaigaBiome.php +++ b/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; diff --git a/src/pocketmine/level/generator/GeneratorRegisterTask.php b/src/pocketmine/level/generator/GeneratorRegisterTask.php index 6de961e16..6c7172fe0 100644 --- a/src/pocketmine/level/generator/GeneratorRegisterTask.php +++ b/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; diff --git a/src/pocketmine/level/generator/biome/BiomeSelector.php b/src/pocketmine/level/generator/biome/BiomeSelector.php index 52bcbc185..b5e519575 100644 --- a/src/pocketmine/level/generator/biome/BiomeSelector.php +++ b/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; diff --git a/src/pocketmine/level/generator/hell/Nether.php b/src/pocketmine/level/generator/hell/Nether.php index 4323302f5..e5e9c6b89 100644 --- a/src/pocketmine/level/generator/hell/Nether.php +++ b/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; diff --git a/src/pocketmine/level/generator/normal/Normal.php b/src/pocketmine/level/generator/normal/Normal.php index 8887db4fa..6605084eb 100644 --- a/src/pocketmine/level/generator/normal/Normal.php +++ b/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; diff --git a/src/pocketmine/level/generator/populator/GroundCover.php b/src/pocketmine/level/generator/populator/GroundCover.php index 02f6050fc..67d125dec 100644 --- a/src/pocketmine/level/generator/populator/GroundCover.php +++ b/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{