mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-06 01:51:51 +00:00
Inventory: Removed BigCraftingGrid, allow arbitrary size parameter
This is more flexible and requires less classes.
This commit is contained in:
parent
1420cd1fa5
commit
1f4f8ab3f0
@ -68,7 +68,6 @@ use pocketmine\event\player\PlayerToggleSneakEvent;
|
|||||||
use pocketmine\event\player\PlayerToggleSprintEvent;
|
use pocketmine\event\player\PlayerToggleSprintEvent;
|
||||||
use pocketmine\event\player\PlayerTransferEvent;
|
use pocketmine\event\player\PlayerTransferEvent;
|
||||||
use pocketmine\event\server\DataPacketSendEvent;
|
use pocketmine\event\server\DataPacketSendEvent;
|
||||||
use pocketmine\inventory\BigCraftingGrid;
|
|
||||||
use pocketmine\inventory\CraftingGrid;
|
use pocketmine\inventory\CraftingGrid;
|
||||||
use pocketmine\inventory\Inventory;
|
use pocketmine\inventory\Inventory;
|
||||||
use pocketmine\inventory\PlayerCursorInventory;
|
use pocketmine\inventory\PlayerCursorInventory;
|
||||||
@ -3764,7 +3763,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
|||||||
$this->cursorInventory = new PlayerCursorInventory($this);
|
$this->cursorInventory = new PlayerCursorInventory($this);
|
||||||
$this->addWindow($this->cursorInventory, ContainerIds::CURSOR, true);
|
$this->addWindow($this->cursorInventory, ContainerIds::CURSOR, true);
|
||||||
|
|
||||||
$this->craftingGrid = new CraftingGrid($this);
|
$this->craftingGrid = new CraftingGrid($this, CraftingGrid::SIZE_SMALL);
|
||||||
|
|
||||||
//TODO: more windows
|
//TODO: more windows
|
||||||
}
|
}
|
||||||
@ -3795,8 +3794,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
|||||||
$this->craftingGrid->clearAll();
|
$this->craftingGrid->clearAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->craftingGrid instanceof BigCraftingGrid){
|
if($this->craftingGrid->getGridWidth() > CraftingGrid::SIZE_SMALL){
|
||||||
$this->craftingGrid = new CraftingGrid($this);
|
$this->craftingGrid = new CraftingGrid($this, CraftingGrid::SIZE_SMALL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\inventory\BigCraftingGrid;
|
use pocketmine\inventory\CraftingGrid;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ class CraftingTable extends Solid{
|
|||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if($player instanceof Player){
|
if($player instanceof Player){
|
||||||
$player->setCraftingGrid(new BigCraftingGrid($player));
|
$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* ____ _ _ __ __ _ __ __ ____
|
|
||||||
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
|
||||||
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
|
||||||
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
|
||||||
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* @author PocketMine Team
|
|
||||||
* @link http://www.pocketmine.net/
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace pocketmine\inventory;
|
|
||||||
|
|
||||||
class BigCraftingGrid extends CraftingGrid{
|
|
||||||
|
|
||||||
public function getGridWidth() : int{
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
}
|
|
@ -26,16 +26,22 @@ namespace pocketmine\inventory;
|
|||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class CraftingGrid extends BaseInventory{
|
class CraftingGrid extends BaseInventory{
|
||||||
|
public const SIZE_SMALL = 2;
|
||||||
|
public const SIZE_BIG = 3;
|
||||||
|
|
||||||
/** @var Player */
|
/** @var Player */
|
||||||
protected $holder;
|
protected $holder;
|
||||||
|
/** @var int */
|
||||||
|
private $gridWidth;
|
||||||
|
|
||||||
public function __construct(Player $holder){
|
public function __construct(Player $holder, int $gridWidth){
|
||||||
$this->holder = $holder;
|
$this->holder = $holder;
|
||||||
|
$this->gridWidth = $gridWidth;
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getGridWidth() : int{
|
public function getGridWidth() : int{
|
||||||
return 2;
|
return $this->gridWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDefaultSize() : int{
|
public function getDefaultSize() : int{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user