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

Added SkullType enum, some cleanup to skull handling

Browse Source 
this is still more ugly than I'd like it to be because of the way the blockfactory currently works.
This commit is contained in:
Dylan K. Taylor
2019-02-26 18:27:30 +00:00
parent edf4a719d5
commit cb91afcc00
5 changed files with 242 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/pocketmine/block/Skull.php
View File

@ -24,24 +24,33 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\SkullType;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\Skull as ItemSkull;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Skull as TileSkull;
use function assert;
use function floor;
class Skull extends Flowable{
/** @var SkullType */
protected $skullType;
/** @var int */
protected $facing = Facing::NORTH;
protected $type = TileSkull::TYPE_SKELETON;
/** @var int */
protected $rotation = 0; //TODO: split this into floor skull and wall skull handling
public function __construct(BlockIdentifier $idInfo, string $name){
$this->skullType = SkullType::SKELETON(); //TODO: this should be a parameter
parent::__construct($idInfo, $name);
}
protected function writeStateToMeta() : int{
return $this->facing;
}
@ -58,7 +67,7 @@ class Skull extends Flowable{
parent::readStateFromWorld();
$tile = $this->level->getTile($this);
if($tile instanceof TileSkull){
$this->type = $tile->getType();
$this->skullType = $tile->getSkullType();
$this->rotation = $tile->getRotation();
}
}
@ -67,16 +76,22 @@ class Skull extends Flowable{
parent::writeStateToWorld();
//extra block properties storage hack
$tile = $this->level->getTile($this);
if($tile instanceof TileSkull){
$tile->setRotation($this->rotation);
$tile->setType($this->type);
}
assert($tile instanceof TileSkull);
$tile->setRotation($this->rotation);
$tile->setSkullType($this->skullType);
}
public function getHardness() : float{
return 1;
}
/**
* @return SkullType
*/
public function getSkullType() : SkullType{
return $this->skullType;
}
protected function recalculateBoundingBox() : ?AxisAlignedBB{
//TODO: different bounds depending on attached face
return AxisAlignedBB::one()->contract(0.25, 0, 0.25)->trim(Facing::UP, 0.5);
@ -88,7 +103,9 @@ class Skull extends Flowable{
}
$this->facing = $face;
$this->type = $item->getDamage(); //TODO: replace this with a proper variant getter
if($item instanceof ItemSkull){
$this->skullType = $item->getSkullType(); //TODO: the item should handle this, but this hack is currently needed because of tile mess
}
if($player !== null and $face === Facing::UP){
$this->rotation = ((int) floor(($player->yaw * 16 / 360) + 0.5)) & 0xf;
}
@ -96,7 +113,7 @@ class Skull extends Flowable{
}
public function asItem() : Item{
return ItemFactory::get(Item::SKULL, $this->type);
return ItemFactory::get(Item::SKULL, $this->skullType->getMagicNumber());
}
public function isAffectedBySilkTouch() : bool{