From a84f756fd5d5dfc96dc2aa96d684431a33a70912 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 11 Mar 2014 20:47:31 +0100 Subject: [PATCH] Optimize Imports --- src/PocketMine/BlockAPI.php | 2 +- src/PocketMine/Player.php | 6 ++---- src/PocketMine/block/Bed.php | 2 +- src/PocketMine/block/Beetroot.php | 2 +- src/PocketMine/block/Block.php | 2 +- src/PocketMine/block/BrownMushroom.php | 2 +- src/PocketMine/block/BurningFurnace.php | 2 +- src/PocketMine/block/Cactus.php | 4 ++-- src/PocketMine/block/Cake.php | 2 +- src/PocketMine/block/Carpet.php | 2 +- src/PocketMine/block/Carrot.php | 2 +- src/PocketMine/block/Chest.php | 2 +- src/PocketMine/block/CyanFlower.php | 2 +- src/PocketMine/block/Dandelion.php | 2 +- src/PocketMine/block/Door.php | 4 ++-- src/PocketMine/block/Fallable.php | 4 ++-- src/PocketMine/block/Fire.php | 2 +- src/PocketMine/block/Generic.php | 4 ++-- src/PocketMine/block/GlowingRedstoneOre.php | 2 +- src/PocketMine/block/Grass.php | 2 +- src/PocketMine/block/Ladder.php | 2 +- src/PocketMine/block/Lava.php | 4 ++-- src/PocketMine/block/Leaves.php | 4 ++-- src/PocketMine/block/MelonStem.php | 2 +- src/PocketMine/block/Potato.php | 2 +- src/PocketMine/block/PumpkinStem.php | 2 +- src/PocketMine/block/RedMushroom.php | 2 +- src/PocketMine/block/RedstoneOre.php | 2 +- src/PocketMine/block/Sapling.php | 4 ++-- src/PocketMine/block/SignPost.php | 2 +- src/PocketMine/block/SnowLayer.php | 2 +- src/PocketMine/block/Sugarcane.php | 4 ++-- src/PocketMine/block/TallGrass.php | 2 +- src/PocketMine/block/Torch.php | 2 +- src/PocketMine/block/Water.php | 4 ++-- src/PocketMine/block/Wheat.php | 2 +- src/PocketMine/entity/Entity.php | 2 +- src/PocketMine/entity/Human.php | 4 ++-- src/PocketMine/event/entity/EntityArmorChangeEvent.php | 6 +++--- .../event/entity/EntityInventoryChangeEvent.php | 6 +++--- src/PocketMine/event/entity/EntityLevelChangeEvent.php | 6 +++--- src/PocketMine/event/entity/EntityMotionEvent.php | 6 +++--- src/PocketMine/event/entity/EntityMoveEvent.php | 6 +++--- .../event/player/PlayerEquipmentChangeEvent.php | 4 ++-- src/PocketMine/event/server/DataPacketReceiveEvent.php | 4 ++-- src/PocketMine/event/server/DataPacketSendEvent.php | 4 ++-- src/PocketMine/event/server/PacketReceiveEvent.php | 2 +- src/PocketMine/event/server/PacketSendEvent.php | 2 +- src/PocketMine/event/tile/TileInventoryChangeEvent.php | 2 +- src/PocketMine/item/Bucket.php | 2 +- src/PocketMine/item/FlintSteel.php | 2 +- src/PocketMine/item/Item.php | 2 +- src/PocketMine/item/Painting.php | 2 +- src/PocketMine/item/SpawnEgg.php | 2 +- src/PocketMine/level/Explosion.php | 2 +- src/PocketMine/level/Level.php | 10 +++++----- src/PocketMine/level/LevelImport.php | 2 +- src/PocketMine/level/WorldGenerator.php | 2 +- src/PocketMine/level/generator/Flat.php | 2 +- src/PocketMine/level/generator/Generator.php | 2 +- src/PocketMine/level/generator/Normal.php | 2 +- src/PocketMine/level/generator/object/BigTree.php | 2 +- src/PocketMine/level/generator/object/Ore.php | 2 +- src/PocketMine/level/generator/object/PineTree.php | 2 +- src/PocketMine/level/generator/object/Pond.php | 2 +- src/PocketMine/level/generator/object/SmallTree.php | 2 +- src/PocketMine/level/generator/object/SpruceTree.php | 2 +- src/PocketMine/level/generator/object/TallGrass.php | 2 +- src/PocketMine/level/generator/object/Tree.php | 2 +- src/PocketMine/level/generator/populator/Mineshaft.php | 2 +- src/PocketMine/level/generator/populator/Ore.php | 2 +- src/PocketMine/level/generator/populator/Pond.php | 2 +- src/PocketMine/level/generator/populator/Populator.php | 2 +- src/PocketMine/level/generator/populator/TallGrass.php | 2 +- src/PocketMine/level/generator/populator/Tree.php | 2 +- src/PocketMine/nbt/NBT.php | 2 +- src/PocketMine/network/Handler.php | 2 +- src/PocketMine/network/protocol/DataPacket.php | 2 +- src/PocketMine/network/query/QueryHandler.php | 2 +- src/PocketMine/network/query/QueryPacket.php | 2 +- src/PocketMine/network/raknet/Packet.php | 2 +- src/PocketMine/pmf/LevelFormat.php | 2 +- src/PocketMine/recipes/Crafting.php | 2 +- src/PocketMine/tile/Chest.php | 2 +- src/PocketMine/tile/Container.php | 2 +- src/PocketMine/tile/Furnace.php | 2 +- src/PocketMine/tile/Sign.php | 4 ++-- src/PocketMine/tile/Tile.php | 2 +- 88 files changed, 117 insertions(+), 119 deletions(-) diff --git a/src/PocketMine/BlockAPI.php b/src/PocketMine/BlockAPI.php index 3bb1ef670..ba50f126d 100644 --- a/src/PocketMine/BlockAPI.php +++ b/src/PocketMine/BlockAPI.php @@ -21,9 +21,9 @@ namespace PocketMine; -use PocketMine\Level\Level; use PocketMine\Block\Block; use PocketMine\Item\Item; +use PocketMine\Level\Level; use PocketMine\Level\Position; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Int; diff --git a/src/PocketMine/Player.php b/src/PocketMine/Player.php index 304e011f6..c6145ad47 100644 --- a/src/PocketMine/Player.php +++ b/src/PocketMine/Player.php @@ -21,13 +21,11 @@ namespace PocketMine; -use PocketMine\Level\Level; use PocketMine\Entity\RealHuman; -use PocketMine\Event; use PocketMine\Event\EventHandler; -use PocketMine\Event\Server\DataPacketReceiveEvent; -use PocketMine\Event\Server\DataPacketSendEvent; +use PocketMine\Event; use PocketMine\Item\Item; +use PocketMine\Level\Level; use PocketMine\Level\Position; use PocketMine\Math\Vector3 as Vector3; use PocketMine\NBT\NBT; diff --git a/src/PocketMine/block/Bed.php b/src/PocketMine/block/Bed.php index aaec5d0a0..230da2ef7 100644 --- a/src/PocketMine/block/Bed.php +++ b/src/PocketMine/block/Bed.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Network\Protocol\ChatPacket; use PocketMine\ServerAPI; +use PocketMine; class Bed extends Transparent{ public function __construct($type = 0){ diff --git a/src/PocketMine/block/Beetroot.php b/src/PocketMine/block/Beetroot.php index 57243f3c1..3660acb9d 100644 --- a/src/PocketMine/block/Beetroot.php +++ b/src/PocketMine/block/Beetroot.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Beetroot extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Block.php b/src/PocketMine/block/Block.php index 016e808b0..bfcdb58e6 100644 --- a/src/PocketMine/block/Block.php +++ b/src/PocketMine/block/Block.php @@ -24,11 +24,11 @@ */ namespace PocketMine\Block; +use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; use PocketMine\Level\Position; use PocketMine\Player; -use PocketMine; abstract class Block extends Position{ const AIR = 0; diff --git a/src/PocketMine/block/BrownMushroom.php b/src/PocketMine/block/BrownMushroom.php index f45eb40e8..15fcbf422 100644 --- a/src/PocketMine/block/BrownMushroom.php +++ b/src/PocketMine/block/BrownMushroom.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class BrownMushroom extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/BurningFurnace.php b/src/PocketMine/block/BurningFurnace.php index 5359d23b3..3e3311cc8 100644 --- a/src/PocketMine/block/BurningFurnace.php +++ b/src/PocketMine/block/BurningFurnace.php @@ -21,7 +21,6 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Enum; @@ -29,6 +28,7 @@ use PocketMine\NBT\Tag\Int; use PocketMine\NBT\Tag\String; use PocketMine\Tile\Furnace; use PocketMine\Tile\Tile; +use PocketMine; class BurningFurnace extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Cactus.php b/src/PocketMine/block/Cactus.php index a1d25adad..f910c896c 100644 --- a/src/PocketMine/block/Cactus.php +++ b/src/PocketMine/block/Cactus.php @@ -21,11 +21,11 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; +use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\ServerAPI; -use PocketMine\Level\Level; +use PocketMine; class Cactus extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Cake.php b/src/PocketMine/block/Cake.php index 0ab2cd5ed..ccefa425f 100644 --- a/src/PocketMine/block/Cake.php +++ b/src/PocketMine/block/Cake.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Cake extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Carpet.php b/src/PocketMine/block/Carpet.php index 9bccb5fb0..d71f3d385 100644 --- a/src/PocketMine/block/Carpet.php +++ b/src/PocketMine/block/Carpet.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Carpet extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Carrot.php b/src/PocketMine/block/Carrot.php index 6f18bb9de..97910dd8f 100644 --- a/src/PocketMine/block/Carrot.php +++ b/src/PocketMine/block/Carrot.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Carrot extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Chest.php b/src/PocketMine/block/Chest.php index 049b96a94..d7a771ca4 100644 --- a/src/PocketMine/block/Chest.php +++ b/src/PocketMine/block/Chest.php @@ -21,7 +21,6 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Enum; @@ -29,6 +28,7 @@ use PocketMine\NBT\Tag\Int; use PocketMine\NBT\Tag\String; use PocketMine\Tile\Chest as TileChest; use PocketMine\Tile\Tile; +use PocketMine; class Chest extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/CyanFlower.php b/src/PocketMine/block/CyanFlower.php index 35801adc8..785093611 100644 --- a/src/PocketMine/block/CyanFlower.php +++ b/src/PocketMine/block/CyanFlower.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class CyanFlower extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/Dandelion.php b/src/PocketMine/block/Dandelion.php index cc6abce3f..4599bb858 100644 --- a/src/PocketMine/block/Dandelion.php +++ b/src/PocketMine/block/Dandelion.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Dandelion extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/Door.php b/src/PocketMine/block/Door.php index 2c47416c2..823ac2078 100644 --- a/src/PocketMine/block/Door.php +++ b/src/PocketMine/block/Door.php @@ -21,11 +21,11 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; +use PocketMine\Level\Level; use PocketMine\Network\Protocol\LevelEventPacket; use PocketMine\Player; -use PocketMine\Level\Level; +use PocketMine; abstract class Door extends Transparent{ diff --git a/src/PocketMine/block/Fallable.php b/src/PocketMine/block/Fallable.php index b8795d5bf..5fb2b766f 100644 --- a/src/PocketMine/block/Fallable.php +++ b/src/PocketMine/block/Fallable.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; -use PocketMine\ServerAPI; use PocketMine\Level\Level; +use PocketMine\ServerAPI; +use PocketMine; class Fallable extends Solid{ diff --git a/src/PocketMine/block/Fire.php b/src/PocketMine/block/Fire.php index 6d1bd7447..d5471a133 100644 --- a/src/PocketMine/block/Fire.php +++ b/src/PocketMine/block/Fire.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Fire extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Generic.php b/src/PocketMine/block/Generic.php index 514f00d63..f17d07105 100644 --- a/src/PocketMine/block/Generic.php +++ b/src/PocketMine/block/Generic.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; -use PocketMine\ServerAPI; use PocketMine\Level\Level; +use PocketMine\ServerAPI; +use PocketMine; class Generic extends Block{ diff --git a/src/PocketMine/block/GlowingRedstoneOre.php b/src/PocketMine/block/GlowingRedstoneOre.php index c47b4a993..dd4884d8a 100644 --- a/src/PocketMine/block/GlowingRedstoneOre.php +++ b/src/PocketMine/block/GlowingRedstoneOre.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class GlowingRedstoneOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Grass.php b/src/PocketMine/block/Grass.php index e82a6ff3f..75d2b16e4 100644 --- a/src/PocketMine/block/Grass.php +++ b/src/PocketMine/block/Grass.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Generator\Object\TallGrass; use PocketMine\Utils\Random; +use PocketMine; class Grass extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Ladder.php b/src/PocketMine/block/Ladder.php index 6e81a17d9..c9442e59e 100644 --- a/src/PocketMine/block/Ladder.php +++ b/src/PocketMine/block/Ladder.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Ladder extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Lava.php b/src/PocketMine/block/Lava.php index 4b5dd31d5..aaa3613a7 100644 --- a/src/PocketMine/block/Lava.php +++ b/src/PocketMine/block/Lava.php @@ -21,11 +21,11 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; +use PocketMine\Level\Level; use PocketMine\Level\Position; use PocketMine\ServerAPI; -use PocketMine\Level\Level; +use PocketMine; class Lava extends Liquid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Leaves.php b/src/PocketMine/block/Leaves.php index b8df5b71e..558ef7f0a 100644 --- a/src/PocketMine/block/Leaves.php +++ b/src/PocketMine/block/Leaves.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; -use PocketMine\ServerAPI; use PocketMine\Level\Level; +use PocketMine\ServerAPI; +use PocketMine; class Leaves extends Transparent{ const OAK = 0; diff --git a/src/PocketMine/block/MelonStem.php b/src/PocketMine/block/MelonStem.php index 8d7ac2131..0d3c2c486 100644 --- a/src/PocketMine/block/MelonStem.php +++ b/src/PocketMine/block/MelonStem.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class MelonStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Potato.php b/src/PocketMine/block/Potato.php index de2ffe020..ae9fe163a 100644 --- a/src/PocketMine/block/Potato.php +++ b/src/PocketMine/block/Potato.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Potato extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/PumpkinStem.php b/src/PocketMine/block/PumpkinStem.php index a19af7057..8099f2f6c 100644 --- a/src/PocketMine/block/PumpkinStem.php +++ b/src/PocketMine/block/PumpkinStem.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class PumpkinStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/RedMushroom.php b/src/PocketMine/block/RedMushroom.php index 081a45896..a8da0879b 100644 --- a/src/PocketMine/block/RedMushroom.php +++ b/src/PocketMine/block/RedMushroom.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class RedMushroom extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/RedstoneOre.php b/src/PocketMine/block/RedstoneOre.php index 7ee9dde7f..b76724d1b 100644 --- a/src/PocketMine/block/RedstoneOre.php +++ b/src/PocketMine/block/RedstoneOre.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class RedstoneOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Sapling.php b/src/PocketMine/block/Sapling.php index fb106254a..3e3f230a7 100644 --- a/src/PocketMine/block/Sapling.php +++ b/src/PocketMine/block/Sapling.php @@ -21,11 +21,11 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Generator\Object\Tree; -use PocketMine\Utils\Random; use PocketMine\Level\Level; +use PocketMine\Utils\Random; +use PocketMine; class Sapling extends Flowable{ const OAK = 0; diff --git a/src/PocketMine/block/SignPost.php b/src/PocketMine/block/SignPost.php index 385753854..1a927bfa4 100644 --- a/src/PocketMine/block/SignPost.php +++ b/src/PocketMine/block/SignPost.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class SignPost extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/SnowLayer.php b/src/PocketMine/block/SnowLayer.php index df3c174d0..d19d0a449 100644 --- a/src/PocketMine/block/SnowLayer.php +++ b/src/PocketMine/block/SnowLayer.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class SnowLayer extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Sugarcane.php b/src/PocketMine/block/Sugarcane.php index 3445acf5e..7d82f3caf 100644 --- a/src/PocketMine/block/Sugarcane.php +++ b/src/PocketMine/block/Sugarcane.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Level\Level; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine; class Sugarcane extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/TallGrass.php b/src/PocketMine/block/TallGrass.php index c2910c4b4..7f73b1f4d 100644 --- a/src/PocketMine/block/TallGrass.php +++ b/src/PocketMine/block/TallGrass.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class TallGrass extends Flowable{ public function __construct($meta = 1){ diff --git a/src/PocketMine/block/Torch.php b/src/PocketMine/block/Torch.php index 92f1a48a5..8cb8fc5f9 100644 --- a/src/PocketMine/block/Torch.php +++ b/src/PocketMine/block/Torch.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Torch extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Water.php b/src/PocketMine/block/Water.php index 038631bd2..355862ff7 100644 --- a/src/PocketMine/block/Water.php +++ b/src/PocketMine/block/Water.php @@ -21,10 +21,10 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; -use PocketMine\ServerAPI; use PocketMine\Level\Level; +use PocketMine\ServerAPI; +use PocketMine; class Water extends Liquid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Wheat.php b/src/PocketMine/block/Wheat.php index 9fa75b319..fa348b90d 100644 --- a/src/PocketMine/block/Wheat.php +++ b/src/PocketMine/block/Wheat.php @@ -21,9 +21,9 @@ namespace PocketMine\Block; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Level\Level; +use PocketMine; class Wheat extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/entity/Entity.php b/src/PocketMine/entity/Entity.php index 06d54e0db..d4790989e 100644 --- a/src/PocketMine/entity/Entity.php +++ b/src/PocketMine/entity/Entity.php @@ -24,7 +24,6 @@ */ namespace PocketMine\Entity; -use PocketMine; use PocketMine\Event\Entity\EntityLevelChangeEvent; use PocketMine\Event\Entity\EntityMotionEvent; use PocketMine\Event\Entity\EntityMoveEvent; @@ -41,6 +40,7 @@ use PocketMine\Network\Protocol\RemoveEntityPacket; use PocketMine\Network\Protocol\SetEntityMotionPacket; use PocketMine\Player; use PocketMine\PMF\LevelFormat; +use PocketMine; abstract class Entity extends Position{ public static $entityCount = 1; diff --git a/src/PocketMine/entity/Human.php b/src/PocketMine/entity/Human.php index 245f6acde..c0fec0da0 100644 --- a/src/PocketMine/entity/Human.php +++ b/src/PocketMine/entity/Human.php @@ -21,7 +21,6 @@ namespace PocketMine\Entity; -use PocketMine; use PocketMine\Event\Entity\EntityArmorChangeEvent; use PocketMine\Event\Entity\EntityInventoryChangeEvent; use PocketMine\Event\Event; @@ -30,13 +29,14 @@ use PocketMine\Item\Item; use PocketMine\NBT\Tag\Byte; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Short; +use PocketMine\Network; use PocketMine\Network\Protocol\AddPlayerPacket; use PocketMine\Network\Protocol\ContainerSetContentPacket; use PocketMine\Network\Protocol\PlayerEquipmentPacket; use PocketMine\Network\Protocol\RemovePlayerPacket; use PocketMine\Network\Protocol\SetEntityMotionPacket; use PocketMine\Player; -use PocketMine\Network; +use PocketMine; class Human extends Creature implements ProjectileSource, InventorySource{ diff --git a/src/PocketMine/event/entity/EntityArmorChangeEvent.php b/src/PocketMine/event/entity/EntityArmorChangeEvent.php index 079d6ff90..402b364b4 100644 --- a/src/PocketMine/event/entity/EntityArmorChangeEvent.php +++ b/src/PocketMine/event/entity/EntityArmorChangeEvent.php @@ -22,10 +22,10 @@ namespace PocketMine\Event\Entity; use PocketMine\Entity\Entity; -use PocketMine; -use PocketMine\Event; -use PocketMine\Item\Item; use PocketMine\Event\CancellableEvent; +use PocketMine\Event; +use PocketMine; +use PocketMine\Item\Item; class EntityArmorChangeEvent extends EntityEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/entity/EntityInventoryChangeEvent.php b/src/PocketMine/event/entity/EntityInventoryChangeEvent.php index fd5f6ed82..cf5ca37b1 100644 --- a/src/PocketMine/event/entity/EntityInventoryChangeEvent.php +++ b/src/PocketMine/event/entity/EntityInventoryChangeEvent.php @@ -22,10 +22,10 @@ namespace PocketMine\Event\Entity; use PocketMine\Entity\Entity; -use PocketMine; -use PocketMine\Event; -use PocketMine\Item\Item; use PocketMine\Event\CancellableEvent; +use PocketMine\Event; +use PocketMine; +use PocketMine\Item\Item; class EntityInventoryChangeEvent extends EntityEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/entity/EntityLevelChangeEvent.php b/src/PocketMine/event/entity/EntityLevelChangeEvent.php index 97bac52cb..fc604b3e7 100644 --- a/src/PocketMine/event/entity/EntityLevelChangeEvent.php +++ b/src/PocketMine/event/entity/EntityLevelChangeEvent.php @@ -22,10 +22,10 @@ namespace PocketMine\Event\Entity; use PocketMine\Entity\Entity; -use PocketMine; -use PocketMine\Event; -use PocketMine\Level\Level; use PocketMine\Event\CancellableEvent; +use PocketMine\Event; +use PocketMine; +use PocketMine\Level\Level; class EntityLevelChangeEvent extends EntityEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/entity/EntityMotionEvent.php b/src/PocketMine/event/entity/EntityMotionEvent.php index eb3c6df00..74a08d71f 100644 --- a/src/PocketMine/event/entity/EntityMotionEvent.php +++ b/src/PocketMine/event/entity/EntityMotionEvent.php @@ -22,10 +22,10 @@ namespace PocketMine\Event\Entity; use PocketMine\Entity\Entity; -use PocketMine; -use PocketMine\Event; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Event\CancellableEvent; +use PocketMine\Event; +use PocketMine; +use PocketMine\Math\Vector3 as Vector3; class EntityMotionEvent extends EntityEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/entity/EntityMoveEvent.php b/src/PocketMine/event/entity/EntityMoveEvent.php index 62ba39b61..493c0a67f 100644 --- a/src/PocketMine/event/entity/EntityMoveEvent.php +++ b/src/PocketMine/event/entity/EntityMoveEvent.php @@ -22,10 +22,10 @@ namespace PocketMine\Event\Entity; use PocketMine\Entity\Entity; -use PocketMine; -use PocketMine\Event; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Event\CancellableEvent; +use PocketMine\Event; +use PocketMine; +use PocketMine\Math\Vector3 as Vector3; class EntityMoveEvent extends EntityEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/player/PlayerEquipmentChangeEvent.php b/src/PocketMine/event/player/PlayerEquipmentChangeEvent.php index 032cc5cf3..9e5c0da3f 100644 --- a/src/PocketMine/event/player/PlayerEquipmentChangeEvent.php +++ b/src/PocketMine/event/player/PlayerEquipmentChangeEvent.php @@ -22,9 +22,9 @@ namespace PocketMine\Event\Player; use PocketMine\Event; -use PocketMine; -use PocketMine\Item\Item; use PocketMine\Event\CancellableEvent; +use PocketMine\Item\Item; +use PocketMine; use PocketMine\Player; class PlayerEquipmentChangeEvent extends PlayerEvent implements CancellableEvent{ diff --git a/src/PocketMine/event/server/DataPacketReceiveEvent.php b/src/PocketMine/event/server/DataPacketReceiveEvent.php index e3abf461f..a83f51d68 100644 --- a/src/PocketMine/event/server/DataPacketReceiveEvent.php +++ b/src/PocketMine/event/server/DataPacketReceiveEvent.php @@ -22,9 +22,9 @@ namespace PocketMine\Event\Server; use PocketMine\Event; -use PocketMine; -use PocketMine\Network\Protocol\DataPacket; use PocketMine\Event\CancellableEvent; +use PocketMine\Network\Protocol\DataPacket; +use PocketMine; use PocketMine\Player; class DataPacketReceiveEvent extends ServerEvent implements CancellableEvent{ diff --git a/src/PocketMine/event/server/DataPacketSendEvent.php b/src/PocketMine/event/server/DataPacketSendEvent.php index 4abb48dd2..98a421d4c 100644 --- a/src/PocketMine/event/server/DataPacketSendEvent.php +++ b/src/PocketMine/event/server/DataPacketSendEvent.php @@ -22,9 +22,9 @@ namespace PocketMine\Event\Server; use PocketMine\Event; -use PocketMine; -use PocketMine\Network\Protocol\DataPacket; use PocketMine\Event\CancellableEvent; +use PocketMine\Network\Protocol\DataPacket; +use PocketMine; use PocketMine\Player; class DataPacketSendEvent extends ServerEvent implements CancellableEvent{ diff --git a/src/PocketMine/event/server/PacketReceiveEvent.php b/src/PocketMine/event/server/PacketReceiveEvent.php index 32f25ba22..b1b6bad78 100644 --- a/src/PocketMine/event/server/PacketReceiveEvent.php +++ b/src/PocketMine/event/server/PacketReceiveEvent.php @@ -21,10 +21,10 @@ namespace PocketMine\Event\Server; +use PocketMine\Event\CancellableEvent; use PocketMine\Event; use PocketMine; use PocketMine\Network\Packet; -use PocketMine\Event\CancellableEvent; class PacketReceiveEvent extends ServerEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/server/PacketSendEvent.php b/src/PocketMine/event/server/PacketSendEvent.php index 633ba3a87..2537eef5c 100644 --- a/src/PocketMine/event/server/PacketSendEvent.php +++ b/src/PocketMine/event/server/PacketSendEvent.php @@ -21,10 +21,10 @@ namespace PocketMine\Event\Server; +use PocketMine\Event\CancellableEvent; use PocketMine\Event; use PocketMine; use PocketMine\Network\Packet; -use PocketMine\Event\CancellableEvent; class PacketSendEvent extends ServerEvent implements CancellableEvent{ public static $handlers; diff --git a/src/PocketMine/event/tile/TileInventoryChangeEvent.php b/src/PocketMine/event/tile/TileInventoryChangeEvent.php index 4d6e54e70..d58eccf5a 100644 --- a/src/PocketMine/event/tile/TileInventoryChangeEvent.php +++ b/src/PocketMine/event/tile/TileInventoryChangeEvent.php @@ -22,8 +22,8 @@ namespace PocketMine\Event\Tile; use PocketMine\Event; -use PocketMine; use PocketMine\Item\Item; +use PocketMine; use PocketMine\Tile\Tile; class TileInventoryChangeEvent extends TileEvent implements CancellableEvent{ diff --git a/src/PocketMine/item/Bucket.php b/src/PocketMine/item/Bucket.php index 6bb9bf954..04d54cada 100644 --- a/src/PocketMine/item/Bucket.php +++ b/src/PocketMine/item/Bucket.php @@ -21,13 +21,13 @@ namespace PocketMine\Item; -use PocketMine; use PocketMine\Block\Air; use PocketMine\Block\Block; use PocketMine\Block\Lava; use PocketMine\Block\Liquid; use PocketMine\Block\Water; use PocketMine\Level\Level; +use PocketMine; class Bucket extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/FlintSteel.php b/src/PocketMine/item/FlintSteel.php index ae23c7660..f12311616 100644 --- a/src/PocketMine/item/FlintSteel.php +++ b/src/PocketMine/item/FlintSteel.php @@ -21,11 +21,11 @@ namespace PocketMine\Item; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Block\Fire; use PocketMine\Block\Solid; use PocketMine\Level\Level; +use PocketMine; class FlintSteel extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Item.php b/src/PocketMine/item/Item.php index 45ee6b6bc..6caa6173c 100644 --- a/src/PocketMine/item/Item.php +++ b/src/PocketMine/item/Item.php @@ -24,13 +24,13 @@ */ namespace PocketMine\Item; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Entity\Entity; use PocketMine\Item\Block as ItemBlock; use PocketMine\Level\Level; use PocketMine\Recipes\Fuel; use PocketMine\Recipes\Smelt; +use PocketMine; class Item{ //All Block IDs are here too diff --git a/src/PocketMine/item/Painting.php b/src/PocketMine/item/Painting.php index 66e4e9e8f..7732a7dfe 100644 --- a/src/PocketMine/item/Painting.php +++ b/src/PocketMine/item/Painting.php @@ -21,10 +21,10 @@ namespace PocketMine\Item; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Level\Level; use PocketMine\ServerAPI; +use PocketMine; class Painting extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/SpawnEgg.php b/src/PocketMine/item/SpawnEgg.php index 61d379f74..deefd36ab 100644 --- a/src/PocketMine/item/SpawnEgg.php +++ b/src/PocketMine/item/SpawnEgg.php @@ -21,9 +21,9 @@ namespace PocketMine\Item; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Level\Level; +use PocketMine; class SpawnEgg extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/level/Explosion.php b/src/PocketMine/level/Explosion.php index 732d6ad55..2fa043522 100644 --- a/src/PocketMine/level/Explosion.php +++ b/src/PocketMine/level/Explosion.php @@ -21,13 +21,13 @@ namespace PocketMine\Level; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Block\TNT; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Network\Protocol\ExplodePacket; use PocketMine\Player; use PocketMine\ServerAPI; +use PocketMine; class Explosion{ public static $specialDrops = array( diff --git a/src/PocketMine/level/Level.php b/src/PocketMine/level/Level.php index 7fb6ba682..4bbf26ada 100644 --- a/src/PocketMine/level/Level.php +++ b/src/PocketMine/level/Level.php @@ -24,16 +24,16 @@ */ namespace PocketMine\Level; -use PocketMine; -use PocketMine\Utils\Utils; use PocketMine\Block\Air; use PocketMine\Block\Block; +use PocketMine\Level\Generator\Flat; use PocketMine\Level\Generator\Generator; +use PocketMine\Level\Generator\Normal; use PocketMine\Math\Vector3 as Vector3; +use PocketMine\NBT\NBT; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Enum; use PocketMine\NBT\Tag\Short; -use PocketMine\NBT\NBT; use PocketMine\Network\Protocol\SetTimePacket; use PocketMine\Network\Protocol\UpdateBlockPacket; use PocketMine\Player; @@ -46,8 +46,8 @@ use PocketMine\Tile\Tile; use PocketMine\Utils\Cache; use PocketMine\Utils\Config; use PocketMine\Utils\Random; -use PocketMine\Level\Generator\Flat; -use PocketMine\Level\Generator\Normal; +use PocketMine\Utils\Utils; +use PocketMine; /** * Class Level diff --git a/src/PocketMine/level/LevelImport.php b/src/PocketMine/level/LevelImport.php index 1b67acbf1..f66fc737d 100644 --- a/src/PocketMine/level/LevelImport.php +++ b/src/PocketMine/level/LevelImport.php @@ -21,9 +21,9 @@ namespace PocketMine\Level; -use PocketMine; use PocketMine\PMF\LevelFormat; use PocketMine\Utils\Config; +use PocketMine; class LevelImport{ private $path; diff --git a/src/PocketMine/level/WorldGenerator.php b/src/PocketMine/level/WorldGenerator.php index edc757826..c8b38c2d9 100644 --- a/src/PocketMine/level/WorldGenerator.php +++ b/src/PocketMine/level/WorldGenerator.php @@ -21,12 +21,12 @@ namespace PocketMine\Level; -use PocketMine; use PocketMine\Level\Generator\Generator; use PocketMine\PMF\LevelFormat; use PocketMine\Utils\Config; use PocketMine\Utils\Random; use PocketMine\Utils\Utils; +use PocketMine; class WorldGenerator{ private $seed, $level, $path, $random, $generator, $height; diff --git a/src/PocketMine/level/generator/Flat.php b/src/PocketMine/level/generator/Flat.php index 0cfb6c3a4..1fa204738 100644 --- a/src/PocketMine/level/generator/Flat.php +++ b/src/PocketMine/level/generator/Flat.php @@ -21,7 +21,6 @@ namespace PocketMine\Level\Generator; -use PocketMine; use PocketMine\Block\CoalOre; use PocketMine\Block\DiamondOre; use PocketMine\Block\Dirt; @@ -35,6 +34,7 @@ use PocketMine\Level\Generator\Populator\Ore; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Flat extends Generator{ private $level, $random, $structure, $chunks, $options, $floorLevel, $preset, $populators = array(); diff --git a/src/PocketMine/level/generator/Generator.php b/src/PocketMine/level/generator/Generator.php index 4237ccafc..aec478afe 100644 --- a/src/PocketMine/level/generator/Generator.php +++ b/src/PocketMine/level/generator/Generator.php @@ -24,9 +24,9 @@ */ namespace PocketMine\Level\Generator; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Utils\Random; +use PocketMine; abstract class Generator{ private static $list = array(); diff --git a/src/PocketMine/level/generator/Normal.php b/src/PocketMine/level/generator/Normal.php index 49ca35fa1..030ce6355 100644 --- a/src/PocketMine/level/generator/Normal.php +++ b/src/PocketMine/level/generator/Normal.php @@ -21,7 +21,6 @@ namespace PocketMine\Level\Generator; -use PocketMine; use PocketMine\Block\CoalOre; use PocketMine\Block\DiamondOre; use PocketMine\Block\Dirt; @@ -38,6 +37,7 @@ use PocketMine\Level\Generator\Populator\Tree; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Normal extends Generator{ diff --git a/src/PocketMine/level/generator/object/BigTree.php b/src/PocketMine/level/generator/object/BigTree.php index 9f0a7d130..cfe0ee1e2 100644 --- a/src/PocketMine/level/generator/object/BigTree.php +++ b/src/PocketMine/level/generator/object/BigTree.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; +use PocketMine; class BigTree extends Tree{ private $trunkHeightMultiplier = 0.618; diff --git a/src/PocketMine/level/generator/object/Ore.php b/src/PocketMine/level/generator/object/Ore.php index 8c279b049..8dde5807b 100644 --- a/src/PocketMine/level/generator/object/Ore.php +++ b/src/PocketMine/level/generator/object/Ore.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Math\VectorMath; use PocketMine\Utils\Random; +use PocketMine; class Ore{ private $random; diff --git a/src/PocketMine/level/generator/object/PineTree.php b/src/PocketMine/level/generator/object/PineTree.php index 67131a474..4077296d9 100644 --- a/src/PocketMine/level/generator/object/PineTree.php +++ b/src/PocketMine/level/generator/object/PineTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Block\Dirt; use PocketMine\Block\Leaves; use PocketMine\Block\Wood; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class PineTree extends Tree{ var $type = 1; diff --git a/src/PocketMine/level/generator/object/Pond.php b/src/PocketMine/level/generator/object/Pond.php index 959456c60..5310c79e1 100644 --- a/src/PocketMine/level/generator/object/Pond.php +++ b/src/PocketMine/level/generator/object/Pond.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Pond{ private $random; diff --git a/src/PocketMine/level/generator/object/SmallTree.php b/src/PocketMine/level/generator/object/SmallTree.php index c9430da3e..0e30288c9 100644 --- a/src/PocketMine/level/generator/object/SmallTree.php +++ b/src/PocketMine/level/generator/object/SmallTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Block\Dirt; use PocketMine\Block\Leaves; use PocketMine\Block\Wood; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class SmallTree extends Tree{ public $type = 0; diff --git a/src/PocketMine/level/generator/object/SpruceTree.php b/src/PocketMine/level/generator/object/SpruceTree.php index 65dce62e4..357b65950 100644 --- a/src/PocketMine/level/generator/object/SpruceTree.php +++ b/src/PocketMine/level/generator/object/SpruceTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Block\Dirt; use PocketMine\Block\Leaves; use PocketMine\Block\Wood; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class SpruceTree extends Tree{ var $type = 1; diff --git a/src/PocketMine/level/generator/object/TallGrass.php b/src/PocketMine/level/generator/object/TallGrass.php index 46c29a6e5..e5723cb69 100644 --- a/src/PocketMine/level/generator/object/TallGrass.php +++ b/src/PocketMine/level/generator/object/TallGrass.php @@ -22,8 +22,8 @@ namespace PocketMine\Level\Generator\Object; use PocketMine\Block\Block; -use PocketMine; use PocketMine\Level; +use PocketMine; use PocketMine\Math\Vector3 as Vector3; class TallGrass{ diff --git a/src/PocketMine/level/generator/object/Tree.php b/src/PocketMine/level/generator/object/Tree.php index 736c19fce..e1d6a420e 100644 --- a/src/PocketMine/level/generator/object/Tree.php +++ b/src/PocketMine/level/generator/object/Tree.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Block\Sapling; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Tree{ public $overridable = array( diff --git a/src/PocketMine/level/generator/populator/Mineshaft.php b/src/PocketMine/level/generator/populator/Mineshaft.php index a6f564434..783a39687 100644 --- a/src/PocketMine/level/generator/populator/Mineshaft.php +++ b/src/PocketMine/level/generator/populator/Mineshaft.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Utils\Random; +use PocketMine; class Mineshaft extends Populator{ private static $DISTANCE = 256; diff --git a/src/PocketMine/level/generator/populator/Ore.php b/src/PocketMine/level/generator/populator/Ore.php index a266c426b..2f6d19e2d 100644 --- a/src/PocketMine/level/generator/populator/Ore.php +++ b/src/PocketMine/level/generator/populator/Ore.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Generator\Object\Ore as ObjectOre; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Ore extends Populator{ private $oreTypes = array(); diff --git a/src/PocketMine/level/generator/populator/Pond.php b/src/PocketMine/level/generator/populator/Pond.php index 6adcfd73a..25edcbf10 100644 --- a/src/PocketMine/level/generator/populator/Pond.php +++ b/src/PocketMine/level/generator/populator/Pond.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Block\Water; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Pond extends Populator{ private $waterOdd = 4; diff --git a/src/PocketMine/level/generator/populator/Populator.php b/src/PocketMine/level/generator/populator/Populator.php index e8ca51459..214dfb6e1 100644 --- a/src/PocketMine/level/generator/populator/Populator.php +++ b/src/PocketMine/level/generator/populator/Populator.php @@ -24,9 +24,9 @@ */ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Utils\Random; +use PocketMine; abstract class Populator{ public abstract function populate(Level $level, $chunkX, $chunkZ, Random $random); diff --git a/src/PocketMine/level/generator/populator/TallGrass.php b/src/PocketMine/level/generator/populator/TallGrass.php index 820a3aa92..587c364f1 100644 --- a/src/PocketMine/level/generator/populator/TallGrass.php +++ b/src/PocketMine/level/generator/populator/TallGrass.php @@ -21,12 +21,12 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Block\TallGrass as BlockTallGrass; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class TallGrass extends Populator{ private $level; diff --git a/src/PocketMine/level/generator/populator/Tree.php b/src/PocketMine/level/generator/populator/Tree.php index af3cc718e..2ad090577 100644 --- a/src/PocketMine/level/generator/populator/Tree.php +++ b/src/PocketMine/level/generator/populator/Tree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Block\Sapling; use PocketMine\Level\Generator\Object\Tree as ObjectTree; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Utils\Random; +use PocketMine; class Tree extends Populator{ private $level; diff --git a/src/PocketMine/nbt/NBT.php b/src/PocketMine/nbt/NBT.php index 51346b228..030df6040 100644 --- a/src/PocketMine/nbt/NBT.php +++ b/src/PocketMine/nbt/NBT.php @@ -24,7 +24,6 @@ */ namespace PocketMine\NBT; -use PocketMine; use PocketMine\NBT\Tag\Byte; use PocketMine\NBT\Tag\Byte_Array; use PocketMine\NBT\Tag\Compound; @@ -40,6 +39,7 @@ use PocketMine\NBT\Tag\Short; use PocketMine\NBT\Tag\String; use PocketMine\NBT\Tag\Tag; use PocketMine\Utils\Utils; +use PocketMine; class NBT implements \ArrayAccess{ const LITTLE_ENDIAN = 0; diff --git a/src/PocketMine/network/Handler.php b/src/PocketMine/network/Handler.php index 55d06e139..9dd567c49 100644 --- a/src/PocketMine/network/Handler.php +++ b/src/PocketMine/network/Handler.php @@ -24,7 +24,6 @@ */ namespace PocketMine\Network; -use PocketMine; use PocketMine\Event\Event; use PocketMine\Event\EventHandler; use PocketMine\Event\Server\PacketReceiveEvent; @@ -34,6 +33,7 @@ use PocketMine\Network\Query\QueryPacket; use PocketMine\Network\RakNet\Info; use PocketMine\Network\RakNet\Packet; use PocketMine\ServerAPI; +use PocketMine; class Handler{ public $bandwidth; diff --git a/src/PocketMine/network/protocol/DataPacket.php b/src/PocketMine/network/protocol/DataPacket.php index 251b21c3e..6278e318e 100644 --- a/src/PocketMine/network/protocol/DataPacket.php +++ b/src/PocketMine/network/protocol/DataPacket.php @@ -21,9 +21,9 @@ namespace PocketMine\Network\Protocol; -use PocketMine; use PocketMine\Item\Item; use PocketMine\Utils\Utils; +use PocketMine; abstract class DataPacket{ private $offset = 0; diff --git a/src/PocketMine/network/query/QueryHandler.php b/src/PocketMine/network/query/QueryHandler.php index f5f45ef83..330b739b5 100644 --- a/src/PocketMine/network/query/QueryHandler.php +++ b/src/PocketMine/network/query/QueryHandler.php @@ -25,11 +25,11 @@ */ namespace PocketMine\Network\Query; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Player; use PocketMine\ServerAPI; use PocketMine\Utils\Utils; +use PocketMine; class QueryHandler{ private $socket, $server, $lastToken, $token, $longData, $timeout; diff --git a/src/PocketMine/network/query/QueryPacket.php b/src/PocketMine/network/query/QueryPacket.php index 9f96a62d7..0d65f8fc3 100644 --- a/src/PocketMine/network/query/QueryPacket.php +++ b/src/PocketMine/network/query/QueryPacket.php @@ -21,9 +21,9 @@ namespace PocketMine\Network\Query; -use PocketMine; use PocketMine\Network\Packet; use PocketMine\Utils\Utils; +use PocketMine; class QueryPacket extends Packet{ const HANDSHAKE = 9; diff --git a/src/PocketMine/network/raknet/Packet.php b/src/PocketMine/network/raknet/Packet.php index 967da36ad..8b585e3ee 100644 --- a/src/PocketMine/network/raknet/Packet.php +++ b/src/PocketMine/network/raknet/Packet.php @@ -21,10 +21,10 @@ namespace PocketMine\Network\RakNet; -use PocketMine; use PocketMine\Network; use PocketMine\Network\Protocol\Info as ProtocolInfo; use PocketMine\Utils\Utils; +use PocketMine; class Packet extends Network\Packet{ private $packetID; diff --git a/src/PocketMine/pmf/LevelFormat.php b/src/PocketMine/pmf/LevelFormat.php index c068308ef..dd883bd10 100644 --- a/src/PocketMine/pmf/LevelFormat.php +++ b/src/PocketMine/pmf/LevelFormat.php @@ -21,12 +21,12 @@ namespace PocketMine\PMF; -use PocketMine; use PocketMine\Level\Level; use PocketMine\NBT\NBT; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Enum; use PocketMine\Utils\Utils; +use PocketMine; class LevelFormat extends PMF{ const VERSION = 2; diff --git a/src/PocketMine/recipes/Crafting.php b/src/PocketMine/recipes/Crafting.php index ddd017b17..e062a9734 100644 --- a/src/PocketMine/recipes/Crafting.php +++ b/src/PocketMine/recipes/Crafting.php @@ -24,10 +24,10 @@ */ namespace PocketMine\Recipes; -use PocketMine; use PocketMine\BlockAPI; use PocketMine\Item\Item; use PocketMine\ServerAPI; +use PocketMine; abstract class Crafting{ private static $small = array( //Probably means craftable on crafting bench and in inventory. Name it better! diff --git a/src/PocketMine/tile/Chest.php b/src/PocketMine/tile/Chest.php index e2cb9afda..d9076ec03 100644 --- a/src/PocketMine/tile/Chest.php +++ b/src/PocketMine/tile/Chest.php @@ -21,13 +21,13 @@ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Int; use PocketMine\NBT\Tag\String; use PocketMine\Network\Protocol\EntityDataPacket; +use PocketMine; class Chest extends Spawnable{ use Container; diff --git a/src/PocketMine/tile/Container.php b/src/PocketMine/tile/Container.php index 6fdffa2de..47f9ec480 100644 --- a/src/PocketMine/tile/Container.php +++ b/src/PocketMine/tile/Container.php @@ -21,7 +21,6 @@ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Event\Event; use PocketMine\Event\EventHandler; use PocketMine\Event\Tile\TileInventoryChangeEvent; @@ -30,6 +29,7 @@ use PocketMine\NBT\Tag\Byte; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Short; use PocketMine\Player; +use PocketMine; trait Container{ public function openInventory(Player $player){ diff --git a/src/PocketMine/tile/Furnace.php b/src/PocketMine/tile/Furnace.php index 5135d6317..8e04ca4f4 100644 --- a/src/PocketMine/tile/Furnace.php +++ b/src/PocketMine/tile/Furnace.php @@ -21,11 +21,11 @@ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Block\Block; use PocketMine\Item\Item; use PocketMine\Level\Level; use PocketMine\NBT\Tag\Compound; +use PocketMine; class Furnace extends Tile{ use Container; diff --git a/src/PocketMine/tile/Sign.php b/src/PocketMine/tile/Sign.php index 5c4fa9beb..090fbd18d 100644 --- a/src/PocketMine/tile/Sign.php +++ b/src/PocketMine/tile/Sign.php @@ -21,13 +21,13 @@ namespace PocketMine\Tile; -use PocketMine; +use PocketMine\Level\Level; use PocketMine\NBT\NBT; use PocketMine\NBT\Tag\Compound; use PocketMine\NBT\Tag\Int; use PocketMine\NBT\Tag\String; use PocketMine\Network\Protocol\EntityDataPacket; -use PocketMine\Level\Level; +use PocketMine; class Sign extends Spawnable{ diff --git a/src/PocketMine/tile/Tile.php b/src/PocketMine/tile/Tile.php index 847c59d80..c5dbba01a 100644 --- a/src/PocketMine/tile/Tile.php +++ b/src/PocketMine/tile/Tile.php @@ -25,12 +25,12 @@ */ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Level\Level; use PocketMine\Level\Position; use PocketMine\NBT\Tag\Compound; use PocketMine\PMF\LevelFormat; use PocketMine\ServerAPI; +use PocketMine; abstract class Tile extends Position{ const SIGN = "Sign";