break cycle between block and inventory packages

This commit is contained in:
Dylan K. Taylor 2020-04-24 23:52:29 +01:00
parent 4fbf4dcdc6
commit 6dd31cc3f5
17 changed files with 26 additions and 23 deletions

View File

@ -23,10 +23,10 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\inventory\AnvilInventory;
use pocketmine\block\utils\BlockDataSerializer; use pocketmine\block\utils\BlockDataSerializer;
use pocketmine\block\utils\Fallable; use pocketmine\block\utils\Fallable;
use pocketmine\block\utils\FallableTrait; use pocketmine\block\utils\FallableTrait;
use pocketmine\inventory\AnvilInventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ToolTier; use pocketmine\item\ToolTier;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;

View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\inventory\EnchantInventory; use pocketmine\block\inventory\EnchantInventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ToolTier; use pocketmine\item\ToolTier;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -21,8 +21,9 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\inventory\BaseInventory;
use pocketmine\world\Position; use pocketmine\world\Position;
class BlockInventory extends BaseInventory{ class BlockInventory extends BaseInventory{

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\network\mcpe\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\player\Player; use pocketmine\player\Player;

View File

@ -21,8 +21,10 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\inventory\BaseInventory;
use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\world\Position; use pocketmine\world\Position;
use pocketmine\world\sound\EnderChestCloseSound; use pocketmine\world\sound\EnderChestCloseSound;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\block\inventory;
use pocketmine\world\Position; use pocketmine\world\Position;

View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block\tile; namespace pocketmine\block\tile;
use pocketmine\inventory\BrewingStandInventory; use pocketmine\block\inventory\BrewingStandInventory;
use pocketmine\inventory\CallbackInventoryListener; use pocketmine\inventory\CallbackInventoryListener;
use pocketmine\inventory\Inventory; use pocketmine\inventory\Inventory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;

View File

@ -23,8 +23,8 @@ declare(strict_types=1);
namespace pocketmine\block\tile; namespace pocketmine\block\tile;
use pocketmine\inventory\ChestInventory; use pocketmine\block\inventory\ChestInventory;
use pocketmine\inventory\DoubleChestInventory; use pocketmine\block\inventory\DoubleChestInventory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;

View File

@ -24,11 +24,11 @@ declare(strict_types=1);
namespace pocketmine\block\tile; namespace pocketmine\block\tile;
use pocketmine\block\Furnace as BlockFurnace; use pocketmine\block\Furnace as BlockFurnace;
use pocketmine\block\inventory\FurnaceInventory;
use pocketmine\crafting\FurnaceRecipe; use pocketmine\crafting\FurnaceRecipe;
use pocketmine\event\inventory\FurnaceBurnEvent; use pocketmine\event\inventory\FurnaceBurnEvent;
use pocketmine\event\inventory\FurnaceSmeltEvent; use pocketmine\event\inventory\FurnaceSmeltEvent;
use pocketmine\inventory\CallbackInventoryListener; use pocketmine\inventory\CallbackInventoryListener;
use pocketmine\inventory\FurnaceInventory;
use pocketmine\inventory\Inventory; use pocketmine\inventory\Inventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ItemFactory; use pocketmine\item\ItemFactory;

View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block\tile; namespace pocketmine\block\tile;
use pocketmine\inventory\HopperInventory; use pocketmine\block\inventory\HopperInventory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\world\World; use pocketmine\world\World;

View File

@ -28,7 +28,7 @@ use pocketmine\entity\effect\VanillaEffects;
use pocketmine\entity\projectile\ProjectileSource; use pocketmine\entity\projectile\ProjectileSource;
use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\player\PlayerExhaustEvent; use pocketmine\event\player\PlayerExhaustEvent;
use pocketmine\inventory\EnderChestInventory; use pocketmine\block\inventory\EnderChestInventory;
use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\InventoryHolder;
use pocketmine\inventory\PlayerInventory; use pocketmine\inventory\PlayerInventory;
use pocketmine\item\Consumable; use pocketmine\item\Consumable;

View File

@ -23,13 +23,13 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe; namespace pocketmine\network\mcpe;
use pocketmine\inventory\AnvilInventory; use pocketmine\block\inventory\AnvilInventory;
use pocketmine\inventory\BlockInventory; use pocketmine\block\inventory\BlockInventory;
use pocketmine\inventory\BrewingStandInventory; use pocketmine\block\inventory\BrewingStandInventory;
use pocketmine\block\inventory\EnchantInventory;
use pocketmine\block\inventory\FurnaceInventory;
use pocketmine\block\inventory\HopperInventory;
use pocketmine\inventory\CreativeInventory; use pocketmine\inventory\CreativeInventory;
use pocketmine\inventory\EnchantInventory;
use pocketmine\inventory\FurnaceInventory;
use pocketmine\inventory\HopperInventory;
use pocketmine\inventory\Inventory; use pocketmine\inventory\Inventory;
use pocketmine\inventory\transaction\action\SlotChangeAction; use pocketmine\inventory\transaction\action\SlotChangeAction;
use pocketmine\inventory\transaction\InventoryTransaction; use pocketmine\inventory\transaction\InventoryTransaction;