diff --git a/src/Achievement.php b/src/Achievement.php index 53362a77d..c676ae819 100644 --- a/src/Achievement.php +++ b/src/Achievement.php @@ -21,8 +21,6 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; - abstract class Achievement{ public static $list = array( /*"openInventory" => array( @@ -31,7 +29,7 @@ abstract class Achievement{ ),*/ "mineWood" => array( "name" => "Getting Wood", - "requires" => array(//"openInventory", + "requires" => array( //"openInventory", ), ), "buildWorkBench" => array( diff --git a/src/BanAPI.php b/src/BanAPI.php index 112265d33..cfe416ed2 100644 --- a/src/BanAPI.php +++ b/src/BanAPI.php @@ -21,9 +21,7 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Utils\Config as Config; -use PocketMine\Player as Player; class BanAPI{ private $server; diff --git a/src/BlockAPI.php b/src/BlockAPI.php index 58a2c90cc..ab71c1450 100644 --- a/src/BlockAPI.php +++ b/src/BlockAPI.php @@ -21,55 +21,14 @@ namespace PocketMine; -use PocketMine\Level\Position as Position; +use PocketMine\Block\Block as Block; use PocketMine\Block\GenericBlock as GenericBlock; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Player as Player; -use PocketMine\Block\Block as Block; -use PocketMine\Tile\Sign as Sign; +use PocketMine\Level\Position as Position; use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\NBT\Tag\String as String; use PocketMine\NBT\Tag\Int as Int; -use PocketMine\Block\STONE as STONE; -use PocketMine\Block\COBBLESTONE as COBBLESTONE; -use PocketMine\Block\BRICKS as BRICKS; -use PocketMine\Block\DIRT as DIRT; -use PocketMine\Block\GRASS as GRASS; -use PocketMine\Block\SANDSTONE as SANDSTONE; -use PocketMine\Block\SAND as SAND; -use PocketMine\Block\GRAVEL as GRAVEL; -use PocketMine\Block\NETHERRACK as NETHERRACK; -use PocketMine\Block\BEDROCK as BEDROCK; -use PocketMine\Block\SLAB as SLAB; -use PocketMine\Block\OBSIDIAN as OBSIDIAN; -use PocketMine\Block\ICE as ICE; -use PocketMine\Block\GLASS as GLASS; -use PocketMine\Block\WOOL as WOOL; -use PocketMine\Block\LADDER as LADDER; -use PocketMine\Block\SPONGE as SPONGE; -use PocketMine\Block\TRAPDOOR as TRAPDOOR; -use PocketMine\Block\FENCE as FENCE; -use PocketMine\Block\BED as BED; -use PocketMine\Block\BOOKSHELF as BOOKSHELF; -use PocketMine\Block\WORKBENCH as WORKBENCH; -use PocketMine\Block\STONECUTTER as STONECUTTER; -use PocketMine\Block\CHEST as CHEST; -use PocketMine\Block\FURNACE as FURNACE; -use PocketMine\Block\DANDELION as DANDELION; -use PocketMine\Block\CACTUS as CACTUS; -use PocketMine\Block\PUMPKIN as PUMPKIN; -use PocketMine\Block\COBWEB as COBWEB; -use PocketMine\Block\SAPLING as SAPLING; -use PocketMine\Block\LEAVES as LEAVES; -use PocketMine\Block\CAKE as CAKE; -use PocketMine\Block\CARPET as CARPET; -use PocketMine\Block\TORCH as TORCH; -use PocketMine\Block\TNT as TNT; -use PocketMine\Block\SUGARCANE as SUGARCANE; -use PocketMine\Block\WHEAT as WHEAT; -use PocketMine\Block\CARROT as CARROT; -use PocketMine\Block\POTATO as POTATO; +use PocketMine\NBT\Tag\String as String; +use PocketMine\Tile\Sign as Sign; class BlockAPI{ private $server; diff --git a/src/ChatAPI.php b/src/ChatAPI.php index f81172c30..12b0b97b8 100644 --- a/src/ChatAPI.php +++ b/src/ChatAPI.php @@ -21,9 +21,6 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Player as Player; - class ChatAPI{ private $server; diff --git a/src/ConsoleAPI.php b/src/ConsoleAPI.php index f32f0db15..0d8c14259 100644 --- a/src/ConsoleAPI.php +++ b/src/ConsoleAPI.php @@ -21,9 +21,7 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Utils\TextFormat as TextFormat; -use PocketMine\Player as Player; class ConsoleAPI{ private $loop, $server, $event, $help, $cmds, $alias; diff --git a/src/Deprecation.php b/src/Deprecation.php index c96f9f8d7..f9fcdb31e 100644 --- a/src/Deprecation.php +++ b/src/Deprecation.php @@ -23,8 +23,6 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; - class Deprecation{ public static $events = array( "server.tick" => "ServerAPI::schedule()", diff --git a/src/LevelAPI.php b/src/LevelAPI.php index b981906f6..a09aecf19 100644 --- a/src/LevelAPI.php +++ b/src/LevelAPI.php @@ -21,27 +21,25 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Level\Generator\Flat as Flat; use PocketMine\Level\Generator\Normal as Normal; -use PocketMine\Level\WorldGenerator as WorldGenerator; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Level\LevelImport as LevelImport; use PocketMine\Level\Level as Level; -use PocketMine\PMF\LevelFormat as LevelFormat; -use PocketMine\Utils\Config as Config; -use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Level\LevelImport as LevelImport; +use PocketMine\Level\Position as Position; +use PocketMine\Level\WorldGenerator as WorldGenerator; +use PocketMine\NBT\Tag\Byte as Byte; use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\NBT\Tag\Byte as Byte; +use PocketMine\NBT\Tag\Int as Int; use PocketMine\NBT\Tag\Short as Short; use PocketMine\NBT\Tag\String as String; -use PocketMine\NBT\Tag\Int as Int; -use PocketMine\Tile\Tile as Tile; -use PocketMine\Tile\Furnace as Furnace; +use PocketMine\PMF\LevelFormat as LevelFormat; use PocketMine\Tile\Chest as Chest; +use PocketMine\Tile\Furnace as Furnace; use PocketMine\Tile\Sign as Sign; -use PocketMine\Level\Position as Position; +use PocketMine\Tile\Tile as Tile; +use PocketMine\Utils\Config as Config; +use PocketMine\Utils\Utils as Utils; class LevelAPI{ private $server, $levels, $default; diff --git a/src/Player.php b/src/Player.php index 454d4af46..3de6d57fe 100644 --- a/src/Player.php +++ b/src/Player.php @@ -22,41 +22,36 @@ namespace PocketMine; use PocketMine\Entity\RealHuman as RealHuman; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\NBT\Tag\Double as Double; -use PocketMine\NBT\Tag\String as String; -use PocketMine\NBT\Tag\Int as Int; -use PocketMine\NBT\Tag\Byte as Byte; -use PocketMine\NBT\Tag\Float as Float; -use PocketMine\NBT\Tag\Short as Short; -use PocketMine\Utils\Config as Config; -use PocketMine\Network\Protocol\DataPacket as DataPacket; -use PocketMine\Achievement as Achievement; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Server as Server; -use PocketMine\Network\RakNet\Packet as Packet; -use PocketMine\Network\RakNet\Info as Info; -use PocketMine\Level\Position as Position; -use PocketMine\PMF\LevelFormat as LevelFormat; -use PocketMine\Tile\Spawnable as Spawnable; -use PocketMine\Utils\TextFormat as TextFormat; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Tile\Furnace as Furnace; -use PocketMine\Item\Item as Item; -use PocketMine\Recipes\Crafting as Crafting; -use PocketMine\Network\Protocol\Info as ProtocolInfo; +use PocketMine\Event\Event as Event; use PocketMine\Event\EventHandler as EventHandler; use PocketMine\Event\Server\DataPacketReceiveEvent as DataPacketReceiveEvent; -use PocketMine\Event\Event as Event; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Entity\Entity as Entity; -use PocketMine\Tile\Chest as Chest; -use PocketMine\Tile\Sign as Sign; -use PocketMine\NBT\NBT as NBT; -use PocketMine\Tile\Tile as Tile; use PocketMine\Event\Server\DataPacketSendEvent as DataPacketSendEvent; +use PocketMine\Item\Item as Item; +use PocketMine\Level\Position as Position; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\NBT\NBT as NBT; +use PocketMine\NBT\Tag\Byte as Byte; +use PocketMine\NBT\Tag\Compound as Compound; +use PocketMine\NBT\Tag\Double as Double; +use PocketMine\NBT\Tag\Enum as Enum; +use PocketMine\NBT\Tag\Float as Float; +use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\Short as Short; +use PocketMine\NBT\Tag\String as String; +use PocketMine\Network\Protocol\DataPacket as DataPacket; +use PocketMine\Network\Protocol\Info as ProtocolInfo; +use PocketMine\Network\RakNet\Info as Info; +use PocketMine\Network\RakNet\Packet as Packet; +use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine\Recipes\Crafting as Crafting; +use PocketMine\Tile\Chest as Chest; +use PocketMine\Tile\Furnace as Furnace; +use PocketMine\Tile\Sign as Sign; +use PocketMine\Tile\Spawnable as Spawnable; +use PocketMine\Tile\Tile as Tile; +use PocketMine\Utils\Config as Config; +use PocketMine\Utils\TextFormat as TextFormat; +use PocketMine\Utils\Utils as Utils; class Player extends RealHuman{ public static $list = array(); diff --git a/src/PlayerAPI.php b/src/PlayerAPI.php index 7ef5e36c1..1ac44c023 100644 --- a/src/PlayerAPI.php +++ b/src/PlayerAPI.php @@ -21,12 +21,10 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Entity\Entity as Entity; -use PocketMine\Player as Player; use PocketMine\Level\Level as Level; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Level\Position as Position; +use PocketMine\Math\Vector3 as Vector3; class PlayerAPI{ private $server; diff --git a/src/PluginAPI.php b/src/PluginAPI.php index dfafc3a2b..a8fac3383 100644 --- a/src/PluginAPI.php +++ b/src/PluginAPI.php @@ -21,12 +21,11 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Utils\Utils as Utils; use PocketMine\Network\Protocol\Info as Info; use PocketMine\PMF\Plugin as PMFPlugin; -use PocketMine\Utils\TextFormat as TextFormat; use PocketMine\Utils\Config as Config; +use PocketMine\Utils\TextFormat as TextFormat; +use PocketMine\Utils\Utils as Utils; class PluginAPI extends \stdClass{ private $server; diff --git a/src/Server.php b/src/Server.php index b187b6268..aecaf3d15 100644 --- a/src/Server.php +++ b/src/Server.php @@ -21,16 +21,14 @@ namespace PocketMine; -use PocketMine\Utils\VersionString as VersionString; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Network\Handler as Handler; -use PocketMine\Player as Player; use PocketMine\Entity\Entity as Entity; -use PocketMine\Deprecation as Deprecation; -use PocketMine\Network\Protocol\Info as Info; +use PocketMine\Network\Handler as Handler; use PocketMine\Network\Packet as Packet; +use PocketMine\Network\Protocol\Info as Info; use PocketMine\Network\RakNet\Info as RakNetInfo; use PocketMine\Network\RakNet\Packet as RakNetPacket; +use PocketMine\Utils\Utils as Utils; +use PocketMine\Utils\VersionString as VersionString; class Server{ public $tCnt; diff --git a/src/ServerAPI.php b/src/ServerAPI.php index 883737d31..391f7a915 100644 --- a/src/ServerAPI.php +++ b/src/ServerAPI.php @@ -21,21 +21,20 @@ namespace PocketMine; -use PocketMine\Utils\VersionString as VersionString; -use PocketMine\Utils\TextFormat as TextFormat; -use PocketMine\Utils\Config as Config; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Network\UPnP\PortForward as PortForward; -use PocketMine\Entity\Entity as Entity; -use PocketMine\Tile\Tile as Tile; -use PocketMine\Network\Protocol\Info as Info; -use PocketMine\Player as Player; -use PocketMine\Network\RCON\RCON as RCON; -use PocketMine\Network\Query\QueryHandler as QueryHandler; -use PocketMine\Recipes\Crafting as Crafting; -use PocketMine\Network\UPnP\RemovePortForward as RemovePortForward; use PocketMine\Block\Block as Block; +use PocketMine\Entity\Entity as Entity; use PocketMine\Item\Item as Item; +use PocketMine\Network\Protocol\Info as Info; +use PocketMine\Network\Query\QueryHandler as QueryHandler; +use PocketMine\Network\RCON\RCON as RCON; +use PocketMine\Network\UPnP\PortForward as PortForward; +use PocketMine\Network\UPnP\RemovePortForward as RemovePortForward; +use PocketMine\Recipes\Crafting as Crafting; +use PocketMine\Tile\Tile as Tile; +use PocketMine\Utils\Config as Config; +use PocketMine\Utils\TextFormat as TextFormat; +use PocketMine\Utils\Utils as Utils; +use PocketMine\Utils\VersionString as VersionString; class ServerAPI{ public $restart = false; diff --git a/src/TimeAPI.php b/src/TimeAPI.php index 90919e3c4..9854f28d8 100644 --- a/src/TimeAPI.php +++ b/src/TimeAPI.php @@ -21,8 +21,6 @@ namespace PocketMine; -use PocketMine\ServerAPI as ServerAPI; - class TimeAPI{ public static $phases = array( "day" => 0, diff --git a/src/block/Air.php b/src/block/Air.php index d37688c81..7a782a347 100644 --- a/src/block/Air.php +++ b/src/block/Air.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Air extends Transparent{ diff --git a/src/block/Bed.php b/src/block/Bed.php index 98a5962ce..d12b8ce18 100644 --- a/src/block/Bed.php +++ b/src/block/Bed.php @@ -20,11 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Block\Block as Block; -use PocketMine\Item\BED as BED; +use PocketMine; class Bed extends Transparent{ public function __construct($type = 0){ diff --git a/src/block/Bedrock.php b/src/block/Bedrock.php index 0b1a7f11f..4c7119060 100644 --- a/src/block/Bedrock.php +++ b/src/block/Bedrock.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Beetroot.php b/src/block/Beetroot.php index 5f3234851..367bb93ce 100644 --- a/src/block/Beetroot.php +++ b/src/block/Beetroot.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class Beetroot extends Flowable{ public function __construct($meta = 0){ @@ -35,6 +35,7 @@ class Beetroot extends Flowable{ $down = $this->getSide(0); if($down->getID() === FARMLAND){ $this->level->setBlock($block, $this, true, false, true); + return true; } diff --git a/src/block/BirchWoodStairs.php b/src/block/BirchWoodStairs.php index 32d06edba..2b5eeb1a3 100644 --- a/src/block/BirchWoodStairs.php +++ b/src/block/BirchWoodStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Block.php b/src/block/Block.php index 207abbc35..59e4d39ef 100644 --- a/src/block/Block.php +++ b/src/block/Block.php @@ -196,8 +196,6 @@ const NETHER_REACTOR = 247; use PocketMine; use PocketMine\Level\Position as Position; -use PocketMine\Level\Level as Level; -use PocketMine\Item\Item as Item; abstract class Block extends Position{ public static $list = array(); @@ -362,12 +360,13 @@ abstract class Block extends Position{ if(isset(self::$list[$id])){ $block = clone self::$list[$id]; $block->setMetadata($meta); - }else{ + } else{ $block = new Generic($id, $meta); } if($pos instanceof Position){ $block->position($pos); } + return $block; } @@ -430,7 +429,7 @@ abstract class Block extends Position{ * Returns an array of Item objects to be dropped * * @param ItemItem $item - * @param Player $player + * @param Player $player * * @return array */ @@ -448,7 +447,7 @@ abstract class Block extends Position{ * Returns the seconds that this block takes to be broken using an specific Item * * @param ItemItem $item - * @param Player $player + * @param Player $player * * @return float */ @@ -485,7 +484,7 @@ abstract class Block extends Position{ * Returns if the item can be broken with an specific Item * * @param ItemItem $item - * @param Player $player + * @param Player $player * * @return bool */ @@ -495,7 +494,7 @@ abstract class Block extends Position{ * Do the actions needed so the block is broken with the Item * * @param ItemItem $item - * @param Player $player + * @param Player $player * * @return mixed */ @@ -505,13 +504,13 @@ abstract class Block extends Position{ * Places the Block, using block space and block target, and side. Returns if the block has been placed. * * @param ItemItem $item - * @param Player $player - * @param Block $block - * @param Block $target - * @param int $face - * @param float $fx - * @param float $fy - * @param float $fz + * @param Player $player + * @param Block $block + * @param Block $target + * @param int $face + * @param float $fx + * @param float $fy + * @param float $fz * * @return bool */ @@ -521,7 +520,7 @@ abstract class Block extends Position{ * Do actions when activated by Item. Returns if it has done anything * * @param ItemItem $item - * @param Player $player + * @param Player $player * * @return bool */ diff --git a/src/block/Bookshelf.php b/src/block/Bookshelf.php index a207d9641..bff2ba2ce 100644 --- a/src/block/Bookshelf.php +++ b/src/block/Bookshelf.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Bookshelf extends Solid{ diff --git a/src/block/BrickStairs.php b/src/block/BrickStairs.php index 51b3d0487..ee3bbde78 100644 --- a/src/block/BrickStairs.php +++ b/src/block/BrickStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class BrickStairs extends Stair{ diff --git a/src/block/Bricks.php b/src/block/Bricks.php index 0a9393848..2a45ab52d 100644 --- a/src/block/Bricks.php +++ b/src/block/Bricks.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/BrownMushroom.php b/src/block/BrownMushroom.php index cb2864fb7..d374233a2 100644 --- a/src/block/BrownMushroom.php +++ b/src/block/BrownMushroom.php @@ -20,8 +20,8 @@ */ namespace PocketMine\Block; + use PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Item\Item as Item; class BrownMushroom extends Flowable{ diff --git a/src/block/BurningFurnace.php b/src/block/BurningFurnace.php index c0c013d94..befb0611b 100644 --- a/src/block/BurningFurnace.php +++ b/src/block/BurningFurnace.php @@ -20,14 +20,15 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\NBT\Tag\String as String; -use PocketMine\Tile\Tile as Tile; use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\String as String; use PocketMine\Tile\Furnace as Furnace; +use PocketMine\Tile\Tile as Tile; +use PocketMine; class BurningFurnace extends Solid{ public function __construct($meta = 0){ diff --git a/src/block/Cactus.php b/src/block/Cactus.php index d55e535fa..664028531 100644 --- a/src/block/Cactus.php +++ b/src/block/Cactus.php @@ -20,10 +20,11 @@ */ namespace PocketMine\Block; -use PocketMine; -use PocketMine\ServerAPI as ServerAPI; + use PocketMine\Item\Item as Item; use PocketMine\Math\Vector3 as Vector3; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Cactus extends Transparent{ public function __construct($meta = 0){ @@ -74,6 +75,7 @@ class Cactus extends Transparent{ $block3 = $this->getSide(5); if($block0->isTransparent === true and $block1->isTransparent === true and $block2->isTransparent === true and $block3->isTransparent === true){ $this->level->setBlock($this, $this, true, false, true); + return true; } } diff --git a/src/block/Cake.php b/src/block/Cake.php index 229389337..5582c6719 100644 --- a/src/block/Cake.php +++ b/src/block/Cake.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Carpet.php b/src/block/Carpet.php index fabf6fa41..6fc1f31cd 100644 --- a/src/block/Carpet.php +++ b/src/block/Carpet.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class Carpet extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/Carrot.php b/src/block/Carrot.php index d4eb50221..c1a0c108b 100644 --- a/src/block/Carrot.php +++ b/src/block/Carrot.php @@ -20,10 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Item\CARROT as CARROT; class Carrot extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/Chest.php b/src/block/Chest.php index 6bfc800f9..ac3623ed1 100644 --- a/src/block/Chest.php +++ b/src/block/Chest.php @@ -20,14 +20,15 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; -use PocketMine\Tile\Chest as TileChest; use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\NBT\Tag\String as String; -use PocketMine\Tile\Tile as Tile; use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\String as String; +use PocketMine\Tile\Chest as TileChest; +use PocketMine\Tile\Tile as Tile; +use PocketMine; class Chest extends Transparent{ public function __construct($meta = 0){ diff --git a/src/block/Clay.php b/src/block/Clay.php index 0e2de55e0..1a190228a 100644 --- a/src/block/Clay.php +++ b/src/block/Clay.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Coal.php b/src/block/Coal.php index 11ab9dadf..0da525077 100644 --- a/src/block/Coal.php +++ b/src/block/Coal.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/CoalOre.php b/src/block/CoalOre.php index fe25f9b99..b06980451 100644 --- a/src/block/CoalOre.php +++ b/src/block/CoalOre.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Item\COAL as COAL; class CoalOre extends Solid{ public function __construct(){ diff --git a/src/block/Cobblestone.php b/src/block/Cobblestone.php index 07b510524..3ff5d8aa9 100644 --- a/src/block/Cobblestone.php +++ b/src/block/Cobblestone.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/CobblestoneStairs.php b/src/block/CobblestoneStairs.php index 345d8c475..bfb1bf0fb 100644 --- a/src/block/CobblestoneStairs.php +++ b/src/block/CobblestoneStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class CobblestoneStairs extends Stair{ diff --git a/src/block/Cobweb.php b/src/block/Cobweb.php index 25b911bd4..b9fafdcd5 100644 --- a/src/block/Cobweb.php +++ b/src/block/Cobweb.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/CyanFlower.php b/src/block/CyanFlower.php index d3bce50b1..ef23c0479 100644 --- a/src/block/CyanFlower.php +++ b/src/block/CyanFlower.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class CyanFlower extends Flowable{ public function __construct(){ diff --git a/src/block/Dandelion.php b/src/block/Dandelion.php index 4cf95f5b9..e1a4dcc09 100644 --- a/src/block/Dandelion.php +++ b/src/block/Dandelion.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class Dandelion extends Flowable{ public function __construct(){ diff --git a/src/block/DeadBush.php b/src/block/DeadBush.php index 62f617895..effcdc4d3 100644 --- a/src/block/DeadBush.php +++ b/src/block/DeadBush.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class DeadBush extends Flowable{ diff --git a/src/block/Diamond.php b/src/block/Diamond.php index e1df5bae1..2eb0efb90 100644 --- a/src/block/Diamond.php +++ b/src/block/Diamond.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/DiamondOre.php b/src/block/DiamondOre.php index 008fea39e..af86f78c0 100644 --- a/src/block/DiamondOre.php +++ b/src/block/DiamondOre.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Item\DIAMOND as DIAMOND; class DiamondOre extends Solid{ public function __construct(){ diff --git a/src/block/Dirt.php b/src/block/Dirt.php index f809ed071..96c95f359 100644 --- a/src/block/Dirt.php +++ b/src/block/Dirt.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; class Dirt extends Solid{ public function __construct(){ diff --git a/src/block/Door.php b/src/block/Door.php index aa5ca054c..01efa39e0 100644 --- a/src/block/Door.php +++ b/src/block/Door.php @@ -20,10 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; use PocketMine\Player as Player; +use PocketMine; abstract class Door extends Transparent{ diff --git a/src/block/DoubleSlab.php b/src/block/DoubleSlab.php index bce406f35..b606543ca 100644 --- a/src/block/DoubleSlab.php +++ b/src/block/DoubleSlab.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/DoubleWoodSlab.php b/src/block/DoubleWoodSlab.php index 098a9c50e..8c16b7d94 100644 --- a/src/block/DoubleWoodSlab.php +++ b/src/block/DoubleWoodSlab.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Fallable.php b/src/block/Fallable.php index 7a9a6e80b..dc713402d 100644 --- a/src/block/Fallable.php +++ b/src/block/Fallable.php @@ -20,9 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Fallable extends Solid{ diff --git a/src/block/Farmland.php b/src/block/Farmland.php index 734604525..c5e0c824f 100644 --- a/src/block/Farmland.php +++ b/src/block/Farmland.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Fence.php b/src/block/Fence.php index df3d2c9bb..74c60fbd3 100644 --- a/src/block/Fence.php +++ b/src/block/Fence.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Fence extends Transparent{ diff --git a/src/block/FenceGate.php b/src/block/FenceGate.php index de58aa12a..b05c6272a 100644 --- a/src/block/FenceGate.php +++ b/src/block/FenceGate.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Fire.php b/src/block/Fire.php index 0c9bca6c5..8ec95c9da 100644 --- a/src/block/Fire.php +++ b/src/block/Fire.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Flowable.php b/src/block/Flowable.php index 3260c902a..6850eb744 100644 --- a/src/block/Flowable.php +++ b/src/block/Flowable.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Flowable extends Transparent{ diff --git a/src/block/Furnace.php b/src/block/Furnace.php index 87df5c23d..08dfba402 100644 --- a/src/block/Furnace.php +++ b/src/block/Furnace.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; diff --git a/src/block/Generic.php b/src/block/Generic.php index 2437e2ea9..20c85956e 100644 --- a/src/block/Generic.php +++ b/src/block/Generic.php @@ -20,9 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Generic extends Block{ diff --git a/src/block/Glass.php b/src/block/Glass.php index e247bef46..ad9fba220 100644 --- a/src/block/Glass.php +++ b/src/block/Glass.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/GlassPane.php b/src/block/GlassPane.php index 5345c87b7..dd2e7d680 100644 --- a/src/block/GlassPane.php +++ b/src/block/GlassPane.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class GlassPane extends Transparent{ diff --git a/src/block/GlowingObsidian.php b/src/block/GlowingObsidian.php index 000004865..c107db1c9 100644 --- a/src/block/GlowingObsidian.php +++ b/src/block/GlowingObsidian.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class GlowingObsidian extends Solid{ diff --git a/src/block/GlowingRedstoneOre.php b/src/block/GlowingRedstoneOre.php index 70442b69d..729187f9f 100644 --- a/src/block/GlowingRedstoneOre.php +++ b/src/block/GlowingRedstoneOre.php @@ -20,11 +20,11 @@ */ namespace PocketMine\Block; -use PocketMine; -use PocketMine\Block\Block as Block; + +use PocketMine\Item\Item as Item; use PocketMine\Level\Position as Position; use PocketMine\Utils\Utils as Utils; -use PocketMine\Item\Item as Item; +use PocketMine; class GlowingRedstoneOre extends Solid{ public function __construct(){ diff --git a/src/block/Glowstone.php b/src/block/Glowstone.php index ca643c27b..4730cad76 100644 --- a/src/block/Glowstone.php +++ b/src/block/Glowstone.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Gold.php b/src/block/Gold.php index 66969c860..cb9bb811f 100644 --- a/src/block/Gold.php +++ b/src/block/Gold.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/GoldOre.php b/src/block/GoldOre.php index 96562c679..15d1d802d 100644 --- a/src/block/GoldOre.php +++ b/src/block/GoldOre.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Grass.php b/src/block/Grass.php index 5ad77e592..fe5785608 100644 --- a/src/block/Grass.php +++ b/src/block/Grass.php @@ -20,10 +20,11 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\Level\Generator\Object\TallGrass as TallGrass; use PocketMine\Utils\Random as Random; +use PocketMine; class Grass extends Solid{ public function __construct(){ diff --git a/src/block/Gravel.php b/src/block/Gravel.php index 09f30ad87..8b5c7539a 100644 --- a/src/block/Gravel.php +++ b/src/block/Gravel.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/HayBale.php b/src/block/HayBale.php index 45a758aff..8d4cdcaf9 100644 --- a/src/block/HayBale.php +++ b/src/block/HayBale.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Ice.php b/src/block/Ice.php index b8d48e3e0..ee3f8c2c3 100644 --- a/src/block/Ice.php +++ b/src/block/Ice.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Iron.php b/src/block/Iron.php index 87f8bf617..bbd9bb145 100644 --- a/src/block/Iron.php +++ b/src/block/Iron.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/IronBars.php b/src/block/IronBars.php index baced9a3d..8ed96bb10 100644 --- a/src/block/IronBars.php +++ b/src/block/IronBars.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class IronBars extends Transparent{ diff --git a/src/block/IronDoor.php b/src/block/IronDoor.php index 94ec7932f..80cb96849 100644 --- a/src/block/IronDoor.php +++ b/src/block/IronDoor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/IronOre.php b/src/block/IronOre.php index 52698fa89..b5217de13 100644 --- a/src/block/IronOre.php +++ b/src/block/IronOre.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/JungleWoodStairs.php b/src/block/JungleWoodStairs.php index 83eeec5e1..2dc6c22be 100644 --- a/src/block/JungleWoodStairs.php +++ b/src/block/JungleWoodStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Ladder.php b/src/block/Ladder.php index 518a61b24..da85f196c 100644 --- a/src/block/Ladder.php +++ b/src/block/Ladder.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class Ladder extends Transparent{ public function __construct($meta = 0){ diff --git a/src/block/Lapis.php b/src/block/Lapis.php index 4c47bfacc..a836e4c2c 100644 --- a/src/block/Lapis.php +++ b/src/block/Lapis.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/LapisOre.php b/src/block/LapisOre.php index 1ce0704cb..486dc95b7 100644 --- a/src/block/LapisOre.php +++ b/src/block/LapisOre.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Lava.php b/src/block/Lava.php index 2f1f21278..ea8b07c2a 100644 --- a/src/block/Lava.php +++ b/src/block/Lava.php @@ -20,10 +20,11 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Level\Position as Position; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Lava extends Liquid{ public function __construct($meta = 0){ diff --git a/src/block/Leaves.php b/src/block/Leaves.php index ac129ab94..356dde737 100644 --- a/src/block/Leaves.php +++ b/src/block/Leaves.php @@ -20,10 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; -use PocketMine\ServerAPI as ServerAPI; + use PocketMine\Item\Item as Item; -use PocketMine\Item\APPLE as APPLE; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Leaves extends Transparent{ const OAK = 0; diff --git a/src/block/Liquid.php b/src/block/Liquid.php index eba8034e9..275fbc25a 100644 --- a/src/block/Liquid.php +++ b/src/block/Liquid.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Liquid extends Transparent{ diff --git a/src/block/LitPumpkin.php b/src/block/LitPumpkin.php index 44b93854b..e4345f1ca 100644 --- a/src/block/LitPumpkin.php +++ b/src/block/LitPumpkin.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Melon.php b/src/block/Melon.php index 8e35fd922..13e16ec22 100644 --- a/src/block/Melon.php +++ b/src/block/Melon.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/MelonStem.php b/src/block/MelonStem.php index 9d6f38867..2ee2cb08b 100644 --- a/src/block/MelonStem.php +++ b/src/block/MelonStem.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class MelonStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/MossStone.php b/src/block/MossStone.php index 3f47e2580..2bc0095cc 100644 --- a/src/block/MossStone.php +++ b/src/block/MossStone.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/NetherBrick.php b/src/block/NetherBrick.php index d11b532d9..1712ea68b 100644 --- a/src/block/NetherBrick.php +++ b/src/block/NetherBrick.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/NetherBricksStairs.php b/src/block/NetherBricksStairs.php index d0a92609b..903a3f06f 100644 --- a/src/block/NetherBricksStairs.php +++ b/src/block/NetherBricksStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class NetherBricksStairs extends Stair{ diff --git a/src/block/NetherReactor.php b/src/block/NetherReactor.php index a97a5c503..e4d4d673d 100644 --- a/src/block/NetherReactor.php +++ b/src/block/NetherReactor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class NetherReactor extends Solid{ diff --git a/src/block/Netherrack.php b/src/block/Netherrack.php index d83b51b3f..fb03bc359 100644 --- a/src/block/Netherrack.php +++ b/src/block/Netherrack.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Obsidian.php b/src/block/Obsidian.php index c83834938..234180b55 100644 --- a/src/block/Obsidian.php +++ b/src/block/Obsidian.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Planks.php b/src/block/Planks.php index 05c9ef1f4..aaa4d5812 100644 --- a/src/block/Planks.php +++ b/src/block/Planks.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Planks extends Solid{ diff --git a/src/block/Potato.php b/src/block/Potato.php index 00e5d0e77..79ccc295d 100644 --- a/src/block/Potato.php +++ b/src/block/Potato.php @@ -20,10 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Item\POTATO as POTATO; class Potato extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/Pumpkin.php b/src/block/Pumpkin.php index 0b66c5a33..cef654b78 100644 --- a/src/block/Pumpkin.php +++ b/src/block/Pumpkin.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Pumpkin extends Solid{ diff --git a/src/block/PumpkinStem.php b/src/block/PumpkinStem.php index c56727e24..d7992f4fe 100644 --- a/src/block/PumpkinStem.php +++ b/src/block/PumpkinStem.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class PumpkinStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/Quartz.php b/src/block/Quartz.php index c123762c5..b0d5fad80 100644 --- a/src/block/Quartz.php +++ b/src/block/Quartz.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/QuartzStairs.php b/src/block/QuartzStairs.php index 40d8d50b9..0438df077 100644 --- a/src/block/QuartzStairs.php +++ b/src/block/QuartzStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class QuartzStairs extends Stair{ diff --git a/src/block/RedMushroom.php b/src/block/RedMushroom.php index d52b81e20..5e88573fb 100644 --- a/src/block/RedMushroom.php +++ b/src/block/RedMushroom.php @@ -20,8 +20,8 @@ */ namespace PocketMine\Block; + use PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Item\Item as Item; class RedMushroom extends Flowable{ diff --git a/src/block/RedstoneOre.php b/src/block/RedstoneOre.php index c883bb658..0eb31b473 100644 --- a/src/block/RedstoneOre.php +++ b/src/block/RedstoneOre.php @@ -20,8 +20,8 @@ */ namespace PocketMine\Block; + use PocketMine; -use PocketMine\Block\Block as Block; use PocketMine\Item\Item as Item; class RedstoneOre extends Solid{ diff --git a/src/block/Sand.php b/src/block/Sand.php index b4fe25bbe..d6ac1c240 100644 --- a/src/block/Sand.php +++ b/src/block/Sand.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Sand extends Fallable{ diff --git a/src/block/Sandstone.php b/src/block/Sandstone.php index 5dc455a21..96e81d5b9 100644 --- a/src/block/Sandstone.php +++ b/src/block/Sandstone.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/SandstoneStairs.php b/src/block/SandstoneStairs.php index b92f86652..fb2f437ef 100644 --- a/src/block/SandstoneStairs.php +++ b/src/block/SandstoneStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class SandstoneStairs extends Stair{ diff --git a/src/block/Sapling.php b/src/block/Sapling.php index 58a405394..e4630e8d8 100644 --- a/src/block/Sapling.php +++ b/src/block/Sapling.php @@ -20,11 +20,11 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\Level\Generator\Object\Tree as Tree; use PocketMine\Utils\Random as Random; -use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Sapling extends Flowable{ const OAK = 0; diff --git a/src/block/SignPost.php b/src/block/SignPost.php index 6d7cef4c4..e78b122ef 100644 --- a/src/block/SignPost.php +++ b/src/block/SignPost.php @@ -20,10 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; -use PocketMine\ServerAPI as ServerAPI; class SignPost extends Transparent{ public function __construct($meta = 0){ diff --git a/src/block/Slab.php b/src/block/Slab.php index 31d2913c7..6763e6ca0 100644 --- a/src/block/Slab.php +++ b/src/block/Slab.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; class Slab extends Transparent{ public function __construct($meta = 0){ diff --git a/src/block/Snow.php b/src/block/Snow.php index cd100d5fd..be9069792 100644 --- a/src/block/Snow.php +++ b/src/block/Snow.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Snow extends Solid{ diff --git a/src/block/SnowLayer.php b/src/block/SnowLayer.php index 3e413b63d..934bd1ff6 100644 --- a/src/block/SnowLayer.php +++ b/src/block/SnowLayer.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Solid.php b/src/block/Solid.php index 99f2f6975..fcfc06200 100644 --- a/src/block/Solid.php +++ b/src/block/Solid.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Solid extends Generic{ diff --git a/src/block/SoulSand.php b/src/block/SoulSand.php index a545d7163..3c829a5eb 100644 --- a/src/block/SoulSand.php +++ b/src/block/SoulSand.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class SoulSand extends Solid{ diff --git a/src/block/Sponge.php b/src/block/Sponge.php index 1afcb19ca..1536fd5fd 100644 --- a/src/block/Sponge.php +++ b/src/block/Sponge.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Sponge extends Solid{ diff --git a/src/block/SpruceWoodStairs.php b/src/block/SpruceWoodStairs.php index a2e200a14..47a5561d5 100644 --- a/src/block/SpruceWoodStairs.php +++ b/src/block/SpruceWoodStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Stair.php b/src/block/Stair.php index 06dd0a38e..f3b1cd919 100644 --- a/src/block/Stair.php +++ b/src/block/Stair.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/StillLava.php b/src/block/StillLava.php index 76d7d84c0..f193c472b 100644 --- a/src/block/StillLava.php +++ b/src/block/StillLava.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class StillLava extends Liquid{ diff --git a/src/block/StillWater.php b/src/block/StillWater.php index e7e4d372b..54f044c3d 100644 --- a/src/block/StillWater.php +++ b/src/block/StillWater.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class StillWater extends Water{ diff --git a/src/block/Stone.php b/src/block/Stone.php index fef2d1b97..29910312e 100644 --- a/src/block/Stone.php +++ b/src/block/Stone.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/StoneBrickStairs.php b/src/block/StoneBrickStairs.php index 1346de5ff..ad28ebe6a 100644 --- a/src/block/StoneBrickStairs.php +++ b/src/block/StoneBrickStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class StoneBrickStairs extends Stair{ diff --git a/src/block/StoneBricks.php b/src/block/StoneBricks.php index dba7b0279..acb6dca7b 100644 --- a/src/block/StoneBricks.php +++ b/src/block/StoneBricks.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/StoneWall.php b/src/block/StoneWall.php index a11cb693e..1823e0e44 100644 --- a/src/block/StoneWall.php +++ b/src/block/StoneWall.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class StoneWall extends Transparent{ diff --git a/src/block/Stonecutter.php b/src/block/Stonecutter.php index 58d201200..672e23e01 100644 --- a/src/block/Stonecutter.php +++ b/src/block/Stonecutter.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Sugarcane.php b/src/block/Sugarcane.php index a6bb5d5db..002079984 100644 --- a/src/block/Sugarcane.php +++ b/src/block/Sugarcane.php @@ -20,11 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; -use PocketMine\Item\SUGARCANE as SUGARCANE; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Sugarcane extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/TNT.php b/src/block/TNT.php index 37e22045c..a94706c94 100644 --- a/src/block/TNT.php +++ b/src/block/TNT.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class TNT extends Solid{ public function __construct(){ diff --git a/src/block/Torch.php b/src/block/Torch.php index 6a3578136..ce2e856d8 100644 --- a/src/block/Torch.php +++ b/src/block/Torch.php @@ -20,8 +20,8 @@ */ namespace PocketMine\Block; + use PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Item\Item as Item; class Torch extends Flowable{ diff --git a/src/block/Transparent.php b/src/block/Transparent.php index 4c03a9dc3..151676249 100644 --- a/src/block/Transparent.php +++ b/src/block/Transparent.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Transparent extends Generic{ diff --git a/src/block/Trapdoor.php b/src/block/Trapdoor.php index bf4c8fa2e..04e95bc48 100644 --- a/src/block/Trapdoor.php +++ b/src/block/Trapdoor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/WallSign.php b/src/block/WallSign.php index dccad3b15..77cfbebd4 100644 --- a/src/block/WallSign.php +++ b/src/block/WallSign.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class WallSign extends SignPost{ diff --git a/src/block/Water.php b/src/block/Water.php index f3b60b0aa..340f6b751 100644 --- a/src/block/Water.php +++ b/src/block/Water.php @@ -20,9 +20,10 @@ */ namespace PocketMine\Block; -use PocketMine; + use PocketMine\Item\Item as Item; use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Water extends Liquid{ public function __construct($meta = 0){ diff --git a/src/block/Wheat.php b/src/block/Wheat.php index 153e645db..3996dce19 100644 --- a/src/block/Wheat.php +++ b/src/block/Wheat.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\ServerAPI as ServerAPI; class Wheat extends Flowable{ public function __construct($meta = 0){ diff --git a/src/block/Wood.php b/src/block/Wood.php index aaa3ddaf3..68e7c4249 100644 --- a/src/block/Wood.php +++ b/src/block/Wood.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/WoodDoor.php b/src/block/WoodDoor.php index 306a6e2a2..84a55ca5f 100644 --- a/src/block/WoodDoor.php +++ b/src/block/WoodDoor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/WoodSlab.php b/src/block/WoodSlab.php index 796886919..e12a436d2 100644 --- a/src/block/WoodSlab.php +++ b/src/block/WoodSlab.php @@ -20,9 +20,9 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; class WoodSlab extends Transparent{ public function __construct($meta = 0){ diff --git a/src/block/WoodStairs.php b/src/block/WoodStairs.php index 9836f67b0..fc12048ee 100644 --- a/src/block/WoodStairs.php +++ b/src/block/WoodStairs.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/block/Wool.php b/src/block/Wool.php index dd38df85c..791d38f9d 100644 --- a/src/block/Wool.php +++ b/src/block/Wool.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; class Wool extends Solid{ diff --git a/src/block/Workbench.php b/src/block/Workbench.php index 282ea2acf..b44745424 100644 --- a/src/block/Workbench.php +++ b/src/block/Workbench.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Block; + use PocketMine; use PocketMine\Item\Item as Item; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index a04d93089..30858ac0a 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -21,19 +21,19 @@ namespace PocketMine\Entity; -use PocketMine; -use PocketMine\Level\Position as Position; +use PocketMine\Event\Entity\EntityLevelChangeEvent as EntityLevelChangeEvent; +use PocketMine\Event\Entity\EntityMotionEvent as EntityMotionEvent; +use PocketMine\Event\Entity\EntityMoveEvent as EntityMoveEvent; +use PocketMine\Event\Event as Event; +use PocketMine\Event\EventHandler as EventHandler; use PocketMine\Level\Level as Level; -use PocketMine\NBT\Tag\Compound as Compound; +use PocketMine\Level\Position as Position; use PocketMine\Math\AxisAlignedBB as AxisAlignedBB; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\Player as Player; -use PocketMine\Event\EventHandler as EventHandler; -use PocketMine\Event\Entity\EntityLevelChangeEvent as EntityLevelChangeEvent; -use PocketMine\Event\Event as Event; -use PocketMine\Event\Entity\EntityMoveEvent as EntityMoveEvent; -use PocketMine\Event\Entity\EntityMotionEvent as EntityMotionEvent; +use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine; abstract class Entity extends Position{ public static $entityCount = 1; diff --git a/src/entity/Human.php b/src/entity/Human.php index 4f19a7756..dee307185 100644 --- a/src/entity/Human.php +++ b/src/entity/Human.php @@ -21,16 +21,15 @@ namespace PocketMine\Entity; -use PocketMine; -use PocketMine\Item\Item as Item; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\NBT\Tag\Byte as Byte; -use PocketMine\NBT\Tag\Short as Short; -use PocketMine\Event\EventHandler as EventHandler; use PocketMine\Event\Entity\EntityArmorChangeEvent as EntityArmorChangeEvent; -use PocketMine\Event\Event as Event; use PocketMine\Event\Entity\EntityInventoryChangeEvent as EntityInventoryChangeEvent; +use PocketMine\Event\Event as Event; +use PocketMine\Event\EventHandler as EventHandler; +use PocketMine\Item\Item as Item; +use PocketMine\NBT\Tag\Byte as Byte; +use PocketMine\NBT\Tag\Compound as Compound; +use PocketMine\NBT\Tag\Short as Short; +use PocketMine; class Human extends Creature implements ProjectileSource, InventorySource{ diff --git a/src/event/Event.php b/src/event/Event.php index 3e719c83e..bca4d4aa3 100644 --- a/src/event/Event.php +++ b/src/event/Event.php @@ -22,7 +22,6 @@ namespace PocketMine\Event; use PocketMine; -use PocketMine\Event\EventPriority as EventPriority; use PocketMine\Utils\Utils as Utils; abstract class Event{ diff --git a/src/event/EventHandler.php b/src/event/EventHandler.php index b8cff179b..cc71229d6 100644 --- a/src/event/EventHandler.php +++ b/src/event/EventHandler.php @@ -22,7 +22,6 @@ namespace PocketMine\Event; use PocketMine; -use PocketMine\Event\Event as Event; abstract class EventHandler{ diff --git a/src/event/entity/EntityArmorChangeEvent.php b/src/event/entity/EntityArmorChangeEvent.php index 21d3e447e..e018dd464 100644 --- a/src/event/entity/EntityArmorChangeEvent.php +++ b/src/event/entity/EntityArmorChangeEvent.php @@ -21,9 +21,9 @@ namespace PocketMine\Event\Entity; +use PocketMine\Entity\Entity as Entity; use PocketMine\Event; use PocketMine; -use PocketMine\Entity\Entity as Entity; use PocketMine\Item\Item as Item; class EntityArmorChangeEvent extends EntityEvent implements CancellableEvent{ diff --git a/src/event/entity/EntityEvent.php b/src/event/entity/EntityEvent.php index 742f96323..01192ff9b 100644 --- a/src/event/entity/EntityEvent.php +++ b/src/event/entity/EntityEvent.php @@ -21,8 +21,8 @@ namespace PocketMine\Event\Entity; -use PocketMine\Event; use PocketMine; +use PocketMine\Event; abstract class EntityEvent extends Event{ protected $entity; diff --git a/src/event/entity/EntityInventoryChangeEvent.php b/src/event/entity/EntityInventoryChangeEvent.php index 28b9aee01..91066839d 100644 --- a/src/event/entity/EntityInventoryChangeEvent.php +++ b/src/event/entity/EntityInventoryChangeEvent.php @@ -21,9 +21,9 @@ namespace PocketMine\Event\Entity; +use PocketMine\Entity\Entity as Entity; use PocketMine\Event; use PocketMine; -use PocketMine\Entity\Entity as Entity; use PocketMine\Item\Item as Item; class EntityInventoryChangeEvent extends EntityEvent implements CancellableEvent{ diff --git a/src/event/entity/EntityLevelChangeEvent.php b/src/event/entity/EntityLevelChangeEvent.php index 3257c9e03..99a7b916a 100644 --- a/src/event/entity/EntityLevelChangeEvent.php +++ b/src/event/entity/EntityLevelChangeEvent.php @@ -21,9 +21,9 @@ namespace PocketMine\Event\Entity; +use PocketMine\Entity\Entity as Entity; use PocketMine\Event; use PocketMine; -use PocketMine\Entity\Entity as Entity; use PocketMine\Level\Level as Level; class EntityLevelChangeEvent extends EntityEvent implements CancellableEvent{ diff --git a/src/event/entity/EntityMotionEvent.php b/src/event/entity/EntityMotionEvent.php index 4079a61b5..4f53c8015 100644 --- a/src/event/entity/EntityMotionEvent.php +++ b/src/event/entity/EntityMotionEvent.php @@ -21,9 +21,9 @@ namespace PocketMine\Event\Entity; +use PocketMine\Entity\Entity as Entity; use PocketMine\Event; use PocketMine; -use PocketMine\Entity\Entity as Entity; use PocketMine\Math\Vector3 as Vector3; class EntityMotionEvent extends EntityEvent implements CancellableEvent{ diff --git a/src/event/entity/EntityMoveEvent.php b/src/event/entity/EntityMoveEvent.php index 3c3ca9571..4cddb703b 100644 --- a/src/event/entity/EntityMoveEvent.php +++ b/src/event/entity/EntityMoveEvent.php @@ -21,9 +21,9 @@ namespace PocketMine\Event\Entity; +use PocketMine\Entity\Entity as Entity; use PocketMine\Event; use PocketMine; -use PocketMine\Entity\Entity as Entity; use PocketMine\Math\Vector3 as Vector3; class EntityMoveEvent extends EntityEvent implements CancellableEvent{ diff --git a/src/event/player/PlayerEvent.php b/src/event/player/PlayerEvent.php index cf99ce4b8..7e58d2d7a 100644 --- a/src/event/player/PlayerEvent.php +++ b/src/event/player/PlayerEvent.php @@ -21,8 +21,8 @@ namespace PocketMine\Event\Player; -use PocketMine\Event; use PocketMine; +use PocketMine\Event; abstract class PlayerEvent extends Event{ protected $player; diff --git a/src/event/plugin/PluginEvent.php b/src/event/plugin/PluginEvent.php index a395986df..9c3ad0439 100644 --- a/src/event/plugin/PluginEvent.php +++ b/src/event/plugin/PluginEvent.php @@ -21,8 +21,8 @@ namespace PocketMine\Event\Plugin; -use PocketMine\Event; use PocketMine; +use PocketMine\Event; abstract class PluginEvent extends Event{ diff --git a/src/event/server/ServerEvent.php b/src/event/server/ServerEvent.php index 903f7f631..3f4b4a492 100644 --- a/src/event/server/ServerEvent.php +++ b/src/event/server/ServerEvent.php @@ -21,8 +21,8 @@ namespace PocketMine\Event\Server; -use PocketMine\Event; use PocketMine; +use PocketMine\Event; abstract class ServerEvent extends Event{ diff --git a/src/event/tile/TileEvent.php b/src/event/tile/TileEvent.php index 725fb4457..bea25a0e8 100644 --- a/src/event/tile/TileEvent.php +++ b/src/event/tile/TileEvent.php @@ -21,8 +21,8 @@ namespace PocketMine\Event\Tile; -use PocketMine\Event; use PocketMine; +use PocketMine\Event; abstract class TileEvent extends Event{ protected $tile; diff --git a/src/event/tile/TileInventoryChangeEvent.php b/src/event/tile/TileInventoryChangeEvent.php index 353ad69f0..f990d861e 100644 --- a/src/event/tile/TileInventoryChangeEvent.php +++ b/src/event/tile/TileInventoryChangeEvent.php @@ -22,9 +22,9 @@ namespace PocketMine\Event\Tile; use PocketMine\Event; +use PocketMine\Item\Item as Item; use PocketMine; use PocketMine\Tile\Tile as Tile; -use PocketMine\Item\Item as Item; class TileInventoryChangeEvent extends TileEvent implements CancellableEvent{ public static $handlers; diff --git a/src/item/Apple.php b/src/item/Apple.php index df939d2fa..1efa47059 100644 --- a/src/item/Apple.php +++ b/src/item/Apple.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Apple extends Item{ diff --git a/src/item/Bed.php b/src/item/Bed.php index 6e0a0caaf..7162bdf93 100644 --- a/src/item/Bed.php +++ b/src/item/Bed.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/BeetrootSeeds.php b/src/item/BeetrootSeeds.php index 562612803..a7946e91a 100644 --- a/src/item/BeetrootSeeds.php +++ b/src/item/BeetrootSeeds.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/BeetrootSoup.php b/src/item/BeetrootSoup.php index d4023e383..4684321c2 100644 --- a/src/item/BeetrootSoup.php +++ b/src/item/BeetrootSoup.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class BeetrootSoup extends Item{ diff --git a/src/item/Block.php b/src/item/Block.php index bf27fc8fe..2ef319071 100644 --- a/src/item/Block.php +++ b/src/item/Block.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as BlockBlock; diff --git a/src/item/Bowl.php b/src/item/Bowl.php index 878e0d3ea..1f2399abb 100644 --- a/src/item/Bowl.php +++ b/src/item/Bowl.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Bowl extends Item{ diff --git a/src/item/Brick.php b/src/item/Brick.php index c07a35f5b..dea29c4d8 100644 --- a/src/item/Brick.php +++ b/src/item/Brick.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Brick extends Item{ diff --git a/src/item/Bucket.php b/src/item/Bucket.php index 5bfdece9e..a77bf4b9c 100644 --- a/src/item/Bucket.php +++ b/src/item/Bucket.php @@ -20,13 +20,14 @@ */ namespace PocketMine\Item; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Block\Block as Block; + use PocketMine\Block\Air as Air; -use PocketMine\Block\Water as Water; +use PocketMine\Block\Block as Block; use PocketMine\Block\Lava as Lava; use PocketMine\Block\Liquid as Liquid; +use PocketMine\Block\Water as Water; +use PocketMine\Level\Level as Level; +use PocketMine; class Bucket extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/item/Cake.php b/src/item/Cake.php index 235d74fb9..96a62d0aa 100644 --- a/src/item/Cake.php +++ b/src/item/Cake.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/Carrot.php b/src/item/Carrot.php index 2fb48c97b..93eab6736 100644 --- a/src/item/Carrot.php +++ b/src/item/Carrot.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/Coal.php b/src/item/Coal.php index 61634c87c..490626657 100644 --- a/src/item/Coal.php +++ b/src/item/Coal.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Coal extends Item{ diff --git a/src/item/Diamond.php b/src/item/Diamond.php index 1559e6610..91fad34ea 100644 --- a/src/item/Diamond.php +++ b/src/item/Diamond.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Diamond extends Item{ diff --git a/src/item/Feather.php b/src/item/Feather.php index 59bc85a94..3e9d83775 100644 --- a/src/item/Feather.php +++ b/src/item/Feather.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Feather extends Item{ diff --git a/src/item/FlintSteel.php b/src/item/FlintSteel.php index 1a692ff0b..999c0a115 100644 --- a/src/item/FlintSteel.php +++ b/src/item/FlintSteel.php @@ -20,11 +20,12 @@ */ namespace PocketMine\Item; -use PocketMine; -use PocketMine\Level\Level as Level; + use PocketMine\Block\Block as Block; use PocketMine\Block\Fire as Fire; use PocketMine\Block\Solid as Solid; +use PocketMine\Level\Level as Level; +use PocketMine; class FlintSteel extends Item{ public function __construct($meta = 0, $count = 1){ @@ -40,6 +41,7 @@ class FlintSteel extends Item{ if($block->getID() === AIR and ($target instanceof Solid)){ $level->setBlock($block, new Fire(), true, false, true); + return true; } diff --git a/src/item/GoldIngot.php b/src/item/GoldIngot.php index ca0462926..1f2eb4ece 100644 --- a/src/item/GoldIngot.php +++ b/src/item/GoldIngot.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class GoldIngot extends Item{ diff --git a/src/item/IronAxe.php b/src/item/IronAxe.php index 0e62f1afe..7a3a2a2d8 100644 --- a/src/item/IronAxe.php +++ b/src/item/IronAxe.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class IronAxe extends Item{ diff --git a/src/item/IronDoor.php b/src/item/IronDoor.php index c04951ee1..d86333852 100644 --- a/src/item/IronDoor.php +++ b/src/item/IronDoor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/IronHoe.php b/src/item/IronHoe.php index 23fd6b5a3..1cde19b67 100644 --- a/src/item/IronHoe.php +++ b/src/item/IronHoe.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class IronHoe extends Item{ diff --git a/src/item/IronIngot.php b/src/item/IronIngot.php index e6d4313fe..2698aa5ac 100644 --- a/src/item/IronIngot.php +++ b/src/item/IronIngot.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class IronIngot extends Item{ diff --git a/src/item/IronPickaxe.php b/src/item/IronPickaxe.php index c1fb215b6..e62c98966 100644 --- a/src/item/IronPickaxe.php +++ b/src/item/IronPickaxe.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class IronPickaxe extends Item{ diff --git a/src/item/IronShovel.php b/src/item/IronShovel.php index cd6410e57..a9f6a6847 100644 --- a/src/item/IronShovel.php +++ b/src/item/IronShovel.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class IronShovel extends Item{ diff --git a/src/item/Item.php b/src/item/Item.php index e86d881d5..0d3f0e8be 100644 --- a/src/item/Item.php +++ b/src/item/Item.php @@ -344,15 +344,13 @@ const BEETROOT = 457; const BEETROOT_SEEDS = 458; const BEETROOT_SEED = 458; const BEETROOT_SOUP = 459; -use PocketMine; use PocketMine\Block\Block as Block; +use PocketMine\Entity\Entity as Entity; use PocketMine\Item\Block as ItemBlock; +use PocketMine\Level\Level as Level; use PocketMine\Recipes\Fuel as Fuel; use PocketMine\Recipes\Smelt as Smelt; -use PocketMine\Entity\Entity as Entity; -use PocketMine\Block\GRASS as GRASS; -use PocketMine\Block\DIRT as DIRT; -use PocketMine\Level\Level as Level; +use PocketMine; class Item{ @@ -417,9 +415,10 @@ class Item{ $item = clone self::$list[$id]; $item->setMetadata($meta); $item->setCount($count); - }else{ + } else{ $item = new Item($id, $meta, $count); } + return $item; } diff --git a/src/item/MelonSeeds.php b/src/item/MelonSeeds.php index ffc816121..c71afedd9 100644 --- a/src/item/MelonSeeds.php +++ b/src/item/MelonSeeds.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/MushroomStew.php b/src/item/MushroomStew.php index ee70030e3..6f721f1a8 100644 --- a/src/item/MushroomStew.php +++ b/src/item/MushroomStew.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class MushroomStew extends Item{ diff --git a/src/item/Painting.php b/src/item/Painting.php index 3a8eca11a..32fc4ed8c 100644 --- a/src/item/Painting.php +++ b/src/item/Painting.php @@ -20,11 +20,11 @@ */ namespace PocketMine\Item; -use PocketMine; -use PocketMine\Level\Level as Level; + use PocketMine\Block\Block as Block; +use PocketMine\Level\Level as Level; use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Item\Item as Item; +use PocketMine; class Painting extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/item/Potato.php b/src/item/Potato.php index fa7e0fe5e..d0b807f5e 100644 --- a/src/item/Potato.php +++ b/src/item/Potato.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/PumpkinSeeds.php b/src/item/PumpkinSeeds.php index 93c6cc491..9e7747d36 100644 --- a/src/item/PumpkinSeeds.php +++ b/src/item/PumpkinSeeds.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/SignItem.php b/src/item/SignItem.php index 43fdc50fd..ad8bfc277 100644 --- a/src/item/SignItem.php +++ b/src/item/SignItem.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/SpawnEgg.php b/src/item/SpawnEgg.php index 873624b9b..3b378b1b6 100644 --- a/src/item/SpawnEgg.php +++ b/src/item/SpawnEgg.php @@ -20,10 +20,10 @@ */ namespace PocketMine\Item; -use PocketMine; -use PocketMine\Level\Level as Level; + use PocketMine\Block\Block as Block; -use PocketMine\ServerAPI as ServerAPI; +use PocketMine\Level\Level as Level; +use PocketMine; class SpawnEgg extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/item/Stick.php b/src/item/Stick.php index 8b387c5b1..c4cdec2d0 100644 --- a/src/item/Stick.php +++ b/src/item/Stick.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class Stick extends Item{ diff --git a/src/item/Sugarcane.php b/src/item/Sugarcane.php index 3b21eed1b..85f7c090d 100644 --- a/src/item/Sugarcane.php +++ b/src/item/Sugarcane.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/WheatSeeds.php b/src/item/WheatSeeds.php index 0f2b8c617..d700ff5da 100644 --- a/src/item/WheatSeeds.php +++ b/src/item/WheatSeeds.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/WoodenAxe.php b/src/item/WoodenAxe.php index 9428d7ba9..db90c3f24 100644 --- a/src/item/WoodenAxe.php +++ b/src/item/WoodenAxe.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class WoodenAxe extends Item{ diff --git a/src/item/WoodenDoor.php b/src/item/WoodenDoor.php index 51cc3544b..6a2a200fc 100644 --- a/src/item/WoodenDoor.php +++ b/src/item/WoodenDoor.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; use PocketMine\Block\Block as Block; diff --git a/src/item/WoodenPickaxe.php b/src/item/WoodenPickaxe.php index a6a511c70..58ff5a096 100644 --- a/src/item/WoodenPickaxe.php +++ b/src/item/WoodenPickaxe.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class WoodenPickaxe extends Item{ diff --git a/src/item/WoodenShovel.php b/src/item/WoodenShovel.php index b80d91234..1620b8e2d 100644 --- a/src/item/WoodenShovel.php +++ b/src/item/WoodenShovel.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class WoodenShovel extends Item{ diff --git a/src/item/WoodenSword.php b/src/item/WoodenSword.php index a86a33ca8..d0f82fb14 100644 --- a/src/item/WoodenSword.php +++ b/src/item/WoodenSword.php @@ -20,6 +20,7 @@ */ namespace PocketMine\Item; + use PocketMine; class WoodenSword extends Item{ diff --git a/src/level/Explosion.php b/src/level/Explosion.php index 031cb45bd..a335ed96d 100644 --- a/src/level/Explosion.php +++ b/src/level/Explosion.php @@ -21,15 +21,12 @@ namespace PocketMine\Level; -use PocketMine; -use PocketMine\Level\Position as Position; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Block\TNT as TNT; -use PocketMine\Player as Player; use PocketMine\Block\Block as Block; -use PocketMine\Item\Item as Item; +use PocketMine\Block\TNT as TNT; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Player as Player; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Explosion{ public static $specialDrops = array( diff --git a/src/level/Level.php b/src/level/Level.php index 00bba5fdf..75a4e1e76 100644 --- a/src/level/Level.php +++ b/src/level/Level.php @@ -21,23 +21,22 @@ namespace PocketMine\Level; -use PocketMine; -use PocketMine\PMF\LevelFormat as LevelFormat; -use PocketMine\ServerAPI as ServerAPI; +use PocketMine\Block\Air as Air; +use PocketMine\Block\Block as Block; use PocketMine\Level\Generator\Generator as Generator; -use PocketMine\Utils\Random as Random; -use PocketMine\Player as Player; use PocketMine\Math\Vector3 as Vector3; use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Block\Block as Block; -use PocketMine\Utils\Cache as Cache; -use PocketMine\Tile\Tile as Tile; +use PocketMine\Player as Player; +use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine\ServerAPI as ServerAPI; use PocketMine\Tile\Chest as Chest; use PocketMine\Tile\Furnace as Furnace; use PocketMine\Tile\Sign as Sign; -use PocketMine\Block\Air as Air; +use PocketMine\Tile\Tile as Tile; +use PocketMine\Utils\Cache as Cache; +use PocketMine\Utils\Random as Random; +use PocketMine; class Level{ public $players = array(); diff --git a/src/level/LevelImport.php b/src/level/LevelImport.php index ec17f8583..b074cfc58 100644 --- a/src/level/LevelImport.php +++ b/src/level/LevelImport.php @@ -21,9 +21,9 @@ namespace PocketMine\Level; -use PocketMine; -use PocketMine\Utils\Config as Config; use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine\Utils\Config as Config; +use PocketMine; class LevelImport{ private $path; diff --git a/src/level/WorldGenerator.php b/src/level/WorldGenerator.php index 7f94cde77..41c35f86d 100644 --- a/src/level/WorldGenerator.php +++ b/src/level/WorldGenerator.php @@ -21,12 +21,12 @@ namespace PocketMine\Level; -use PocketMine; use PocketMine\Level\Generator\Generator as Generator; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Utils\Random as Random; use PocketMine\PMF\LevelFormat as LevelFormat; use PocketMine\Utils\Config as Config; +use PocketMine\Utils\Random as Random; +use PocketMine\Utils\Utils as Utils; +use PocketMine; class WorldGenerator{ private $seed, $level, $path, $random, $generator, $height; diff --git a/src/level/generator/Flat.php b/src/level/generator/Flat.php index bd393de2f..bf6a50040 100644 --- a/src/level/generator/Flat.php +++ b/src/level/generator/Flat.php @@ -21,21 +21,20 @@ namespace PocketMine\Level\Generator; -use PocketMine; -use PocketMine\Level\Generator\Populator\Ore as Ore; use PocketMine\Block\CoalOre as CoalOre; -use PocketMine\Block\IronOre as IronOre; -use PocketMine\Block\RedstoneOre as RedstoneOre; -use PocketMine\Block\LapisOre as LapisOre; -use PocketMine\Block\GoldOre as GoldOre; use PocketMine\Block\DiamondOre as DiamondOre; use PocketMine\Block\Dirt as Dirt; +use PocketMine\Block\GoldOre as GoldOre; use PocketMine\Block\Gravel as Gravel; +use PocketMine\Block\IronOre as IronOre; +use PocketMine\Block\LapisOre as LapisOre; +use PocketMine\Block\RedstoneOre as RedstoneOre; use PocketMine\BlockAPI as BlockAPI; +use PocketMine\Level\Generator\Populator\Ore as Ore; use PocketMine\Level\Level as Level; -use PocketMine\Utils\Random as Random; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Level\Generator\Generator as Generator; +use PocketMine\Utils\Random as Random; +use PocketMine; class Flat extends Generator{ private $level, $random, $structure, $chunks, $options, $floorLevel, $preset, $populators = array(); diff --git a/src/level/generator/Generator.php b/src/level/generator/Generator.php index cd4b3eeb4..decad7e95 100644 --- a/src/level/generator/Generator.php +++ b/src/level/generator/Generator.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator; -use PocketMine; use PocketMine\Level\Level as Level; use PocketMine\Utils\Random as Random; +use PocketMine; abstract class Generator{ private static $list = array(); diff --git a/src/level/generator/Normal.php b/src/level/generator/Normal.php index 6bfcfe32e..c2b20c82a 100644 --- a/src/level/generator/Normal.php +++ b/src/level/generator/Normal.php @@ -21,24 +21,23 @@ namespace PocketMine\Level\Generator; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Utils\Random as Random; -use PocketMine\Level\Generator\Noise\Simplex as Simplex; -use PocketMine\Level\Generator\Populator\Ore as Ore; -use PocketMine\Level\Generator\Object\OreType as OreType; use PocketMine\Block\CoalOre as CoalOre; -use PocketMine\Block\IronOre as IronOre; -use PocketMine\Block\RedstoneOre as RedstoneOre; -use PocketMine\Block\LapisOre as LapisOre; -use PocketMine\Block\GoldOre as GoldOre; use PocketMine\Block\DiamondOre as DiamondOre; use PocketMine\Block\Dirt as Dirt; +use PocketMine\Block\GoldOre as GoldOre; use PocketMine\Block\Gravel as Gravel; -use PocketMine\Level\Generator\Populator\Tree as Tree; +use PocketMine\Block\IronOre as IronOre; +use PocketMine\Block\LapisOre as LapisOre; +use PocketMine\Block\RedstoneOre as RedstoneOre; +use PocketMine\Level\Generator\Noise\Simplex as Simplex; +use PocketMine\Level\Generator\Object\OreType as OreType; +use PocketMine\Level\Generator\Populator\Ore as Ore; use PocketMine\Level\Generator\Populator\TallGrass as TallGrass; +use PocketMine\Level\Generator\Populator\Tree as Tree; +use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Level\Generator\Generator as Generator; +use PocketMine\Utils\Random as Random; +use PocketMine; class Normal extends Generator{ diff --git a/src/level/generator/noise/Simplex.php b/src/level/generator/noise/Simplex.php index 03f0b8e64..c105c44b9 100644 --- a/src/level/generator/noise/Simplex.php +++ b/src/level/generator/noise/Simplex.php @@ -21,8 +21,8 @@ namespace PocketMine\Level\Generator\Noise; -use PocketMine\Level; use PocketMine; +use PocketMine\Level; /** * Generates simplex-based noise. diff --git a/src/level/generator/object/BigTree.php b/src/level/generator/object/BigTree.php index dcb74660c..2d82f26cc 100644 --- a/src/level/generator/object/BigTree.php +++ b/src/level/generator/object/BigTree.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; +use PocketMine; class BigTree extends Tree{ private $trunkHeightMultiplier = 0.618; diff --git a/src/level/generator/object/Ore.php b/src/level/generator/object/Ore.php index 197eb279c..1dbb4929b 100644 --- a/src/level/generator/object/Ore.php +++ b/src/level/generator/object/Ore.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; -use PocketMine\Utils\Random as Random; use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; use PocketMine\Math\VectorMath as VectorMath; +use PocketMine\Utils\Random as Random; +use PocketMine; class Ore{ private $random; diff --git a/src/level/generator/object/PineTree.php b/src/level/generator/object/PineTree.php index afec213d5..b550cb44a 100644 --- a/src/level/generator/object/PineTree.php +++ b/src/level/generator/object/PineTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random as Random; use PocketMine\Block\Dirt as Dirt; use PocketMine\Block\Leaves as Leaves; use PocketMine\Block\Wood as Wood; +use PocketMine\Level\Level as Level; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class PineTree extends Tree{ var $type = 1; diff --git a/src/level/generator/object/Pond.php b/src/level/generator/object/Pond.php index 1b447d1b6..1b4e0d3e6 100644 --- a/src/level/generator/object/Pond.php +++ b/src/level/generator/object/Pond.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; -use PocketMine\Utils\Random as Random; use PocketMine\Block\Block as Block; use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class Pond{ private $random; diff --git a/src/level/generator/object/SmallTree.php b/src/level/generator/object/SmallTree.php index ead99e63a..69c0a9ac0 100644 --- a/src/level/generator/object/SmallTree.php +++ b/src/level/generator/object/SmallTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random as Random; use PocketMine\Block\Dirt as Dirt; use PocketMine\Block\Leaves as Leaves; use PocketMine\Block\Wood as Wood; +use PocketMine\Level\Level as Level; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class SmallTree extends Tree{ public $type = 0; diff --git a/src/level/generator/object/SpruceTree.php b/src/level/generator/object/SpruceTree.php index 121684232..7b2dca1bf 100644 --- a/src/level/generator/object/SpruceTree.php +++ b/src/level/generator/object/SpruceTree.php @@ -21,13 +21,13 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random as Random; use PocketMine\Block\Dirt as Dirt; use PocketMine\Block\Leaves as Leaves; use PocketMine\Block\Wood as Wood; +use PocketMine\Level\Level as Level; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class SpruceTree extends Tree{ var $type = 1; diff --git a/src/level/generator/object/TallGrass.php b/src/level/generator/object/TallGrass.php index 78e158d41..a36111443 100644 --- a/src/level/generator/object/TallGrass.php +++ b/src/level/generator/object/TallGrass.php @@ -21,11 +21,10 @@ namespace PocketMine\Level\Generator\Object; +use PocketMine\Block\Block as Block; use PocketMine\Level; use PocketMine; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Block\Block as Block; class TallGrass{ public static function growGrass(Level $level, Vector3 $pos, Random $random, $count = 15, $radius = 10){ diff --git a/src/level/generator/object/Tree.php b/src/level/generator/object/Tree.php index 511a80a87..546f63999 100644 --- a/src/level/generator/object/Tree.php +++ b/src/level/generator/object/Tree.php @@ -21,10 +21,10 @@ namespace PocketMine\Level\Generator\Object; -use PocketMine; +use PocketMine\Block\Sapling as Sapling; use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Block\Sapling as Sapling; +use PocketMine; class Tree{ public $overridable = array( diff --git a/src/level/generator/populator/Mineshaft.php b/src/level/generator/populator/Mineshaft.php index 60ba58299..51e4c88b0 100644 --- a/src/level/generator/populator/Mineshaft.php +++ b/src/level/generator/populator/Mineshaft.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Level as Level; use PocketMine\Utils\Random as Random; +use PocketMine; class Mineshaft extends Populator{ private static $DISTANCE = 256; diff --git a/src/level/generator/populator/Ore.php b/src/level/generator/populator/Ore.php index acf016d61..38e659c8e 100644 --- a/src/level/generator/populator/Ore.php +++ b/src/level/generator/populator/Ore.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Utils\Random as Random; use PocketMine\Level\Generator\Object\Ore as ObjectOre; +use PocketMine\Level\Level as Level; use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class Ore extends Populator{ private $oreTypes = array(); diff --git a/src/level/generator/populator/Pond.php b/src/level/generator/populator/Pond.php index 955bc88a2..486d517f3 100644 --- a/src/level/generator/populator/Pond.php +++ b/src/level/generator/populator/Pond.php @@ -21,11 +21,11 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; -use PocketMine\Level\Level as Level; -use PocketMine\Utils\Random as Random; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Block\Water as Water; +use PocketMine\Level\Level as Level; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class Pond extends Populator{ private $waterOdd = 4; diff --git a/src/level/generator/populator/Populator.php b/src/level/generator/populator/Populator.php index ea8e86755..d24153093 100644 --- a/src/level/generator/populator/Populator.php +++ b/src/level/generator/populator/Populator.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Level as Level; use PocketMine\Utils\Random as Random; +use PocketMine; abstract class Populator{ public abstract function populate(Level $level, $chunkX, $chunkZ, Random $random); diff --git a/src/level/generator/populator/TallGrass.php b/src/level/generator/populator/TallGrass.php index c48a6100d..181f87c6a 100644 --- a/src/level/generator/populator/TallGrass.php +++ b/src/level/generator/populator/TallGrass.php @@ -21,9 +21,9 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; -use PocketMine\Math\Vector3 as Vector3; use PocketMine\Block\TallGrass as BlockTallGrass; +use PocketMine\Math\Vector3 as Vector3; +use PocketMine; class TallGrass extends Populator{ private $level; diff --git a/src/level/generator/populator/Tree.php b/src/level/generator/populator/Tree.php index a397b1bc0..c7c3f34e5 100644 --- a/src/level/generator/populator/Tree.php +++ b/src/level/generator/populator/Tree.php @@ -21,10 +21,10 @@ namespace PocketMine\Level\Generator\Populator; -use PocketMine; use PocketMine\Level\Level as Level; -use PocketMine\Utils\Random as Random; use PocketMine\Math\Vector3 as Vector3; +use PocketMine\Utils\Random as Random; +use PocketMine; class Tree extends Populator{ private $level; diff --git a/src/math/AxisAlignedBB.php b/src/math/AxisAlignedBB.php index 37d26ef12..aaf5ab163 100644 --- a/src/math/AxisAlignedBB.php +++ b/src/math/AxisAlignedBB.php @@ -22,7 +22,6 @@ namespace PocketMine\Math; use PocketMine; -use PocketMine\Math\Vector3 as Vector3; class AxisAlignedBB{ public $minX; diff --git a/src/math/Vector2.php b/src/math/Vector2.php index a36d04039..a2c6eb9dd 100644 --- a/src/math/Vector2.php +++ b/src/math/Vector2.php @@ -22,7 +22,6 @@ namespace PocketMine\Math; use PocketMine; -use PocketMine\Math\Vector3 as Vector3; class Vector2{ public $x, $y; diff --git a/src/nbt/NBT.php b/src/nbt/NBT.php index 86a9c3be3..9b1aab2bf 100644 --- a/src/nbt/NBT.php +++ b/src/nbt/NBT.php @@ -22,20 +22,20 @@ namespace PocketMine\NBT; const LITTLE_ENDIAN = 0; const BIG_ENDIAN = 1; -use PocketMine; -use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Byte as Byte; -use PocketMine\NBT\Tag\Short as Short; -use PocketMine\NBT\Tag\Int as Int; -use PocketMine\NBT\Tag\Long as Long; -use PocketMine\NBT\Tag\Float as Float; -use PocketMine\NBT\Tag\Double as Double; use PocketMine\NBT\Tag\Byte_Array as Byte_Array; -use PocketMine\NBT\Tag\String as String; -use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\NBT\Tag\Int_Array as Int_Array; +use PocketMine\NBT\Tag\Compound as Compound; +use PocketMine\NBT\Tag\Double as Double; use PocketMine\NBT\Tag\End as End; +use PocketMine\NBT\Tag\Enum as Enum; +use PocketMine\NBT\Tag\Float as Float; +use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\Int_Array as Int_Array; +use PocketMine\NBT\Tag\Long as Long; +use PocketMine\NBT\Tag\Short as Short; +use PocketMine\NBT\Tag\String as String; use PocketMine\Utils\Utils as Utils; +use PocketMine; class NBT implements \ArrayAccess{ private $buffer; diff --git a/src/nbt/tag/Byte.php b/src/nbt/tag/Byte.php index 0c2b4b58c..a963d6791 100644 --- a/src/nbt/tag/Byte.php +++ b/src/nbt/tag/Byte.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Byte extends NamedNBTTag{ diff --git a/src/nbt/tag/Byte_Array.php b/src/nbt/tag/Byte_Array.php index 9e431ad3a..28d037165 100644 --- a/src/nbt/tag/Byte_Array.php +++ b/src/nbt/tag/Byte_Array.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Byte_Array extends NamedNBTTag{ diff --git a/src/nbt/tag/Compound.php b/src/nbt/tag/Compound.php index 5d09df517..780ce18b0 100644 --- a/src/nbt/tag/Compound.php +++ b/src/nbt/tag/Compound.php @@ -21,9 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; -use PocketMine\NBT\Tag\End as End; +use PocketMine\NBT; class Compound extends NamedNBTTag implements \ArrayAccess, \Iterator{ diff --git a/src/nbt/tag/Double.php b/src/nbt/tag/Double.php index 2ef2f11d1..7ce07c5d6 100644 --- a/src/nbt/tag/Double.php +++ b/src/nbt/tag/Double.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Double extends NamedNBTTag{ diff --git a/src/nbt/tag/End.php b/src/nbt/tag/End.php index e9d3d4423..8802fd274 100644 --- a/src/nbt/tag/End.php +++ b/src/nbt/tag/End.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class End extends NBTTag{ diff --git a/src/nbt/tag/Enum.php b/src/nbt/tag/Enum.php index a6eb5c2b9..0b678fec9 100644 --- a/src/nbt/tag/Enum.php +++ b/src/nbt/tag/Enum.php @@ -21,19 +21,9 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; -use PocketMine; -use PocketMine\NBT\Tag\Byte as Byte; -use PocketMine\NBT\Tag\Short as Short; -use PocketMine\NBT\Tag\Int as Int; -use PocketMine\NBT\Tag\Long as Long; -use PocketMine\NBT\Tag\Float as Float; -use PocketMine\NBT\Tag\Double as Double; -use PocketMine\NBT\Tag\Byte_Array as Byte_Array; -use PocketMine\NBT\Tag\String as String; use PocketMine\NBT\Tag\Enum as TagEnum; -use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\NBT\Tag\Int_Array as Int_Array; +use PocketMine; +use PocketMine\NBT; class Enum extends NamedNBTTag implements \ArrayAccess, \Iterator{ diff --git a/src/nbt/tag/Float.php b/src/nbt/tag/Float.php index 341a3d8b4..5da314c9b 100644 --- a/src/nbt/tag/Float.php +++ b/src/nbt/tag/Float.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Float extends NamedNBTTag{ diff --git a/src/nbt/tag/Int.php b/src/nbt/tag/Int.php index ed713f145..fd743018a 100644 --- a/src/nbt/tag/Int.php +++ b/src/nbt/tag/Int.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Int extends NamedNBTTag{ diff --git a/src/nbt/tag/Int_Array.php b/src/nbt/tag/Int_Array.php index 0f56d63e1..0c234b1b2 100644 --- a/src/nbt/tag/Int_Array.php +++ b/src/nbt/tag/Int_Array.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Int_Array extends NamedNBTTag{ diff --git a/src/nbt/tag/Long.php b/src/nbt/tag/Long.php index 4ad96f795..ea87c6c3b 100644 --- a/src/nbt/tag/Long.php +++ b/src/nbt/tag/Long.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Long extends NamedNBTTag{ diff --git a/src/nbt/tag/Short.php b/src/nbt/tag/Short.php index 25c5deaad..050058650 100644 --- a/src/nbt/tag/Short.php +++ b/src/nbt/tag/Short.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class Short extends NamedNBTTag{ diff --git a/src/nbt/tag/String.php b/src/nbt/tag/String.php index 0e31c7dc7..54a9b1aba 100644 --- a/src/nbt/tag/String.php +++ b/src/nbt/tag/String.php @@ -21,8 +21,8 @@ namespace PocketMine\NBT\Tag; -use PocketMine\NBT; use PocketMine; +use PocketMine\NBT; class String extends NamedNBTTag{ diff --git a/src/network/Handler.php b/src/network/Handler.php index 1538f7cbb..12450baa9 100644 --- a/src/network/Handler.php +++ b/src/network/Handler.php @@ -21,16 +21,16 @@ namespace PocketMine\Network; -use PocketMine; -use PocketMine\ServerAPI as ServerAPI; -use PocketMine\Network\RakNet\Info as Info; -use PocketMine\Network\RakNet\Packet as Packet; +use PocketMine\Event\Event as Event; use PocketMine\Event\EventHandler as EventHandler; use PocketMine\Event\Server\PacketReceiveEvent as PacketReceiveEvent; -use PocketMine\Event\Event as Event; +use PocketMine\Event\Server\PacketSendEvent as PacketSendEvent; use PocketMine\Network\Query\QueryHandler as QueryHandler; use PocketMine\Network\Query\QueryPacket as QueryPacket; -use PocketMine\Event\Server\PacketSendEvent as PacketSendEvent; +use PocketMine\Network\RakNet\Info as Info; +use PocketMine\Network\RakNet\Packet as Packet; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; class Handler{ public $bandwidth; diff --git a/src/network/protocol/DataPacket.php b/src/network/protocol/DataPacket.php index d7d5b8e91..5f0904fad 100644 --- a/src/network/protocol/DataPacket.php +++ b/src/network/protocol/DataPacket.php @@ -21,10 +21,9 @@ namespace PocketMine\Network\Protocol; -use PocketMine; -use PocketMine\Utils\Utils as Utils; -use PocketMine\BlockAPI as BlockAPI; use PocketMine\Item\Item as Item; +use PocketMine\Utils\Utils as Utils; +use PocketMine; abstract class DataPacket{ private $offset = 0; diff --git a/src/network/protocol/packet/AddEntityPacket.php b/src/network/protocol/packet/AddEntityPacket.php index e77c2c83b..b25ed0496 100644 --- a/src/network/protocol/packet/AddEntityPacket.php +++ b/src/network/protocol/packet/AddEntityPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class AddEntityPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/AddItemEntityPacket.php b/src/network/protocol/packet/AddItemEntityPacket.php index a0011fc4b..cf1400f11 100644 --- a/src/network/protocol/packet/AddItemEntityPacket.php +++ b/src/network/protocol/packet/AddItemEntityPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class AddItemEntityPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/AddMobPacket.php b/src/network/protocol/packet/AddMobPacket.php index 6f47da019..f34721505 100644 --- a/src/network/protocol/packet/AddMobPacket.php +++ b/src/network/protocol/packet/AddMobPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; use PocketMine\Utils\Utils as Utils; class AddMobPacket extends DataPacket{ diff --git a/src/network/protocol/packet/AddPaintingPacket.php b/src/network/protocol/packet/AddPaintingPacket.php index 7705d7509..c42bcbf5e 100644 --- a/src/network/protocol/packet/AddPaintingPacket.php +++ b/src/network/protocol/packet/AddPaintingPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class AddPaintingPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/AddPlayerPacket.php b/src/network/protocol/packet/AddPlayerPacket.php index c9a5d19fa..52c11b132 100644 --- a/src/network/protocol/packet/AddPlayerPacket.php +++ b/src/network/protocol/packet/AddPlayerPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; use PocketMine\Utils\Utils as Utils; class AddPlayerPacket extends DataPacket{ diff --git a/src/network/protocol/packet/AdventureSettingsPacket.php b/src/network/protocol/packet/AdventureSettingsPacket.php index e7b122d2e..608b1df28 100644 --- a/src/network/protocol/packet/AdventureSettingsPacket.php +++ b/src/network/protocol/packet/AdventureSettingsPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class AdventureSettingsPacket extends DataPacket{ public $flags; diff --git a/src/network/protocol/packet/AnimatePacket.php b/src/network/protocol/packet/AnimatePacket.php index 372e8041b..7d2199696 100644 --- a/src/network/protocol/packet/AnimatePacket.php +++ b/src/network/protocol/packet/AnimatePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class AnimatePacket extends DataPacket{ public $action; diff --git a/src/network/protocol/packet/ChatPacket.php b/src/network/protocol/packet/ChatPacket.php index cbd66eb7b..28a3757a1 100644 --- a/src/network/protocol/packet/ChatPacket.php +++ b/src/network/protocol/packet/ChatPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ChatPacket extends DataPacket{ public $message; diff --git a/src/network/protocol/packet/ChunkDataPacket.php b/src/network/protocol/packet/ChunkDataPacket.php index e87ef1f0b..55649560d 100644 --- a/src/network/protocol/packet/ChunkDataPacket.php +++ b/src/network/protocol/packet/ChunkDataPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ChunkDataPacket extends DataPacket{ public $chunkX; diff --git a/src/network/protocol/packet/ClientConnectPacket.php b/src/network/protocol/packet/ClientConnectPacket.php index 832d10b8c..10469b652 100644 --- a/src/network/protocol/packet/ClientConnectPacket.php +++ b/src/network/protocol/packet/ClientConnectPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ClientConnectPacket extends DataPacket{ public $clientID; diff --git a/src/network/protocol/packet/ClientHandshakePacket.php b/src/network/protocol/packet/ClientHandshakePacket.php index daf507364..de89b6736 100644 --- a/src/network/protocol/packet/ClientHandshakePacket.php +++ b/src/network/protocol/packet/ClientHandshakePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ClientHandshakePacket extends DataPacket{ public $cookie; diff --git a/src/network/protocol/packet/ContainerClosePacket.php b/src/network/protocol/packet/ContainerClosePacket.php index 9a344034f..03d835871 100644 --- a/src/network/protocol/packet/ContainerClosePacket.php +++ b/src/network/protocol/packet/ContainerClosePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ContainerClosePacket extends DataPacket{ public $windowid; diff --git a/src/network/protocol/packet/ContainerOpenPacket.php b/src/network/protocol/packet/ContainerOpenPacket.php index 9df65201f..63aeb6583 100644 --- a/src/network/protocol/packet/ContainerOpenPacket.php +++ b/src/network/protocol/packet/ContainerOpenPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ContainerOpenPacket extends DataPacket{ public $windowid; diff --git a/src/network/protocol/packet/ContainerSetContentPacket.php b/src/network/protocol/packet/ContainerSetContentPacket.php index 239f5b665..ec4711094 100644 --- a/src/network/protocol/packet/ContainerSetContentPacket.php +++ b/src/network/protocol/packet/ContainerSetContentPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ContainerSetContentPacket extends DataPacket{ public $windowid; diff --git a/src/network/protocol/packet/ContainerSetDataPacket.php b/src/network/protocol/packet/ContainerSetDataPacket.php index 8bd4738be..75529e7ff 100644 --- a/src/network/protocol/packet/ContainerSetDataPacket.php +++ b/src/network/protocol/packet/ContainerSetDataPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ContainerSetDataPacket extends DataPacket{ public $windowid; diff --git a/src/network/protocol/packet/ContainerSetSlotPacket.php b/src/network/protocol/packet/ContainerSetSlotPacket.php index 2ec0a7c3a..8bfa5bfbc 100644 --- a/src/network/protocol/packet/ContainerSetSlotPacket.php +++ b/src/network/protocol/packet/ContainerSetSlotPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ContainerSetSlotPacket extends DataPacket{ public $windowid; diff --git a/src/network/protocol/packet/DisconnectPacket.php b/src/network/protocol/packet/DisconnectPacket.php index 36a6a2e8b..91f008bc0 100644 --- a/src/network/protocol/packet/DisconnectPacket.php +++ b/src/network/protocol/packet/DisconnectPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class DisconnectPacket extends DataPacket{ public function pid(){ diff --git a/src/network/protocol/packet/DropItemPacket.php b/src/network/protocol/packet/DropItemPacket.php index 9f70c1696..170ae7dd1 100644 --- a/src/network/protocol/packet/DropItemPacket.php +++ b/src/network/protocol/packet/DropItemPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class DropItemPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/EntityDataPacket.php b/src/network/protocol/packet/EntityDataPacket.php index a3b7abdff..5ffe5047f 100644 --- a/src/network/protocol/packet/EntityDataPacket.php +++ b/src/network/protocol/packet/EntityDataPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class EntityDataPacket extends DataPacket{ public $x; diff --git a/src/network/protocol/packet/EntityEventPacket.php b/src/network/protocol/packet/EntityEventPacket.php index 81dbdd5d0..ed79f86e0 100644 --- a/src/network/protocol/packet/EntityEventPacket.php +++ b/src/network/protocol/packet/EntityEventPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class EntityEventPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/ExplodePacket.php b/src/network/protocol/packet/ExplodePacket.php index 917dbb28b..9db3efea9 100644 --- a/src/network/protocol/packet/ExplodePacket.php +++ b/src/network/protocol/packet/ExplodePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ExplodePacket extends DataPacket{ public $x; diff --git a/src/network/protocol/packet/HurtArmorPacket.php b/src/network/protocol/packet/HurtArmorPacket.php index f6d7e5c2c..f30c14190 100644 --- a/src/network/protocol/packet/HurtArmorPacket.php +++ b/src/network/protocol/packet/HurtArmorPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class HurtArmorPacket extends DataPacket{ public $health; diff --git a/src/network/protocol/packet/InteractPacket.php b/src/network/protocol/packet/InteractPacket.php index d7fb80fdf..b1726b7f4 100644 --- a/src/network/protocol/packet/InteractPacket.php +++ b/src/network/protocol/packet/InteractPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class InteractPacket extends DataPacket{ public $action; diff --git a/src/network/protocol/packet/LevelEventPacket.php b/src/network/protocol/packet/LevelEventPacket.php index aa83939a0..7777e5f0e 100644 --- a/src/network/protocol/packet/LevelEventPacket.php +++ b/src/network/protocol/packet/LevelEventPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class LevelEventPacket extends DataPacket{ public $evid; diff --git a/src/network/protocol/packet/LoginPacket.php b/src/network/protocol/packet/LoginPacket.php index 530aba38b..69bf0fb1e 100644 --- a/src/network/protocol/packet/LoginPacket.php +++ b/src/network/protocol/packet/LoginPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class LoginPacket extends DataPacket{ public $username; diff --git a/src/network/protocol/packet/LoginStatusPacket.php b/src/network/protocol/packet/LoginStatusPacket.php index aed1a9d6b..29de4365f 100644 --- a/src/network/protocol/packet/LoginStatusPacket.php +++ b/src/network/protocol/packet/LoginStatusPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class LoginStatusPacket extends DataPacket{ public $status; diff --git a/src/network/protocol/packet/MessagePacket.php b/src/network/protocol/packet/MessagePacket.php index d0ccc13e9..24f99b438 100644 --- a/src/network/protocol/packet/MessagePacket.php +++ b/src/network/protocol/packet/MessagePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class MessagePacket extends DataPacket{ public $source; diff --git a/src/network/protocol/packet/MoveEntityPacket.php b/src/network/protocol/packet/MoveEntityPacket.php index 1c6035069..3d2a3b9f7 100644 --- a/src/network/protocol/packet/MoveEntityPacket.php +++ b/src/network/protocol/packet/MoveEntityPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class MoveEntityPacket extends DataPacket{ diff --git a/src/network/protocol/packet/MoveEntityPacket_PosRot.php b/src/network/protocol/packet/MoveEntityPacket_PosRot.php index ea385a419..d23b727ca 100644 --- a/src/network/protocol/packet/MoveEntityPacket_PosRot.php +++ b/src/network/protocol/packet/MoveEntityPacket_PosRot.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class MoveEntityPacket_PosRot extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/MovePlayerPacket.php b/src/network/protocol/packet/MovePlayerPacket.php index 9d797cd82..d5bb4feab 100644 --- a/src/network/protocol/packet/MovePlayerPacket.php +++ b/src/network/protocol/packet/MovePlayerPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class MovePlayerPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/PingPacket.php b/src/network/protocol/packet/PingPacket.php index d55ac691f..e9d3740c2 100644 --- a/src/network/protocol/packet/PingPacket.php +++ b/src/network/protocol/packet/PingPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class PingPacket extends DataPacket{ public $time = 0; diff --git a/src/network/protocol/packet/PlayerActionPacket.php b/src/network/protocol/packet/PlayerActionPacket.php index 8d32f3a58..e3f95d710 100644 --- a/src/network/protocol/packet/PlayerActionPacket.php +++ b/src/network/protocol/packet/PlayerActionPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class PlayerActionPacket extends DataPacket{ public $action; diff --git a/src/network/protocol/packet/PlayerArmorEquipmentPacket.php b/src/network/protocol/packet/PlayerArmorEquipmentPacket.php index f6439208c..ba3b8ce2b 100644 --- a/src/network/protocol/packet/PlayerArmorEquipmentPacket.php +++ b/src/network/protocol/packet/PlayerArmorEquipmentPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class PlayerArmorEquipmentPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/PlayerEquipmentPacket.php b/src/network/protocol/packet/PlayerEquipmentPacket.php index 3cbe3d741..ee86ecb29 100644 --- a/src/network/protocol/packet/PlayerEquipmentPacket.php +++ b/src/network/protocol/packet/PlayerEquipmentPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class PlayerEquipmentPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/PongPacket.php b/src/network/protocol/packet/PongPacket.php index 643939ba2..9f3d578db 100644 --- a/src/network/protocol/packet/PongPacket.php +++ b/src/network/protocol/packet/PongPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class PongPacket extends DataPacket{ public $time = 0; diff --git a/src/network/protocol/packet/ReadyPacket.php b/src/network/protocol/packet/ReadyPacket.php index 2d9449a98..40f44991d 100644 --- a/src/network/protocol/packet/ReadyPacket.php +++ b/src/network/protocol/packet/ReadyPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ReadyPacket extends DataPacket{ public $status; diff --git a/src/network/protocol/packet/RemoveBlockPacket.php b/src/network/protocol/packet/RemoveBlockPacket.php index 2fbe55b03..7e6927894 100644 --- a/src/network/protocol/packet/RemoveBlockPacket.php +++ b/src/network/protocol/packet/RemoveBlockPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RemoveBlockPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/RemoveEntityPacket.php b/src/network/protocol/packet/RemoveEntityPacket.php index 8b1cb9c4e..d922fe0eb 100644 --- a/src/network/protocol/packet/RemoveEntityPacket.php +++ b/src/network/protocol/packet/RemoveEntityPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RemoveEntityPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/RemovePlayerPacket.php b/src/network/protocol/packet/RemovePlayerPacket.php index d071de7da..152e4572c 100644 --- a/src/network/protocol/packet/RemovePlayerPacket.php +++ b/src/network/protocol/packet/RemovePlayerPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RemovePlayerPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/RequestChunkPacket.php b/src/network/protocol/packet/RequestChunkPacket.php index 5a61bca0b..3ec07ddfa 100644 --- a/src/network/protocol/packet/RequestChunkPacket.php +++ b/src/network/protocol/packet/RequestChunkPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RequestChunkPacket extends DataPacket{ public $chunkX; diff --git a/src/network/protocol/packet/RespawnPacket.php b/src/network/protocol/packet/RespawnPacket.php index 61c5d839c..bdf31d642 100644 --- a/src/network/protocol/packet/RespawnPacket.php +++ b/src/network/protocol/packet/RespawnPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RespawnPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/RotateHeadPacket.php b/src/network/protocol/packet/RotateHeadPacket.php index c384df2a0..3e045bfb5 100644 --- a/src/network/protocol/packet/RotateHeadPacket.php +++ b/src/network/protocol/packet/RotateHeadPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class RotateHeadPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/SendInventoryPacket.php b/src/network/protocol/packet/SendInventoryPacket.php index b65f1a39d..5b84605bd 100644 --- a/src/network/protocol/packet/SendInventoryPacket.php +++ b/src/network/protocol/packet/SendInventoryPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class SendInventoryPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/ServerHandshakePacket.php b/src/network/protocol/packet/ServerHandshakePacket.php index 10cc6e867..fed467750 100644 --- a/src/network/protocol/packet/ServerHandshakePacket.php +++ b/src/network/protocol/packet/ServerHandshakePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class ServerHandshakePacket extends DataPacket{ public $port; diff --git a/src/network/protocol/packet/SetEntityDataPacket.php b/src/network/protocol/packet/SetEntityDataPacket.php index 16ea883ab..fdcb8dfe9 100644 --- a/src/network/protocol/packet/SetEntityDataPacket.php +++ b/src/network/protocol/packet/SetEntityDataPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; use PocketMine\Utils\Utils as Utils; class SetEntityDataPacket extends DataPacket{ diff --git a/src/network/protocol/packet/SetEntityMotionPacket.php b/src/network/protocol/packet/SetEntityMotionPacket.php index 0593cc4e4..d17ed35e8 100644 --- a/src/network/protocol/packet/SetEntityMotionPacket.php +++ b/src/network/protocol/packet/SetEntityMotionPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class SetEntityMotionPacket extends DataPacket{ public $eid; diff --git a/src/network/protocol/packet/SetHealthPacket.php b/src/network/protocol/packet/SetHealthPacket.php index fcbf8ee5b..73393b165 100644 --- a/src/network/protocol/packet/SetHealthPacket.php +++ b/src/network/protocol/packet/SetHealthPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class SetHealthPacket extends DataPacket{ public $health; diff --git a/src/network/protocol/packet/SetSpawnPositionPacket.php b/src/network/protocol/packet/SetSpawnPositionPacket.php index 7df251111..a49d23f85 100644 --- a/src/network/protocol/packet/SetSpawnPositionPacket.php +++ b/src/network/protocol/packet/SetSpawnPositionPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class SetSpawnPositionPacket extends DataPacket{ public $x; diff --git a/src/network/protocol/packet/SetTimePacket.php b/src/network/protocol/packet/SetTimePacket.php index d7ad355ce..962fcd5f2 100644 --- a/src/network/protocol/packet/SetTimePacket.php +++ b/src/network/protocol/packet/SetTimePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class SetTimePacket extends DataPacket{ public $time; diff --git a/src/network/protocol/packet/StartGamePacket.php b/src/network/protocol/packet/StartGamePacket.php index dcdbbeb5e..f57f2dd0d 100644 --- a/src/network/protocol/packet/StartGamePacket.php +++ b/src/network/protocol/packet/StartGamePacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class StartGamePacket extends DataPacket{ public $seed; diff --git a/src/network/protocol/packet/TakeItemEntityPacket.php b/src/network/protocol/packet/TakeItemEntityPacket.php index b888c702c..3f6650982 100644 --- a/src/network/protocol/packet/TakeItemEntityPacket.php +++ b/src/network/protocol/packet/TakeItemEntityPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class TakeItemEntityPacket extends DataPacket{ public $target; diff --git a/src/network/protocol/packet/TileEventPacket.php b/src/network/protocol/packet/TileEventPacket.php index b9a1e1ea0..7c9c5d806 100644 --- a/src/network/protocol/packet/TileEventPacket.php +++ b/src/network/protocol/packet/TileEventPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class TileEventPacket extends DataPacket{ public $x; diff --git a/src/network/protocol/packet/UpdateBlockPacket.php b/src/network/protocol/packet/UpdateBlockPacket.php index 7d6fe3c77..10c272475 100644 --- a/src/network/protocol/packet/UpdateBlockPacket.php +++ b/src/network/protocol/packet/UpdateBlockPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class UpdateBlockPacket extends DataPacket{ public $x; diff --git a/src/network/protocol/packet/UseItemPacket.php b/src/network/protocol/packet/UseItemPacket.php index 8dc38979e..24156bf57 100644 --- a/src/network/protocol/packet/UseItemPacket.php +++ b/src/network/protocol/packet/UseItemPacket.php @@ -22,7 +22,6 @@ namespace PocketMine\Network\Protocol; use PocketMine; -use PocketMine\Network\Protocol\Info as Info; class UseItemPacket extends DataPacket{ public $x; diff --git a/src/network/query/QueryHandler.php b/src/network/query/QueryHandler.php index 615484035..a70b8f6fe 100644 --- a/src/network/query/QueryHandler.php +++ b/src/network/query/QueryHandler.php @@ -21,11 +21,10 @@ namespace PocketMine\Network\Query; -use PocketMine; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\Player as Player; +use PocketMine\ServerAPI as ServerAPI; use PocketMine\Utils\Utils as Utils; -use PocketMine\Network\Query\QueryPacket as QueryPacket; +use PocketMine; /* Implementation of the UT3 Query Protocol (GameSpot) diff --git a/src/network/query/QueryPacket.php b/src/network/query/QueryPacket.php index cc414f7d7..f15f7b52a 100644 --- a/src/network/query/QueryPacket.php +++ b/src/network/query/QueryPacket.php @@ -21,9 +21,9 @@ namespace PocketMine\Network\Query; -use PocketMine; use PocketMine\Network\Packet as Packet; use PocketMine\Utils\Utils as Utils; +use PocketMine; class QueryPacket extends Packet{ const HANDSHAKE = 9; diff --git a/src/network/raknet/Packet.php b/src/network/raknet/Packet.php index 0b174161b..0e980f0c9 100644 --- a/src/network/raknet/Packet.php +++ b/src/network/raknet/Packet.php @@ -21,11 +21,10 @@ namespace PocketMine\Network\RakNet; -use PocketMine; use PocketMine\Network\Packet as NetworkPacket; -use PocketMine\Utils\Utils as Utils; -use PocketMine\Network\RakNet\Info as Info; use PocketMine\Network\Protocol\Info as ProtocolInfo; +use PocketMine\Utils\Utils as Utils; +use PocketMine; class Packet extends NetworkPacket{ private $packetID; diff --git a/src/pmf/LevelFormat.php b/src/pmf/LevelFormat.php index 94668997d..2b51e61e9 100644 --- a/src/pmf/LevelFormat.php +++ b/src/pmf/LevelFormat.php @@ -21,11 +21,11 @@ namespace PocketMine\PMF; -use PocketMine; -use PocketMine\Utils\Utils as Utils; +use PocketMine\Level\Level as Level; use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Enum as Enum; -use PocketMine\Level\Level as Level; +use PocketMine\Utils\Utils as Utils; +use PocketMine; class LevelFormat extends PMF{ const VERSION = 2; diff --git a/src/recipes/Crafting.php b/src/recipes/Crafting.php index 0563ccaab..c727c24af 100644 --- a/src/recipes/Crafting.php +++ b/src/recipes/Crafting.php @@ -21,9 +21,9 @@ namespace PocketMine\Recipes; -use PocketMine; use PocketMine\BlockAPI as BlockAPI; use PocketMine\ServerAPI as 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/tile/Chest.php b/src/tile/Chest.php index 52bbca840..d9a53810c 100644 --- a/src/tile/Chest.php +++ b/src/tile/Chest.php @@ -21,13 +21,12 @@ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Level\Level as Level; -use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\Tile\Tile as Tile; use PocketMine\Math\Vector3 as Vector3; -use PocketMine\NBT\Tag\String as String; +use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\String as String; +use PocketMine; class Chest extends Spawnable{ use Container; diff --git a/src/tile/Container.php b/src/tile/Container.php index 2af878a21..d0cbc923e 100644 --- a/src/tile/Container.php +++ b/src/tile/Container.php @@ -21,18 +21,15 @@ namespace PocketMine\Tile; -use PocketMine; -use PocketMine\Tile\Chest as Chest; -use PocketMine\Player as Player; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Tile\Furnace as Furnace; -use PocketMine\Item\Item as Item; +use PocketMine\Event\Event as Event; use PocketMine\Event\EventHandler as EventHandler; use PocketMine\Event\Tile\TileInventoryChangeEvent as TileInventoryChangeEvent; -use PocketMine\Event\Event as Event; -use PocketMine\NBT\Tag\Compound as Compound; +use PocketMine\Item\Item as Item; use PocketMine\NBT\Tag\Byte as Byte; +use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Short as Short; +use PocketMine\Player as Player; +use PocketMine; trait Container{ public function openInventory(Player $player){ diff --git a/src/tile/Furnace.php b/src/tile/Furnace.php index 5f8775bbc..2cac10213 100644 --- a/src/tile/Furnace.php +++ b/src/tile/Furnace.php @@ -21,13 +21,11 @@ namespace PocketMine\Tile; -use PocketMine; +use PocketMine\Block\Block as Block; +use PocketMine\Item\Item as Item; use PocketMine\Level\Level as Level; use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\Tile\Tile as Tile; -use PocketMine\BlockAPI as BlockAPI; -use PocketMine\Item\Item as Item; -use PocketMine\Block\Block as Block; +use PocketMine; class Furnace extends Tile{ use Container; diff --git a/src/tile/Sign.php b/src/tile/Sign.php index b83e759f1..9a11cfc29 100644 --- a/src/tile/Sign.php +++ b/src/tile/Sign.php @@ -21,12 +21,11 @@ namespace PocketMine\Tile; -use PocketMine; -use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\Tile\Tile as Tile; use PocketMine\NBT\NBT as NBT; -use PocketMine\NBT\Tag\String as String; +use PocketMine\NBT\Tag\Compound as Compound; use PocketMine\NBT\Tag\Int as Int; +use PocketMine\NBT\Tag\String as String; +use PocketMine; class Sign extends Spawnable{ diff --git a/src/tile/Tile.php b/src/tile/Tile.php index ae8833ea3..972a99ccd 100644 --- a/src/tile/Tile.php +++ b/src/tile/Tile.php @@ -21,11 +21,11 @@ namespace PocketMine\Tile; -use PocketMine; use PocketMine\Level\Level as Level; use PocketMine\NBT\Tag\Compound as Compound; -use PocketMine\ServerAPI as ServerAPI; use PocketMine\PMF\LevelFormat as LevelFormat; +use PocketMine\ServerAPI as ServerAPI; +use PocketMine; abstract class Tile extends Position{ const SIGN = "Sign"; diff --git a/src/utils/Random.php b/src/utils/Random.php index aaf5d561f..b0c60c99d 100644 --- a/src/utils/Random.php +++ b/src/utils/Random.php @@ -22,7 +22,6 @@ namespace PocketMine\Utils; use PocketMine; -use PocketMine\Utils\Utils as Utils; //Unsecure, not used for "Real Randomness" class Random{ diff --git a/src/utils/Utils.php b/src/utils/Utils.php index 7634826bc..89152150a 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -22,7 +22,6 @@ namespace PocketMine\Utils; use PocketMine; -use PocketMine\BlockAPI as BlockAPI; use PocketMine\Item\Item as Item; class Utils{ diff --git a/src/wizard/Installer.php b/src/wizard/Installer.php index c4b9ee656..c5c384b98 100644 --- a/src/wizard/Installer.php +++ b/src/wizard/Installer.php @@ -21,10 +21,8 @@ namespace PocketMine\Wizard; -use PocketMine\Utils\Config as Config; -use PocketMine\Wizard\InstallerLang as InstallerLang; -use PocketMine\Utils\Utils as Utils; use PocketMine; +use PocketMine\Utils\Utils as Utils; class Installer{ const DEFAULT_NAME = "Minecraft: PE Server";