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

Separate item ID/meta to ItemIdentifier structure

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-06-29 12:16:34 +01:00
parent cbfdfe87cf
commit 4fc134bd04
14 changed files with 274 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/item/ItemBlock.php
View File

@ -32,25 +32,26 @@ use pocketmine\block\BlockFactory;
class ItemBlock extends Item{
/** @var int */
protected $blockId;
/** @var int */
protected $blockMeta;
/**
* @param int $meta usually 0-15 (placed blocks may only have meta values 0-15)
* @param int $blockId
* @param int $blockMeta usually 0-15 (placed blocks may only have meta values 0-15)
* @param ItemIdentifier $identifier
*/
public function __construct(int $blockId, int $meta = 0, ?int $itemId = null){
if($blockId < 0){ //extended blocks
if($itemId === null){
$itemId = $blockId;
}
$blockId = 255 - $blockId;
public function __construct(int $blockId, int $blockMeta, ItemIdentifier $identifier){
if($blockMeta < 0 || $blockMeta > 15){
throw new \InvalidArgumentException("Block meta value may only be between 0 and 15");
}
$this->blockId = $blockId;
$this->meta = $meta;
$this->blockMeta = $blockMeta;
parent::__construct($itemId ?? $blockId, $meta, $this->getBlock()->getName());
parent::__construct($identifier, $this->getBlock()->getName());
}
public function getBlock() : Block{
return BlockFactory::getInstance()->get($this->blockId, $this->meta & 0xf);
return BlockFactory::getInstance()->get($this->blockId, $this->blockMeta);
}
public function getFuelTime() : int{