Move some exceptions out of utils into their relevant namespaces, move some Chunk methods to ChunkUtils for I/O, refactor "colour" -> "color"

This commit is contained in:
Dylan K. Taylor
2017-01-15 01:17:45 +00:00
parent 4577f3ee22
commit b28e38ab26
23 changed files with 124 additions and 98 deletions

View File

@ -25,6 +25,8 @@ namespace pocketmine\level\format\io\region;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkException;
use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\format\SubChunk;
use pocketmine\level\generator\Generator;
use pocketmine\level\Level;
@ -129,7 +131,7 @@ class McRegion extends BaseLevelProvider{
$chunk = $nbt->getData();
if(!isset($chunk->Level) or !($chunk->Level instanceof CompoundTag)){
return null;
throw new ChunkException("Invalid NBT format");
}
$chunk = $chunk->Level;
@ -169,7 +171,7 @@ class McRegion extends BaseLevelProvider{
}
if(isset($chunk->BiomeColors)){
$biomeIds = Chunk::convertBiomeColours($chunk->BiomeColors->getValue()); //Convert back to PC format (RIP colours D:)
$biomeIds = ChunkUtils::convertBiomeColors($chunk->BiomeColors->getValue()); //Convert back to original format
}elseif(isset($chunk->Biomes)){
$biomeIds = $chunk->Biomes->getValue();
}else{