diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index a48ea0ba1..bcc93a2a2 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -68,6 +68,9 @@ use pocketmine\network\upnp\UPnP; use pocketmine\permission\BanList; use pocketmine\permission\DefaultPermissions; use pocketmine\permission\PermissionManager; +use pocketmine\player\GameMode; +use pocketmine\player\OfflinePlayer; +use pocketmine\player\Player; use pocketmine\plugin\PharPluginLoader; use pocketmine\plugin\Plugin; use pocketmine\plugin\PluginGraylist; diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index f03c9174c..f2c280fd4 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -33,7 +33,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Anvil extends Transparent implements Fallable{ diff --git a/src/pocketmine/block/Banner.php b/src/pocketmine/block/Banner.php index 37d773482..348d4843e 100644 --- a/src/pocketmine/block/Banner.php +++ b/src/pocketmine/block/Banner.php @@ -34,7 +34,7 @@ use pocketmine\item\ItemFactory; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function assert; use function floor; diff --git a/src/pocketmine/block/BaseRail.php b/src/pocketmine/block/BaseRail.php index 0a68f967e..501f65365 100644 --- a/src/pocketmine/block/BaseRail.php +++ b/src/pocketmine/block/BaseRail.php @@ -27,7 +27,7 @@ use pocketmine\block\utils\InvalidBlockStateException; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function array_map; use function array_reverse; diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index 08900ff04..b1ee5582c 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -34,7 +34,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use pocketmine\world\BlockTransaction; use pocketmine\world\World; diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index 1762bcad8..b3261209b 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -42,7 +42,7 @@ use pocketmine\metadata\Metadatable; use pocketmine\metadata\MetadataValue; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\plugin\Plugin; use pocketmine\world\BlockTransaction; use pocketmine\world\Position; diff --git a/src/pocketmine/block/BrewingStand.php b/src/pocketmine/block/BrewingStand.php index 465934fab..1cfe4125a 100644 --- a/src/pocketmine/block/BrewingStand.php +++ b/src/pocketmine/block/BrewingStand.php @@ -27,7 +27,7 @@ use pocketmine\block\tile\BrewingStand as TileBrewingStand; use pocketmine\item\Item; use pocketmine\item\TieredTool; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class BrewingStand extends Transparent{ diff --git a/src/pocketmine/block/Button.php b/src/pocketmine/block/Button.php index d2ce43a17..a6ae2a1ff 100644 --- a/src/pocketmine/block/Button.php +++ b/src/pocketmine/block/Button.php @@ -27,7 +27,7 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\RedstonePowerOffSound; use pocketmine\world\sound\RedstonePowerOnSound; diff --git a/src/pocketmine/block/Cactus.php b/src/pocketmine/block/Cactus.php index 1b3895f9e..ae6692517 100644 --- a/src/pocketmine/block/Cactus.php +++ b/src/pocketmine/block/Cactus.php @@ -32,7 +32,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Cactus extends Transparent{ diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index 2cc905790..8d1cd4b8a 100644 --- a/src/pocketmine/block/Cake.php +++ b/src/pocketmine/block/Cake.php @@ -31,7 +31,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Cake extends Transparent implements FoodSource{ diff --git a/src/pocketmine/block/Carpet.php b/src/pocketmine/block/Carpet.php index 7a90923da..39b7d2ccb 100644 --- a/src/pocketmine/block/Carpet.php +++ b/src/pocketmine/block/Carpet.php @@ -27,7 +27,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Carpet extends Flowable{ diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index c56eeafac..baae80b32 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Chest extends Transparent{ diff --git a/src/pocketmine/block/CoarseDirt.php b/src/pocketmine/block/CoarseDirt.php index ac26869a5..91026cdc4 100644 --- a/src/pocketmine/block/CoarseDirt.php +++ b/src/pocketmine/block/CoarseDirt.php @@ -27,7 +27,7 @@ use pocketmine\item\Hoe; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class CoarseDirt extends Dirt{ diff --git a/src/pocketmine/block/CocoaBlock.php b/src/pocketmine/block/CocoaBlock.php index 15a504e8b..06e2dfac7 100644 --- a/src/pocketmine/block/CocoaBlock.php +++ b/src/pocketmine/block/CocoaBlock.php @@ -32,7 +32,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function mt_rand; diff --git a/src/pocketmine/block/CraftingTable.php b/src/pocketmine/block/CraftingTable.php index 67a38b5e0..2a9aec8b4 100644 --- a/src/pocketmine/block/CraftingTable.php +++ b/src/pocketmine/block/CraftingTable.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\inventory\CraftingGrid; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class CraftingTable extends Solid{ diff --git a/src/pocketmine/block/Crops.php b/src/pocketmine/block/Crops.php index 7e62e79e8..799f59fd5 100644 --- a/src/pocketmine/block/Crops.php +++ b/src/pocketmine/block/Crops.php @@ -29,7 +29,7 @@ use pocketmine\item\Fertilizer; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function mt_rand; diff --git a/src/pocketmine/block/DaylightSensor.php b/src/pocketmine/block/DaylightSensor.php index d06670859..596e71dee 100644 --- a/src/pocketmine/block/DaylightSensor.php +++ b/src/pocketmine/block/DaylightSensor.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use function cos; use function max; use function round; diff --git a/src/pocketmine/block/DeadBush.php b/src/pocketmine/block/DeadBush.php index 6d03f4857..19ff078c0 100644 --- a/src/pocketmine/block/DeadBush.php +++ b/src/pocketmine/block/DeadBush.php @@ -27,7 +27,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function mt_rand; diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php index 9f502e1c1..f1db0380e 100644 --- a/src/pocketmine/block/Dirt.php +++ b/src/pocketmine/block/Dirt.php @@ -27,7 +27,7 @@ use pocketmine\item\Hoe; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class Dirt extends Solid{ diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index 1cd369998..c244ddacc 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -29,7 +29,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\DoorSound; diff --git a/src/pocketmine/block/DoublePlant.php b/src/pocketmine/block/DoublePlant.php index cfe827b3a..3c2194763 100644 --- a/src/pocketmine/block/DoublePlant.php +++ b/src/pocketmine/block/DoublePlant.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class DoublePlant extends Flowable{ diff --git a/src/pocketmine/block/DragonEgg.php b/src/pocketmine/block/DragonEgg.php index ffd1d549b..0be7e15fe 100644 --- a/src/pocketmine/block/DragonEgg.php +++ b/src/pocketmine/block/DragonEgg.php @@ -29,7 +29,7 @@ use pocketmine\event\block\BlockTeleportEvent; use pocketmine\item\Item; use pocketmine\item\TieredTool; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\particle\DragonEggTeleportParticle; use pocketmine\world\World; use function max; diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index 66ebae89d..5afb805a5 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -29,7 +29,7 @@ use pocketmine\item\TieredTool; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class EnchantingTable extends Transparent{ diff --git a/src/pocketmine/block/EndPortalFrame.php b/src/pocketmine/block/EndPortalFrame.php index ae0f0217c..70e5f5aef 100644 --- a/src/pocketmine/block/EndPortalFrame.php +++ b/src/pocketmine/block/EndPortalFrame.php @@ -29,7 +29,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class EndPortalFrame extends Solid{ diff --git a/src/pocketmine/block/EndRod.php b/src/pocketmine/block/EndRod.php index 8ff7a6085..7da132665 100644 --- a/src/pocketmine/block/EndRod.php +++ b/src/pocketmine/block/EndRod.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class EndRod extends Flowable{ diff --git a/src/pocketmine/block/EnderChest.php b/src/pocketmine/block/EnderChest.php index d750b56db..17287b49c 100644 --- a/src/pocketmine/block/EnderChest.php +++ b/src/pocketmine/block/EnderChest.php @@ -31,7 +31,7 @@ use pocketmine\item\TieredTool; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class EnderChest extends Transparent{ diff --git a/src/pocketmine/block/FenceGate.php b/src/pocketmine/block/FenceGate.php index 96399b5d8..41ae3543b 100644 --- a/src/pocketmine/block/FenceGate.php +++ b/src/pocketmine/block/FenceGate.php @@ -29,7 +29,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\DoorSound; diff --git a/src/pocketmine/block/Flower.php b/src/pocketmine/block/Flower.php index 7e8b2137b..c44fc6829 100644 --- a/src/pocketmine/block/Flower.php +++ b/src/pocketmine/block/Flower.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Flower extends Flowable{ diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index 0b4a06d94..9d941546d 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function assert; diff --git a/src/pocketmine/block/Furnace.php b/src/pocketmine/block/Furnace.php index c2248ebf7..404df7f19 100644 --- a/src/pocketmine/block/Furnace.php +++ b/src/pocketmine/block/Furnace.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\item\TieredTool; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Furnace extends Solid{ diff --git a/src/pocketmine/block/GlazedTerracotta.php b/src/pocketmine/block/GlazedTerracotta.php index 881026a60..196d6d10d 100644 --- a/src/pocketmine/block/GlazedTerracotta.php +++ b/src/pocketmine/block/GlazedTerracotta.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\item\TieredTool; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class GlazedTerracotta extends Solid{ diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index 29eb1712c..aa8935696 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -31,7 +31,7 @@ use pocketmine\item\ItemFactory; use pocketmine\item\Shovel; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Random; use pocketmine\world\generator\object\TallGrass as TallGrassObject; use function mt_rand; diff --git a/src/pocketmine/block/Hopper.php b/src/pocketmine/block/Hopper.php index 6c997f350..9318dc39a 100644 --- a/src/pocketmine/block/Hopper.php +++ b/src/pocketmine/block/Hopper.php @@ -30,7 +30,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Hopper extends Transparent{ diff --git a/src/pocketmine/block/Ice.php b/src/pocketmine/block/Ice.php index 725aa0375..d62193cc3 100644 --- a/src/pocketmine/block/Ice.php +++ b/src/pocketmine/block/Ice.php @@ -25,7 +25,7 @@ namespace pocketmine\block; use pocketmine\item\enchantment\Enchantment; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; class Ice extends Transparent{ diff --git a/src/pocketmine/block/ItemFrame.php b/src/pocketmine/block/ItemFrame.php index aadd676a5..0eaf1f317 100644 --- a/src/pocketmine/block/ItemFrame.php +++ b/src/pocketmine/block/ItemFrame.php @@ -28,7 +28,7 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function lcg_value; diff --git a/src/pocketmine/block/Ladder.php b/src/pocketmine/block/Ladder.php index 2477c33e8..2440ac50a 100644 --- a/src/pocketmine/block/Ladder.php +++ b/src/pocketmine/block/Ladder.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Ladder extends Transparent{ diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 7c21d789c..a8c9d0537 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\World; use function mt_rand; diff --git a/src/pocketmine/block/Lever.php b/src/pocketmine/block/Lever.php index a0c1aced1..6315df724 100644 --- a/src/pocketmine/block/Lever.php +++ b/src/pocketmine/block/Lever.php @@ -27,7 +27,7 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\RedstonePowerOffSound; use pocketmine\world\sound\RedstonePowerOnSound; diff --git a/src/pocketmine/block/NetherWartPlant.php b/src/pocketmine/block/NetherWartPlant.php index 2b2029e60..6e47e7738 100644 --- a/src/pocketmine/block/NetherWartPlant.php +++ b/src/pocketmine/block/NetherWartPlant.php @@ -29,7 +29,7 @@ use pocketmine\event\block\BlockGrowEvent; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function mt_rand; diff --git a/src/pocketmine/block/Pumpkin.php b/src/pocketmine/block/Pumpkin.php index 31123bb9c..335835630 100644 --- a/src/pocketmine/block/Pumpkin.php +++ b/src/pocketmine/block/Pumpkin.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Pumpkin extends Solid{ diff --git a/src/pocketmine/block/RedMushroom.php b/src/pocketmine/block/RedMushroom.php index 909cfd853..d8b9bdca8 100644 --- a/src/pocketmine/block/RedMushroom.php +++ b/src/pocketmine/block/RedMushroom.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class RedMushroom extends Flowable{ diff --git a/src/pocketmine/block/RedstoneComparator.php b/src/pocketmine/block/RedstoneComparator.php index 8ea7f9a76..937f153ae 100644 --- a/src/pocketmine/block/RedstoneComparator.php +++ b/src/pocketmine/block/RedstoneComparator.php @@ -30,7 +30,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function assert; diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php index d3b11d4c7..863c4fea8 100644 --- a/src/pocketmine/block/RedstoneOre.php +++ b/src/pocketmine/block/RedstoneOre.php @@ -27,7 +27,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use function mt_rand; class RedstoneOre extends Solid{ diff --git a/src/pocketmine/block/RedstoneRepeater.php b/src/pocketmine/block/RedstoneRepeater.php index fad3f599d..f1f3ab18f 100644 --- a/src/pocketmine/block/RedstoneRepeater.php +++ b/src/pocketmine/block/RedstoneRepeater.php @@ -29,7 +29,7 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class RedstoneRepeater extends Flowable{ diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index e312c9ff7..49a56fe33 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -28,7 +28,7 @@ use pocketmine\item\Fertilizer; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Random; use pocketmine\world\BlockTransaction; use pocketmine\world\generator\object\Tree; diff --git a/src/pocketmine/block/SeaPickle.php b/src/pocketmine/block/SeaPickle.php index 26dab94aa..0775d7e19 100644 --- a/src/pocketmine/block/SeaPickle.php +++ b/src/pocketmine/block/SeaPickle.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class SeaPickle extends Transparent{ diff --git a/src/pocketmine/block/Sign.php b/src/pocketmine/block/Sign.php index 58ca72773..a865d80ef 100644 --- a/src/pocketmine/block/Sign.php +++ b/src/pocketmine/block/Sign.php @@ -31,7 +31,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use pocketmine\world\BlockTransaction; use function array_map; diff --git a/src/pocketmine/block/Skull.php b/src/pocketmine/block/Skull.php index e9aa86a18..04806392e 100644 --- a/src/pocketmine/block/Skull.php +++ b/src/pocketmine/block/Skull.php @@ -32,7 +32,7 @@ use pocketmine\item\Skull as ItemSkull; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function assert; use function floor; diff --git a/src/pocketmine/block/Slab.php b/src/pocketmine/block/Slab.php index 975010f69..7cceddba9 100644 --- a/src/pocketmine/block/Slab.php +++ b/src/pocketmine/block/Slab.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Slab extends Transparent{ diff --git a/src/pocketmine/block/SnowLayer.php b/src/pocketmine/block/SnowLayer.php index a7ceacc5a..80c282701 100644 --- a/src/pocketmine/block/SnowLayer.php +++ b/src/pocketmine/block/SnowLayer.php @@ -32,7 +32,7 @@ use pocketmine\item\TieredTool; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function floor; use function max; diff --git a/src/pocketmine/block/Stair.php b/src/pocketmine/block/Stair.php index d904de925..892c73045 100644 --- a/src/pocketmine/block/Stair.php +++ b/src/pocketmine/block/Stair.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Stair extends Transparent{ diff --git a/src/pocketmine/block/Sugarcane.php b/src/pocketmine/block/Sugarcane.php index d60e1a5f3..92488993d 100644 --- a/src/pocketmine/block/Sugarcane.php +++ b/src/pocketmine/block/Sugarcane.php @@ -29,7 +29,7 @@ use pocketmine\item\Fertilizer; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Sugarcane extends Flowable{ diff --git a/src/pocketmine/block/TNT.php b/src/pocketmine/block/TNT.php index b789b8ae4..882e1ff9d 100644 --- a/src/pocketmine/block/TNT.php +++ b/src/pocketmine/block/TNT.php @@ -32,7 +32,7 @@ use pocketmine\item\enchantment\Enchantment; use pocketmine\item\FlintSteel; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Random; use function cos; use function sin; diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index 7a6a8cc81..13c054410 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -27,7 +27,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function mt_rand; diff --git a/src/pocketmine/block/Torch.php b/src/pocketmine/block/Torch.php index c9f09ec88..1af73c2af 100644 --- a/src/pocketmine/block/Torch.php +++ b/src/pocketmine/block/Torch.php @@ -27,7 +27,7 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class Torch extends Flowable{ diff --git a/src/pocketmine/block/Trapdoor.php b/src/pocketmine/block/Trapdoor.php index 5b829ee0e..4fc3cbe99 100644 --- a/src/pocketmine/block/Trapdoor.php +++ b/src/pocketmine/block/Trapdoor.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\DoorSound; diff --git a/src/pocketmine/block/TripwireHook.php b/src/pocketmine/block/TripwireHook.php index b884900af..1cd9be24b 100644 --- a/src/pocketmine/block/TripwireHook.php +++ b/src/pocketmine/block/TripwireHook.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\Bearing; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class TripwireHook extends Flowable{ diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php index 4de77fada..4c320540e 100644 --- a/src/pocketmine/block/Vine.php +++ b/src/pocketmine/block/Vine.php @@ -28,7 +28,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use function array_intersect_key; use function array_keys; diff --git a/src/pocketmine/block/WaterLily.php b/src/pocketmine/block/WaterLily.php index 73428917a..4b6bcaeb5 100644 --- a/src/pocketmine/block/WaterLily.php +++ b/src/pocketmine/block/WaterLily.php @@ -27,7 +27,7 @@ use pocketmine\item\Item; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; class WaterLily extends Flowable{ diff --git a/src/pocketmine/block/utils/PillarRotationTrait.php b/src/pocketmine/block/utils/PillarRotationTrait.php index b84dd7b79..639dd3ed2 100644 --- a/src/pocketmine/block/utils/PillarRotationTrait.php +++ b/src/pocketmine/block/utils/PillarRotationTrait.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\item\Item; use pocketmine\math\Facing; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\BlockTransaction; trait PillarRotationTrait{ diff --git a/src/pocketmine/command/defaults/BanCommand.php b/src/pocketmine/command/defaults/BanCommand.php index 67ddff1ed..6823ba19c 100644 --- a/src/pocketmine/command/defaults/BanCommand.php +++ b/src/pocketmine/command/defaults/BanCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use function array_shift; use function count; use function implode; diff --git a/src/pocketmine/command/defaults/BanIpCommand.php b/src/pocketmine/command/defaults/BanIpCommand.php index 6f10b192d..18f09efe3 100644 --- a/src/pocketmine/command/defaults/BanIpCommand.php +++ b/src/pocketmine/command/defaults/BanIpCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use function array_shift; use function count; use function implode; diff --git a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php index 74a4f5c92..6e3957ce9 100644 --- a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php +++ b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php @@ -25,8 +25,8 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\GameMode; use pocketmine\lang\TranslationContainer; +use pocketmine\player\GameMode; use function count; class DefaultGamemodeCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DeopCommand.php b/src/pocketmine/command/defaults/DeopCommand.php index 0dc92755f..c9f052f12 100644 --- a/src/pocketmine/command/defaults/DeopCommand.php +++ b/src/pocketmine/command/defaults/DeopCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function array_shift; use function count; diff --git a/src/pocketmine/command/defaults/GamemodeCommand.php b/src/pocketmine/command/defaults/GamemodeCommand.php index 5a0aa01a8..d520f9879 100644 --- a/src/pocketmine/command/defaults/GamemodeCommand.php +++ b/src/pocketmine/command/defaults/GamemodeCommand.php @@ -26,9 +26,9 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\GameMode; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\GameMode; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php index 1d10cb2de..126215e41 100644 --- a/src/pocketmine/command/defaults/KickCommand.php +++ b/src/pocketmine/command/defaults/KickCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function array_shift; use function count; diff --git a/src/pocketmine/command/defaults/KillCommand.php b/src/pocketmine/command/defaults/KillCommand.php index b6326aedd..ee5ed3ecf 100644 --- a/src/pocketmine/command/defaults/KillCommand.php +++ b/src/pocketmine/command/defaults/KillCommand.php @@ -28,7 +28,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; diff --git a/src/pocketmine/command/defaults/ListCommand.php b/src/pocketmine/command/defaults/ListCommand.php index 6fe084b1e..7b7b4be55 100644 --- a/src/pocketmine/command/defaults/ListCommand.php +++ b/src/pocketmine/command/defaults/ListCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use function array_filter; use function array_map; use function count; diff --git a/src/pocketmine/command/defaults/MeCommand.php b/src/pocketmine/command/defaults/MeCommand.php index d9aadd7f4..8b6d9a7fb 100644 --- a/src/pocketmine/command/defaults/MeCommand.php +++ b/src/pocketmine/command/defaults/MeCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; use function implode; diff --git a/src/pocketmine/command/defaults/OpCommand.php b/src/pocketmine/command/defaults/OpCommand.php index 5f677a4ab..fd711d98c 100644 --- a/src/pocketmine/command/defaults/OpCommand.php +++ b/src/pocketmine/command/defaults/OpCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function array_shift; use function count; diff --git a/src/pocketmine/command/defaults/ParticleCommand.php b/src/pocketmine/command/defaults/ParticleCommand.php index ddec2514b..9a04c845f 100644 --- a/src/pocketmine/command/defaults/ParticleCommand.php +++ b/src/pocketmine/command/defaults/ParticleCommand.php @@ -30,7 +30,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Random; use pocketmine\utils\TextFormat; use pocketmine\world\particle\AngryVillagerParticle; diff --git a/src/pocketmine/command/defaults/SayCommand.php b/src/pocketmine/command/defaults/SayCommand.php index 841b1bb04..709d68fac 100644 --- a/src/pocketmine/command/defaults/SayCommand.php +++ b/src/pocketmine/command/defaults/SayCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; use function implode; diff --git a/src/pocketmine/command/defaults/SeedCommand.php b/src/pocketmine/command/defaults/SeedCommand.php index 9ea9fb26f..1ce522ff6 100644 --- a/src/pocketmine/command/defaults/SeedCommand.php +++ b/src/pocketmine/command/defaults/SeedCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; class SeedCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php index f406b6a46..641de76b2 100644 --- a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php +++ b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php @@ -28,7 +28,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; use function round; diff --git a/src/pocketmine/command/defaults/SpawnpointCommand.php b/src/pocketmine/command/defaults/SpawnpointCommand.php index eac5caafa..a0f87ca61 100644 --- a/src/pocketmine/command/defaults/SpawnpointCommand.php +++ b/src/pocketmine/command/defaults/SpawnpointCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use pocketmine\world\Position; use pocketmine\world\World; diff --git a/src/pocketmine/command/defaults/TeleportCommand.php b/src/pocketmine/command/defaults/TeleportCommand.php index 353a33f4f..8170fbb6d 100644 --- a/src/pocketmine/command/defaults/TeleportCommand.php +++ b/src/pocketmine/command/defaults/TeleportCommand.php @@ -28,7 +28,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function array_filter; use function array_values; diff --git a/src/pocketmine/command/defaults/TellCommand.php b/src/pocketmine/command/defaults/TellCommand.php index ed1c3f05e..443d1e979 100644 --- a/src/pocketmine/command/defaults/TellCommand.php +++ b/src/pocketmine/command/defaults/TellCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function array_shift; use function count; diff --git a/src/pocketmine/command/defaults/TimeCommand.php b/src/pocketmine/command/defaults/TimeCommand.php index 5b91adfa1..91cc1cbc7 100644 --- a/src/pocketmine/command/defaults/TimeCommand.php +++ b/src/pocketmine/command/defaults/TimeCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use pocketmine\world\World; use function count; diff --git a/src/pocketmine/command/defaults/TimingsCommand.php b/src/pocketmine/command/defaults/TimingsCommand.php index 2c17170a4..a926d554a 100644 --- a/src/pocketmine/command/defaults/TimingsCommand.php +++ b/src/pocketmine/command/defaults/TimingsCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\scheduler\BulkCurlTask; use pocketmine\timings\TimingsHandler; use pocketmine\utils\InternetException; diff --git a/src/pocketmine/command/defaults/TransferServerCommand.php b/src/pocketmine/command/defaults/TransferServerCommand.php index ee5821706..ebf1a4af1 100644 --- a/src/pocketmine/command/defaults/TransferServerCommand.php +++ b/src/pocketmine/command/defaults/TransferServerCommand.php @@ -27,7 +27,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\Player; +use pocketmine\player\Player; use function count; class TransferServerCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/WhitelistCommand.php b/src/pocketmine/command/defaults/WhitelistCommand.php index aed16e033..e53c74164 100644 --- a/src/pocketmine/command/defaults/WhitelistCommand.php +++ b/src/pocketmine/command/defaults/WhitelistCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\TextFormat; use function count; use function implode; diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index ee58ad42e..db768c7fa 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -57,7 +57,7 @@ use pocketmine\network\mcpe\protocol\types\DataPropertyManager; use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; use pocketmine\timings\Timings; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index 5f8f1bd46..33339e7e1 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -53,7 +53,7 @@ use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use pocketmine\network\mcpe\protocol\types\PlayerMetadataFlags; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\UUID; use pocketmine\world\sound\TotemUseSound; use pocketmine\world\sound\XpCollectSound; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index f01f4b700..cb2434818 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -48,7 +48,7 @@ use pocketmine\nbt\tag\ListTag; use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\timings\Timings; use pocketmine\utils\Binary; use pocketmine\utils\Color; diff --git a/src/pocketmine/entity/effect/LevitationEffect.php b/src/pocketmine/entity/effect/LevitationEffect.php index 746ad49ad..44e9caccd 100644 --- a/src/pocketmine/entity/effect/LevitationEffect.php +++ b/src/pocketmine/entity/effect/LevitationEffect.php @@ -25,7 +25,7 @@ namespace pocketmine\entity\effect; use pocketmine\entity\Entity; use pocketmine\entity\Living; -use pocketmine\Player; +use pocketmine\player\Player; class LevitationEffect extends Effect{ diff --git a/src/pocketmine/entity/object/ExperienceOrb.php b/src/pocketmine/entity/object/ExperienceOrb.php index 612f055f5..17af49d89 100644 --- a/src/pocketmine/entity/object/ExperienceOrb.php +++ b/src/pocketmine/entity/object/ExperienceOrb.php @@ -29,7 +29,7 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\Player; +use pocketmine\player\Player; use function sqrt; class ExperienceOrb extends Entity{ diff --git a/src/pocketmine/entity/object/ItemEntity.php b/src/pocketmine/entity/object/ItemEntity.php index d2a14732a..fcb5727ff 100644 --- a/src/pocketmine/entity/object/ItemEntity.php +++ b/src/pocketmine/entity/object/ItemEntity.php @@ -33,7 +33,7 @@ use pocketmine\item\ItemIds; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\AddItemEntityPacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; -use pocketmine\Player; +use pocketmine\player\Player; use function get_class; use function max; diff --git a/src/pocketmine/entity/object/Painting.php b/src/pocketmine/entity/object/Painting.php index 2b38a835c..3f1b26a3f 100644 --- a/src/pocketmine/entity/object/Painting.php +++ b/src/pocketmine/entity/object/Painting.php @@ -36,7 +36,7 @@ use pocketmine\math\Vector3; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\AddPaintingPacket; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\particle\DestroyBlockParticle; use pocketmine\world\World; use function ceil; diff --git a/src/pocketmine/entity/projectile/Arrow.php b/src/pocketmine/entity/projectile/Arrow.php index f3c6c6a2a..ddc39e3a8 100644 --- a/src/pocketmine/entity/projectile/Arrow.php +++ b/src/pocketmine/entity/projectile/Arrow.php @@ -34,7 +34,7 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\sound\ArrowHitSound; use pocketmine\world\World; use function mt_rand; diff --git a/src/pocketmine/event/block/BlockBreakEvent.php b/src/pocketmine/event/block/BlockBreakEvent.php index 16d97b713..a01fc6ccb 100644 --- a/src/pocketmine/event/block/BlockBreakEvent.php +++ b/src/pocketmine/event/block/BlockBreakEvent.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player destroys a block somewhere in the world. diff --git a/src/pocketmine/event/block/BlockPlaceEvent.php b/src/pocketmine/event/block/BlockPlaceEvent.php index d7c51cf67..57aaacc37 100644 --- a/src/pocketmine/event/block/BlockPlaceEvent.php +++ b/src/pocketmine/event/block/BlockPlaceEvent.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player places a block diff --git a/src/pocketmine/event/block/SignChangeEvent.php b/src/pocketmine/event/block/SignChangeEvent.php index a69508942..70c7a789c 100644 --- a/src/pocketmine/event/block/SignChangeEvent.php +++ b/src/pocketmine/event/block/SignChangeEvent.php @@ -27,7 +27,7 @@ use pocketmine\block\Sign; use pocketmine\block\utils\SignText; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a sign's text is changed by a player. diff --git a/src/pocketmine/event/inventory/CraftItemEvent.php b/src/pocketmine/event/inventory/CraftItemEvent.php index 8630331b4..71ff4a1cb 100644 --- a/src/pocketmine/event/inventory/CraftItemEvent.php +++ b/src/pocketmine/event/inventory/CraftItemEvent.php @@ -29,7 +29,7 @@ use pocketmine\event\Event; use pocketmine\inventory\CraftingRecipe; use pocketmine\inventory\transaction\CraftingTransaction; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; class CraftItemEvent extends Event implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/inventory/InventoryCloseEvent.php b/src/pocketmine/event/inventory/InventoryCloseEvent.php index 929efb8d7..f123fc497 100644 --- a/src/pocketmine/event/inventory/InventoryCloseEvent.php +++ b/src/pocketmine/event/inventory/InventoryCloseEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\inventory; use pocketmine\inventory\Inventory; -use pocketmine\Player; +use pocketmine\player\Player; class InventoryCloseEvent extends InventoryEvent{ /** @var Player */ diff --git a/src/pocketmine/event/inventory/InventoryOpenEvent.php b/src/pocketmine/event/inventory/InventoryOpenEvent.php index 79ccb8ec2..1eb43eb74 100644 --- a/src/pocketmine/event/inventory/InventoryOpenEvent.php +++ b/src/pocketmine/event/inventory/InventoryOpenEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\inventory; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\inventory\Inventory; -use pocketmine\Player; +use pocketmine\player\Player; class InventoryOpenEvent extends InventoryEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerAchievementAwardedEvent.php b/src/pocketmine/event/player/PlayerAchievementAwardedEvent.php index da9ebea5d..7edcb7019 100644 --- a/src/pocketmine/event/player/PlayerAchievementAwardedEvent.php +++ b/src/pocketmine/event/player/PlayerAchievementAwardedEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player is awarded an achievement diff --git a/src/pocketmine/event/player/PlayerAnimationEvent.php b/src/pocketmine/event/player/PlayerAnimationEvent.php index af6ad556f..fb965fe6c 100644 --- a/src/pocketmine/event/player/PlayerAnimationEvent.php +++ b/src/pocketmine/event/player/PlayerAnimationEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player does an animation diff --git a/src/pocketmine/event/player/PlayerBedEnterEvent.php b/src/pocketmine/event/player/PlayerBedEnterEvent.php index be2ee766c..c25c28e26 100644 --- a/src/pocketmine/event/player/PlayerBedEnterEvent.php +++ b/src/pocketmine/event/player/PlayerBedEnterEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\block\Block; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerBedEnterEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerBedLeaveEvent.php b/src/pocketmine/event/player/PlayerBedLeaveEvent.php index 005bc750c..0231edd36 100644 --- a/src/pocketmine/event/player/PlayerBedLeaveEvent.php +++ b/src/pocketmine/event/player/PlayerBedLeaveEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\block\Block; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerBedLeaveEvent extends PlayerEvent{ /** @var Block */ diff --git a/src/pocketmine/event/player/PlayerBlockPickEvent.php b/src/pocketmine/event/player/PlayerBlockPickEvent.php index 9cbb09221..c365cda16 100644 --- a/src/pocketmine/event/player/PlayerBlockPickEvent.php +++ b/src/pocketmine/event/player/PlayerBlockPickEvent.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player middle-clicks on a block to get an item in creative mode. diff --git a/src/pocketmine/event/player/PlayerBucketEvent.php b/src/pocketmine/event/player/PlayerBucketEvent.php index 8aba82ae5..1080b533f 100644 --- a/src/pocketmine/event/player/PlayerBucketEvent.php +++ b/src/pocketmine/event/player/PlayerBucketEvent.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * @allowHandle diff --git a/src/pocketmine/event/player/PlayerChangeSkinEvent.php b/src/pocketmine/event/player/PlayerChangeSkinEvent.php index 5202ff974..0aa380244 100644 --- a/src/pocketmine/event/player/PlayerChangeSkinEvent.php +++ b/src/pocketmine/event/player/PlayerChangeSkinEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\entity\Skin; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player changes their skin in-game. diff --git a/src/pocketmine/event/player/PlayerChatEvent.php b/src/pocketmine/event/player/PlayerChatEvent.php index ca54c1a5d..9bafa319a 100644 --- a/src/pocketmine/event/player/PlayerChatEvent.php +++ b/src/pocketmine/event/player/PlayerChatEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\permission\PermissionManager; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\Server; /** diff --git a/src/pocketmine/event/player/PlayerCommandPreprocessEvent.php b/src/pocketmine/event/player/PlayerCommandPreprocessEvent.php index 2c8951c6f..1831e1d19 100644 --- a/src/pocketmine/event/player/PlayerCommandPreprocessEvent.php +++ b/src/pocketmine/event/player/PlayerCommandPreprocessEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player runs a command or chats, early in the process diff --git a/src/pocketmine/event/player/PlayerCreationEvent.php b/src/pocketmine/event/player/PlayerCreationEvent.php index a1d8b2a58..5976e0605 100644 --- a/src/pocketmine/event/player/PlayerCreationEvent.php +++ b/src/pocketmine/event/player/PlayerCreationEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Event; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\NetworkInterface; -use pocketmine\Player; +use pocketmine\player\Player; use function is_a; /** diff --git a/src/pocketmine/event/player/PlayerDataSaveEvent.php b/src/pocketmine/event/player/PlayerDataSaveEvent.php index cb23ad01d..5f08d4fb4 100644 --- a/src/pocketmine/event/player/PlayerDataSaveEvent.php +++ b/src/pocketmine/event/player/PlayerDataSaveEvent.php @@ -26,8 +26,8 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\event\Event; -use pocketmine\IPlayer; use pocketmine\nbt\tag\CompoundTag; +use pocketmine\player\IPlayer; use pocketmine\Server; /** diff --git a/src/pocketmine/event/player/PlayerDeathEvent.php b/src/pocketmine/event/player/PlayerDeathEvent.php index 74f41cf37..b9653d27d 100644 --- a/src/pocketmine/event/player/PlayerDeathEvent.php +++ b/src/pocketmine/event/player/PlayerDeathEvent.php @@ -32,7 +32,7 @@ use pocketmine\event\entity\EntityDeathEvent; use pocketmine\item\Item; use pocketmine\lang\TextContainer; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerDeathEvent extends EntityDeathEvent{ /** @var Player */ diff --git a/src/pocketmine/event/player/PlayerDropItemEvent.php b/src/pocketmine/event/player/PlayerDropItemEvent.php index 0cf50d995..46a88ec9e 100644 --- a/src/pocketmine/event/player/PlayerDropItemEvent.php +++ b/src/pocketmine/event/player/PlayerDropItemEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player tries to drop an item from its hotbar diff --git a/src/pocketmine/event/player/PlayerEditBookEvent.php b/src/pocketmine/event/player/PlayerEditBookEvent.php index ee0e0b252..074bf3f13 100644 --- a/src/pocketmine/event/player/PlayerEditBookEvent.php +++ b/src/pocketmine/event/player/PlayerEditBookEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\WritableBookBase; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerEditBookEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerEvent.php b/src/pocketmine/event/player/PlayerEvent.php index 77cce3444..8be23d350 100644 --- a/src/pocketmine/event/player/PlayerEvent.php +++ b/src/pocketmine/event/player/PlayerEvent.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\event\Event; -use pocketmine\Player; +use pocketmine\player\Player; abstract class PlayerEvent extends Event{ /** @var Player */ diff --git a/src/pocketmine/event/player/PlayerGameModeChangeEvent.php b/src/pocketmine/event/player/PlayerGameModeChangeEvent.php index 8e4415bd9..926d17d2b 100644 --- a/src/pocketmine/event/player/PlayerGameModeChangeEvent.php +++ b/src/pocketmine/event/player/PlayerGameModeChangeEvent.php @@ -25,8 +25,8 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\GameMode; -use pocketmine\Player; +use pocketmine\player\GameMode; +use pocketmine\player\Player; /** * Called when a player has its gamemode changed diff --git a/src/pocketmine/event/player/PlayerInteractEvent.php b/src/pocketmine/event/player/PlayerInteractEvent.php index 5b4a86cd3..3d01955fc 100644 --- a/src/pocketmine/event/player/PlayerInteractEvent.php +++ b/src/pocketmine/event/player/PlayerInteractEvent.php @@ -28,7 +28,7 @@ use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player interacts or touches a block (including air?) diff --git a/src/pocketmine/event/player/PlayerItemConsumeEvent.php b/src/pocketmine/event/player/PlayerItemConsumeEvent.php index aac350fd0..f08a5847f 100644 --- a/src/pocketmine/event/player/PlayerItemConsumeEvent.php +++ b/src/pocketmine/event/player/PlayerItemConsumeEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player eats something diff --git a/src/pocketmine/event/player/PlayerItemHeldEvent.php b/src/pocketmine/event/player/PlayerItemHeldEvent.php index 6f8100417..7fbd3f4cc 100644 --- a/src/pocketmine/event/player/PlayerItemHeldEvent.php +++ b/src/pocketmine/event/player/PlayerItemHeldEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerItemHeldEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerItemUseEvent.php b/src/pocketmine/event/player/PlayerItemUseEvent.php index c7aafd61b..ec804115a 100644 --- a/src/pocketmine/event/player/PlayerItemUseEvent.php +++ b/src/pocketmine/event/player/PlayerItemUseEvent.php @@ -27,7 +27,7 @@ use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player uses its held item, for example when throwing a projectile. diff --git a/src/pocketmine/event/player/PlayerJoinEvent.php b/src/pocketmine/event/player/PlayerJoinEvent.php index 36609ec82..64b7a6c2d 100644 --- a/src/pocketmine/event/player/PlayerJoinEvent.php +++ b/src/pocketmine/event/player/PlayerJoinEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\lang\TextContainer; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when the player spawns in the world after logging in, when they first see the terrain. diff --git a/src/pocketmine/event/player/PlayerJumpEvent.php b/src/pocketmine/event/player/PlayerJumpEvent.php index 85d8b3a4d..e3e67da38 100644 --- a/src/pocketmine/event/player/PlayerJumpEvent.php +++ b/src/pocketmine/event/player/PlayerJumpEvent.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\player; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player jumps diff --git a/src/pocketmine/event/player/PlayerKickEvent.php b/src/pocketmine/event/player/PlayerKickEvent.php index b199a9410..971269c2c 100644 --- a/src/pocketmine/event/player/PlayerKickEvent.php +++ b/src/pocketmine/event/player/PlayerKickEvent.php @@ -26,7 +26,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\lang\TextContainer; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player leaves the server diff --git a/src/pocketmine/event/player/PlayerLoginEvent.php b/src/pocketmine/event/player/PlayerLoginEvent.php index 298f2a1b2..979750090 100644 --- a/src/pocketmine/event/player/PlayerLoginEvent.php +++ b/src/pocketmine/event/player/PlayerLoginEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called after the player has successfully authenticated, before it spawns. The player is on the loading screen when diff --git a/src/pocketmine/event/player/PlayerMoveEvent.php b/src/pocketmine/event/player/PlayerMoveEvent.php index f949abd67..7678eed05 100644 --- a/src/pocketmine/event/player/PlayerMoveEvent.php +++ b/src/pocketmine/event/player/PlayerMoveEvent.php @@ -25,8 +25,8 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; +use pocketmine\player\Player; use pocketmine\world\Location; -use pocketmine\Player; class PlayerMoveEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerPreLoginEvent.php b/src/pocketmine/event/player/PlayerPreLoginEvent.php index fef54b7f9..9a566813e 100644 --- a/src/pocketmine/event/player/PlayerPreLoginEvent.php +++ b/src/pocketmine/event/player/PlayerPreLoginEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\event\Event; -use pocketmine\PlayerInfo; +use pocketmine\player\PlayerInfo; use function array_keys; /** diff --git a/src/pocketmine/event/player/PlayerQuitEvent.php b/src/pocketmine/event/player/PlayerQuitEvent.php index 24460db30..028548b15 100644 --- a/src/pocketmine/event/player/PlayerQuitEvent.php +++ b/src/pocketmine/event/player/PlayerQuitEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\lang\TranslationContainer; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player leaves the server diff --git a/src/pocketmine/event/player/PlayerRespawnEvent.php b/src/pocketmine/event/player/PlayerRespawnEvent.php index 1df9eac36..926da5e17 100644 --- a/src/pocketmine/event/player/PlayerRespawnEvent.php +++ b/src/pocketmine/event/player/PlayerRespawnEvent.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\event\player; +use pocketmine\player\Player; use pocketmine\world\Position; -use pocketmine\Player; /** * Called when a player is respawned diff --git a/src/pocketmine/event/player/PlayerToggleFlightEvent.php b/src/pocketmine/event/player/PlayerToggleFlightEvent.php index 298947c42..1547e7ed2 100644 --- a/src/pocketmine/event/player/PlayerToggleFlightEvent.php +++ b/src/pocketmine/event/player/PlayerToggleFlightEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerToggleFlightEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerToggleSneakEvent.php b/src/pocketmine/event/player/PlayerToggleSneakEvent.php index 8ba0ac599..14dd0d4fe 100644 --- a/src/pocketmine/event/player/PlayerToggleSneakEvent.php +++ b/src/pocketmine/event/player/PlayerToggleSneakEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerToggleSneakEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerToggleSprintEvent.php b/src/pocketmine/event/player/PlayerToggleSprintEvent.php index 323df0120..67bae1424 100644 --- a/src/pocketmine/event/player/PlayerToggleSprintEvent.php +++ b/src/pocketmine/event/player/PlayerToggleSprintEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerToggleSprintEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/PlayerTransferEvent.php b/src/pocketmine/event/player/PlayerTransferEvent.php index 31baa90dc..082dd619b 100644 --- a/src/pocketmine/event/player/PlayerTransferEvent.php +++ b/src/pocketmine/event/player/PlayerTransferEvent.php @@ -25,7 +25,7 @@ namespace pocketmine\event\player; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerTransferEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; diff --git a/src/pocketmine/event/player/cheat/PlayerIllegalMoveEvent.php b/src/pocketmine/event/player/cheat/PlayerIllegalMoveEvent.php index 454cb7f38..3596f6d11 100644 --- a/src/pocketmine/event/player/cheat/PlayerIllegalMoveEvent.php +++ b/src/pocketmine/event/player/cheat/PlayerIllegalMoveEvent.php @@ -27,7 +27,7 @@ namespace pocketmine\event\player\cheat; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; /** * Called when a player attempts to perform movement cheats such as clipping through blocks. diff --git a/src/pocketmine/event/server/QueryRegenerateEvent.php b/src/pocketmine/event/server/QueryRegenerateEvent.php index d7e49c22f..fc007edca 100644 --- a/src/pocketmine/event/server/QueryRegenerateEvent.php +++ b/src/pocketmine/event/server/QueryRegenerateEvent.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\server; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; use pocketmine\utils\Binary; diff --git a/src/pocketmine/form/Form.php b/src/pocketmine/form/Form.php index e4a2fcc5a..1e6b43dd7 100644 --- a/src/pocketmine/form/Form.php +++ b/src/pocketmine/form/Form.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\form; -use pocketmine\Player; +use pocketmine\player\Player; /** * Form implementations must implement this interface to be able to utilize the Player form-sending mechanism. diff --git a/src/pocketmine/inventory/AnvilInventory.php b/src/pocketmine/inventory/AnvilInventory.php index 94f327212..95b932d9c 100644 --- a/src/pocketmine/inventory/AnvilInventory.php +++ b/src/pocketmine/inventory/AnvilInventory.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\inventory; use pocketmine\network\mcpe\protocol\types\WindowTypes; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\Position; class AnvilInventory extends ContainerInventory{ diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php index b71ac0453..dc2948662 100644 --- a/src/pocketmine/inventory/BaseInventory.php +++ b/src/pocketmine/inventory/BaseInventory.php @@ -25,7 +25,7 @@ namespace pocketmine\inventory; use pocketmine\item\Item; use pocketmine\item\ItemFactory; -use pocketmine\Player; +use pocketmine\player\Player; use function array_slice; use function count; use function max; diff --git a/src/pocketmine/inventory/ChestInventory.php b/src/pocketmine/inventory/ChestInventory.php index 539e93bc9..f19ec2517 100644 --- a/src/pocketmine/inventory/ChestInventory.php +++ b/src/pocketmine/inventory/ChestInventory.php @@ -26,7 +26,7 @@ namespace pocketmine\inventory; use pocketmine\block\tile\Chest; use pocketmine\network\mcpe\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\types\WindowTypes; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\sound\ChestCloseSound; use pocketmine\world\sound\ChestOpenSound; use pocketmine\world\sound\Sound; diff --git a/src/pocketmine/inventory/ContainerInventory.php b/src/pocketmine/inventory/ContainerInventory.php index cd4ad6ddd..48a4a2be5 100644 --- a/src/pocketmine/inventory/ContainerInventory.php +++ b/src/pocketmine/inventory/ContainerInventory.php @@ -27,7 +27,7 @@ use pocketmine\entity\Entity; use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\ContainerOpenPacket; -use pocketmine\Player; +use pocketmine\player\Player; abstract class ContainerInventory extends BaseInventory{ /** @var Vector3 */ diff --git a/src/pocketmine/inventory/CraftingGrid.php b/src/pocketmine/inventory/CraftingGrid.php index bd29d8c8b..ea8663dd9 100644 --- a/src/pocketmine/inventory/CraftingGrid.php +++ b/src/pocketmine/inventory/CraftingGrid.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\inventory; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; use function max; use function min; use const PHP_INT_MAX; diff --git a/src/pocketmine/inventory/DoubleChestInventory.php b/src/pocketmine/inventory/DoubleChestInventory.php index bab524746..a4861a290 100644 --- a/src/pocketmine/inventory/DoubleChestInventory.php +++ b/src/pocketmine/inventory/DoubleChestInventory.php @@ -25,7 +25,7 @@ namespace pocketmine\inventory; use pocketmine\block\tile\Chest; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; use function array_merge; use function count; diff --git a/src/pocketmine/inventory/EnchantInventory.php b/src/pocketmine/inventory/EnchantInventory.php index 30d4994b1..d4510767b 100644 --- a/src/pocketmine/inventory/EnchantInventory.php +++ b/src/pocketmine/inventory/EnchantInventory.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\inventory; use pocketmine\network\mcpe\protocol\types\WindowTypes; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\Position; class EnchantInventory extends ContainerInventory{ diff --git a/src/pocketmine/inventory/Inventory.php b/src/pocketmine/inventory/Inventory.php index e07318db2..0224ba4cf 100644 --- a/src/pocketmine/inventory/Inventory.php +++ b/src/pocketmine/inventory/Inventory.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace pocketmine\inventory; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; interface Inventory{ public const MAX_STACK = 64; diff --git a/src/pocketmine/inventory/PlayerCursorInventory.php b/src/pocketmine/inventory/PlayerCursorInventory.php index a016d3b4f..07ff443f7 100644 --- a/src/pocketmine/inventory/PlayerCursorInventory.php +++ b/src/pocketmine/inventory/PlayerCursorInventory.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\inventory; -use pocketmine\Player; +use pocketmine\player\Player; class PlayerCursorInventory extends BaseInventory{ /** @var Player */ diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php index 909fd3ff2..9c3f1f2c5 100644 --- a/src/pocketmine/inventory/PlayerInventory.php +++ b/src/pocketmine/inventory/PlayerInventory.php @@ -27,7 +27,7 @@ use pocketmine\entity\Human; use pocketmine\item\Item; use pocketmine\network\mcpe\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\types\ContainerIds; -use pocketmine\Player; +use pocketmine\player\Player; use function in_array; use function is_array; diff --git a/src/pocketmine/inventory/transaction/InventoryTransaction.php b/src/pocketmine/inventory/transaction/InventoryTransaction.php index 199e8aa27..ea73c22fc 100644 --- a/src/pocketmine/inventory/transaction/InventoryTransaction.php +++ b/src/pocketmine/inventory/transaction/InventoryTransaction.php @@ -28,7 +28,7 @@ use pocketmine\inventory\Inventory; use pocketmine\inventory\transaction\action\InventoryAction; use pocketmine\inventory\transaction\action\SlotChangeAction; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; use function array_keys; use function assert; use function count; diff --git a/src/pocketmine/inventory/transaction/action/CreateItemAction.php b/src/pocketmine/inventory/transaction/action/CreateItemAction.php index 62450dbbe..2ecd868a6 100644 --- a/src/pocketmine/inventory/transaction/action/CreateItemAction.php +++ b/src/pocketmine/inventory/transaction/action/CreateItemAction.php @@ -26,7 +26,7 @@ namespace pocketmine\inventory\transaction\action; use pocketmine\inventory\CreativeInventory; use pocketmine\item\Item; use pocketmine\item\ItemFactory; -use pocketmine\Player; +use pocketmine\player\Player; /** * This action is used by creative players to balance transactions involving the creative inventory menu. diff --git a/src/pocketmine/inventory/transaction/action/DestroyItemAction.php b/src/pocketmine/inventory/transaction/action/DestroyItemAction.php index b97454e56..d59485c07 100644 --- a/src/pocketmine/inventory/transaction/action/DestroyItemAction.php +++ b/src/pocketmine/inventory/transaction/action/DestroyItemAction.php @@ -25,7 +25,7 @@ namespace pocketmine\inventory\transaction\action; use pocketmine\item\Item; use pocketmine\item\ItemFactory; -use pocketmine\Player; +use pocketmine\player\Player; /** * This action type shows up when a creative player puts an item into the creative inventory menu to destroy it. diff --git a/src/pocketmine/inventory/transaction/action/DropItemAction.php b/src/pocketmine/inventory/transaction/action/DropItemAction.php index 3ffab2a72..6c8db64a0 100644 --- a/src/pocketmine/inventory/transaction/action/DropItemAction.php +++ b/src/pocketmine/inventory/transaction/action/DropItemAction.php @@ -26,7 +26,7 @@ namespace pocketmine\inventory\transaction\action; use pocketmine\event\player\PlayerDropItemEvent; use pocketmine\item\Item; use pocketmine\item\ItemFactory; -use pocketmine\Player; +use pocketmine\player\Player; /** * Represents an action involving dropping an item into the world. diff --git a/src/pocketmine/inventory/transaction/action/InventoryAction.php b/src/pocketmine/inventory/transaction/action/InventoryAction.php index 326dbe440..e5b9c2dad 100644 --- a/src/pocketmine/inventory/transaction/action/InventoryAction.php +++ b/src/pocketmine/inventory/transaction/action/InventoryAction.php @@ -25,7 +25,7 @@ namespace pocketmine\inventory\transaction\action; use pocketmine\inventory\transaction\InventoryTransaction; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Represents an action involving a change that applies in some way to an inventory or other item-source. diff --git a/src/pocketmine/inventory/transaction/action/SlotChangeAction.php b/src/pocketmine/inventory/transaction/action/SlotChangeAction.php index 8aaa70e15..1ec24af63 100644 --- a/src/pocketmine/inventory/transaction/action/SlotChangeAction.php +++ b/src/pocketmine/inventory/transaction/action/SlotChangeAction.php @@ -26,7 +26,7 @@ namespace pocketmine\inventory\transaction\action; use pocketmine\inventory\Inventory; use pocketmine\inventory\transaction\InventoryTransaction; use pocketmine\item\Item; -use pocketmine\Player; +use pocketmine\player\Player; /** * Represents an action causing a change in an inventory slot. diff --git a/src/pocketmine/item/Armor.php b/src/pocketmine/item/Armor.php index f2ceb5adf..99454c8be 100644 --- a/src/pocketmine/item/Armor.php +++ b/src/pocketmine/item/Armor.php @@ -31,7 +31,7 @@ use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\ProtectionEnchantment; use pocketmine\math\Vector3; use pocketmine\nbt\tag\IntTag; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Binary; use pocketmine\utils\Color; use function lcg_value; diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php index 51ed4dcda..541084446 100644 --- a/src/pocketmine/item/Bow.php +++ b/src/pocketmine/item/Bow.php @@ -29,7 +29,7 @@ use pocketmine\entity\projectile\Projectile; use pocketmine\event\entity\EntityShootBowEvent; use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\item\enchantment\Enchantment; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\sound\BowShootSound; use function intdiv; use function min; diff --git a/src/pocketmine/item/Bucket.php b/src/pocketmine/item/Bucket.php index 095ae7fd9..3497b9a4b 100644 --- a/src/pocketmine/item/Bucket.php +++ b/src/pocketmine/item/Bucket.php @@ -29,7 +29,7 @@ use pocketmine\block\BlockLegacyIds; use pocketmine\block\Liquid; use pocketmine\event\player\PlayerBucketFillEvent; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class Bucket extends Item{ diff --git a/src/pocketmine/item/FlintSteel.php b/src/pocketmine/item/FlintSteel.php index 3478ce5a5..7d8e07119 100644 --- a/src/pocketmine/item/FlintSteel.php +++ b/src/pocketmine/item/FlintSteel.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\sound\FlintSteelSound; use function assert; diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index 3c551c9a2..0f6257b5f 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -43,7 +43,7 @@ use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\TreeRoot; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Binary; use function array_map; use function base64_decode; diff --git a/src/pocketmine/item/LiquidBucket.php b/src/pocketmine/item/LiquidBucket.php index 5ec0efe31..1f2b74e3c 100644 --- a/src/pocketmine/item/LiquidBucket.php +++ b/src/pocketmine/item/LiquidBucket.php @@ -29,7 +29,7 @@ use pocketmine\block\Lava; use pocketmine\block\Liquid; use pocketmine\event\player\PlayerBucketEmptyEvent; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; class LiquidBucket extends Item{ /** @var int|null */ diff --git a/src/pocketmine/item/PaintingItem.php b/src/pocketmine/item/PaintingItem.php index 7018b181e..939603337 100644 --- a/src/pocketmine/item/PaintingItem.php +++ b/src/pocketmine/item/PaintingItem.php @@ -30,7 +30,7 @@ use pocketmine\entity\object\PaintingMotive; use pocketmine\math\Facing; use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\LevelEventPacket; -use pocketmine\Player; +use pocketmine\player\Player; use function array_rand; class PaintingItem extends Item{ diff --git a/src/pocketmine/item/ProjectileItem.php b/src/pocketmine/item/ProjectileItem.php index 66adef0b0..b0a939a89 100644 --- a/src/pocketmine/item/ProjectileItem.php +++ b/src/pocketmine/item/ProjectileItem.php @@ -26,11 +26,11 @@ namespace pocketmine\item; use pocketmine\entity\EntityFactory; use pocketmine\entity\projectile\Throwable; use pocketmine\event\entity\ProjectileLaunchEvent; -use pocketmine\world\sound\ThrowSound; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Utils; +use pocketmine\world\sound\ThrowSound; abstract class ProjectileItem extends Item{ diff --git a/src/pocketmine/item/SpawnEgg.php b/src/pocketmine/item/SpawnEgg.php index f1a52ef89..f09ceee09 100644 --- a/src/pocketmine/item/SpawnEgg.php +++ b/src/pocketmine/item/SpawnEgg.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; use pocketmine\entity\Entity; use pocketmine\entity\EntityFactory; use pocketmine\math\Vector3; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\Utils; use function lcg_value; diff --git a/src/pocketmine/metadata/PlayerMetadataStore.php b/src/pocketmine/metadata/PlayerMetadataStore.php index 0c2a96798..3d6880444 100644 --- a/src/pocketmine/metadata/PlayerMetadataStore.php +++ b/src/pocketmine/metadata/PlayerMetadataStore.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\metadata; -use pocketmine\IPlayer; +use pocketmine\player\IPlayer; use pocketmine\plugin\Plugin; use function strtolower; diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php index 5acdf3b48..97f952ef9 100644 --- a/src/pocketmine/network/mcpe/NetworkSession.php +++ b/src/pocketmine/network/mcpe/NetworkSession.php @@ -29,7 +29,6 @@ use pocketmine\event\player\PlayerCreationEvent; use pocketmine\event\server\DataPacketReceiveEvent; use pocketmine\event\server\DataPacketSendEvent; use pocketmine\form\Form; -use pocketmine\GameMode; use pocketmine\inventory\CreativeInventory; use pocketmine\inventory\Inventory; use pocketmine\math\Vector3; @@ -74,8 +73,9 @@ use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; use pocketmine\network\NetworkInterface; use pocketmine\network\NetworkSessionManager; -use pocketmine\Player; -use pocketmine\PlayerInfo; +use pocketmine\player\GameMode; +use pocketmine\player\Player; +use pocketmine\player\PlayerInfo; use pocketmine\Server; use pocketmine\timings\Timings; use pocketmine\utils\BinaryDataException; diff --git a/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php b/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php index 81b7e86ff..549b0f27d 100644 --- a/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php +++ b/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\handler; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\RespawnPacket; -use pocketmine\Player; +use pocketmine\player\Player; class DeathPacketHandler extends PacketHandler{ diff --git a/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php index 25415d759..ffa482680 100644 --- a/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php +++ b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php @@ -77,7 +77,7 @@ use pocketmine\network\mcpe\protocol\types\NormalTransactionData; use pocketmine\network\mcpe\protocol\types\ReleaseItemTransactionData; use pocketmine\network\mcpe\protocol\types\UseItemOnEntityTransactionData; use pocketmine\network\mcpe\protocol\types\UseItemTransactionData; -use pocketmine\Player; +use pocketmine\player\Player; use function array_push; use function base64_encode; use function fmod; diff --git a/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php b/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php index c9c4c19ad..76bd38f46 100644 --- a/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php +++ b/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php @@ -31,8 +31,8 @@ use pocketmine\network\mcpe\ProcessLoginTask; use pocketmine\network\mcpe\protocol\LoginPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\ProtocolInfo; -use pocketmine\Player; -use pocketmine\PlayerInfo; +use pocketmine\player\Player; +use pocketmine\player\PlayerInfo; use pocketmine\Server; use pocketmine\utils\UUID; use function base64_decode; diff --git a/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php index 701c117b0..1cab9d63c 100644 --- a/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php +++ b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php @@ -30,7 +30,7 @@ use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; use pocketmine\network\mcpe\protocol\SetLocalPlayerAsInitializedPacket; use pocketmine\network\mcpe\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\types\DimensionIds; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\Server; /** diff --git a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php index 8318d6159..7d689f73e 100644 --- a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php +++ b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php @@ -33,7 +33,7 @@ use pocketmine\inventory\transaction\action\SlotChangeAction; use pocketmine\item\Item; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\NetworkBinaryStream; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\utils\BinaryDataException; class NetworkInventoryAction{ diff --git a/src/pocketmine/Achievement.php b/src/pocketmine/player/Achievement.php similarity index 98% rename from src/pocketmine/Achievement.php rename to src/pocketmine/player/Achievement.php index 41049f4c5..76414095a 100644 --- a/src/pocketmine/Achievement.php +++ b/src/pocketmine/player/Achievement.php @@ -21,9 +21,10 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\lang\TranslationContainer; +use pocketmine\Server; use pocketmine\utils\TextFormat; /** diff --git a/src/pocketmine/GameMode.php b/src/pocketmine/player/GameMode.php similarity index 99% rename from src/pocketmine/GameMode.php rename to src/pocketmine/player/GameMode.php index 409ebe4b0..33a37fc80 100644 --- a/src/pocketmine/GameMode.php +++ b/src/pocketmine/player/GameMode.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\utils\EnumTrait; diff --git a/src/pocketmine/IPlayer.php b/src/pocketmine/player/IPlayer.php similarity index 98% rename from src/pocketmine/IPlayer.php rename to src/pocketmine/player/IPlayer.php index 4d007a188..5ba416891 100644 --- a/src/pocketmine/IPlayer.php +++ b/src/pocketmine/player/IPlayer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\permission\ServerOperator; diff --git a/src/pocketmine/OfflinePlayer.php b/src/pocketmine/player/OfflinePlayer.php similarity index 98% rename from src/pocketmine/OfflinePlayer.php rename to src/pocketmine/player/OfflinePlayer.php index 8de4013fe..81a77d250 100644 --- a/src/pocketmine/OfflinePlayer.php +++ b/src/pocketmine/player/OfflinePlayer.php @@ -21,13 +21,14 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\metadata\Metadatable; use pocketmine\metadata\MetadataValue; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\LongTag; use pocketmine\plugin\Plugin; +use pocketmine\Server; class OfflinePlayer implements IPlayer, Metadatable{ diff --git a/src/pocketmine/Player.php b/src/pocketmine/player/Player.php similarity index 99% rename from src/pocketmine/Player.php rename to src/pocketmine/player/Player.php index 2522e5d16..359966821 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/player/Player.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\block\Bed; use pocketmine\block\BlockFactory; @@ -104,6 +104,7 @@ use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissibleDelegateTrait; use pocketmine\permission\PermissionManager; use pocketmine\plugin\Plugin; +use pocketmine\Server; use pocketmine\timings\Timings; use pocketmine\utils\TextFormat; use pocketmine\utils\UUID; diff --git a/src/pocketmine/PlayerInfo.php b/src/pocketmine/player/PlayerInfo.php similarity index 98% rename from src/pocketmine/PlayerInfo.php rename to src/pocketmine/player/PlayerInfo.php index f0363bd2f..423e784e1 100644 --- a/src/pocketmine/PlayerInfo.php +++ b/src/pocketmine/player/PlayerInfo.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine; +namespace pocketmine\player; use pocketmine\entity\Skin; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/scheduler/SendUsageTask.php b/src/pocketmine/scheduler/SendUsageTask.php index 3f66a0e07..1d00766c5 100644 --- a/src/pocketmine/scheduler/SendUsageTask.php +++ b/src/pocketmine/scheduler/SendUsageTask.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\scheduler; use pocketmine\network\mcpe\protocol\ProtocolInfo; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\Server; use pocketmine\utils\Internet; use pocketmine\utils\Process; diff --git a/src/pocketmine/timings/Timings.php b/src/pocketmine/timings/Timings.php index d5b28a0ff..6fd130279 100644 --- a/src/pocketmine/timings/Timings.php +++ b/src/pocketmine/timings/Timings.php @@ -27,7 +27,7 @@ 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\player\Player; use pocketmine\scheduler\TaskHandler; use function dechex; diff --git a/src/pocketmine/updater/AutoUpdater.php b/src/pocketmine/updater/AutoUpdater.php index 15ad63ae5..3b80d5cc5 100644 --- a/src/pocketmine/updater/AutoUpdater.php +++ b/src/pocketmine/updater/AutoUpdater.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\updater; use pocketmine\event\server\UpdateNotifyEvent; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\Server; use pocketmine\utils\TextFormat; use pocketmine\utils\VersionString; diff --git a/src/pocketmine/world/World.php b/src/pocketmine/world/World.php index 4b9d57e7c..908df2ef7 100644 --- a/src/pocketmine/world/World.php +++ b/src/pocketmine/world/World.php @@ -46,7 +46,6 @@ use pocketmine\event\world\ChunkPopulateEvent; use pocketmine\event\world\ChunkUnloadEvent; use pocketmine\event\world\SpawnChangeEvent; use pocketmine\event\world\WorldSaveEvent; -use pocketmine\GameMode; use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\item\ItemUseResult; @@ -64,7 +63,7 @@ use pocketmine\network\mcpe\protocol\SetDifficultyPacket; use pocketmine\network\mcpe\protocol\SetTimePacket; use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping; use pocketmine\network\mcpe\protocol\UpdateBlockPacket; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; use pocketmine\timings\Timings; diff --git a/src/pocketmine/world/format/Chunk.php b/src/pocketmine/world/format/Chunk.php index e6906a6c1..e6b2c2e6c 100644 --- a/src/pocketmine/world/format/Chunk.php +++ b/src/pocketmine/world/format/Chunk.php @@ -33,7 +33,7 @@ use pocketmine\block\tile\TileFactory; use pocketmine\entity\Entity; use pocketmine\entity\EntityFactory; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\Player; +use pocketmine\player\Player; use pocketmine\world\World; use function array_fill; use function array_filter;