From 3e2cce3c2caa0571477526fc3b96103a4ea4f5fa Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 7 Aug 2015 21:26:24 +0200 Subject: [PATCH] use cleanup --- src/pocketmine/MemoryManager.php | 2 +- src/pocketmine/Player.php | 10 +++++----- src/pocketmine/block/Block.php | 5 ++--- src/pocketmine/block/Cake.php | 2 +- src/pocketmine/block/Door.php | 1 - src/pocketmine/block/EnchantingTable.php | 2 +- src/pocketmine/block/EndStone.php | 2 +- src/pocketmine/block/Flowable.php | 2 +- src/pocketmine/block/GrassPath.php | 11 ++++------- src/pocketmine/block/HardenedClay.php | 2 +- src/pocketmine/block/StainedClay.php | 2 +- src/pocketmine/block/WaterLily.php | 4 ++-- src/pocketmine/command/PluginCommand.php | 2 +- src/pocketmine/command/defaults/BanCommand.php | 2 +- src/pocketmine/command/defaults/BanIpCommand.php | 2 +- .../command/defaults/DefaultGamemodeCommand.php | 2 +- src/pocketmine/command/defaults/DifficultyCommand.php | 2 +- src/pocketmine/command/defaults/DumpMemoryCommand.php | 3 +-- src/pocketmine/command/defaults/EffectCommand.php | 2 +- .../command/defaults/GarbageCollectorCommand.php | 2 +- src/pocketmine/command/defaults/PardonCommand.php | 2 +- src/pocketmine/command/defaults/PardonIpCommand.php | 2 +- src/pocketmine/command/defaults/TimingsCommand.php | 2 +- src/pocketmine/entity/Effect.php | 2 +- src/pocketmine/entity/Entity.php | 2 +- src/pocketmine/entity/FallingSand.php | 4 ++-- src/pocketmine/entity/Item.php | 8 ++++---- src/pocketmine/entity/Living.php | 2 +- src/pocketmine/entity/PrimedTNT.php | 2 +- src/pocketmine/entity/Projectile.php | 2 +- src/pocketmine/inventory/ChestInventory.php | 2 +- src/pocketmine/inventory/DoubleChestInventory.php | 2 +- src/pocketmine/inventory/FakeBlockMenu.php | 9 ++------- src/pocketmine/level/Explosion.php | 2 +- src/pocketmine/level/Level.php | 4 ++-- src/pocketmine/level/format/anvil/Anvil.php | 2 +- .../level/format/anvil/ChunkRequestTask.php | 3 +-- src/pocketmine/level/format/anvil/RegionLoader.php | 11 +---------- src/pocketmine/level/format/generic/BaseFullChunk.php | 2 +- src/pocketmine/level/format/mcregion/McRegion.php | 2 +- src/pocketmine/level/format/mcregion/RegionLoader.php | 10 ++-------- src/pocketmine/level/generator/GenerationTask.php | 6 +++--- .../level/generator/GeneratorRegisterTask.php | 4 ++-- .../level/generator/GeneratorUnregisterTask.php | 9 +++------ .../level/generator/LightPopulationTask.php | 8 ++++---- src/pocketmine/level/generator/PopulationTask.php | 6 +++--- src/pocketmine/level/generator/normal/Normal.php | 8 ++++---- .../level/generator/normal/biome/DesertBiome.php | 2 +- .../generator/normal/biome/SmallMountainsBiome.php | 2 -- src/pocketmine/network/protocol/DataPacket.php | 5 ++--- src/pocketmine/tile/Chest.php | 4 ++-- src/pocketmine/tile/Furnace.php | 2 +- src/pocketmine/utils/BinaryStream.php | 3 +-- 53 files changed, 82 insertions(+), 116 deletions(-) diff --git a/src/pocketmine/MemoryManager.php b/src/pocketmine/MemoryManager.php index 655fcb346..bbca6a3ca 100644 --- a/src/pocketmine/MemoryManager.php +++ b/src/pocketmine/MemoryManager.php @@ -25,7 +25,7 @@ use pocketmine\event\server\LowMemoryEvent; use pocketmine\event\Timings; use pocketmine\scheduler\GarbageCollectionTask; use pocketmine\utils\Utils; -use pocketmine\utils\UUID; + class MemoryManager{ diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index d836b4152..b03125dc9 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -75,7 +75,7 @@ use pocketmine\inventory\PlayerInventory; use pocketmine\inventory\ShapedRecipe; use pocketmine\inventory\ShapelessRecipe; use pocketmine\inventory\SimpleTransactionGroup; -use pocketmine\inventory\StonecutterShapelessRecipe; + use pocketmine\item\Item; use pocketmine\level\ChunkLoader; use pocketmine\level\format\FullChunk; @@ -112,7 +112,7 @@ use pocketmine\network\protocol\Info as ProtocolInfo; use pocketmine\network\protocol\PlayStatusPacket; use pocketmine\network\protocol\RespawnPacket; use pocketmine\network\protocol\TextPacket; -use pocketmine\network\protocol\MoveEntityPacket; + use pocketmine\network\protocol\MovePlayerPacket; use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\protocol\SetEntityMotionPacket; @@ -130,8 +130,8 @@ use pocketmine\tile\Sign; use pocketmine\tile\Spawnable; use pocketmine\tile\Tile; use pocketmine\utils\TextFormat; -use pocketmine\utils\Utils; -use pocketmine\utils\UUID; + + use raklib\Binary; /** @@ -2486,7 +2486,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade $this->inventory->addItem(Item::get(Item::BOWL, 0, 1)); }elseif($slot->getId() === Item::RAW_FISH and $slot->getDamage() === 3){ //Pufferfish $this->addEffect(Effect::getEffect(Effect::HUNGER)->setAmplifier(2)->setDuration(15 * 20)); - $this->addEffect(Effect::getEffect(Effect::NAUSEA)->setAmplifier(1)->setDuration(15 * 20)); + //$this->addEffect(Effect::getEffect(Effect::NAUSEA)->setAmplifier(1)->setDuration(15 * 20)); $this->addEffect(Effect::getEffect(Effect::POISON)->setAmplifier(3)->setDuration(60 * 20)); } } diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index b694fff54..28eae50c2 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -25,9 +25,8 @@ namespace pocketmine\block; use pocketmine\entity\Entity; -use pocketmine\entity\Squid; -use pocketmine\entity\Villager; -use pocketmine\entity\Zombie; + + use pocketmine\item\Item; use pocketmine\item\Tool; use pocketmine\level\Level; diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index 42ded7a0f..7f0187f51 100644 --- a/src/pocketmine/block/Cake.php +++ b/src/pocketmine/block/Cake.php @@ -26,7 +26,7 @@ use pocketmine\item\Item; use pocketmine\level\Level; use pocketmine\math\AxisAlignedBB; use pocketmine\Player; -use pocketmine\Server; + class Cake extends Transparent{ diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index 2f44366c6..61258f1e4 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -27,7 +27,6 @@ use pocketmine\level\sound\DoorSound; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; use pocketmine\Player; -use pocketmine\Server; abstract class Door extends Transparent{ diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index fb2768955..d7be3cbe8 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -24,7 +24,7 @@ namespace pocketmine\block; use pocketmine\inventory\EnchantInventory; use pocketmine\item\Item; use pocketmine\item\Tool; -use pocketmine\nbt\NBT; + use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Int; use pocketmine\nbt\tag\String; diff --git a/src/pocketmine/block/EndStone.php b/src/pocketmine/block/EndStone.php index fa14abbd7..fe67d2b84 100644 --- a/src/pocketmine/block/EndStone.php +++ b/src/pocketmine/block/EndStone.php @@ -21,7 +21,7 @@ namespace pocketmine\block; -use pocketmine\item\Item; + use pocketmine\item\Tool; class EndStone extends Solid{ diff --git a/src/pocketmine/block/Flowable.php b/src/pocketmine/block/Flowable.php index d74c9867e..3c380301e 100644 --- a/src/pocketmine/block/Flowable.php +++ b/src/pocketmine/block/Flowable.php @@ -22,7 +22,7 @@ namespace pocketmine\block; -use pocketmine\item\Item; + abstract class Flowable extends Transparent{ diff --git a/src/pocketmine/block/GrassPath.php b/src/pocketmine/block/GrassPath.php index c53ed2eed..db642a54c 100644 --- a/src/pocketmine/block/GrassPath.php +++ b/src/pocketmine/block/GrassPath.php @@ -21,16 +21,13 @@ namespace pocketmine\block; -use pocketmine\event\block\BlockSpreadEvent; + use pocketmine\item\Item; use pocketmine\item\Tool; -use pocketmine\level\generator\object\TallGrass as TallGrassObject; -use pocketmine\level\Level; + + use pocketmine\math\AxisAlignedBB; -use pocketmine\math\Vector3; -use pocketmine\Player; -use pocketmine\Server; -use pocketmine\utils\Random; + class GrassPath extends Transparent{ diff --git a/src/pocketmine/block/HardenedClay.php b/src/pocketmine/block/HardenedClay.php index c01c8c349..c959d5a42 100644 --- a/src/pocketmine/block/HardenedClay.php +++ b/src/pocketmine/block/HardenedClay.php @@ -21,7 +21,7 @@ namespace pocketmine\block; -use pocketmine\item\Item; + use pocketmine\item\Tool; class HardenedClay extends Solid{ diff --git a/src/pocketmine/block/StainedClay.php b/src/pocketmine/block/StainedClay.php index c67d138ab..73ae98895 100644 --- a/src/pocketmine/block/StainedClay.php +++ b/src/pocketmine/block/StainedClay.php @@ -21,7 +21,7 @@ namespace pocketmine\block; -use pocketmine\item\Item; + use pocketmine\item\Tool; class StainedClay extends Solid{ diff --git a/src/pocketmine/block/WaterLily.php b/src/pocketmine/block/WaterLily.php index b3d6abee0..0a56de20e 100644 --- a/src/pocketmine/block/WaterLily.php +++ b/src/pocketmine/block/WaterLily.php @@ -21,9 +21,9 @@ namespace pocketmine\block; -use pocketmine\entity\Entity; + use pocketmine\item\Item; -use pocketmine\item\Tool; + use pocketmine\level\Level; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; diff --git a/src/pocketmine/command/PluginCommand.php b/src/pocketmine/command/PluginCommand.php index f1d34e751..c8fbc65d9 100644 --- a/src/pocketmine/command/PluginCommand.php +++ b/src/pocketmine/command/PluginCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command; use pocketmine\event\TranslationContainer; use pocketmine\plugin\Plugin; -use pocketmine\utils\TextFormat; + class PluginCommand extends Command implements PluginIdentifiableCommand{ diff --git a/src/pocketmine/command/defaults/BanCommand.php b/src/pocketmine/command/defaults/BanCommand.php index bd97abaea..e57e20a66 100644 --- a/src/pocketmine/command/defaults/BanCommand.php +++ b/src/pocketmine/command/defaults/BanCommand.php @@ -25,7 +25,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; use pocketmine\Player; -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 385fac6c6..b5b82c5d9 100644 --- a/src/pocketmine/command/defaults/BanIpCommand.php +++ b/src/pocketmine/command/defaults/BanIpCommand.php @@ -25,7 +25,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; use pocketmine\Player; -use pocketmine\utils\TextFormat; + class BanIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php index e14d58471..b6e804f80 100644 --- a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php +++ b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; use pocketmine\Server; -use pocketmine\utils\TextFormat; + class DefaultGamemodeCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DifficultyCommand.php b/src/pocketmine/command/defaults/DifficultyCommand.php index ea7255997..88b0e85d4 100644 --- a/src/pocketmine/command/defaults/DifficultyCommand.php +++ b/src/pocketmine/command/defaults/DifficultyCommand.php @@ -27,7 +27,7 @@ use pocketmine\event\TranslationContainer; use pocketmine\network\Network; use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\Server; -use pocketmine\utils\TextFormat; + class DifficultyCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DumpMemoryCommand.php b/src/pocketmine/command/defaults/DumpMemoryCommand.php index 4d35d16e7..b4efb17d3 100644 --- a/src/pocketmine/command/defaults/DumpMemoryCommand.php +++ b/src/pocketmine/command/defaults/DumpMemoryCommand.php @@ -22,8 +22,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\utils\TextFormat; -use pocketmine\utils\Utils; + class DumpMemoryCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/EffectCommand.php b/src/pocketmine/command/defaults/EffectCommand.php index 184bbf87b..6da6a7e16 100644 --- a/src/pocketmine/command/defaults/EffectCommand.php +++ b/src/pocketmine/command/defaults/EffectCommand.php @@ -21,7 +21,7 @@ namespace pocketmine\command\defaults; -use pocketmine\command\Command; + use pocketmine\command\CommandSender; use pocketmine\entity\Effect; use pocketmine\entity\InstantEffect; diff --git a/src/pocketmine/command/defaults/GarbageCollectorCommand.php b/src/pocketmine/command/defaults/GarbageCollectorCommand.php index 6794e83d6..6dcd3aa99 100644 --- a/src/pocketmine/command/defaults/GarbageCollectorCommand.php +++ b/src/pocketmine/command/defaults/GarbageCollectorCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\utils\TextFormat; -use pocketmine\utils\Utils; + class GarbageCollectorCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/PardonCommand.php b/src/pocketmine/command/defaults/PardonCommand.php index d44862ac6..30f306666 100644 --- a/src/pocketmine/command/defaults/PardonCommand.php +++ b/src/pocketmine/command/defaults/PardonCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; -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 7e729bac0..bb25c24c9 100644 --- a/src/pocketmine/command/defaults/PardonIpCommand.php +++ b/src/pocketmine/command/defaults/PardonIpCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; -use pocketmine\utils\TextFormat; + class PardonIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/TimingsCommand.php b/src/pocketmine/command/defaults/TimingsCommand.php index 22e2fd79f..ccac246c0 100644 --- a/src/pocketmine/command/defaults/TimingsCommand.php +++ b/src/pocketmine/command/defaults/TimingsCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\event\TimingsHandler; use pocketmine\event\TranslationContainer; -use pocketmine\utils\TextFormat; + class TimingsCommand extends VanillaCommand{ diff --git a/src/pocketmine/entity/Effect.php b/src/pocketmine/entity/Effect.php index 9626f317c..e8196676b 100644 --- a/src/pocketmine/entity/Effect.php +++ b/src/pocketmine/entity/Effect.php @@ -26,7 +26,7 @@ use pocketmine\event\entity\EntityRegainHealthEvent; use pocketmine\network\Network; use pocketmine\network\protocol\MobEffectPacket; use pocketmine\Player; -use pocketmine\Server; + class Effect{ const SPEED = 1; diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 905da3661..8c15d6418 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -57,7 +57,7 @@ use pocketmine\network\Network; use pocketmine\network\protocol\MobEffectPacket; use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\protocol\SetEntityDataPacket; -use pocketmine\network\protocol\SetTimePacket; + use pocketmine\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; diff --git a/src/pocketmine/entity/FallingSand.php b/src/pocketmine/entity/FallingSand.php index e6c97bc0e..2192499bf 100644 --- a/src/pocketmine/entity/FallingSand.php +++ b/src/pocketmine/entity/FallingSand.php @@ -23,11 +23,11 @@ namespace pocketmine\entity; use pocketmine\block\Block; -use pocketmine\block\Flowable; + use pocketmine\block\Liquid; use pocketmine\event\entity\EntityBlockChangeEvent; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\entity\EntityRegainHealthEvent; + use pocketmine\item\Item as ItemItem; use pocketmine\math\Vector3; use pocketmine\nbt\tag\Byte; diff --git a/src/pocketmine/entity/Item.php b/src/pocketmine/entity/Item.php index da3aed53d..729a3f833 100644 --- a/src/pocketmine/entity/Item.php +++ b/src/pocketmine/entity/Item.php @@ -22,14 +22,14 @@ namespace pocketmine\entity; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\entity\EntityRegainHealthEvent; + use pocketmine\event\entity\ItemDespawnEvent; use pocketmine\event\entity\ItemSpawnEvent; use pocketmine\item\Item as ItemItem; -use pocketmine\math\Vector3; + use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\Byte; -use pocketmine\nbt\tag\Compound; + + use pocketmine\nbt\tag\Short; use pocketmine\nbt\tag\String; use pocketmine\network\Network; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index 4bfe52ccf..e569ddee1 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -34,7 +34,7 @@ use pocketmine\math\Vector3; use pocketmine\nbt\tag\Short; use pocketmine\network\Network; use pocketmine\network\protocol\EntityEventPacket; -use pocketmine\Player; + use pocketmine\Server; use pocketmine\utils\BlockIterator; diff --git a/src/pocketmine/entity/PrimedTNT.php b/src/pocketmine/entity/PrimedTNT.php index eed361c5a..07e7a2b76 100644 --- a/src/pocketmine/entity/PrimedTNT.php +++ b/src/pocketmine/entity/PrimedTNT.php @@ -23,7 +23,7 @@ namespace pocketmine\entity; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\entity\EntityRegainHealthEvent; + use pocketmine\event\entity\ExplosionPrimeEvent; use pocketmine\level\Explosion; use pocketmine\nbt\tag\Byte; diff --git a/src/pocketmine/entity/Projectile.php b/src/pocketmine/entity/Projectile.php index d37c63c13..e37a418a6 100644 --- a/src/pocketmine/entity/Projectile.php +++ b/src/pocketmine/entity/Projectile.php @@ -26,7 +26,7 @@ use pocketmine\event\entity\EntityCombustByEntityEvent; use pocketmine\event\entity\EntityDamageByChildEntityEvent; use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\entity\EntityRegainHealthEvent; + use pocketmine\event\entity\ProjectileHitEvent; use pocketmine\level\format\FullChunk; use pocketmine\level\MovingObjectPosition; diff --git a/src/pocketmine/inventory/ChestInventory.php b/src/pocketmine/inventory/ChestInventory.php index a2f8447c6..fbcc48666 100644 --- a/src/pocketmine/inventory/ChestInventory.php +++ b/src/pocketmine/inventory/ChestInventory.php @@ -25,7 +25,7 @@ use pocketmine\level\Level; use pocketmine\network\Network; use pocketmine\network\protocol\TileEventPacket; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\tile\Chest; class ChestInventory extends ContainerInventory{ diff --git a/src/pocketmine/inventory/DoubleChestInventory.php b/src/pocketmine/inventory/DoubleChestInventory.php index 94c611cb4..1fb1f1b7e 100644 --- a/src/pocketmine/inventory/DoubleChestInventory.php +++ b/src/pocketmine/inventory/DoubleChestInventory.php @@ -26,7 +26,7 @@ use pocketmine\level\Level; use pocketmine\network\Network; use pocketmine\network\protocol\TileEventPacket; use pocketmine\Player; -use pocketmine\Server; + use pocketmine\tile\Chest; class DoubleChestInventory extends ChestInventory implements InventoryHolder{ diff --git a/src/pocketmine/inventory/FakeBlockMenu.php b/src/pocketmine/inventory/FakeBlockMenu.php index a479b4634..aac6b9c29 100644 --- a/src/pocketmine/inventory/FakeBlockMenu.php +++ b/src/pocketmine/inventory/FakeBlockMenu.php @@ -21,14 +21,9 @@ namespace pocketmine\inventory; -use pocketmine\level\Level; + use pocketmine\level\Position; -use pocketmine\math\Vector3; -use pocketmine\network\Network; -use pocketmine\network\protocol\TileEventPacket; -use pocketmine\Player; -use pocketmine\Server; -use pocketmine\tile\Chest; + class FakeBlockMenu extends Position implements InventoryHolder{ diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index 0cadd5ecc..120130a02 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -39,7 +39,7 @@ use pocketmine\nbt\tag\Enum; use pocketmine\nbt\tag\Float; use pocketmine\network\Network; use pocketmine\network\protocol\ExplodePacket; -use pocketmine\Server; + use pocketmine\utils\Random; class Explosion{ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 275e6365b..47fabbe15 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -80,7 +80,7 @@ use pocketmine\metadata\BlockMetadataStore; use pocketmine\metadata\Metadatable; use pocketmine\metadata\MetadataValue; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\Byte; + use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Double; use pocketmine\nbt\tag\Enum; @@ -98,7 +98,7 @@ use pocketmine\network\protocol\SetTimePacket; use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\Player; use pocketmine\plugin\Plugin; -use pocketmine\scheduler\AsyncTask; + use pocketmine\Server; use pocketmine\tile\Chest; use pocketmine\tile\Tile; diff --git a/src/pocketmine/level/format/anvil/Anvil.php b/src/pocketmine/level/format/anvil/Anvil.php index 68a8f4f89..5e0ccd5a6 100644 --- a/src/pocketmine/level/format/anvil/Anvil.php +++ b/src/pocketmine/level/format/anvil/Anvil.php @@ -32,7 +32,7 @@ use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\tile\Spawnable; use pocketmine\utils\BinaryStream; use pocketmine\utils\ChunkException; -use raklib\Binary; + class Anvil extends McRegion{ diff --git a/src/pocketmine/level/format/anvil/ChunkRequestTask.php b/src/pocketmine/level/format/anvil/ChunkRequestTask.php index 39ea4e1d0..2c7cd8c0a 100644 --- a/src/pocketmine/level/format/anvil/ChunkRequestTask.php +++ b/src/pocketmine/level/format/anvil/ChunkRequestTask.php @@ -26,8 +26,7 @@ use pocketmine\nbt\NBT; use pocketmine\scheduler\AsyncTask; use pocketmine\Server; use pocketmine\tile\Spawnable; -use pocketmine\utils\Binary; -use pocketmine\utils\ChunkException; + class ChunkRequestTask extends AsyncTask{ diff --git a/src/pocketmine/level/format/anvil/RegionLoader.php b/src/pocketmine/level/format/anvil/RegionLoader.php index 265e62889..4b13dc491 100644 --- a/src/pocketmine/level/format/anvil/RegionLoader.php +++ b/src/pocketmine/level/format/anvil/RegionLoader.php @@ -22,16 +22,7 @@ namespace pocketmine\level\format\anvil; use pocketmine\level\format\LevelProvider; -use pocketmine\nbt\NBT; -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\nbt\tag\Long; -use pocketmine\utils\Binary; -use pocketmine\utils\MainLogger; + class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{ diff --git a/src/pocketmine/level/format/generic/BaseFullChunk.php b/src/pocketmine/level/format/generic/BaseFullChunk.php index 8690c08b7..4a163eca0 100644 --- a/src/pocketmine/level/format/generic/BaseFullChunk.php +++ b/src/pocketmine/level/format/generic/BaseFullChunk.php @@ -30,7 +30,7 @@ use pocketmine\level\Level; use pocketmine\nbt\tag\Compound; use pocketmine\Player; use pocketmine\tile\Tile; -use pocketmine\utils\Binary; + abstract class BaseFullChunk implements FullChunk{ diff --git a/src/pocketmine/level/format/mcregion/McRegion.php b/src/pocketmine/level/format/mcregion/McRegion.php index 8b0ae20cb..d30f2682b 100644 --- a/src/pocketmine/level/format/mcregion/McRegion.php +++ b/src/pocketmine/level/format/mcregion/McRegion.php @@ -32,7 +32,7 @@ use pocketmine\nbt\tag\Int; use pocketmine\nbt\tag\Long; use pocketmine\nbt\tag\String; use pocketmine\tile\Spawnable; -use pocketmine\utils\Binary; + use pocketmine\utils\BinaryStream; use pocketmine\utils\ChunkException; diff --git a/src/pocketmine/level/format/mcregion/RegionLoader.php b/src/pocketmine/level/format/mcregion/RegionLoader.php index 94099853e..c7a528874 100644 --- a/src/pocketmine/level/format/mcregion/RegionLoader.php +++ b/src/pocketmine/level/format/mcregion/RegionLoader.php @@ -23,14 +23,8 @@ namespace pocketmine\level\format\mcregion; use pocketmine\level\format\FullChunk; use pocketmine\level\format\LevelProvider; -use pocketmine\nbt\NBT; -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\nbt\tag\Long; + + use pocketmine\utils\Binary; use pocketmine\utils\ChunkException; use pocketmine\utils\MainLogger; diff --git a/src/pocketmine/level/generator/GenerationTask.php b/src/pocketmine/level/generator/GenerationTask.php index fa042a13c..5aae87fce 100644 --- a/src/pocketmine/level/generator/GenerationTask.php +++ b/src/pocketmine/level/generator/GenerationTask.php @@ -21,14 +21,14 @@ namespace pocketmine\level\generator; -use pocketmine\block\Block; + use pocketmine\level\format\FullChunk; -use pocketmine\level\generator\biome\Biome; + use pocketmine\level\Level; use pocketmine\level\SimpleChunkManager; use pocketmine\scheduler\AsyncTask; use pocketmine\Server; -use pocketmine\utils\Random; + class GenerationTask extends AsyncTask{ diff --git a/src/pocketmine/level/generator/GeneratorRegisterTask.php b/src/pocketmine/level/generator/GeneratorRegisterTask.php index 27cf1acfe..38ba77404 100644 --- a/src/pocketmine/level/generator/GeneratorRegisterTask.php +++ b/src/pocketmine/level/generator/GeneratorRegisterTask.php @@ -22,12 +22,12 @@ namespace pocketmine\level\generator; use pocketmine\block\Block; -use pocketmine\level\format\FullChunk; + use pocketmine\level\generator\biome\Biome; use pocketmine\level\Level; use pocketmine\level\SimpleChunkManager; use pocketmine\scheduler\AsyncTask; -use pocketmine\Server; + use pocketmine\utils\Random; class GeneratorRegisterTask extends AsyncTask{ diff --git a/src/pocketmine/level/generator/GeneratorUnregisterTask.php b/src/pocketmine/level/generator/GeneratorUnregisterTask.php index dff150004..dbf060138 100644 --- a/src/pocketmine/level/generator/GeneratorUnregisterTask.php +++ b/src/pocketmine/level/generator/GeneratorUnregisterTask.php @@ -21,14 +21,11 @@ namespace pocketmine\level\generator; -use pocketmine\block\Block; -use pocketmine\level\format\FullChunk; -use pocketmine\level\generator\biome\Biome; + use pocketmine\level\Level; -use pocketmine\level\SimpleChunkManager; + use pocketmine\scheduler\AsyncTask; -use pocketmine\Server; -use pocketmine\utils\Random; + class GeneratorUnregisterTask extends AsyncTask{ diff --git a/src/pocketmine/level/generator/LightPopulationTask.php b/src/pocketmine/level/generator/LightPopulationTask.php index 7334e1f30..efe9d2644 100644 --- a/src/pocketmine/level/generator/LightPopulationTask.php +++ b/src/pocketmine/level/generator/LightPopulationTask.php @@ -21,14 +21,14 @@ namespace pocketmine\level\generator; -use pocketmine\block\Block; + use pocketmine\level\format\FullChunk; -use pocketmine\level\generator\biome\Biome; + use pocketmine\level\Level; -use pocketmine\level\SimpleChunkManager; + use pocketmine\scheduler\AsyncTask; use pocketmine\Server; -use pocketmine\utils\Random; + class LightPopulationTask extends AsyncTask{ diff --git a/src/pocketmine/level/generator/PopulationTask.php b/src/pocketmine/level/generator/PopulationTask.php index 6a9b6ed08..9e24e4e1b 100644 --- a/src/pocketmine/level/generator/PopulationTask.php +++ b/src/pocketmine/level/generator/PopulationTask.php @@ -21,14 +21,14 @@ namespace pocketmine\level\generator; -use pocketmine\block\Block; + use pocketmine\level\format\FullChunk; -use pocketmine\level\generator\biome\Biome; + use pocketmine\level\Level; use pocketmine\level\SimpleChunkManager; use pocketmine\scheduler\AsyncTask; use pocketmine\Server; -use pocketmine\utils\Random; + class PopulationTask extends AsyncTask{ diff --git a/src/pocketmine/level/generator/normal/Normal.php b/src/pocketmine/level/generator/normal/Normal.php index e7bbcb087..c2c91084b 100644 --- a/src/pocketmine/level/generator/normal/Normal.php +++ b/src/pocketmine/level/generator/normal/Normal.php @@ -36,15 +36,15 @@ use pocketmine\level\generator\biome\BiomeSelector; use pocketmine\level\generator\GenerationChunkManager; use pocketmine\level\generator\GenerationManager; use pocketmine\level\generator\Generator; -use pocketmine\level\generator\noise\Perlin; + use pocketmine\level\generator\noise\Simplex; -use pocketmine\level\generator\normal\biome\NormalBiome; + use pocketmine\level\generator\object\OreType; use pocketmine\level\generator\populator\GroundCover; use pocketmine\level\generator\populator\Ore; use pocketmine\level\generator\populator\Populator; -use pocketmine\level\generator\populator\TallGrass; -use pocketmine\level\generator\populator\Tree; + + use pocketmine\level\Level; use pocketmine\math\Vector3 as Vector3; use pocketmine\utils\Random; diff --git a/src/pocketmine/level/generator/normal/biome/DesertBiome.php b/src/pocketmine/level/generator/normal/biome/DesertBiome.php index b0d8399ef..3ffd6d5dc 100644 --- a/src/pocketmine/level/generator/normal/biome/DesertBiome.php +++ b/src/pocketmine/level/generator/normal/biome/DesertBiome.php @@ -21,7 +21,7 @@ namespace pocketmine\level\generator\normal\biome; -use pocketmine\block\Block; + class DesertBiome extends SandyBiome{ diff --git a/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php b/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php index 9321d19a4..98a585ac5 100644 --- a/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php +++ b/src/pocketmine/level/generator/normal/biome/SmallMountainsBiome.php @@ -21,8 +21,6 @@ namespace pocketmine\level\generator\normal\biome; -use pocketmine\level\generator\populator\TallGrass; -use pocketmine\level\generator\populator\Tree; class SmallMountainsBiome extends MountainsBiome{ diff --git a/src/pocketmine/network/protocol/DataPacket.php b/src/pocketmine/network/protocol/DataPacket.php index 443b8093f..a42b4525f 100644 --- a/src/pocketmine/network/protocol/DataPacket.php +++ b/src/pocketmine/network/protocol/DataPacket.php @@ -24,13 +24,12 @@ namespace pocketmine\network\protocol; #include #ifndef COMPILE -use pocketmine\utils\Binary; + #endif -use pocketmine\item\Item; + use pocketmine\utils\BinaryStream; use pocketmine\utils\Utils; -use pocketmine\utils\UUID; abstract class DataPacket extends BinaryStream{ diff --git a/src/pocketmine/tile/Chest.php b/src/pocketmine/tile/Chest.php index e8fe1729f..69f4892aa 100644 --- a/src/pocketmine/tile/Chest.php +++ b/src/pocketmine/tile/Chest.php @@ -28,11 +28,11 @@ use pocketmine\item\Item; use pocketmine\level\format\FullChunk; use pocketmine\math\Vector3; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\Byte; + use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Enum; use pocketmine\nbt\tag\Int; -use pocketmine\nbt\tag\Short; + use pocketmine\nbt\tag\String; class Chest extends Spawnable implements InventoryHolder, Container, Nameable{ diff --git a/src/pocketmine/tile/Furnace.php b/src/pocketmine/tile/Furnace.php index 3dca094de..0c4e82e65 100644 --- a/src/pocketmine/tile/Furnace.php +++ b/src/pocketmine/tile/Furnace.php @@ -30,7 +30,7 @@ use pocketmine\inventory\InventoryHolder; use pocketmine\item\Item; use pocketmine\level\format\FullChunk; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\Byte; + use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Enum; use pocketmine\nbt\tag\Short; diff --git a/src/pocketmine/utils/BinaryStream.php b/src/pocketmine/utils/BinaryStream.php index 83aa07bd4..40aeb192c 100644 --- a/src/pocketmine/utils/BinaryStream.php +++ b/src/pocketmine/utils/BinaryStream.php @@ -24,11 +24,10 @@ namespace pocketmine\utils; #include #ifndef COMPILE -use pocketmine\utils\Binary; + #endif use pocketmine\item\Item; -use pocketmine\utils\UUID; class BinaryStream extends \stdClass{