mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-03-01 09:21:16 +00:00
48dcf0e32c
Farmland can end up scanning up to 162 blocks looking for water in the worst case. This is obviously not great for huge farms where there are thousands of blocks of the stuff. In most farms, the water won't be moved, and nor will the farmland. This means that we can avoid this costly search on random updates. This PR implements a cache using blockstate data (only possible in PM5) which stores an index mapping to a coordinate offset where water was previously found by this farmland block. This allows the farmland to avoid water searching entirely in most cases. This is a colossal improvement as compared to scanning the whole 9x2x9 area every time, which, on average, scans about 40 blocks to find water if the water is at the same Y coordinate. In real terms this translates into about a 8x performance improvement for farmland (see timings below).
88 lines
3.5 KiB
PHP
88 lines
3.5 KiB
PHP
<?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\data\bedrock\block\convert;
|
|
|
|
use PHPUnit\Framework\TestCase;
|
|
use pocketmine\block\BaseBanner;
|
|
use pocketmine\block\Bed;
|
|
use pocketmine\block\BlockTypeIds;
|
|
use pocketmine\block\CaveVines;
|
|
use pocketmine\block\Farmland;
|
|
use pocketmine\block\MobHead;
|
|
use pocketmine\block\RuntimeBlockStateRegistry;
|
|
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
|
|
use pocketmine\data\bedrock\block\BlockStateSerializeException;
|
|
use function print_r;
|
|
|
|
final class BlockSerializerDeserializerTest extends TestCase{
|
|
private BlockStateToObjectDeserializer $deserializer;
|
|
private BlockObjectToStateSerializer $serializer;
|
|
|
|
public function setUp() : void{
|
|
$this->deserializer = new BlockStateToObjectDeserializer();
|
|
$this->serializer = new BlockObjectToStateSerializer();
|
|
}
|
|
|
|
public function testAllKnownBlockStatesSerializableAndDeserializable() : void{
|
|
foreach(RuntimeBlockStateRegistry::getInstance()->getAllKnownStates() as $block){
|
|
try{
|
|
$blockStateData = $this->serializer->serializeBlock($block);
|
|
}catch(BlockStateSerializeException $e){
|
|
self::fail($e->getMessage());
|
|
}
|
|
try{
|
|
$newBlock = $this->deserializer->deserializeBlock($blockStateData);
|
|
}catch(BlockStateDeserializeException $e){
|
|
self::fail($e->getMessage());
|
|
}
|
|
|
|
if($block->getTypeId() === BlockTypeIds::POTION_CAULDRON){
|
|
//this pretends to be a water cauldron in the blockstate, and stores its actual data in the blockentity
|
|
continue;
|
|
}
|
|
|
|
//The following are workarounds for differences in blockstate representation in Bedrock vs PM
|
|
//In some cases, some properties are not stored in the blockstate (but rather in the block entity NBT), but
|
|
//they do form part of the internal blockstate hash in PM. In other cases, PM allows representing states
|
|
//that don't exist in Bedrock, such as the cave vines head without berries, which is a state that visually
|
|
//exists in Bedrock, but doesn't have its own ID.
|
|
//This leads to inconsistencies when serializing and deserializing blockstates which we need to correct for.
|
|
if(
|
|
($block instanceof BaseBanner && $newBlock instanceof BaseBanner) ||
|
|
($block instanceof Bed && $newBlock instanceof Bed)
|
|
){
|
|
$newBlock->setColor($block->getColor());
|
|
}elseif($block instanceof MobHead && $newBlock instanceof MobHead){
|
|
$newBlock->setMobHeadType($block->getMobHeadType());
|
|
}elseif($block instanceof CaveVines && $newBlock instanceof CaveVines && !$block->hasBerries()){
|
|
$newBlock->setHead($block->isHead());
|
|
}elseif($block instanceof Farmland && $newBlock instanceof Farmland){
|
|
$block->setWaterPositionIndex($newBlock->getWaterPositionIndex());
|
|
}
|
|
|
|
self::assertSame($block->getStateId(), $newBlock->getStateId(), "Mismatch of blockstate for " . $block->getName() . ", " . print_r($block, true) . " vs " . print_r($newBlock, true));
|
|
}
|
|
}
|
|
}
|