mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Relocate biome ID constants to pocketmine\data\bedrock package

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-11-01 16:53:06 +00:00
parent b176f4c12f
commit 4231bfdc7e
7 changed files with 79 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/world/generator/hell/Nether.php
View File

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace pocketmine\world\generator\hell;
use pocketmine\block\VanillaBlocks;
use pocketmine\world\biome\Biome;
use pocketmine\data\bedrock\BiomeIds;
use pocketmine\world\biome\BiomeRegistry;
use pocketmine\world\ChunkManager;
use pocketmine\world\generator\Generator;
@ -85,7 +85,7 @@ class Nether extends Generator{
for($x = 0; $x < 16; ++$x){
for($z = 0; $z < 16; ++$z){
$chunk->setBiomeId($x, $z, Biome::HELL);
$chunk->setBiomeId($x, $z, BiomeIds::HELL);
for($y = 0; $y < 128; ++$y){
if($y === 0 or $y === 127){

25
src/world/generator/normal/Normal.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\world\generator\normal;
use pocketmine\block\VanillaBlocks;
use pocketmine\data\bedrock\BiomeIds;
use pocketmine\world\biome\Biome;
use pocketmine\world\biome\BiomeRegistry;
use pocketmine\world\ChunkManager;
@ -74,38 +75,38 @@ class Normal extends Generator{
protected function lookup(float $temperature, float $rainfall) : int{
if($rainfall < 0.25){
if($temperature < 0.7){
return Biome::OCEAN;
return BiomeIds::OCEAN;
}elseif($temperature < 0.85){
return Biome::RIVER;
return BiomeIds::RIVER;
}else{
return Biome::SWAMP;
return BiomeIds::SWAMP;
}
}elseif($rainfall < 0.60){
if($temperature < 0.25){
return Biome::ICE_PLAINS;
return BiomeIds::ICE_PLAINS;
}elseif($temperature < 0.75){
return Biome::PLAINS;
return BiomeIds::PLAINS;
}else{
return Biome::DESERT;
return BiomeIds::DESERT;
}
}elseif($rainfall < 0.80){
if($temperature < 0.25){
return Biome::TAIGA;
return BiomeIds::TAIGA;
}elseif($temperature < 0.75){
return Biome::FOREST;
return BiomeIds::FOREST;
}else{
return Biome::BIRCH_FOREST;
return BiomeIds::BIRCH_FOREST;
}
}else{
//FIXME: This will always cause River to be used since the rainfall is always greater than 0.8 if we
//reached this branch. However I don't think that substituting temperature for rainfall is correct given
//that mountain biomes are supposed to be pretty cold.
if($rainfall < 0.25){
return Biome::MOUNTAINS;
return BiomeIds::MOUNTAINS;
}elseif($rainfall < 0.70){
return Biome::SMALL_MOUNTAINS;
return BiomeIds::SMALL_MOUNTAINS;
}else{
return Biome::RIVER;
return BiomeIds::RIVER;
}
}
}