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

Rename InventoryChangeListener -> InventoryListener

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-24 23:44:38 +01:00
parent c869a7f099
commit 4fbf4dcdc6
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/inventory/BaseInventory.php
View File

@ -43,7 +43,7 @@ abstract class BaseInventory implements Inventory{
protected $slots;
/** @var Player[] */
protected $viewers = [];
/** @var InventoryChangeListener[] */
/** @var InventoryListener[] */
protected $listeners = [];
public function __construct(int $size){
@ -105,7 +105,7 @@ abstract class BaseInventory implements Inventory{
}
}
$this->addChangeListeners(...$listeners); //don't directly write, in case listeners were added while operation was in progress
$this->addListeners(...$listeners); //don't directly write, in case listeners were added while operation was in progress
foreach($viewers as $id => $viewer){
$this->viewers[$id] = $viewer;
}
@ -372,19 +372,19 @@ abstract class BaseInventory implements Inventory{
return $slot >= 0 and $slot < $this->slots->getSize();
}
public function addChangeListeners(InventoryChangeListener ...$listeners) : void{
public function addListeners(InventoryListener ...$listeners) : void{
foreach($listeners as $listener){
$this->listeners[spl_object_id($listener)] = $listener;
}
}
public function removeChangeListeners(InventoryChangeListener ...$listeners) : void{
public function removeListeners(InventoryListener ...$listeners) : void{
foreach($listeners as $listener){
unset($this->listeners[spl_object_id($listener)]);
}
}
public function getChangeListeners() : array{
public function getListeners() : array{
return $this->listeners;
}
}

2
src/inventory/CallbackInventoryChangeListener.php → src/inventory/CallbackInventoryListener.php
View File

@ -26,7 +26,7 @@ namespace pocketmine\inventory;
use pocketmine\item\Item;
use pocketmine\utils\Utils;
class CallbackInventoryChangeListener implements InventoryChangeListener{
class CallbackInventoryListener implements InventoryListener{
//TODO: turn the closure signatures into type aliases when PHPStan supports them

12
src/inventory/Inventory.php
View File

@ -155,17 +155,17 @@ interface Inventory{
public function slotExists(int $slot) : bool;
/**
* @param InventoryChangeListener ...$listeners
* @param InventoryListener ...$listeners
*/
public function addChangeListeners(InventoryChangeListener ...$listeners) : void;
public function addListeners(InventoryListener ...$listeners) : void;
/**
* @param InventoryChangeListener ...$listeners
* @param InventoryListener ...$listeners
*/
public function removeChangeListeners(InventoryChangeListener ...$listeners) : void;
public function removeListeners(InventoryListener ...$listeners) : void;
/**
* @return InventoryChangeListener[]
* @return InventoryListener[]
*/
public function getChangeListeners() : array;
public function getListeners() : array;
}

8
src/inventory/InventoryChangeListener.php → src/inventory/InventoryListener.php
View File

@ -28,11 +28,11 @@ use pocketmine\item\Item;
/**
* Classes implementing this interface can be injected into inventories to receive notifications when content changes
* occur.
* @see CallbackInventoryChangeListener for a closure-based listener
* @see Inventory::addChangeListeners()
* @see Inventory::removeChangeListeners()
* @see CallbackInventoryListener for a closure-based listener
* @see Inventory::addListeners()
* @see Inventory::removeListeners()
*/
interface InventoryChangeListener{
interface InventoryListener{
public function onSlotChange(Inventory $inventory, int $slot, Item $oldItem) : void;