From 6dd31cc3f5554aa27954c7447dc8a624994f5049 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 24 Apr 2020 23:52:29 +0100 Subject: [PATCH] break cycle between block and inventory packages --- src/block/Anvil.php | 2 +- src/block/EnchantingTable.php | 2 +- src/{ => block}/inventory/AnvilInventory.php | 2 +- src/{ => block}/inventory/BlockInventory.php | 3 ++- src/{ => block}/inventory/BrewingStandInventory.php | 2 +- src/{ => block}/inventory/ChestInventory.php | 2 +- src/{ => block}/inventory/DoubleChestInventory.php | 4 +++- src/{ => block}/inventory/EnchantInventory.php | 2 +- src/{ => block}/inventory/EnderChestInventory.php | 2 +- src/{ => block}/inventory/FurnaceInventory.php | 2 +- src/{ => block}/inventory/HopperInventory.php | 2 +- src/block/tile/BrewingStand.php | 2 +- src/block/tile/Chest.php | 4 ++-- src/block/tile/Furnace.php | 2 +- src/block/tile/Hopper.php | 2 +- src/entity/Human.php | 2 +- src/network/mcpe/InventoryManager.php | 12 ++++++------ 17 files changed, 26 insertions(+), 23 deletions(-) rename src/{ => block}/inventory/AnvilInventory.php (96%) rename src/{ => block}/inventory/BlockInventory.php (93%) rename src/{ => block}/inventory/BrewingStandInventory.php (96%) rename src/{ => block}/inventory/ChestInventory.php (98%) rename src/{ => block}/inventory/DoubleChestInventory.php (95%) rename src/{ => block}/inventory/EnchantInventory.php (96%) rename src/{ => block}/inventory/EnderChestInventory.php (97%) rename src/{ => block}/inventory/FurnaceInventory.php (97%) rename src/{ => block}/inventory/HopperInventory.php (96%) diff --git a/src/block/Anvil.php b/src/block/Anvil.php index 99ab726eb..68f1a7392 100644 --- a/src/block/Anvil.php +++ b/src/block/Anvil.php @@ -23,10 +23,10 @@ declare(strict_types=1); namespace pocketmine\block; +use pocketmine\block\inventory\AnvilInventory; use pocketmine\block\utils\BlockDataSerializer; use pocketmine\block\utils\Fallable; use pocketmine\block\utils\FallableTrait; -use pocketmine\inventory\AnvilInventory; use pocketmine\item\Item; use pocketmine\item\ToolTier; use pocketmine\math\AxisAlignedBB; diff --git a/src/block/EnchantingTable.php b/src/block/EnchantingTable.php index 9507433d4..d59e258dd 100644 --- a/src/block/EnchantingTable.php +++ b/src/block/EnchantingTable.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\block; -use pocketmine\inventory\EnchantInventory; +use pocketmine\block\inventory\EnchantInventory; use pocketmine\item\Item; use pocketmine\item\ToolTier; use pocketmine\math\AxisAlignedBB; diff --git a/src/inventory/AnvilInventory.php b/src/block/inventory/AnvilInventory.php similarity index 96% rename from src/inventory/AnvilInventory.php rename to src/block/inventory/AnvilInventory.php index e07ff965e..b6ecddf13 100644 --- a/src/inventory/AnvilInventory.php +++ b/src/block/inventory/AnvilInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\player\Player; use pocketmine\world\Position; diff --git a/src/inventory/BlockInventory.php b/src/block/inventory/BlockInventory.php similarity index 93% rename from src/inventory/BlockInventory.php rename to src/block/inventory/BlockInventory.php index 5e4267b61..bb346a598 100644 --- a/src/inventory/BlockInventory.php +++ b/src/block/inventory/BlockInventory.php @@ -21,8 +21,9 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; +use pocketmine\inventory\BaseInventory; use pocketmine\world\Position; class BlockInventory extends BaseInventory{ diff --git a/src/inventory/BrewingStandInventory.php b/src/block/inventory/BrewingStandInventory.php similarity index 96% rename from src/inventory/BrewingStandInventory.php rename to src/block/inventory/BrewingStandInventory.php index 48aaaa6b3..39d806b33 100644 --- a/src/inventory/BrewingStandInventory.php +++ b/src/block/inventory/BrewingStandInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\world\Position; diff --git a/src/inventory/ChestInventory.php b/src/block/inventory/ChestInventory.php similarity index 98% rename from src/inventory/ChestInventory.php rename to src/block/inventory/ChestInventory.php index 1aea2a77d..377703ebd 100644 --- a/src/inventory/ChestInventory.php +++ b/src/block/inventory/ChestInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\network\mcpe\protocol\BlockEventPacket; use pocketmine\player\Player; diff --git a/src/inventory/DoubleChestInventory.php b/src/block/inventory/DoubleChestInventory.php similarity index 95% rename from src/inventory/DoubleChestInventory.php rename to src/block/inventory/DoubleChestInventory.php index 41f7ce69e..1998f1822 100644 --- a/src/inventory/DoubleChestInventory.php +++ b/src/block/inventory/DoubleChestInventory.php @@ -21,8 +21,10 @@ 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\player\Player; use pocketmine\world\Position; diff --git a/src/inventory/EnchantInventory.php b/src/block/inventory/EnchantInventory.php similarity index 96% rename from src/inventory/EnchantInventory.php rename to src/block/inventory/EnchantInventory.php index 06d7f651c..54be05fc1 100644 --- a/src/inventory/EnchantInventory.php +++ b/src/block/inventory/EnchantInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\player\Player; use pocketmine\world\Position; diff --git a/src/inventory/EnderChestInventory.php b/src/block/inventory/EnderChestInventory.php similarity index 97% rename from src/inventory/EnderChestInventory.php rename to src/block/inventory/EnderChestInventory.php index bd9a448f2..1e822aa28 100644 --- a/src/inventory/EnderChestInventory.php +++ b/src/block/inventory/EnderChestInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\world\Position; use pocketmine\world\sound\EnderChestCloseSound; diff --git a/src/inventory/FurnaceInventory.php b/src/block/inventory/FurnaceInventory.php similarity index 97% rename from src/inventory/FurnaceInventory.php rename to src/block/inventory/FurnaceInventory.php index c68111120..40abbe954 100644 --- a/src/inventory/FurnaceInventory.php +++ b/src/block/inventory/FurnaceInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\item\Item; use pocketmine\world\Position; diff --git a/src/inventory/HopperInventory.php b/src/block/inventory/HopperInventory.php similarity index 96% rename from src/inventory/HopperInventory.php rename to src/block/inventory/HopperInventory.php index 8378458ce..ce79ebb90 100644 --- a/src/inventory/HopperInventory.php +++ b/src/block/inventory/HopperInventory.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\inventory; +namespace pocketmine\block\inventory; use pocketmine\world\Position; diff --git a/src/block/tile/BrewingStand.php b/src/block/tile/BrewingStand.php index 740578e7f..9e5c5dd16 100644 --- a/src/block/tile/BrewingStand.php +++ b/src/block/tile/BrewingStand.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\block\tile; -use pocketmine\inventory\BrewingStandInventory; +use pocketmine\block\inventory\BrewingStandInventory; use pocketmine\inventory\CallbackInventoryListener; use pocketmine\inventory\Inventory; use pocketmine\math\Vector3; diff --git a/src/block/tile/Chest.php b/src/block/tile/Chest.php index 3cea05102..e197685e4 100644 --- a/src/block/tile/Chest.php +++ b/src/block/tile/Chest.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\block\tile; -use pocketmine\inventory\ChestInventory; -use pocketmine\inventory\DoubleChestInventory; +use pocketmine\block\inventory\ChestInventory; +use pocketmine\block\inventory\DoubleChestInventory; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; diff --git a/src/block/tile/Furnace.php b/src/block/tile/Furnace.php index 0ad0dba36..2fccc2d5d 100644 --- a/src/block/tile/Furnace.php +++ b/src/block/tile/Furnace.php @@ -24,11 +24,11 @@ declare(strict_types=1); namespace pocketmine\block\tile; use pocketmine\block\Furnace as BlockFurnace; +use pocketmine\block\inventory\FurnaceInventory; use pocketmine\crafting\FurnaceRecipe; use pocketmine\event\inventory\FurnaceBurnEvent; use pocketmine\event\inventory\FurnaceSmeltEvent; use pocketmine\inventory\CallbackInventoryListener; -use pocketmine\inventory\FurnaceInventory; use pocketmine\inventory\Inventory; use pocketmine\item\Item; use pocketmine\item\ItemFactory; diff --git a/src/block/tile/Hopper.php b/src/block/tile/Hopper.php index 838cc2f34..6a0988dcf 100644 --- a/src/block/tile/Hopper.php +++ b/src/block/tile/Hopper.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\block\tile; -use pocketmine\inventory\HopperInventory; +use pocketmine\block\inventory\HopperInventory; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\world\World; diff --git a/src/entity/Human.php b/src/entity/Human.php index 042675f58..54ef3de9c 100644 --- a/src/entity/Human.php +++ b/src/entity/Human.php @@ -28,7 +28,7 @@ use pocketmine\entity\effect\VanillaEffects; use pocketmine\entity\projectile\ProjectileSource; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\player\PlayerExhaustEvent; -use pocketmine\inventory\EnderChestInventory; +use pocketmine\block\inventory\EnderChestInventory; use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\PlayerInventory; use pocketmine\item\Consumable; diff --git a/src/network/mcpe/InventoryManager.php b/src/network/mcpe/InventoryManager.php index bd665dee9..cd09663f4 100644 --- a/src/network/mcpe/InventoryManager.php +++ b/src/network/mcpe/InventoryManager.php @@ -23,13 +23,13 @@ declare(strict_types=1); namespace pocketmine\network\mcpe; -use pocketmine\inventory\AnvilInventory; -use pocketmine\inventory\BlockInventory; -use pocketmine\inventory\BrewingStandInventory; +use pocketmine\block\inventory\AnvilInventory; +use pocketmine\block\inventory\BlockInventory; +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\EnchantInventory; -use pocketmine\inventory\FurnaceInventory; -use pocketmine\inventory\HopperInventory; use pocketmine\inventory\Inventory; use pocketmine\inventory\transaction\action\SlotChangeAction; use pocketmine\inventory\transaction\InventoryTransaction;