mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-26 13:19:55 +00:00
Code Issues Projects Releases Wiki Activity

fix interacting with anvil & enchanting table inventories

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-07-04 23:46:26 +01:00
parent d840e8c4d4
commit ae179e5039
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/network/mcpe/convert/TypeConverter.php
View File

@ -22,7 +22,10 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\convert; namespace pocketmine\network\mcpe\convert;
use pocketmine\block\inventory\AnvilInventory;
use pocketmine\block\inventory\EnchantInventory;
use pocketmine\crafting\CraftingGrid; use pocketmine\crafting\CraftingGrid;
use pocketmine\inventory\Inventory;
use pocketmine\inventory\transaction\action\CreateItemAction; use pocketmine\inventory\transaction\action\CreateItemAction;
use pocketmine\inventory\transaction\action\DestroyItemAction; use pocketmine\inventory\transaction\action\DestroyItemAction;
use pocketmine\inventory\transaction\action\DropItemAction; use pocketmine\inventory\transaction\action\DropItemAction;
@ -157,6 +160,22 @@ class TypeConverter{
); );
} }
/**
* @param int[] $test
* @phpstan-param array<int, int> $test
* @phpstan-param \Closure(Inventory) : bool $c
* @phpstan-return array{int, Inventory}
*/
protected function mapUIInventory(int $slot, array $test, ?Inventory $inventory, \Closure $c) : ?array{
if($inventory === null){
return null;
}
if(array_key_exists($slot, $test) && $c($inventory)){
return [$test[$slot], $inventory];
}
return null;
}
/** /**
* @throws \UnexpectedValueException * @throws \UnexpectedValueException
*/ */
@ -173,21 +192,26 @@ class TypeConverter{
if($action->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT){ if($action->inventorySlot === UIInventorySlotOffset::CREATED_ITEM_OUTPUT){
return null; //useless noise return null; //useless noise
} }
if(array_key_exists($action->inventorySlot, UIInventorySlotOffset::CRAFTING2X2_INPUT)){ $pSlot = $action->inventorySlot;
$window = $player->getCraftingGrid();
if($window->getGridWidth() !== CraftingGrid::SIZE_SMALL){ $craftingGrid = $player->getCraftingGrid();
throw new \UnexpectedValueException("Expected small crafting grid"); $mapped =
$this->mapUIInventory($pSlot, UIInventorySlotOffset::CRAFTING2X2_INPUT, $craftingGrid,
function(Inventory $i) : bool{ return $i instanceof CraftingGrid && $i->getGridWidth() === CraftingGrid::SIZE_SMALL; }) ??
$this->mapUIInventory($pSlot, UIInventorySlotOffset::CRAFTING3X3_INPUT, $craftingGrid,
function(Inventory $i) : bool{ return $i instanceof CraftingGrid && $i->getGridWidth() === CraftingGrid::SIZE_BIG; });
if($mapped === null){
$current = $player->getCurrentWindow();
$mapped =
$this->mapUIInventory($pSlot, UIInventorySlotOffset::ANVIL, $current,
function(Inventory $i) : bool{ return $i instanceof AnvilInventory; }) ??
$this->mapUIInventory($pSlot, UIInventorySlotOffset::ENCHANTING_TABLE, $current,
function(Inventory $i) : bool{ return $i instanceof EnchantInventory; });
} }
$slot = UIInventorySlotOffset::CRAFTING2X2_INPUT[$action->inventorySlot]; if($mapped === null){
}elseif(array_key_exists($action->inventorySlot, UIInventorySlotOffset::CRAFTING3X3_INPUT)){ throw new \UnexpectedValueException("Unmatched UI inventory slot offset $pSlot");
$window = $player->getCraftingGrid();
if($window->getGridWidth() !== CraftingGrid::SIZE_BIG){
throw new \UnexpectedValueException("Expected big crafting grid");
}
$slot = UIInventorySlotOffset::CRAFTING3X3_INPUT[$action->inventorySlot];
}else{
throw new \UnexpectedValueException("Unhandled magic UI slot offset $action->inventorySlot");
} }
[$slot, $window] = $mapped;
}else{ }else{
$window = $player->getNetworkSession()->getInvManager()->getWindow($action->windowId); $window = $player->getNetworkSession()->getInvManager()->getWindow($action->windowId);
$slot = $action->inventorySlot; $slot = $action->inventorySlot;