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

Tile: Cleaned up utterly pointless overcomplicated code for inventories

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-02-06 12:57:50 +00:00
parent 8222b16d9a
commit c4486d9ad7
4 changed files with 11 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/tile/Chest.php
View File

@ -73,13 +73,6 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
$this->saveItems(); $this->saveItems();
} }
/**
* @return int
*/
public function getSize() : int{
return 27;
}
/** /**
* @return ChestInventory|DoubleChestInventory * @return ChestInventory|DoubleChestInventory
*/ */

18
src/pocketmine/tile/Container.php
View File

@ -29,24 +29,6 @@ use pocketmine\item\Item;
interface Container{ interface Container{
public const TAG_ITEMS = "Items"; public const TAG_ITEMS = "Items";
/**
* @param int $index
*
* @return Item
*/
public function getItem(int $index) : Item;
/**
* @param int $index
* @param Item $item
*/
public function setItem(int $index, Item $item);
/**
* @return int
*/
public function getSize() : int;
/** /**
* @return Inventory * @return Inventory
*/ */

93
src/pocketmine/tile/ContainerTrait.php
View File

@ -35,11 +35,6 @@ use pocketmine\nbt\tag\ListTag;
*/ */
trait ContainerTrait{ trait ContainerTrait{
/**
* @return int
*/
abstract public function getSize() : int;
abstract public function getNBT() : CompoundTag; abstract public function getNBT() : CompoundTag;
/** /**
@ -47,89 +42,23 @@ trait ContainerTrait{
*/ */
abstract public function getRealInventory(); abstract public function getRealInventory();
/**
* @param $index
*
* @return int
*/
protected function getSlotIndex(int $index) : int{
foreach($this->getNBT()->getListTag(Container::TAG_ITEMS) as $i => $slot){
/** @var CompoundTag $slot */
if($slot->getByte("Slot") === $index){
return (int) $i;
}
}
return -1;
}
/**
* This method should not be used by plugins, use the Inventory
*
* @param int $index
*
* @return Item
*/
public function getItem(int $index) : Item{
$i = $this->getSlotIndex($index);
/** @var CompoundTag|null $itemTag */
$itemTag = $this->getNBT()->getListTag(Container::TAG_ITEMS)[$i] ?? null;
if($itemTag !== null){
return Item::nbtDeserialize($itemTag);
}
return ItemFactory::get(Item::AIR, 0, 0);
}
/**
* This method should not be used by plugins, use the Inventory
*
* @param int $index
* @param Item $item
*/
public function setItem(int $index, Item $item) : void{
$i = $this->getSlotIndex($index);
$d = $item->nbtSerialize($index);
$items = $this->getNBT()->getListTag(Container::TAG_ITEMS);
assert($items instanceof ListTag);
if($item->isNull()){
if($i >= 0){
unset($items[$i]);
}
}elseif($i < 0){
for($i = 0; $i <= $this->getSize(); ++$i){
if(!isset($items[$i])){
break;
}
}
$items[$i] = $d;
}else{
$items[$i] = $d;
}
$this->getNBT()->setTag($items);
}
protected function loadItems() : void{ protected function loadItems() : void{
if(!$this->getNBT()->hasTag(Container::TAG_ITEMS, ListTag::class)){ if($this->getNBT()->hasTag(Container::TAG_ITEMS, ListTag::class)){
$this->getNBT()->setTag(new ListTag(Container::TAG_ITEMS, [], NBT::TAG_Compound)); $inventoryTag = $this->getNBT()->getListTag(Container::TAG_ITEMS);
}
$inventory = $this->getRealInventory(); $inventory = $this->getRealInventory();
for($i = 0, $size = $this->getSize(); $i < $size; ++$i){ foreach($inventoryTag as $itemNBT){
$inventory->setItem($i, $this->getItem($i)); $inventory->setItem($itemNBT->getByte("Slot"), Item::nbtDeserialize($itemNBT));
}
} }
} }
protected function saveItems() : void{ protected function saveItems() : void{
$this->getNBT()->setTag(new ListTag(Container::TAG_ITEMS, [], NBT::TAG_Compound)); $items = [];
foreach($this->getRealInventory()->getContents() as $slot => $item){
$inventory = $this->getRealInventory(); $items[] = $item->nbtSerialize($slot);
for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
$this->setItem($i, $inventory->getItem($i));
} }
$this->getNBT()->setTag(new ListTag(Container::TAG_ITEMS, $items, NBT::TAG_Compound));
} }
} }

7
src/pocketmine/tile/Furnace.php
View File

@ -104,13 +104,6 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
$this->saveItems(); $this->saveItems();
} }
/**
* @return int
*/
public function getSize() : int{
return 3;
}
/** /**
* @return FurnaceInventory * @return FurnaceInventory
*/ */