mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 22:45:28 +00:00
Code Issues Projects Releases Wiki Activity

ItemStackRequestExecutor: make non-final, and make some stuff protected

Browse Source 
this allows for plugin extension, for example to implement anvils.
This commit is contained in:
Dylan K. Taylor 2023-03-21 00:22:21 +00:00
parent 08e8ef275f
commit c8d9477da1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/mcpe/handler/ItemStackRequestExecutor.php
View File

@ -58,7 +58,7 @@ use function array_key_first;
use function count; use function count;
use function spl_object_id; use function spl_object_id;
final class ItemStackRequestExecutor{ class ItemStackRequestExecutor{
private TransactionBuilder $builder; private TransactionBuilder $builder;
/** @var ItemStackRequestSlotInfo[] */ /** @var ItemStackRequestSlotInfo[] */
@ -81,7 +81,7 @@ final class ItemStackRequestExecutor{
$this->builder = new TransactionBuilder(); $this->builder = new TransactionBuilder();
} }
private function prettyInventoryAndSlot(Inventory $inventory, int $slot) : string{ protected function prettyInventoryAndSlot(Inventory $inventory, int $slot) : string{
if($inventory instanceof TransactionBuilderInventory){ if($inventory instanceof TransactionBuilderInventory){
$inventory = $inventory->getActualInventory(); $inventory = $inventory->getActualInventory();
} }
@ -111,7 +111,7 @@ final class ItemStackRequestExecutor{
* *
* @throws ItemStackRequestProcessException * @throws ItemStackRequestProcessException
*/ */
private function getBuilderInventoryAndSlot(ItemStackRequestSlotInfo $info) : array{ protected function getBuilderInventoryAndSlot(ItemStackRequestSlotInfo $info) : array{
$windowId = ItemStackContainerIdTranslator::translate($info->getContainerId(), $this->inventoryManager->getCurrentWindowId()); $windowId = ItemStackContainerIdTranslator::translate($info->getContainerId(), $this->inventoryManager->getCurrentWindowId());
$windowAndSlot = $this->inventoryManager->locateWindowAndSlot($windowId, $info->getSlotId()); $windowAndSlot = $this->inventoryManager->locateWindowAndSlot($windowId, $info->getSlotId());
if($windowAndSlot === null){ if($windowAndSlot === null){
@ -129,7 +129,7 @@ final class ItemStackRequestExecutor{
return [$this->builder->getInventory($inventory), $slot]; return [$this->builder->getInventory($inventory), $slot];
} }
private function transferItems(ItemStackRequestSlotInfo $source, ItemStackRequestSlotInfo $destination, int $count) : void{ protected function transferItems(ItemStackRequestSlotInfo $source, ItemStackRequestSlotInfo $destination, int $count) : void{
$removed = $this->removeItemFromSlot($source, $count); $removed = $this->removeItemFromSlot($source, $count);
$this->addItemToSlot($destination, $removed, $count); $this->addItemToSlot($destination, $removed, $count);
} }
@ -138,7 +138,7 @@ final class ItemStackRequestExecutor{
* Deducts items from an inventory slot, returning a stack containing the removed items. * Deducts items from an inventory slot, returning a stack containing the removed items.
* @throws ItemStackRequestProcessException * @throws ItemStackRequestProcessException
*/ */
private function removeItemFromSlot(ItemStackRequestSlotInfo $slotInfo, int $count) : Item{ protected function removeItemFromSlot(ItemStackRequestSlotInfo $slotInfo, int $count) : Item{
$this->requestSlotInfos[] = $slotInfo; $this->requestSlotInfos[] = $slotInfo;
[$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo); [$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo);
if($count < 1){ if($count < 1){
@ -160,7 +160,7 @@ final class ItemStackRequestExecutor{
/** /**
* Adds items to the target slot, if they are stackable. * Adds items to the target slot, if they are stackable.
*/ */
private function addItemToSlot(ItemStackRequestSlotInfo $slotInfo, Item $item, int $count) : void{ protected function addItemToSlot(ItemStackRequestSlotInfo $slotInfo, Item $item, int $count) : void{
$this->requestSlotInfos[] = $slotInfo; $this->requestSlotInfos[] = $slotInfo;
[$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo); [$inventory, $slot] = $this->getBuilderInventoryAndSlot($slotInfo);
if($count < 1){ if($count < 1){
@ -182,7 +182,7 @@ final class ItemStackRequestExecutor{
/** /**
* @throws ItemStackRequestProcessException * @throws ItemStackRequestProcessException
*/ */
private function setNextCreatedItem(?Item $item, bool $creative = false) : void{ protected function setNextCreatedItem(?Item $item, bool $creative = false) : void{
if($item !== null && $item->isNull()){ if($item !== null && $item->isNull()){
$item = null; $item = null;
} }
@ -204,7 +204,7 @@ final class ItemStackRequestExecutor{
/** /**
* @throws ItemStackRequestProcessException * @throws ItemStackRequestProcessException
*/ */
private function beginCrafting(int $recipeId, int $repetitions) : void{ protected function beginCrafting(int $recipeId, int $repetitions) : void{
if($this->specialTransaction !== null){ if($this->specialTransaction !== null){
throw new ItemStackRequestProcessException("Another special transaction is already in progress"); throw new ItemStackRequestProcessException("Another special transaction is already in progress");
} }
@ -242,7 +242,7 @@ final class ItemStackRequestExecutor{
} }
} }
private function takeCreatedItem(ItemStackRequestSlotInfo $destination, int $count) : void{ protected function takeCreatedItem(ItemStackRequestSlotInfo $destination, int $count) : void{
if($count < 1){ if($count < 1){
//this should be impossible at the protocol level, but in case of buggy core code this will prevent exploits //this should be impossible at the protocol level, but in case of buggy core code this will prevent exploits
throw new ItemStackRequestProcessException("Cannot take less than 1 created item"); throw new ItemStackRequestProcessException("Cannot take less than 1 created item");
@ -282,7 +282,7 @@ final class ItemStackRequestExecutor{
/** /**
* @throws ItemStackRequestProcessException * @throws ItemStackRequestProcessException
*/ */
private function processItemStackRequestAction(ItemStackRequestAction $action) : void{ protected function processItemStackRequestAction(ItemStackRequestAction $action) : void{
if( if(
$action instanceof TakeStackRequestAction || $action instanceof TakeStackRequestAction ||
$action instanceof PlaceStackRequestAction $action instanceof PlaceStackRequestAction