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

Move pocketmine\tile\* to pocketmine\block\tile\*

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-25 19:23:43 +01:00
parent 066eadd687
commit b329cac3d2
41 changed files with 76 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -82,7 +82,6 @@ use pocketmine\scheduler\AsyncPool;
use pocketmine\scheduler\SendUsageTask;
use pocketmine\snooze\SleeperHandler;
use pocketmine\snooze\SleeperNotifier;
use pocketmine\tile\TileFactory;
use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler;
use pocketmine\updater\AutoUpdater;
@ -1187,7 +1186,6 @@ class Server{
$this->commandMap = new SimpleCommandMap($this);
EntityFactory::init();
TileFactory::init();
BlockFactory::init();
Enchantment::init();
ItemFactory::init();

2
src/pocketmine/block/Banner.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use Ds\Deque;
use pocketmine\block\tile\Banner as TileBanner;
use pocketmine\block\utils\BannerPattern;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\DyeColor;
@ -34,7 +35,6 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Banner as TileBanner;
use function assert;
use function floor;

2
src/pocketmine/block/Bed.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Bed as TileBed;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\DyeColor;
use pocketmine\item\Bed as ItemBed;
@ -34,7 +35,6 @@ use pocketmine\math\Bearing;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Bed as TileBed;
use pocketmine\utils\TextFormat;
use pocketmine\world\World;

4
src/pocketmine/block/Block.php
View File

@ -26,6 +26,8 @@ declare(strict_types=1);
*/
namespace pocketmine\block;
use pocketmine\block\tile\Tile;
use pocketmine\block\tile\TileFactory;
use pocketmine\block\utils\InvalidBlockStateException;
use pocketmine\entity\Entity;
use pocketmine\item\enchantment\Enchantment;
@ -41,8 +43,6 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
use pocketmine\Player;
use pocketmine\plugin\Plugin;
use pocketmine\tile\Tile;
use pocketmine\tile\TileFactory;
use pocketmine\world\Position;
use pocketmine\world\World;
use function array_merge;

47
src/pocketmine/block/BlockFactory.php
View File

@ -24,6 +24,18 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\BlockIdentifier as BID;
use pocketmine\block\tile\Banner as TileBanner;
use pocketmine\block\tile\Bed as TileBed;
use pocketmine\block\tile\Chest as TileChest;
use pocketmine\block\tile\Comparator;
use pocketmine\block\tile\EnchantTable as TileEnchantingTable;
use pocketmine\block\tile\EnderChest as TileEnderChest;
use pocketmine\block\tile\FlowerPot as TileFlowerPot;
use pocketmine\block\tile\Furnace as TileFurnace;
use pocketmine\block\tile\ItemFrame as TileItemFrame;
use pocketmine\block\tile\Sign as TileSign;
use pocketmine\block\tile\Skull as TileSkull;
use pocketmine\block\tile\TileFactory;
use pocketmine\block\utils\DyeColor;
use pocketmine\block\utils\InvalidBlockStateException;
use pocketmine\block\utils\PillarRotationTrait;
@ -32,7 +44,6 @@ use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\ItemIds;
use pocketmine\item\TieredTool;
use pocketmine\tile\Comparator;
use pocketmine\world\Position;
use function array_fill;
use function array_filter;
@ -58,6 +69,8 @@ class BlockFactory{
* this if you need to reset the block factory back to its original defaults for whatever reason.
*/
public static function init() : void{
TileFactory::init();
self::$fullList = new \SplFixedArray(8192);
self::$lightFilter = \SplFixedArray::fromArray(array_fill(0, 8192, 1));
@ -69,9 +82,9 @@ class BlockFactory{
self::register(new Anvil(new BID(BlockLegacyIds::ANVIL, BlockLegacyMetadata::ANVIL_NORMAL), "Anvil"));
self::register(new Anvil(new BID(BlockLegacyIds::ANVIL, BlockLegacyMetadata::ANVIL_SLIGHTLY_DAMAGED), "Slightly Damaged Anvil"));
self::register(new Anvil(new BID(BlockLegacyIds::ANVIL, BlockLegacyMetadata::ANVIL_VERY_DAMAGED), "Very Damaged Anvil"));
self::register(new Banner(new BlockIdentifierFlattened(BlockLegacyIds::STANDING_BANNER, BlockLegacyIds::WALL_BANNER, 0, ItemIds::BANNER, \pocketmine\tile\Banner::class), "Banner"));
self::register(new Banner(new BlockIdentifierFlattened(BlockLegacyIds::STANDING_BANNER, BlockLegacyIds::WALL_BANNER, 0, ItemIds::BANNER, TileBanner::class), "Banner"));
self::register(new Transparent(new BID(BlockLegacyIds::BARRIER), "Barrier", BlockBreakInfo::indestructible()));
self::register(new Bed(new BID(BlockLegacyIds::BED_BLOCK, 0, ItemIds::BED, \pocketmine\tile\Bed::class), "Bed Block"));
self::register(new Bed(new BID(BlockLegacyIds::BED_BLOCK, 0, ItemIds::BED, TileBed::class), "Bed Block"));
self::register(new Bedrock(new BID(BlockLegacyIds::BEDROCK), "Bedrock"));
self::register(new Beetroot(new BID(BlockLegacyIds::BEETROOT_BLOCK), "Beetroot Block"));
self::register(new BlueIce(new BID(BlockLegacyIds::BLUE_ICE), "Blue Ice"));
@ -88,7 +101,7 @@ class BlockFactory{
self::register(new Cactus(new BID(BlockLegacyIds::CACTUS), "Cactus"));
self::register(new Cake(new BID(BlockLegacyIds::CAKE_BLOCK, 0, ItemIds::CAKE), "Cake"));
self::register(new Carrot(new BID(BlockLegacyIds::CARROTS), "Carrot Block"));
self::register(new Chest(new BID(BlockLegacyIds::CHEST, 0, null, \pocketmine\tile\Chest::class), "Chest"));
self::register(new Chest(new BID(BlockLegacyIds::CHEST, 0, null, TileChest::class), "Chest"));
self::register(new Clay(new BID(BlockLegacyIds::CLAY_BLOCK), "Clay Block"));
self::register(new Coal(new BID(BlockLegacyIds::COAL_BLOCK), "Coal Block"));
self::register(new CoalOre(new BID(BlockLegacyIds::COAL_ORE), "Coal Ore"));
@ -119,7 +132,7 @@ class BlockFactory{
self::register(new DragonEgg(new BID(BlockLegacyIds::DRAGON_EGG), "Dragon Egg"));
self::register(new Solid(new BID(BlockLegacyIds::EMERALD_BLOCK), "Emerald Block", new BlockBreakInfo(5.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_IRON, 30.0)));
self::register(new EmeraldOre(new BID(BlockLegacyIds::EMERALD_ORE), "Emerald Ore"));
self::register(new EnchantingTable(new BID(BlockLegacyIds::ENCHANTING_TABLE, 0, null, \pocketmine\tile\EnchantTable::class), "Enchanting Table"));
self::register(new EnchantingTable(new BID(BlockLegacyIds::ENCHANTING_TABLE, 0, null, TileEnchantingTable::class), "Enchanting Table"));
self::register(new EndPortalFrame(new BID(BlockLegacyIds::END_PORTAL_FRAME), "End Portal Frame"));
self::register(new EndRod(new BID(BlockLegacyIds::END_ROD), "End Rod"));
self::register(new Solid(new BID(BlockLegacyIds::END_STONE), "End Stone", new BlockBreakInfo(3.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_WOODEN, 45.0)));
@ -128,7 +141,7 @@ class BlockFactory{
self::register(new Solid(new BID(BlockLegacyIds::END_BRICKS), "End Stone Bricks", $endBrickBreakInfo));
self::register(new Stair(new BID(BlockLegacyIds::END_BRICK_STAIRS), "End Stone Brick Stairs", $endBrickBreakInfo));
self::register(new EnderChest(new BID(BlockLegacyIds::ENDER_CHEST, 0, null, \pocketmine\tile\EnderChest::class), "Ender Chest"));
self::register(new EnderChest(new BID(BlockLegacyIds::ENDER_CHEST, 0, null, TileEnderChest::class), "Ender Chest"));
self::register(new Farmland(new BID(BlockLegacyIds::FARMLAND), "Farmland"));
self::register(new Fire(new BID(BlockLegacyIds::FIRE), "Fire Block"));
self::register(new Flower(new BID(BlockLegacyIds::DANDELION), "Dandelion"));
@ -143,9 +156,9 @@ class BlockFactory{
self::register(new Flower(new BID(BlockLegacyIds::RED_FLOWER, BlockLegacyMetadata::FLOWER_POPPY), "Poppy"));
self::register(new Flower(new BID(BlockLegacyIds::RED_FLOWER, BlockLegacyMetadata::FLOWER_RED_TULIP), "Red Tulip"));
self::register(new Flower(new BID(BlockLegacyIds::RED_FLOWER, BlockLegacyMetadata::FLOWER_WHITE_TULIP), "White Tulip"));
self::register(new FlowerPot(new BID(BlockLegacyIds::FLOWER_POT_BLOCK, 0, ItemIds::FLOWER_POT, \pocketmine\tile\FlowerPot::class), "Flower Pot"));
self::register(new FlowerPot(new BID(BlockLegacyIds::FLOWER_POT_BLOCK, 0, ItemIds::FLOWER_POT, TileFlowerPot::class), "Flower Pot"));
self::register(new FrostedIce(new BID(BlockLegacyIds::FROSTED_ICE), "Frosted Ice"));
self::register(new Furnace(new BlockIdentifierFlattened(BlockLegacyIds::FURNACE, BlockLegacyIds::LIT_FURNACE, 0, null, \pocketmine\tile\Furnace::class), "Furnace"));
self::register(new Furnace(new BlockIdentifierFlattened(BlockLegacyIds::FURNACE, BlockLegacyIds::LIT_FURNACE, 0, null, TileFurnace::class), "Furnace"));
self::register(new Glass(new BID(BlockLegacyIds::GLASS), "Glass"));
self::register(new GlassPane(new BID(BlockLegacyIds::GLASS_PANE), "Glass Pane"));
self::register(new GlowingObsidian(new BID(BlockLegacyIds::GLOWINGOBSIDIAN), "Glowing Obsidian"));
@ -200,7 +213,7 @@ class BlockFactory{
self::register(new Door(new BID(BlockLegacyIds::IRON_DOOR_BLOCK, 0, ItemIds::IRON_DOOR), "Iron Door", new BlockBreakInfo(5.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_WOODEN, 25.0)));
self::register(new Solid(new BID(BlockLegacyIds::IRON_ORE), "Iron Ore", new BlockBreakInfo(3.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_STONE)));
self::register(new Trapdoor(new BID(BlockLegacyIds::IRON_TRAPDOOR), "Iron Trapdoor", new BlockBreakInfo(5.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_WOODEN, 25.0)));
self::register(new ItemFrame(new BID(BlockLegacyIds::FRAME_BLOCK, 0, ItemIds::FRAME, \pocketmine\tile\ItemFrame::class), "Item Frame"));
self::register(new ItemFrame(new BID(BlockLegacyIds::FRAME_BLOCK, 0, ItemIds::FRAME, TileItemFrame::class), "Item Frame"));
self::register(new Ladder(new BID(BlockLegacyIds::LADDER), "Ladder"));
self::register(new Solid(new BID(BlockLegacyIds::LAPIS_BLOCK), "Lapis Lazuli Block", new BlockBreakInfo(3.0, BlockToolType::TYPE_PICKAXE, TieredTool::TIER_STONE)));
self::register(new LapisOre(new BID(BlockLegacyIds::LAPIS_ORE), "Lapis Lazuli Ore"));
@ -277,7 +290,7 @@ class BlockFactory{
self::register(new Sand(new BID(BlockLegacyIds::SAND, 1), "Red Sand"));
self::register(new SeaLantern(new BID(BlockLegacyIds::SEALANTERN), "Sea Lantern"));
self::register(new SeaPickle(new BID(BlockLegacyIds::SEA_PICKLE), "Sea Pickle"));
self::register(new Skull(new BID(BlockLegacyIds::MOB_HEAD_BLOCK, 0, null, \pocketmine\tile\Skull::class), "Mob Head"));
self::register(new Skull(new BID(BlockLegacyIds::MOB_HEAD_BLOCK, 0, null, TileSkull::class), "Mob Head"));
@ -358,7 +371,7 @@ class BlockFactory{
self::register(new Torch(new BID(BlockLegacyIds::COLORED_TORCH_RG), "Red Torch"));
self::register(new Torch(new BID(BlockLegacyIds::COLORED_TORCH_RG, 8), "Green Torch"));
self::register(new Torch(new BID(BlockLegacyIds::TORCH), "Torch"));
self::register(new TrappedChest(new BID(BlockLegacyIds::TRAPPED_CHEST, 0, null, \pocketmine\tile\Chest::class), "Trapped Chest"));
self::register(new TrappedChest(new BID(BlockLegacyIds::TRAPPED_CHEST, 0, null, TileChest::class), "Trapped Chest"));
self::register(new Tripwire(new BID(BlockLegacyIds::TRIPWIRE, 0, ItemIds::STRING), "Tripwire"));
self::register(new TripwireHook(new BID(BlockLegacyIds::TRIPWIRE_HOOK), "Tripwire Hook"));
self::register(new UnderwaterTorch(new BID(BlockLegacyIds::UNDERWATER_TORCH), "Underwater Torch"));
@ -427,12 +440,12 @@ class BlockFactory{
/** @var BlockIdentifierFlattened[]|\SplObjectStorage $woodenSignIds */
$woodenSignIds = new \SplObjectStorage();
$woodenSignIds[TreeType::OAK()] = new BlockIdentifierFlattened(BlockLegacyIds::SIGN_POST, BlockLegacyIds::WALL_SIGN, 0, ItemIds::SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::SPRUCE()] = new BlockIdentifierFlattened(BlockLegacyIds::SPRUCE_STANDING_SIGN, BlockLegacyIds::SPRUCE_WALL_SIGN, 0, ItemIds::SPRUCE_SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::BIRCH()] = new BlockIdentifierFlattened(BlockLegacyIds::BIRCH_STANDING_SIGN, BlockLegacyIds::BIRCH_WALL_SIGN, 0, ItemIds::BIRCH_SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::JUNGLE()] = new BlockIdentifierFlattened(BlockLegacyIds::JUNGLE_STANDING_SIGN, BlockLegacyIds::JUNGLE_WALL_SIGN, 0, ItemIds::JUNGLE_SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::ACACIA()] = new BlockIdentifierFlattened(BlockLegacyIds::ACACIA_STANDING_SIGN, BlockLegacyIds::ACACIA_WALL_SIGN, 0, ItemIds::ACACIA_SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::DARK_OAK()] = new BlockIdentifierFlattened(BlockLegacyIds::DARKOAK_STANDING_SIGN, BlockLegacyIds::DARKOAK_WALL_SIGN, 0, ItemIds::DARKOAK_SIGN, \pocketmine\tile\Sign::class);
$woodenSignIds[TreeType::OAK()] = new BlockIdentifierFlattened(BlockLegacyIds::SIGN_POST, BlockLegacyIds::WALL_SIGN, 0, ItemIds::SIGN, TileSign::class);
$woodenSignIds[TreeType::SPRUCE()] = new BlockIdentifierFlattened(BlockLegacyIds::SPRUCE_STANDING_SIGN, BlockLegacyIds::SPRUCE_WALL_SIGN, 0, ItemIds::SPRUCE_SIGN, TileSign::class);
$woodenSignIds[TreeType::BIRCH()] = new BlockIdentifierFlattened(BlockLegacyIds::BIRCH_STANDING_SIGN, BlockLegacyIds::BIRCH_WALL_SIGN, 0, ItemIds::BIRCH_SIGN, TileSign::class);
$woodenSignIds[TreeType::JUNGLE()] = new BlockIdentifierFlattened(BlockLegacyIds::JUNGLE_STANDING_SIGN, BlockLegacyIds::JUNGLE_WALL_SIGN, 0, ItemIds::JUNGLE_SIGN, TileSign::class);
$woodenSignIds[TreeType::ACACIA()] = new BlockIdentifierFlattened(BlockLegacyIds::ACACIA_STANDING_SIGN, BlockLegacyIds::ACACIA_WALL_SIGN, 0, ItemIds::ACACIA_SIGN, TileSign::class);
$woodenSignIds[TreeType::DARK_OAK()] = new BlockIdentifierFlattened(BlockLegacyIds::DARKOAK_STANDING_SIGN, BlockLegacyIds::DARKOAK_WALL_SIGN, 0, ItemIds::DARKOAK_SIGN, TileSign::class);
//endregion
foreach(TreeType::getAll() as $treeType){

2
src/pocketmine/block/Chest.php
View File

@ -23,13 +23,13 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Chest as TileChest;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Chest as TileChest;
class Chest extends Transparent{

2
src/pocketmine/block/EnderChest.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\EnderChest as TileEnderChest;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
@ -31,7 +32,6 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\EnderChest as TileEnderChest;
class EnderChest extends Transparent{

2
src/pocketmine/block/FlowerPot.php
View File

@ -23,12 +23,12 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\FlowerPot as TileFlowerPot;
use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\FlowerPot as TileFlowerPot;
use function assert;
class FlowerPot extends Flowable{

2
src/pocketmine/block/Furnace.php
View File

@ -23,13 +23,13 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Furnace as TileFurnace;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Furnace as TileFurnace;
class Furnace extends Solid{
/** @var BlockIdentifierFlattened */

2
src/pocketmine/block/ItemFrame.php
View File

@ -23,12 +23,12 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\ItemFrame as TileItemFrame;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\item\Item;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\ItemFrame as TileItemFrame;
use function lcg_value;
class ItemFrame extends Flowable{

2
src/pocketmine/block/RedstoneComparator.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Comparator;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB;
@ -30,7 +31,6 @@ use pocketmine\math\Bearing;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Comparator;
use function assert;
class RedstoneComparator extends Flowable{

2
src/pocketmine/block/Sign.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Sign as TileSign;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\SignText;
use pocketmine\event\block\SignChangeEvent;
@ -31,7 +32,6 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Sign as TileSign;
use pocketmine\utils\TextFormat;
use function array_map;
use function assert;

2
src/pocketmine/block/Skull.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\tile\Skull as TileSkull;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\SkullType;
use pocketmine\item\Item;
@ -32,7 +33,6 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\tile\Skull as TileSkull;
use function assert;
use function floor;

2
src/pocketmine/tile/Banner.php → src/pocketmine/block/tile/Banner.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use Ds\Deque;
use pocketmine\block\utils\BannerPattern;

2
src/pocketmine/tile/Bed.php → src/pocketmine/block/tile/Bed.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\utils\DyeColor;
use pocketmine\math\Vector3;

2
src/pocketmine/tile/Chest.php → src/pocketmine/block/tile/Chest.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\inventory\ChestInventory;
use pocketmine\inventory\DoubleChestInventory;

2
src/pocketmine/tile/Comparator.php → src/pocketmine/block/tile/Comparator.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\RedstoneComparator;
use pocketmine\nbt\tag\CompoundTag;

2
src/pocketmine/tile/Container.php → src/pocketmine/block/tile/Container.php
View File

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

2
src/pocketmine/tile/ContainerTrait.php → src/pocketmine/block/tile/ContainerTrait.php
View File

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

2
src/pocketmine/tile/EnchantTable.php → src/pocketmine/block/tile/EnchantTable.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
class EnchantTable extends Spawnable implements Nameable{
use NameableTrait {

2
src/pocketmine/tile/EnderChest.php → src/pocketmine/block/tile/EnderChest.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\nbt\tag\CompoundTag;

2
src/pocketmine/tile/FlowerPot.php → src/pocketmine/block/tile/FlowerPot.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\Air;
use pocketmine\block\Block;

2
src/pocketmine/tile/Furnace.php → src/pocketmine/block/tile/Furnace.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\Furnace as BlockFurnace;
use pocketmine\event\inventory\FurnaceBurnEvent;

2
src/pocketmine/tile/ItemFrame.php → src/pocketmine/block/tile/ItemFrame.php
View File

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

2
src/pocketmine/tile/Nameable.php → src/pocketmine/block/tile/Nameable.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
interface Nameable{
public const TAG_CUSTOM_NAME = "CustomName";

2
src/pocketmine/tile/NameableTrait.php → src/pocketmine/block/tile/NameableTrait.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\item\Item;
use pocketmine\nbt\tag\CompoundTag;

2
src/pocketmine/tile/Sign.php → src/pocketmine/block/tile/Sign.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\utils\SignText;
use pocketmine\math\Vector3;

2
src/pocketmine/tile/Skull.php → src/pocketmine/block/tile/Skull.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\utils\SkullType;
use pocketmine\math\Vector3;

2
src/pocketmine/tile/Spawnable.php → src/pocketmine/block/tile/Spawnable.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\TreeRoot;

2
src/pocketmine/tile/Tile.php → src/pocketmine/block/tile/Tile.php
View File

@ -25,7 +25,7 @@ declare(strict_types=1);
* All the Tile classes and related classes
*/
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\block\Block;
use pocketmine\item\Item;

2
src/pocketmine/tile/TileFactory.php → src/pocketmine/block/tile/TileFactory.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\tile;
namespace pocketmine\block\tile;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag;

2
src/pocketmine/event/inventory/FurnaceBurnEvent.php
View File

@ -23,11 +23,11 @@ declare(strict_types=1);
namespace pocketmine\event\inventory;
use pocketmine\block\tile\Furnace;
use pocketmine\event\block\BlockEvent;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\item\Item;
use pocketmine\tile\Furnace;
class FurnaceBurnEvent extends BlockEvent implements Cancellable{
use CancellableTrait;

2
src/pocketmine/event/inventory/FurnaceSmeltEvent.php
View File

@ -23,11 +23,11 @@ declare(strict_types=1);
namespace pocketmine\event\inventory;
use pocketmine\block\tile\Furnace;
use pocketmine\event\block\BlockEvent;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\item\Item;
use pocketmine\tile\Furnace;
class FurnaceSmeltEvent extends BlockEvent implements Cancellable{
use CancellableTrait;

8
src/pocketmine/inventory/ChestInventory.php
View File

@ -23,13 +23,13 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\world\sound\ChestCloseSound;
use pocketmine\world\sound\ChestOpenSound;
use pocketmine\world\sound\Sound;
use pocketmine\block\tile\Chest;
use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\network\mcpe\protocol\types\WindowTypes;
use pocketmine\Player;
use pocketmine\tile\Chest;
use pocketmine\world\sound\ChestCloseSound;
use pocketmine\world\sound\ChestOpenSound;
use pocketmine\world\sound\Sound;
use function count;
class ChestInventory extends ContainerInventory{

2
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -23,9 +23,9 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\block\tile\Chest;
use pocketmine\item\Item;
use pocketmine\Player;
use pocketmine\tile\Chest;
use function array_merge;
use function array_slice;
use function count;

2
src/pocketmine/inventory/EnderChestInventory.php
View File

@ -23,8 +23,8 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\block\tile\EnderChest;
use pocketmine\network\mcpe\protocol\types\WindowTypes;
use pocketmine\tile\EnderChest;
use pocketmine\world\Position;
use pocketmine\world\sound\EnderChestCloseSound;
use pocketmine\world\sound\EnderChestOpenSound;

2
src/pocketmine/inventory/FurnaceInventory.php
View File

@ -23,9 +23,9 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\block\tile\Furnace;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\types\WindowTypes;
use pocketmine\tile\Furnace;
class FurnaceInventory extends ContainerInventory{
/** @var Furnace */

2
src/pocketmine/item/Banner.php
View File

@ -27,11 +27,11 @@ use Ds\Deque;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\BlockLegacyIds;
use pocketmine\block\tile\Banner as TileBanner;
use pocketmine\block\utils\BannerPattern;
use pocketmine\block\utils\DyeColor;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\tile\Banner as TileBanner;
class Banner extends Item{
public const TAG_PATTERNS = TileBanner::TAG_PATTERNS;

2
src/pocketmine/timings/Timings.php
View File

@ -23,12 +23,12 @@ declare(strict_types=1);
namespace pocketmine\timings;
use pocketmine\block\tile\Tile;
use pocketmine\entity\Entity;
use pocketmine\network\mcpe\protocol\ClientboundPacket;
use pocketmine\network\mcpe\protocol\ServerboundPacket;
use pocketmine\Player;
use pocketmine\scheduler\TaskHandler;
use pocketmine\tile\Tile;
use function dechex;
abstract class Timings{

4
src/pocketmine/world/World.php
View File

@ -30,6 +30,8 @@ use pocketmine\block\Air;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\BlockLegacyIds;
use pocketmine\block\tile\Spawnable;
use pocketmine\block\tile\Tile;
use pocketmine\block\UnknownBlock;
use pocketmine\entity\Entity;
use pocketmine\entity\EntityFactory;
@ -64,8 +66,6 @@ use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\Player;
use pocketmine\plugin\Plugin;
use pocketmine\Server;
use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile;
use pocketmine\timings\Timings;
use pocketmine\utils\ReversePriorityQueue;
use pocketmine\world\biome\Biome;

6
src/pocketmine/world/format/Chunk.php
View File

@ -28,15 +28,15 @@ namespace pocketmine\world\format;
use pocketmine\block\BlockFactory;
use pocketmine\block\BlockLegacyIds;
use pocketmine\block\tile\Spawnable;
use pocketmine\block\tile\Tile;
use pocketmine\block\tile\TileFactory;
use pocketmine\entity\Entity;
use pocketmine\entity\EntityFactory;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\NetworkBinaryStream;
use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
use pocketmine\Player;
use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile;
use pocketmine\tile\TileFactory;
use pocketmine\utils\BinaryStream;
use pocketmine\world\World;
use function array_fill;