From f073a5b83714fb91160e3dd5f4b14ebb4234f25b Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 17 Jun 2014 18:46:16 +0200 Subject: [PATCH] Fixed a few things --- src/pocketmine/Server.php | 3 +-- src/pocketmine/block/Block.php | 2 +- src/pocketmine/block/Wood2.php | 2 -- src/pocketmine/command/defaults/BanCommand.php | 2 +- src/pocketmine/command/defaults/BanIpCommand.php | 2 +- src/pocketmine/command/defaults/BanListCommand.php | 2 +- src/pocketmine/command/defaults/DeopCommand.php | 2 +- src/pocketmine/command/defaults/GiveCommand.php | 2 +- src/pocketmine/command/defaults/HelpCommand.php | 2 +- src/pocketmine/command/defaults/KickCommand.php | 2 +- src/pocketmine/command/defaults/ListCommand.php | 2 +- src/pocketmine/command/defaults/MeCommand.php | 2 +- src/pocketmine/command/defaults/OpCommand.php | 2 +- src/pocketmine/command/defaults/PardonCommand.php | 2 +- src/pocketmine/command/defaults/PardonIpCommand.php | 2 +- src/pocketmine/command/defaults/PluginsCommand.php | 2 +- src/pocketmine/command/defaults/ReloadCommand.php | 2 +- src/pocketmine/command/defaults/SaveCommand.php | 2 +- src/pocketmine/command/defaults/SaveOffCommand.php | 2 +- src/pocketmine/command/defaults/SaveOnCommand.php | 2 +- src/pocketmine/command/defaults/SayCommand.php | 2 +- src/pocketmine/command/defaults/SeedCommand.php | 2 +- src/pocketmine/command/defaults/SetWorldSpawnCommand.php | 2 +- src/pocketmine/command/defaults/SpawnpointCommand.php | 2 +- src/pocketmine/command/defaults/StatusCommand.php | 2 +- src/pocketmine/command/defaults/StopCommand.php | 2 +- src/pocketmine/command/defaults/TeleportCommand.php | 2 +- src/pocketmine/command/defaults/TellCommand.php | 2 +- src/pocketmine/command/defaults/VersionCommand.php | 2 +- src/pocketmine/command/defaults/WhitelistCommand.php | 2 +- src/pocketmine/entity/Enderman.php | 4 +++- src/pocketmine/entity/Entity.php | 2 +- src/pocketmine/item/Painting.php | 2 +- src/pocketmine/item/Tool.php | 1 + src/pocketmine/level/Level.php | 2 +- src/pocketmine/level/format/anvil/Chunk.php | 2 +- src/pocketmine/network/RakLibInterface.php | 1 - src/pocketmine/network/query/QueryPacket.php | 2 +- src/pocketmine/tile/Container.php | 1 - 39 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 75f6ac83f..25c2633d5 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -42,8 +42,7 @@ use pocketmine\level\format\LevelProviderManager; use pocketmine\level\generator\GenerationRequestManager; use pocketmine\level\generator\Generator; use pocketmine\level\Level; -use pocketmine\level\LevelImport; -use pocketmine\level\WorldGenerator; + use pocketmine\metadata\EntityMetadataStore; use pocketmine\metadata\LevelMetadataStore; use pocketmine\metadata\PlayerMetadataStore; diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index 71f937110..6c0adcb6c 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -32,7 +32,7 @@ use pocketmine\metadata\Metadatable; use pocketmine\metadata\MetadataValue; use pocketmine\Player; use pocketmine\plugin\Plugin; -use pocketmine\Server; + abstract class Block extends Position implements Metadatable{ const AIR = 0; diff --git a/src/pocketmine/block/Wood2.php b/src/pocketmine/block/Wood2.php index 5905fc764..52d5d89b6 100644 --- a/src/pocketmine/block/Wood2.php +++ b/src/pocketmine/block/Wood2.php @@ -21,8 +21,6 @@ namespace pocketmine\block; -use pocketmine\item\Item; -use pocketmine\Player; class Wood2 extends Wood{ diff --git a/src/pocketmine/command/defaults/BanCommand.php b/src/pocketmine/command/defaults/BanCommand.php index c3438550a..73c2f0368 100644 --- a/src/pocketmine/command/defaults/BanCommand.php +++ b/src/pocketmine/command/defaults/BanCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class BanCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/BanIpCommand.php b/src/pocketmine/command/defaults/BanIpCommand.php index b1ddcee91..2583a8337 100644 --- a/src/pocketmine/command/defaults/BanIpCommand.php +++ b/src/pocketmine/command/defaults/BanIpCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class BanIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/BanListCommand.php b/src/pocketmine/command/defaults/BanListCommand.php index 1e6f820d7..29324faa3 100644 --- a/src/pocketmine/command/defaults/BanListCommand.php +++ b/src/pocketmine/command/defaults/BanListCommand.php @@ -22,7 +22,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\Server; + class BanListCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DeopCommand.php b/src/pocketmine/command/defaults/DeopCommand.php index c8d1fb0b7..7f823ea9e 100644 --- a/src/pocketmine/command/defaults/DeopCommand.php +++ b/src/pocketmine/command/defaults/DeopCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class DeopCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/GiveCommand.php b/src/pocketmine/command/defaults/GiveCommand.php index 93e9a37d5..e7b69f0ca 100644 --- a/src/pocketmine/command/defaults/GiveCommand.php +++ b/src/pocketmine/command/defaults/GiveCommand.php @@ -25,7 +25,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\item\Item; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class GiveCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/HelpCommand.php b/src/pocketmine/command/defaults/HelpCommand.php index 2958095c4..4445b33ee 100644 --- a/src/pocketmine/command/defaults/HelpCommand.php +++ b/src/pocketmine/command/defaults/HelpCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class HelpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php index ed728b97c..d90b46ba6 100644 --- a/src/pocketmine/command/defaults/KickCommand.php +++ b/src/pocketmine/command/defaults/KickCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class KickCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/ListCommand.php b/src/pocketmine/command/defaults/ListCommand.php index f941fc092..e96b03f1b 100644 --- a/src/pocketmine/command/defaults/ListCommand.php +++ b/src/pocketmine/command/defaults/ListCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + class ListCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/MeCommand.php b/src/pocketmine/command/defaults/MeCommand.php index 68534e5cd..a8e90853e 100644 --- a/src/pocketmine/command/defaults/MeCommand.php +++ b/src/pocketmine/command/defaults/MeCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class MeCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/OpCommand.php b/src/pocketmine/command/defaults/OpCommand.php index 047fa6487..3f61e7935 100644 --- a/src/pocketmine/command/defaults/OpCommand.php +++ b/src/pocketmine/command/defaults/OpCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class OpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/PardonCommand.php b/src/pocketmine/command/defaults/PardonCommand.php index dd6e031b2..f75632930 100644 --- a/src/pocketmine/command/defaults/PardonCommand.php +++ b/src/pocketmine/command/defaults/PardonCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class PardonCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/PardonIpCommand.php b/src/pocketmine/command/defaults/PardonIpCommand.php index 520d37023..fae0062a1 100644 --- a/src/pocketmine/command/defaults/PardonIpCommand.php +++ b/src/pocketmine/command/defaults/PardonIpCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class PardonIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/PluginsCommand.php b/src/pocketmine/command/defaults/PluginsCommand.php index d13baa8ee..ab77a5908 100644 --- a/src/pocketmine/command/defaults/PluginsCommand.php +++ b/src/pocketmine/command/defaults/PluginsCommand.php @@ -22,7 +22,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class PluginsCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/ReloadCommand.php b/src/pocketmine/command/defaults/ReloadCommand.php index 76897c0af..ffcdc5e1b 100644 --- a/src/pocketmine/command/defaults/ReloadCommand.php +++ b/src/pocketmine/command/defaults/ReloadCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class ReloadCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveCommand.php b/src/pocketmine/command/defaults/SaveCommand.php index a2adc0892..f69a62770 100644 --- a/src/pocketmine/command/defaults/SaveCommand.php +++ b/src/pocketmine/command/defaults/SaveCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + class SaveCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveOffCommand.php b/src/pocketmine/command/defaults/SaveOffCommand.php index 81074c156..593989b38 100644 --- a/src/pocketmine/command/defaults/SaveOffCommand.php +++ b/src/pocketmine/command/defaults/SaveOffCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + class SaveOffCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveOnCommand.php b/src/pocketmine/command/defaults/SaveOnCommand.php index 6f6e4e734..0fb815cd6 100644 --- a/src/pocketmine/command/defaults/SaveOnCommand.php +++ b/src/pocketmine/command/defaults/SaveOnCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + class SaveOnCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SayCommand.php b/src/pocketmine/command/defaults/SayCommand.php index 56632e1da..6da4731c8 100644 --- a/src/pocketmine/command/defaults/SayCommand.php +++ b/src/pocketmine/command/defaults/SayCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class SayCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SeedCommand.php b/src/pocketmine/command/defaults/SeedCommand.php index e3d6c8b17..6a0cdc31f 100644 --- a/src/pocketmine/command/defaults/SeedCommand.php +++ b/src/pocketmine/command/defaults/SeedCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + class SeedCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php index 54b1cbb1f..4c3d2b1c4 100644 --- a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php +++ b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php @@ -25,7 +25,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\math\Vector3; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class SetWorldSpawnCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SpawnpointCommand.php b/src/pocketmine/command/defaults/SpawnpointCommand.php index 3248155f1..091e98961 100644 --- a/src/pocketmine/command/defaults/SpawnpointCommand.php +++ b/src/pocketmine/command/defaults/SpawnpointCommand.php @@ -25,7 +25,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\level\Position; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class SpawnpointCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/StatusCommand.php b/src/pocketmine/command/defaults/StatusCommand.php index 644d86db9..39da13edb 100644 --- a/src/pocketmine/command/defaults/StatusCommand.php +++ b/src/pocketmine/command/defaults/StatusCommand.php @@ -22,7 +22,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class StatusCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/StopCommand.php b/src/pocketmine/command/defaults/StopCommand.php index e5a4ae67f..d559bf153 100644 --- a/src/pocketmine/command/defaults/StopCommand.php +++ b/src/pocketmine/command/defaults/StopCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + class StopCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/TeleportCommand.php b/src/pocketmine/command/defaults/TeleportCommand.php index 3dcb0ca24..878037f1f 100644 --- a/src/pocketmine/command/defaults/TeleportCommand.php +++ b/src/pocketmine/command/defaults/TeleportCommand.php @@ -26,7 +26,7 @@ use pocketmine\command\CommandSender; use pocketmine\level\Position; use pocketmine\math\Vector3; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class TeleportCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/TellCommand.php b/src/pocketmine/command/defaults/TellCommand.php index 0f6521586..6ace8fb25 100644 --- a/src/pocketmine/command/defaults/TellCommand.php +++ b/src/pocketmine/command/defaults/TellCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class TellCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/VersionCommand.php b/src/pocketmine/command/defaults/VersionCommand.php index 44472f494..f22775f2c 100644 --- a/src/pocketmine/command/defaults/VersionCommand.php +++ b/src/pocketmine/command/defaults/VersionCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\network\protocol\Info; use pocketmine\plugin\Plugin; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class VersionCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/WhitelistCommand.php b/src/pocketmine/command/defaults/WhitelistCommand.php index 00548ebdf..d84e7a1e4 100644 --- a/src/pocketmine/command/defaults/WhitelistCommand.php +++ b/src/pocketmine/command/defaults/WhitelistCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Server; + use pocketmine\utils\TextFormat; class WhitelistCommand extends VanillaCommand{ diff --git a/src/pocketmine/entity/Enderman.php b/src/pocketmine/entity/Enderman.php index 642519397..86d8eafd6 100644 --- a/src/pocketmine/entity/Enderman.php +++ b/src/pocketmine/entity/Enderman.php @@ -22,6 +22,8 @@ namespace pocketmine\entity; -class Enderman extends Monster implements InventorySource{ +use pocketmine\inventory\InventoryHolder; + +class Enderman extends Monster implements InventoryHolder{ } \ No newline at end of file diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 5b1e833e4..0e592d1a9 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -32,7 +32,7 @@ use pocketmine\event\entity\EntityMoveEvent; use pocketmine\event\entity\EntitySpawnEvent; use pocketmine\event\entity\EntityTeleportEvent; use pocketmine\level\format\Chunk; -use pocketmine\level\format\pmf\LevelFormat; + use pocketmine\level\Level; use pocketmine\level\Position; use pocketmine\math\AxisAlignedBB; diff --git a/src/pocketmine/item/Painting.php b/src/pocketmine/item/Painting.php index c91305961..5e15bbae1 100644 --- a/src/pocketmine/item/Painting.php +++ b/src/pocketmine/item/Painting.php @@ -24,7 +24,7 @@ namespace pocketmine\item; use pocketmine\block\Block; use pocketmine\level\Level; use pocketmine\Player; -use pocketmine\Server; + class Painting extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php index 2a0eefb2e..eb622018a 100644 --- a/src/pocketmine/item/Tool.php +++ b/src/pocketmine/item/Tool.php @@ -23,6 +23,7 @@ namespace pocketmine\item; use pocketmine\entity\Entity; +use pocketmine\block\Block; abstract class Tool extends Item{ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 779604331..1d091770b 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -37,7 +37,7 @@ use pocketmine\level\format\Chunk; use pocketmine\level\format\LevelProvider; use pocketmine\level\format\SimpleChunk; use pocketmine\level\generator\Generator; -use pocketmine\level\generator\populator\Populator; + use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector2; use pocketmine\math\Vector3; diff --git a/src/pocketmine/level/format/anvil/Chunk.php b/src/pocketmine/level/format/anvil/Chunk.php index 8c72d37b6..2a95eee55 100644 --- a/src/pocketmine/level/format/anvil/Chunk.php +++ b/src/pocketmine/level/format/anvil/Chunk.php @@ -29,7 +29,7 @@ use pocketmine\nbt\tag\Byte; use pocketmine\nbt\tag\ByteArray; use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Enum; -use pocketmine\nbt\tag\Int; + use pocketmine\nbt\tag\IntArray; use pocketmine\utils\Binary; diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php index 5b9ff162e..d625ba375 100644 --- a/src/pocketmine/network/RakLibInterface.php +++ b/src/pocketmine/network/RakLibInterface.php @@ -32,7 +32,6 @@ use pocketmine\network\protocol\AddPlayerPacket; use pocketmine\network\protocol\AdventureSettingsPacket; use pocketmine\network\protocol\AnimatePacket; use pocketmine\network\protocol\ChatPacket; -use pocketmine\network\protocol\ChunkDataPacket; use pocketmine\network\protocol\ContainerClosePacket; use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\protocol\ContainerSetContentPacket; diff --git a/src/pocketmine/network/query/QueryPacket.php b/src/pocketmine/network/query/QueryPacket.php index 0788bfb0c..43879bc84 100644 --- a/src/pocketmine/network/query/QueryPacket.php +++ b/src/pocketmine/network/query/QueryPacket.php @@ -21,7 +21,7 @@ namespace pocketmine\network\query; -se pocketmine\utils\Binary; +use pocketmine\utils\Binary; class QueryPacket extends Packet{ const HANDSHAKE = 9; diff --git a/src/pocketmine/tile/Container.php b/src/pocketmine/tile/Container.php index 1b5c4909f..e98e4e386 100644 --- a/src/pocketmine/tile/Container.php +++ b/src/pocketmine/tile/Container.php @@ -21,7 +21,6 @@ namespace pocketmine\tile; -use pocketmine\event\tile\TileInventoryChangeEvent; use pocketmine\item\Item; use pocketmine\Network;