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

Break Block's dependence on ItemFactory, and item legacy IDs

Browse Source 
let's GOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
This commit is contained in:
Dylan K. Taylor
2022-07-02 17:29:28 +01:00
parent 9740891a2f
commit 323c563684
9 changed files with 113 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/item/ItemBlock.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\VanillaBlocks;
/**
* Class used for Items that directly represent blocks, such as stone, dirt, wood etc.
@ -33,15 +34,23 @@ use pocketmine\block\BlockFactory;
* just place wheat crops when used on the ground).
*/
final class ItemBlock extends Item{
private int $blockFullId;
private int $blockTypeId;
private int $blockTypeData;
public function __construct(Block $block){
parent::__construct(ItemIdentifier::fromBlock($block), $block->getName());
$this->blockFullId = $block->getStateId();
$this->blockTypeId = $block->getTypeId();
$this->blockTypeData = $block->computeTypeData();
}
public function getBlock(?int $clickedFace = null) : Block{
return BlockFactory::getInstance()->fromFullBlock($this->blockFullId);
//TODO: HACKY MESS, CLEAN IT UP
$blockType = BlockFactory::getInstance()->fromTypeId($this->blockTypeId);
if($blockType === null){
return VanillaBlocks::AIR();
}
$blockType->decodeTypeData($this->blockTypeData);
return $blockType;
}
public function getFuelTime() : int{