diff --git a/.gitignore b/.gitignore index 0ade7e162..44f84a923 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ bin/* .idea/* *.log *.txt +*.phar server.properties # Windows image file caches diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13ecc65aa..aceec41d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accept ```php whitelist = new Config(\PocketMine\DATA . "white-list.txt", Config::ENUM); //Open whitelist list file - $this->bannedIPs = new Config(\PocketMine\DATA . "banned-ips.txt", Config::ENUM); //Open Banned IPs list file - $this->banned = new Config(\PocketMine\DATA . "banned.txt", Config::ENUM); //Open Banned Usernames list file - $this->ops = new Config(\PocketMine\DATA . "ops.txt", Config::ENUM); //Open list of OPs + $this->whitelist = new Config(\pocketmine\DATA . "white-list.txt", Config::ENUM); //Open whitelist list file + $this->bannedIPs = new Config(\pocketmine\DATA . "banned-ips.txt", Config::ENUM); //Open Banned IPs list file + $this->banned = new Config(\pocketmine\DATA . "banned.txt", Config::ENUM); //Open Banned Usernames list file + $this->ops = new Config(\pocketmine\DATA . "ops.txt", Config::ENUM); //Open list of OPs $this->server->api->console->register("banip", " [IP|player]", array($this, "commandHandler")); $this->server->api->console->register("ban", " [username]", array($this, "commandHandler")); $this->server->api->console->register("kick", " [reason ...]", array($this, "commandHandler")); @@ -220,7 +220,7 @@ class BanAPI{ $output .= "Player \"$user\" added to white-list\n"; break; case "reload": - $this->whitelist = new Config(\PocketMine\DATA . "white-list.txt", Config::ENUM); + $this->whitelist = new Config(\pocketmine\DATA . "white-list.txt", Config::ENUM); break; case "list": $output .= "White-list: " . implode(", ", $this->whitelist->getAll(true)) . "\n"; @@ -265,7 +265,7 @@ class BanAPI{ $output .= "IP \"$ip\" added to ban list\n"; break; case "reload": - $this->bannedIPs = new Config(\PocketMine\DATA . "banned-ips.txt", Config::ENUM); + $this->bannedIPs = new Config(\pocketmine\DATA . "banned-ips.txt", Config::ENUM); break; case "list": $output .= "IP ban list: " . implode(", ", $this->bannedIPs->getAll(true)) . "\n"; @@ -303,7 +303,7 @@ class BanAPI{ $output .= "Player \"$user\" added to ban list\n"; break; case "reload": - $this->banned = new Config(\PocketMine\DATA . "banned.txt", Config::ENUM); + $this->banned = new Config(\pocketmine\DATA . "banned.txt", Config::ENUM); break; case "list": $output .= "Ban list: " . implode(", ", $this->banned->getAll(true)) . "\n"; diff --git a/src/PocketMine/BlockAPI.php b/src/PocketMine/BlockAPI.php index 0635fa2b3..3077666fe 100644 --- a/src/PocketMine/BlockAPI.php +++ b/src/PocketMine/BlockAPI.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Level\Position; +use pocketmine\Block; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\level\Position; class BlockAPI{ private $server; @@ -292,7 +292,7 @@ class BlockAPI{ } public function blockUpdate(Position $pos, $type = Level::BLOCK_UPDATE_NORMAL){ - if(!($pos instanceof BLock\Block)){ + if(!($pos instanceof block\Block)){ $block = $pos->level->getBlock($pos); }else{ $pos = new Position($pos->x, $pos->y, $pos->z, $pos->level); diff --git a/src/PocketMine/LevelAPI.php b/src/PocketMine/LevelAPI.php index 7ac933f50..b3f97ee8a 100644 --- a/src/PocketMine/LevelAPI.php +++ b/src/PocketMine/LevelAPI.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Level\Level; +use pocketmine\level\Level; class LevelAPI{ private $server; diff --git a/src/PocketMine/Player.php b/src/PocketMine/Player.php index 06ccef356..6fb0475f4 100644 --- a/src/PocketMine/Player.php +++ b/src/PocketMine/Player.php @@ -19,58 +19,58 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Command\CommandSender; -use PocketMine\Entity\Human; -use PocketMine\Event; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Byte; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Double; -use PocketMine\NBT\Tag\Enum; -use PocketMine\NBT\Tag\Float; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\Short; -use PocketMine\NBT\Tag\String; -use PocketMine\Network\Protocol\AdventureSettingsPacket; -use PocketMine\Network\Protocol\ChunkDataPacket; -use PocketMine\Network\Protocol\ContainerClosePacket; -use PocketMine\Network\Protocol\ContainerSetContentPacket; -use PocketMine\Network\Protocol\ContainerSetSlotPacket; -use PocketMine\Network\Protocol\DataPacket; -use PocketMine\Network\Protocol\DisconnectPacket; -use PocketMine\Network\Protocol\Info as ProtocolInfo; -use PocketMine\Network\Protocol\LoginStatusPacket; -use PocketMine\Network\Protocol\MessagePacket; -use PocketMine\Network\Protocol\PongPacket; -use PocketMine\Network\Protocol\ServerHandshakePacket; -use PocketMine\Network\Protocol\SetSpawnPositionPacket; -use PocketMine\Network\Protocol\SetTimePacket; -use PocketMine\Network\Protocol\StartGamePacket; -use PocketMine\Network\Protocol\TileEventPacket; -use PocketMine\Network\Protocol\UnknownPacket; -use PocketMine\Network\Protocol\UpdateBlockPacket; -use PocketMine\Network\RakNet\Info; -use PocketMine\Network\RakNet\Packet; -use PocketMine\Permission\PermissibleBase; -use PocketMine\Permission\PermissionAttachment; -use PocketMine\Plugin\Plugin; -use PocketMine\PMF\LevelFormat; -use PocketMine\Recipes\Crafting; -use PocketMine\Scheduler\CallbackTask; -use PocketMine\Tile\Chest; -use PocketMine\Tile\Furnace; -use PocketMine\Tile\Sign; -use PocketMine\Tile\Spawnable; -use PocketMine\Tile\Tile; -use PocketMine\Utils\Config; -use PocketMine\Utils\TextFormat; -use PocketMine\Utils\Utils; +use pocketmine\command\CommandSender; +use pocketmine\entity\Human; +use pocketmine\Event; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Byte; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Double; +use pocketmine\nbt\tag\Enum; +use pocketmine\nbt\tag\Float; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\Short; +use pocketmine\nbt\tag\String; +use pocketmine\network\protocol\AdventureSettingsPacket; +use pocketmine\network\protocol\ChunkDataPacket; +use pocketmine\network\protocol\ContainerClosePacket; +use pocketmine\network\protocol\ContainerSetContentPacket; +use pocketmine\network\protocol\ContainerSetSlotPacket; +use pocketmine\network\protocol\DataPacket; +use pocketmine\network\protocol\DisconnectPacket; +use pocketmine\network\protocol\Info as ProtocolInfo; +use pocketmine\network\protocol\LoginStatusPacket; +use pocketmine\network\protocol\MessagePacket; +use pocketmine\network\protocol\PongPacket; +use pocketmine\network\protocol\ServerHandshakePacket; +use pocketmine\network\protocol\SetSpawnPositionPacket; +use pocketmine\network\protocol\SetTimePacket; +use pocketmine\network\protocol\StartGamePacket; +use pocketmine\network\protocol\TileEventPacket; +use pocketmine\network\protocol\UnknownPacket; +use pocketmine\network\protocol\UpdateBlockPacket; +use pocketmine\network\raknet\Info; +use pocketmine\network\raknet\Packet; +use pocketmine\permission\PermissibleBase; +use pocketmine\permission\PermissionAttachment; +use pocketmine\plugin\Plugin; +use pocketmine\pmf\LevelFormat; +use pocketmine\recipes\Crafting; +use pocketmine\scheduler\CallbackTask; +use pocketmine\tile\Chest; +use pocketmine\tile\Furnace; +use pocketmine\tile\Sign; +use pocketmine\tile\Spawnable; +use pocketmine\tile\Tile; +use pocketmine\utils\Config; +use pocketmine\utils\TextFormat; +use pocketmine\utils\Utils; /** * Main class that handles networking, recovery, and packet sending to the server part @@ -131,7 +131,7 @@ class Player extends Human implements CommandSender{ private $resendQueue = array(); private $ackQueue = array(); private $receiveCount = -1; - /** @var \PocketMine\Network\RakNet\Packet */ + /** @var \pocketmine\network\raknet\Packet */ private $buffer; private $bufferLen = 0; private $nextBuffer = 0; @@ -154,7 +154,7 @@ class Player extends Human implements CommandSender{ private $received = array(); /** - * @var \PocketMine\Scheduler\TaskHandler[] + * @var \pocketmine\scheduler\TaskHandler[] */ private $tasks = array(); @@ -255,7 +255,7 @@ class Player extends Human implements CommandSender{ } /** - * @param Permission\Permission|string $name + * @param permission\Permission|string $name * * @return bool */ @@ -264,7 +264,7 @@ class Player extends Human implements CommandSender{ } /** - * @param Permission\Permission|string $name + * @param permission\Permission|string $name * * @return bool */ @@ -277,7 +277,7 @@ class Player extends Human implements CommandSender{ * @param string $name * @param bool $value * - * @return Permission\PermissionAttachment + * @return permission\PermissionAttachment */ public function addAttachment(Plugin $plugin, $name = null, $value = null){ return $this->perm->addAttachment($plugin, $name, $value); @@ -295,7 +295,7 @@ class Player extends Human implements CommandSender{ } /** - * @return Permission\PermissionAttachmentInfo[] + * @return permission\PermissionAttachmentInfo[] */ public function getEffectivePermissions(){ return $this->perm->getEffectivePermissions(); @@ -603,7 +603,7 @@ class Player extends Human implements CommandSender{ if($this->connected === false){ return false; } - $this->server->getPluginManager()->callEvent($ev = new Event\Server\DataPacketSendEvent($this, $packet)); + $this->server->getPluginManager()->callEvent($ev = new event\server\DataPacketSendEvent($this, $packet)); if($ev->isCancelled()){ return false; } @@ -884,7 +884,7 @@ class Player extends Human implements CommandSender{ return false; } } - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerAchievementAwardedEvent($this, $achievementId)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerAchievementAwardedEvent($this, $achievementId)); if(!$ev->isCancelled()){ $this->achievements[$achievementId] = true; Achievement::broadcast($this, $achievementId); @@ -918,7 +918,7 @@ class Player extends Human implements CommandSender{ return false; } - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerGameModeChangeEvent($this, (int) $gm)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerGameModeChangeEvent($this, (int) $gm)); if($ev->isCancelled()){ return false; } @@ -1177,7 +1177,7 @@ class Player extends Human implements CommandSender{ return; } - $this->server->getPluginManager()->callEvent($ev = new Event\Server\DataPacketReceiveEvent($this, $packet)); + $this->server->getPluginManager()->callEvent($ev = new event\server\DataPacketReceiveEvent($this, $packet)); if($ev->isCancelled()){ return; } @@ -1246,7 +1246,7 @@ class Player extends Human implements CommandSender{ return; } - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerPreLoginEvent($this, "Plugin reason")); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerPreLoginEvent($this, "Plugin reason")); if($ev->isCancelled()){ $this->close($ev->getKickMessage(), "Plugin reason"); @@ -1311,7 +1311,7 @@ class Player extends Human implements CommandSender{ $this->slot = $this->hotbar[0]; } - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerLoginEvent($this, "Plugin reason")); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerLoginEvent($this, "Plugin reason")); if($ev->isCancelled()){ $this->close($ev->getKickMessage(), "Plugin reason"); @@ -1355,7 +1355,7 @@ class Player extends Human implements CommandSender{ console("[INFO] " . TextFormat::AQUA . $this->username . TextFormat::RESET . "[/" . $this->ip . ":" . $this->port . "] logged in with entity id " . $this->id . " at (" . $this->level->getName() . ", " . round($this->x, 4) . ", " . round($this->y, 4) . ", " . round($this->z, 4) . ")"); - $this->server->getPluginManager()->callEvent(new Event\Player\PlayerJoinEvent($this, $this->username . " joined the game")); + $this->server->getPluginManager()->callEvent(new event\player\PlayerJoinEvent($this, $this->username . " joined the game")); break; case ProtocolInfo::READY_PACKET: @@ -1386,7 +1386,7 @@ class Player extends Human implements CommandSender{ $pos = new Position($this->x, $this->y, $this->z, $this->level); $pos = $this->level->getSafeSpawn($pos); - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerRespawnEvent($this, $pos)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerRespawnEvent($this, $pos)); $this->teleport($ev->getRespawnPosition()); $this->sendBuffer(); @@ -1457,7 +1457,7 @@ class Player extends Human implements CommandSender{ if($packet->slot === false){ $this->sendInventorySlot($packet->slot); }else{ - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerItemHeldEvent($this, $item, $packet->slot, 0)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerItemHeldEvent($this, $item, $packet->slot, 0)); if($ev->isCancelled()){ $this->sendInventorySlot($packet->slot); }elseif($item instanceof Item){ @@ -1816,7 +1816,7 @@ class Player extends Human implements CommandSender{ $this->craftingItems = array(); $this->toCraft = array(); - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerRespawnEvent($this, $this->spawnPosition)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerRespawnEvent($this, $this->spawnPosition)); $this->teleport($ev->getRespawnPosition()); //$this->entity->fire = 0; @@ -1914,16 +1914,16 @@ class Player extends Human implements CommandSender{ $packet->message = TextFormat::clean($packet->message); if(trim($packet->message) != "" and strlen($packet->message) <= 255){ $message = $packet->message; - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerCommandPreprocessEvent($this, $message)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerCommandPreprocessEvent($this, $message)); if($ev->isCancelled()){ break; } if(substr($ev->getMessage(), 0, 1) === "/"){ //Command $this->server->dispatchCommand($ev->getPlayer(), substr($ev->getMessage(), 1)); }else{ - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerChatEvent($this, $ev->getMessage())); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerChatEvent($this, $ev->getMessage())); if(!$ev->isCancelled()){ - Player::groupChat(sprintf($ev->getFormat(), $ev->getPlayer()->getDisplayName(), $ev->getMessage()), $ev->getRecipients()); + $this->server->broadcastMessage(sprintf($ev->getFormat(), $ev->getPlayer()->getDisplayName(), $ev->getMessage()), $ev->getRecipients()); } } } @@ -2181,7 +2181,7 @@ class Player extends Human implements CommandSender{ * @return bool */ public function kick($reason = ""){ - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerKickEvent($this, $reason, "Kicked player " . $this->username . "." . ($reason !== "" ? " With reason: $reason" : ""))); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerKickEvent($this, $reason, "Kicked player " . $this->username . "." . ($reason !== "" ? " With reason: $reason" : ""))); if(!$ev->isCancelled()){ $this->sendMessage("You have been kicked. " . ($reason !== "" ? " Reason: $reason" : "") . "\n"); $this->close($ev->getQuitMessage(), $reason); @@ -2235,7 +2235,7 @@ class Player extends Human implements CommandSender{ if($this->connected === true){ unset($this->level->players[$this->CID]); if($this->username != ""){ - $this->server->getPluginManager()->callEvent($ev = new Event\Player\PlayerQuitEvent($this, $message)); + $this->server->getPluginManager()->callEvent($ev = new event\player\PlayerQuitEvent($this, $message)); if($this->loggedIn === true){ parent::close(); $this->save(); @@ -2312,7 +2312,7 @@ class Player extends Human implements CommandSender{ return false; } - $this->server->getPluginManager()->callEvent($ev = new Event\Server\DataPacketSendEvent($this, $packet)); + $this->server->getPluginManager()->callEvent($ev = new event\server\DataPacketSendEvent($this, $packet)); if($ev->isCancelled()){ return array(); } diff --git a/src/PocketMine/PlayerAPI.php b/src/PocketMine/PlayerAPI.php index 1cdbc9039..0b5094b5f 100644 --- a/src/PocketMine/PlayerAPI.php +++ b/src/PocketMine/PlayerAPI.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Entity\Entity; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Math\Vector3 as Vector3; +use pocketmine\entity\Entity; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\math\Vector3 as Vector3; class PlayerAPI{ private $server; diff --git a/src/PocketMine/PocketMine.php b/src/PocketMine/PocketMine.php index 814b80b89..a80bb5bc7 100644 --- a/src/PocketMine/PocketMine.php +++ b/src/PocketMine/PocketMine.php @@ -29,7 +29,7 @@ namespace { * @param int $level */ function console($message, $EOL = true, $log = true, $level = 1){ - PocketMine\console($message, $EOL, $log, $level); + pocketmine\console($message, $EOL, $log, $level); } function safe_var_dump(){ @@ -76,23 +76,27 @@ namespace { } } -namespace PocketMine { +namespace pocketmine { + use pocketmine\utils\TextFormat; + use pocketmine\utils\Utils; + use pocketmine\wizard\Installer; + const VERSION = "Alpha_1.4dev"; const API_VERSION = "1.0.0"; const CODENAME = "絶好(Zekkou)ケーキ(Cake)"; const MINECRAFT_VERSION = "v0.8.1 alpha"; const PHP_VERSION = "5.5"; - @define("PocketMine\\PATH", \getcwd() . DIRECTORY_SEPARATOR); + @define("pocketmine\\PATH", \getcwd() . DIRECTORY_SEPARATOR); if(!class_exists("SplClassLoader", false)){ - require_once(\PocketMine\PATH . "src/SPL/SplClassLoader.php"); + require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php"); } $autoloader = new \SplClassLoader(); - $autoloader->add("PocketMine", array( - \PocketMine\PATH . "src" + $autoloader->add("pocketmine", array( + \pocketmine\PATH . "src" )); $autoloader->register(true); @@ -138,21 +142,21 @@ namespace PocketMine { ini_set("default_charset", "utf-8"); ini_set("memory_limit", "128M"); //Default - define("PocketMine\\START_TIME", microtime(true)); + define("pocketmine\\START_TIME", microtime(true)); $opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard")); - define("PocketMine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR); - define("PocketMine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR); + define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR); + define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR); if((strpos(strtoupper(php_uname("s")), "WIN") === false or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])){ - define("PocketMine\\ANSI", true); + define("pocketmine\\ANSI", true); }else{ - define("PocketMine\\ANSI", false); + define("pocketmine\\ANSI", false); } function kill($pid){ - switch(Utils\Utils::getOS()){ + switch(Utils::getOS()){ case "win": exec("taskkill.exe /F /PID " . ((int) $pid) . " > NUL"); break; @@ -172,41 +176,41 @@ namespace PocketMine { * @param int $level */ function console($message, $EOL = true, $log = true, $level = 1){ - if(!defined("PocketMine\\DEBUG") or \PocketMine\DEBUG >= $level){ + if(!defined("pocketmine\\DEBUG") or \pocketmine\DEBUG >= $level){ $message .= $EOL === true ? PHP_EOL : ""; if($message{0} !== "["){ $message = "[INFO] $message"; } - $time = (\PocketMine\ANSI === true ? Utils\TextFormat::AQUA . date("H:i:s") . Utils\TextFormat::RESET : date("H:i:s")) . " "; - $replaced = Utils\TextFormat::clean(preg_replace('/\x1b\[[0-9;]*m/', "", $time . $message)); + $time = (\pocketmine\ANSI === true ? TextFormat::AQUA . date("H:i:s") . TextFormat::RESET : date("H:i:s")) . " "; + $replaced = TextFormat::clean(preg_replace('/\x1b\[[0-9;]*m/', "", $time . $message)); if($log === true and (!defined("LOG") or LOG === true)){ log(date("Y-m-d") . " " . $replaced, "server", false, $level); } - if(\PocketMine\ANSI === true){ + if(\pocketmine\ANSI === true){ $add = ""; if(preg_match("/^\\[([a-zA-Z0-9]*)\\]/", $message, $matches) > 0){ switch($matches[1]){ case "ERROR": case "SEVERE": - $add .= Utils\TextFormat::RED; + $add .= TextFormat::RED; break; case "TRACE": case "INTERNAL": case "DEBUG": - $add .= Utils\TextFormat::GRAY; + $add .= TextFormat::GRAY; break; case "WARNING": - $add .= Utils\TextFormat::YELLOW; + $add .= TextFormat::YELLOW; break; case "NOTICE": - $add .= Utils\TextFormat::AQUA; + $add .= TextFormat::AQUA; break; default: $add = ""; break; } } - $message = Utils\TextFormat::toANSI($time . $add . $message . Utils\TextFormat::RESET); + $message = TextFormat::toANSI($time . $add . $message . TextFormat::RESET); }else{ $message = $replaced; } @@ -265,13 +269,13 @@ namespace PocketMine { function log($message, $name, $EOL = true, $level = 2, $close = false){ global $fpointers; - if((!defined("PocketMine\\DEBUG") or \PocketMine\DEBUG >= $level) and (!defined("PocketMine\\LOG") or \PocketMine\LOG === true)){ + if((!defined("pocketmine\\DEBUG") or \pocketmine\DEBUG >= $level) and (!defined("pocketmine\\LOG") or \pocketmine\LOG === true)){ $message .= $EOL === true ? PHP_EOL : ""; if(!isset($fpointers)){ $fpointers = array(); } if(!isset($fpointers[$name]) or $fpointers[$name] === false){ - $fpointers[$name] = @fopen(\PocketMine\DATA . "/" . $name . ".log", "ab"); + $fpointers[$name] = @fopen(\pocketmine\DATA . "/" . $name . ".log", "ab"); } @fwrite($fpointers[$name], $message); if($close === true){ @@ -282,7 +286,7 @@ namespace PocketMine { } - set_error_handler("\\PocketMine\\error_handler", E_ALL); + set_error_handler("\\pocketmine\\error_handler", E_ALL); $errors = 0; @@ -340,20 +344,20 @@ namespace PocketMine { exit(1); //Exit with error } - if(file_exists(\PocketMine\PATH . ".git/refs/heads/master")){ //Found Git information! - define("PocketMine\\GIT_COMMIT", strtolower(trim(file_get_contents(\PocketMine\PATH . ".git/refs/heads/master")))); + if(file_exists(\pocketmine\PATH . ".git/refs/heads/master")){ //Found Git information! + define("pocketmine\\GIT_COMMIT", strtolower(trim(file_get_contents(\pocketmine\PATH . ".git/refs/heads/master")))); }else{ //Unknown :( - define("PocketMine\\GIT_COMMIT", str_repeat("00", 20)); + define("pocketmine\\GIT_COMMIT", str_repeat("00", 20)); } - @ini_set("opcache.mmap_base", bin2hex(Utils\Utils::getRandomBytes(8, false))); //Fix OPCache address errors + @ini_set("opcache.mmap_base", bin2hex(Utils::getRandomBytes(8, false))); //Fix OPCache address errors - if(!file_exists(\PocketMine\DATA . "server.properties") and !isset($opts["no-wizard"])){ - new Wizard\Installer(); + if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){ + new Installer(); } - $server = new Server($autoloader, \PocketMine\PATH, \PocketMine\DATA, \PocketMine\PLUGIN_PATH); + $server = new Server($autoloader, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH); $server->start(); kill(getmypid()); diff --git a/src/PocketMine/Server.php b/src/PocketMine/Server.php index f0f555501..71ed0999c 100644 --- a/src/PocketMine/Server.php +++ b/src/PocketMine/Server.php @@ -23,43 +23,43 @@ * PocketMine-MP is the Minecraft: PE multiplayer server software * Homepage: http://www.pocketmine.net/ */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Block\Block; -use PocketMine\Command\CommandReader; -use PocketMine\Command\CommandSender; -use PocketMine\Command\ConsoleCommandSender; -use PocketMine\Command\PluginCommand; -use PocketMine\Command\SimpleCommandMap; -use PocketMine\Entity\Entity; -use PocketMine\Event\HandlerList; -use PocketMine\Event\Server\PacketReceiveEvent; -use PocketMine\Event\Server\PacketSendEvent; -use PocketMine\Event\Server\ServerCommandEvent; -use PocketMine\Item\Item; -use PocketMine\Level\Generator\Generator; -use PocketMine\Level\Level; -use PocketMine\Network\Packet; -use PocketMine\Network\Query\QueryHandler; -use PocketMine\Network\Query\QueryPacket; -use PocketMine\Network\RakNet\Info as RakNetInfo; -use PocketMine\Network\RakNet\Packet as RakNetPacket; -use PocketMine\Network\ThreadedHandler; -use PocketMine\Network\UPnP\UPnP; -use PocketMine\Permission\BanList; -use PocketMine\Permission\DefaultPermissions; -use PocketMine\Plugin\Plugin; -use PocketMine\Plugin\PluginLoadOrder; -use PocketMine\Plugin\PluginManager; -use PocketMine\Recipes\Crafting; -use PocketMine\Scheduler\CallbackTask; -use PocketMine\Scheduler\ServerScheduler; -use PocketMine\Scheduler\TickScheduler; -use PocketMine\Tile\Tile; -use PocketMine\Utils\Config; -use PocketMine\Utils\TextFormat; -use PocketMine\Utils\Utils; -use PocketMine\Utils\VersionString; +use pocketmine\block\Block; +use pocketmine\command\CommandReader; +use pocketmine\command\CommandSender; +use pocketmine\command\ConsoleCommandSender; +use pocketmine\command\PluginCommand; +use pocketmine\command\SimpleCommandMap; +use pocketmine\entity\Entity; +use pocketmine\event\HandlerList; +use pocketmine\event\server\PacketReceiveEvent; +use pocketmine\event\server\PacketSendEvent; +use pocketmine\event\server\ServerCommandEvent; +use pocketmine\item\Item; +use pocketmine\level\generator\Generator; +use pocketmine\level\Level; +use pocketmine\network\Packet; +use pocketmine\network\query\QueryHandler; +use pocketmine\network\query\QueryPacket; +use pocketmine\network\raknet\Info as RakNetInfo; +use pocketmine\network\raknet\Packet as RakNetPacket; +use pocketmine\network\ThreadedHandler; +use pocketmine\network\upnp\UPnP; +use pocketmine\permission\BanList; +use pocketmine\permission\DefaultPermissions; +use pocketmine\plugin\Plugin; +use pocketmine\plugin\PluginLoadOrder; +use pocketmine\plugin\PluginManager; +use pocketmine\recipes\Crafting; +use pocketmine\scheduler\CallbackTask; +use pocketmine\scheduler\ServerScheduler; +use pocketmine\scheduler\TickScheduler; +use pocketmine\tile\Tile; +use pocketmine\utils\Config; +use pocketmine\utils\TextFormat; +use pocketmine\utils\Utils; +use pocketmine\utils\VersionString; class Server{ const BROADCAST_CHANNEL_ADMINISTRATIVE = "pocketmine.broadcast.admin"; @@ -146,28 +146,28 @@ class Server{ * @return string */ public function getPocketMineVersion(){ - return \PocketMine\VERSION; + return \pocketmine\VERSION; } /** * @return string */ public function getCodename(){ - return \PocketMine\CODENAME; + return \pocketmine\CODENAME; } /** * @return string */ public function getVersion(){ - return \PocketMine\MINECRAFT_VERSION; + return \pocketmine\MINECRAFT_VERSION; } /** * @return string */ public function getApiVersion(){ - return \PocketMine\API_VERSION; + return \pocketmine\API_VERSION; } /** @@ -700,14 +700,14 @@ class Server{ $this->setConfigInt("difficulty", 3); } - define("PocketMine\\DEBUG", $this->getConfigInt("debug", 1)); + define("pocketmine\\DEBUG", $this->getConfigInt("debug", 1)); define("ADVANCED_CACHE", $this->getConfigBoolean("enable-advanced-cache", false)); define("MAX_CHUNK_RATE", 20 / $this->getConfigInt("max-chunks-per-second", 7)); //Default rate ~448 kB/s if(ADVANCED_CACHE == true){ console("[INFO] Advanced cache enabled"); } - if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and function_exists("cli_set_process_title")){ + if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and function_exists("cli_set_process_title")){ @cli_set_process_title("PocketMine-MP " . $this->getPocketMineVersion()); } @@ -723,8 +723,8 @@ class Server{ $this->commandMap = new SimpleCommandMap($this); $this->pluginManager = new PluginManager($this, $this->commandMap); $this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender); - $this->pluginManager->registerInterface("PocketMine\\Plugin\\FolderPluginLoader"); - $this->pluginManager->registerInterface("PocketMine\\Plugin\\PharPluginLoader"); + $this->pluginManager->registerInterface("pocketmine\\plugin\\FolderPluginLoader"); + $this->pluginManager->registerInterface("pocketmine\\plugin\\PharPluginLoader"); $this->pluginManager->loadPlugins($this->pluginPath); //TODO: update checking (async) @@ -734,9 +734,9 @@ class Server{ Item::init(); Crafting::init(); - Generator::addGenerator("PocketMine\\Level\\Generator\\Flat", "flat"); - Generator::addGenerator("PocketMine\\Level\\Generator\\Normal", "normal"); - Generator::addGenerator("PocketMine\\Level\\Generator\\Normal", "default"); + Generator::addGenerator("pocketmine\\level\\generator\\Flat", "flat"); + Generator::addGenerator("pocketmine\\level\\generator\\Normal", "normal"); + Generator::addGenerator("pocketmine\\level\\generator\\Normal", "default"); Level::init(); $this->properties->save(); @@ -748,7 +748,7 @@ class Server{ if(!defined("NO_THREADS") and $this->getProperty("enable-rcon") === true){ $this->rcon = new RCON($this->getProperty("rcon.password", ""), $this->getProperty("rcon.port", $this->getProperty("server-port")), ($ip = $this->getProperty("server-ip")) != "" ? $ip : "0.0.0.0", $this->getProperty("rcon.threads", 1), $this->getProperty("rcon.clients-per-thread", 50)); }*/ - $this->scheduler->scheduleRepeatingTask(new CallbackTask("PocketMine\\Utils\\Cache::cleanup"), 20 * 45); + $this->scheduler->scheduleRepeatingTask(new CallbackTask("pocketmine\\utils\\Cache::cleanup"), 20 * 45); if($this->getConfigBoolean("auto-save", true) === true){ $this->scheduler->scheduleRepeatingTask(new CallbackTask(array($this, "doAutoSave")), 18000); } @@ -874,7 +874,7 @@ class Server{ */ console("[INFO] Default game type: " . self::getGamemodeString($this->getGamemode())); //TODO: string name //$this->trigger("server.start", microtime(true)); - console('[INFO] Done (' . round(microtime(true) - \PocketMine\START_TIME, 3) . 's)! For help, type "help" or "?"'); + console('[INFO] Done (' . round(microtime(true) - \pocketmine\START_TIME, 3) . 's)! For help, type "help" or "?"'); if(Utils::getOS() === "win"){ //Workaround less usleep() waste $this->tickProcessorWindows(); }else{ @@ -1076,7 +1076,7 @@ class Server{ } public function titleTick(){ - if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and \PocketMine\ANSI === true){ + if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){ echo "\x1b]0;PocketMine-MP " . $this->getPocketMineVersion() . " | Online " . count(Player::$list) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U " . round($this->interface->getUploadSpeed() / 1024, 2) . " D " . round($this->interface->getDownloadSpeed() / 1024, 2) . " kB/s | TPS " . $this->getTicksPerSecond() . "\x07"; } } diff --git a/src/PocketMine/ServerAPI.php b/src/PocketMine/ServerAPI.php index b8e602484..96a94bb40 100644 --- a/src/PocketMine/ServerAPI.php +++ b/src/PocketMine/ServerAPI.php @@ -19,16 +19,16 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Network\Query\QueryHandler; -use PocketMine\Network\RCON\RCON; -use PocketMine\Network\UPnP\UPnP; -use PocketMine\Plugin\PluginManager; -use PocketMine\Utils\Config; -use PocketMine\Utils\TextFormat; -use PocketMine\Utils\Utils; -use PocketMine\Utils\VersionString; +use pocketmine\network\query\QueryHandler; +use pocketmine\network\rcon\RCON; +use pocketmine\network\upnp\UPnP; +use pocketmine\plugin\PluginManager; +use pocketmine\utils\Config; +use pocketmine\utils\TextFormat; +use pocketmine\utils\Utils; +use pocketmine\utils\VersionString; class ServerAPI{ public $restart = false; @@ -83,15 +83,15 @@ class ServerAPI{ } public function load(){ - @mkdir(\PocketMine\DATA . "players/", 0755); - @mkdir(\PocketMine\DATA . "worlds/", 0755); - @mkdir(\PocketMine\DATA . "plugins/", 0755); + @mkdir(\pocketmine\DATA . "players/", 0755); + @mkdir(\pocketmine\DATA . "worlds/", 0755); + @mkdir(\pocketmine\DATA . "plugins/", 0755); $version = new VersionString(); console("[INFO] Starting Minecraft: PE server version " . TextFormat::AQUA . MINECRAFT_VERSION); console("[INFO] Loading properties..."); - $this->config = new Config(\PocketMine\DATA . "server.properties", Config::PROPERTIES, array( + $this->config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES, array( "server-name" => "Minecraft: PE Server", "description" => "Server made using PocketMine-MP", "motd" => "Welcome @player to this server!", @@ -124,7 +124,7 @@ class ServerAPI{ $this->parseProperties(); //Load advanced properties - define("PocketMine\\DEBUG", $this->getProperty("debug", 1)); + define("pocketmine\\DEBUG", $this->getProperty("debug", 1)); define("ADVANCED_CACHE", $this->getProperty("enable-advanced-cache", false)); define("MAX_CHUNK_RATE", 20 / $this->getProperty("max-chunks-per-second", 7)); //Default rate ~448 kB/s if(ADVANCED_CACHE == true){ @@ -150,7 +150,7 @@ class ServerAPI{ }else{ $last = new \DateTime($info[0]["commit"]["committer"]["date"]); $last = $last->getTimestamp(); - if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and \PocketMine\GIT_COMMIT != $info[0]["sha"]){ + if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and \pocketmine\GIT_COMMIT != $info[0]["sha"]){ console("[NOTICE] " . TextFormat::YELLOW . "A new DEVELOPMENT version of PocketMine-MP has been released!"); console("[NOTICE] " . TextFormat::YELLOW . "Commit \"" . $info[0]["commit"]["message"] . "\" [" . substr($info[0]["sha"], 0, 10) . "] by " . $info[0]["commit"]["committer"]["name"]); console("[NOTICE] " . TextFormat::YELLOW . "Get it at PocketMine.net or at https://github.com/PocketMine/PocketMine-MP/archive/" . $info[0]["sha"] . ".zip"); @@ -200,7 +200,7 @@ class ServerAPI{ } } - console("[INFO] Loaded " . count(PluginManager::loadPlugins(\PocketMine\DATA . "plugins/")) . " plugin(s)."); + console("[INFO] Loaded " . count(PluginManager::loadPlugins(\pocketmine\DATA . "plugins/")) . " plugin(s)."); } diff --git a/src/PocketMine/ServerOld.php b/src/PocketMine/ServerOld.php index 34c3b6758..02e6b9e82 100644 --- a/src/PocketMine/ServerOld.php +++ b/src/PocketMine/ServerOld.php @@ -23,16 +23,16 @@ * PocketMine-MP is the Minecraft: PE multiplayer server software * Homepage: http://www.pocketmine.net/ */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Entity\Entity; -use PocketMine\Network\Packet; -use PocketMine\Network\Protocol\Info; -use PocketMine\Network\RakNet\Info as RakNetInfo; -use PocketMine\Network\RakNet\Packet as RakNetPacket; -use PocketMine\Plugin\PluginManager; -use PocketMine\Utils\Utils; -use PocketMine\Utils\VersionString; +use pocketmine\entity\Entity; +use pocketmine\network\Packet; +use pocketmine\network\protocol\Info; +use pocketmine\network\raknet\Info as RakNetInfo; +use pocketmine\network\raknet\Packet as RakNetPacket; +use pocketmine\plugin\PluginManager; +use pocketmine\utils\Utils; +use pocketmine\utils\VersionString; class ServerOld{ /** @var Server */ @@ -93,8 +93,8 @@ class ServerOld{ private function load(){ $this->version = new VersionString(); - if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and function_exists("cli_set_process_title")){ - @cli_set_process_title("PocketMine-MP " . \PocketMine\VERSION); + if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and function_exists("cli_set_process_title")){ + @cli_set_process_title("PocketMine-MP " . \pocketmine\VERSION); } console("[INFO] Starting Minecraft PE server on " . ($this->serverip === "0.0.0.0" ? "*" : $this->serverip) . ":" . $this->port); define("BOOTUP_RANDOM", Utils::getRandomBytes(16)); @@ -155,19 +155,19 @@ class ServerOld{ public function titleTick(){ $time = microtime(true); - if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and \PocketMine\ANSI === true){ + if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){ echo "\x1b]0;PocketMine-MP " . VERSION . " | Online " . count(Player::$list) . "/" . $this->maxClients . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "MB | U " . round(($this->interface->bandwidth[1] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2) . " D " . round(($this->interface->bandwidth[0] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2) . " kB/s | TPS " . $this->getTPS() . "\x07"; } $this->interface->bandwidth = array(0, 0, $time); } public function loadEvents(){ - if(\PocketMine\ANSI === true){ + if(\pocketmine\ANSI === true){ $this->schedule(30, array($this, "titleTick"), array(), true); } $this->schedule(20 * 15, array($this, "checkTicks"), array(), true); $this->schedule(20 * 60, array($this, "checkMemory"), array(), true); - $this->schedule(20 * 45, "PocketMine\\Utils\\Cache::cleanup", array(), true); + $this->schedule(20 * 45, "pocketmine\\utils\\Cache::cleanup", array(), true); $this->schedule(20, array($this, "asyncOperationChecker"), array(), true); } @@ -435,7 +435,7 @@ class ServerOld{ } console("[INFO] Default game type: " . strtoupper($this->getGamemode())); $this->trigger("server.start", microtime(true)); - console('[INFO] Done (' . round(microtime(true) - \PocketMine\START_TIME, 3) . 's)! For help, type "help" or "?"'); + console('[INFO] Done (' . round(microtime(true) - \pocketmine\START_TIME, 3) . 's)! For help, type "help" or "?"'); $this->process(); } @@ -496,7 +496,7 @@ class ServerOld{ $p["rcon.password"] = "******"; } $dump .= "server.properties: " . var_export($p, true) . "\r\n\r\n\r\n"; - if(class_exists("PocketMine\\Plugin\\PluginManager", false)){ + if(class_exists("pocketmine\\plugin\\PluginManager", false)){ $dump .= "Loaded plugins:\r\n"; foreach(PluginManager::getPlugins() as $p){ $d = $p->getDescription(); diff --git a/src/PocketMine/TimeAPI.php b/src/PocketMine/TimeAPI.php index 30fdd4fb4..7804cb150 100644 --- a/src/PocketMine/TimeAPI.php +++ b/src/PocketMine/TimeAPI.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine; +namespace pocketmine; -use PocketMine\Level\Level; +use pocketmine\level\Level; class TimeAPI{ public static $phases = array( diff --git a/src/PocketMine/block/Air.php b/src/PocketMine/block/Air.php index 75ee6cea7..ad1ee5ff4 100644 --- a/src/PocketMine/block/Air.php +++ b/src/PocketMine/block/Air.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; /** diff --git a/src/PocketMine/block/Bed.php b/src/PocketMine/block/Bed.php index de348077c..8a56ca641 100644 --- a/src/PocketMine/block/Bed.php +++ b/src/PocketMine/block/Bed.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Network\Protocol\ChatPacket; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\network\protocol\ChatPacket; +use pocketmine\Player; +use pocketmine\Server; class Bed extends Transparent{ public function __construct($type = 0){ diff --git a/src/PocketMine/block/Bedrock.php b/src/PocketMine/block/Bedrock.php index 69b6a2e19..5ef5aa996 100644 --- a/src/PocketMine/block/Bedrock.php +++ b/src/PocketMine/block/Bedrock.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Bedrock extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Beetroot.php b/src/PocketMine/block/Beetroot.php index 5f23a5d78..897000a3e 100644 --- a/src/PocketMine/block/Beetroot.php +++ b/src/PocketMine/block/Beetroot.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Beetroot extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/BirchWoodStairs.php b/src/PocketMine/block/BirchWoodStairs.php index 22568aa81..ed4a3049b 100644 --- a/src/PocketMine/block/BirchWoodStairs.php +++ b/src/PocketMine/block/BirchWoodStairs.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class BirchWoodStairs extends Stair{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Block.php b/src/PocketMine/block/Block.php index da6a07327..7f2261dfe 100644 --- a/src/PocketMine/block/Block.php +++ b/src/PocketMine/block/Block.php @@ -22,12 +22,12 @@ /** * All Block classes are in here */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\Player; abstract class Block extends Position{ const AIR = 0; diff --git a/src/PocketMine/block/Bookshelf.php b/src/PocketMine/block/Bookshelf.php index f7f562844..6cabe255e 100644 --- a/src/PocketMine/block/Bookshelf.php +++ b/src/PocketMine/block/Bookshelf.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Bookshelf extends Solid{ diff --git a/src/PocketMine/block/BrickStairs.php b/src/PocketMine/block/BrickStairs.php index 97a737696..ec63c17f9 100644 --- a/src/PocketMine/block/BrickStairs.php +++ b/src/PocketMine/block/BrickStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class BrickStairs extends Stair{ diff --git a/src/PocketMine/block/Bricks.php b/src/PocketMine/block/Bricks.php index 8ee0e4102..df648c616 100644 --- a/src/PocketMine/block/Bricks.php +++ b/src/PocketMine/block/Bricks.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Bricks extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/BrownMushroom.php b/src/PocketMine/block/BrownMushroom.php index 650590b5a..36021c2b8 100644 --- a/src/PocketMine/block/BrownMushroom.php +++ b/src/PocketMine/block/BrownMushroom.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class BrownMushroom extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/BurningFurnace.php b/src/PocketMine/block/BurningFurnace.php index 226f6e0f5..71948e267 100644 --- a/src/PocketMine/block/BurningFurnace.php +++ b/src/PocketMine/block/BurningFurnace.php @@ -19,17 +19,17 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Enum; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\String; -use PocketMine\Player; -use PocketMine\Tile\Furnace; -use PocketMine\Tile\Tile; +use pocketmine\item\Item; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Enum; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\String; +use pocketmine\Player; +use pocketmine\tile\Furnace; +use pocketmine\tile\Tile; class BurningFurnace extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Cactus.php b/src/PocketMine/block/Cactus.php index bd842bba8..053715e3c 100644 --- a/src/PocketMine/block/Cactus.php +++ b/src/PocketMine/block/Cactus.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\Player; +use pocketmine\Server; class Cactus extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Cake.php b/src/PocketMine/block/Cake.php index dbc12abd8..e151d1050 100644 --- a/src/PocketMine/block/Cake.php +++ b/src/PocketMine/block/Cake.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Cake extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Carpet.php b/src/PocketMine/block/Carpet.php index 37beb5b50..b52c26772 100644 --- a/src/PocketMine/block/Carpet.php +++ b/src/PocketMine/block/Carpet.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Carpet extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Carrot.php b/src/PocketMine/block/Carrot.php index 671cfc651..a3f92a4c9 100644 --- a/src/PocketMine/block/Carrot.php +++ b/src/PocketMine/block/Carrot.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Carrot extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Chest.php b/src/PocketMine/block/Chest.php index 7f6d62cf2..a42018f25 100644 --- a/src/PocketMine/block/Chest.php +++ b/src/PocketMine/block/Chest.php @@ -19,17 +19,17 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Enum; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\String; -use PocketMine\Player; -use PocketMine\Tile\Chest as TileChest; -use PocketMine\Tile\Tile; +use pocketmine\item\Item; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Enum; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\String; +use pocketmine\Player; +use pocketmine\tile\Chest as TileChest; +use pocketmine\tile\Tile; class Chest extends Transparent{ diff --git a/src/PocketMine/block/Clay.php b/src/PocketMine/block/Clay.php index 3c25cdba3..055e3fc02 100644 --- a/src/PocketMine/block/Clay.php +++ b/src/PocketMine/block/Clay.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Clay extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Coal.php b/src/PocketMine/block/Coal.php index fad6bd0c6..88e2b9dac 100644 --- a/src/PocketMine/block/Coal.php +++ b/src/PocketMine/block/Coal.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Coal extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/CoalOre.php b/src/PocketMine/block/CoalOre.php index c4b8de861..4db7b5d35 100644 --- a/src/PocketMine/block/CoalOre.php +++ b/src/PocketMine/block/CoalOre.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class CoalOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Cobblestone.php b/src/PocketMine/block/Cobblestone.php index 403ce0cd4..14f2cd253 100644 --- a/src/PocketMine/block/Cobblestone.php +++ b/src/PocketMine/block/Cobblestone.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Cobblestone extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/CobblestoneStairs.php b/src/PocketMine/block/CobblestoneStairs.php index 4f9208541..f63780ac3 100644 --- a/src/PocketMine/block/CobblestoneStairs.php +++ b/src/PocketMine/block/CobblestoneStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class CobblestoneStairs extends Stair{ diff --git a/src/PocketMine/block/Cobweb.php b/src/PocketMine/block/Cobweb.php index 17ee7ef03..3268f8cab 100644 --- a/src/PocketMine/block/Cobweb.php +++ b/src/PocketMine/block/Cobweb.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Cobweb extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/CyanFlower.php b/src/PocketMine/block/CyanFlower.php index 077565b76..88672df66 100644 --- a/src/PocketMine/block/CyanFlower.php +++ b/src/PocketMine/block/CyanFlower.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class CyanFlower extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/Dandelion.php b/src/PocketMine/block/Dandelion.php index b2a6b1ffc..bf49eaaf2 100644 --- a/src/PocketMine/block/Dandelion.php +++ b/src/PocketMine/block/Dandelion.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Dandelion extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/DeadBush.php b/src/PocketMine/block/DeadBush.php index ea303ca2d..9888ad663 100644 --- a/src/PocketMine/block/DeadBush.php +++ b/src/PocketMine/block/DeadBush.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Level\Level; +use pocketmine\level\Level; class DeadBush extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/Diamond.php b/src/PocketMine/block/Diamond.php index 1484c3fc8..53210dbf9 100644 --- a/src/PocketMine/block/Diamond.php +++ b/src/PocketMine/block/Diamond.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Diamond extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/DiamondOre.php b/src/PocketMine/block/DiamondOre.php index 91f832e2d..f9c09fd23 100644 --- a/src/PocketMine/block/DiamondOre.php +++ b/src/PocketMine/block/DiamondOre.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class DiamondOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Dirt.php b/src/PocketMine/block/Dirt.php index 6df5e262d..67e6ba1c9 100644 --- a/src/PocketMine/block/Dirt.php +++ b/src/PocketMine/block/Dirt.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Dirt extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Door.php b/src/PocketMine/block/Door.php index 4da753a58..8ce237605 100644 --- a/src/PocketMine/block/Door.php +++ b/src/PocketMine/block/Door.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Network\Protocol\LevelEventPacket; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\Player; abstract class Door extends Transparent{ diff --git a/src/PocketMine/block/DoubleSlab.php b/src/PocketMine/block/DoubleSlab.php index d0a5b0066..19acd361d 100644 --- a/src/PocketMine/block/DoubleSlab.php +++ b/src/PocketMine/block/DoubleSlab.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class DoubleSlab extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/DoubleWoodSlab.php b/src/PocketMine/block/DoubleWoodSlab.php index f3cd5a77a..ecd009f97 100644 --- a/src/PocketMine/block/DoubleWoodSlab.php +++ b/src/PocketMine/block/DoubleWoodSlab.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class DoubleWoodSlab extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Fallable.php b/src/PocketMine/block/Fallable.php index b3224d6cf..cfa2cf2c0 100644 --- a/src/PocketMine/block/Fallable.php +++ b/src/PocketMine/block/Fallable.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; +use pocketmine\Server; class Fallable extends Solid{ diff --git a/src/PocketMine/block/Farmland.php b/src/PocketMine/block/Farmland.php index a2f7ea7c7..9e1e341f3 100644 --- a/src/PocketMine/block/Farmland.php +++ b/src/PocketMine/block/Farmland.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Farmland extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Fence.php b/src/PocketMine/block/Fence.php index 46c7c0475..c82be5f47 100644 --- a/src/PocketMine/block/Fence.php +++ b/src/PocketMine/block/Fence.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Fence extends Transparent{ diff --git a/src/PocketMine/block/FenceGate.php b/src/PocketMine/block/FenceGate.php index 0c5794cb9..6a30d95aa 100644 --- a/src/PocketMine/block/FenceGate.php +++ b/src/PocketMine/block/FenceGate.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class FenceGate extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Fire.php b/src/PocketMine/block/Fire.php index e9912acc6..a070e1905 100644 --- a/src/PocketMine/block/Fire.php +++ b/src/PocketMine/block/Fire.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; +use pocketmine\item\Item; +use pocketmine\level\Level; class Fire extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Flowable.php b/src/PocketMine/block/Flowable.php index 39be68949..0a4a7aa29 100644 --- a/src/PocketMine/block/Flowable.php +++ b/src/PocketMine/block/Flowable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Flowable extends Transparent{ diff --git a/src/PocketMine/block/Furnace.php b/src/PocketMine/block/Furnace.php index 90388c6d6..29bd2b69d 100644 --- a/src/PocketMine/block/Furnace.php +++ b/src/PocketMine/block/Furnace.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Furnace extends BurningFurnace{ diff --git a/src/PocketMine/block/Generic.php b/src/PocketMine/block/Generic.php index 4d445e8dc..d18b472ea 100644 --- a/src/PocketMine/block/Generic.php +++ b/src/PocketMine/block/Generic.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; +use pocketmine\Server; class Generic extends Block{ diff --git a/src/PocketMine/block/Glass.php b/src/PocketMine/block/Glass.php index 13b0c63fa..88f2de244 100644 --- a/src/PocketMine/block/Glass.php +++ b/src/PocketMine/block/Glass.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Glass extends Transparent{ public function __construct(){ diff --git a/src/PocketMine/block/GlassPane.php b/src/PocketMine/block/GlassPane.php index cb68838da..5620c4dd9 100644 --- a/src/PocketMine/block/GlassPane.php +++ b/src/PocketMine/block/GlassPane.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class GlassPane extends Transparent{ diff --git a/src/PocketMine/block/GlowingObsidian.php b/src/PocketMine/block/GlowingObsidian.php index 0588fe1ed..90fea22db 100644 --- a/src/PocketMine/block/GlowingObsidian.php +++ b/src/PocketMine/block/GlowingObsidian.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class GlowingObsidian extends Solid{ diff --git a/src/PocketMine/block/GlowingRedstoneOre.php b/src/PocketMine/block/GlowingRedstoneOre.php index 404e94e4d..b8ab5a0bb 100644 --- a/src/PocketMine/block/GlowingRedstoneOre.php +++ b/src/PocketMine/block/GlowingRedstoneOre.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; +use pocketmine\item\Item; +use pocketmine\level\Level; class GlowingRedstoneOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Glowstone.php b/src/PocketMine/block/Glowstone.php index 0032aee67..f7d3a1863 100644 --- a/src/PocketMine/block/Glowstone.php +++ b/src/PocketMine/block/Glowstone.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Glowstone extends Transparent{ public function __construct(){ diff --git a/src/PocketMine/block/Gold.php b/src/PocketMine/block/Gold.php index 7709bfbf9..4c9dafe52 100644 --- a/src/PocketMine/block/Gold.php +++ b/src/PocketMine/block/Gold.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Gold extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/GoldOre.php b/src/PocketMine/block/GoldOre.php index 0eeed6025..7353dc71b 100644 --- a/src/PocketMine/block/GoldOre.php +++ b/src/PocketMine/block/GoldOre.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class GoldOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Grass.php b/src/PocketMine/block/Grass.php index 3be3d81e3..9f1d7296b 100644 --- a/src/PocketMine/block/Grass.php +++ b/src/PocketMine/block/Grass.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Generator\Object\TallGrass; -use PocketMine\Player; -use PocketMine\Utils\Random; +use pocketmine\item\Item; +use pocketmine\level\generator\object\TallGrass; +use pocketmine\Player; +use pocketmine\utils\Random; class Grass extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Gravel.php b/src/PocketMine/block/Gravel.php index d9eaea325..2ffc98bde 100644 --- a/src/PocketMine/block/Gravel.php +++ b/src/PocketMine/block/Gravel.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Gravel extends Fallable{ public function __construct(){ diff --git a/src/PocketMine/block/HayBale.php b/src/PocketMine/block/HayBale.php index 53bd16f9e..44f21e5d2 100644 --- a/src/PocketMine/block/HayBale.php +++ b/src/PocketMine/block/HayBale.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class HayBale extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Ice.php b/src/PocketMine/block/Ice.php index 19805213a..b9b0d3a02 100644 --- a/src/PocketMine/block/Ice.php +++ b/src/PocketMine/block/Ice.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Ice extends Transparent{ public function __construct(){ diff --git a/src/PocketMine/block/Iron.php b/src/PocketMine/block/Iron.php index 62cb2cec4..b31273244 100644 --- a/src/PocketMine/block/Iron.php +++ b/src/PocketMine/block/Iron.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Iron extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/IronBars.php b/src/PocketMine/block/IronBars.php index 07f2d7fa2..2b2b53152 100644 --- a/src/PocketMine/block/IronBars.php +++ b/src/PocketMine/block/IronBars.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class IronBars extends Transparent{ diff --git a/src/PocketMine/block/IronDoor.php b/src/PocketMine/block/IronDoor.php index cfe7c09af..f8ff9c12a 100644 --- a/src/PocketMine/block/IronDoor.php +++ b/src/PocketMine/block/IronDoor.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class IronDoor extends Door{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/IronOre.php b/src/PocketMine/block/IronOre.php index ee707b88c..c3c378616 100644 --- a/src/PocketMine/block/IronOre.php +++ b/src/PocketMine/block/IronOre.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class IronOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/JungleWoodStairs.php b/src/PocketMine/block/JungleWoodStairs.php index 8fedd2115..3706548e8 100644 --- a/src/PocketMine/block/JungleWoodStairs.php +++ b/src/PocketMine/block/JungleWoodStairs.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class JungleWoodStairs extends Stair{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Ladder.php b/src/PocketMine/block/Ladder.php index 208b398f2..f1d7b24d0 100644 --- a/src/PocketMine/block/Ladder.php +++ b/src/PocketMine/block/Ladder.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Ladder extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Lapis.php b/src/PocketMine/block/Lapis.php index 34d888d96..fc1844b25 100644 --- a/src/PocketMine/block/Lapis.php +++ b/src/PocketMine/block/Lapis.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Lapis extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/LapisOre.php b/src/PocketMine/block/LapisOre.php index c6423dd51..c8c079078 100644 --- a/src/PocketMine/block/LapisOre.php +++ b/src/PocketMine/block/LapisOre.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class LapisOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Lava.php b/src/PocketMine/block/Lava.php index a7e9429ce..d32b84dae 100644 --- a/src/PocketMine/block/Lava.php +++ b/src/PocketMine/block/Lava.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\Player; +use pocketmine\Server; class Lava extends Liquid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Leaves.php b/src/PocketMine/block/Leaves.php index 261204e43..b2f5f5119 100644 --- a/src/PocketMine/block/Leaves.php +++ b/src/PocketMine/block/Leaves.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Leaves extends Transparent{ const OAK = 0; diff --git a/src/PocketMine/block/Liquid.php b/src/PocketMine/block/Liquid.php index 45f8fe3c0..7125d2e99 100644 --- a/src/PocketMine/block/Liquid.php +++ b/src/PocketMine/block/Liquid.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Liquid extends Transparent{ diff --git a/src/PocketMine/block/LitPumpkin.php b/src/PocketMine/block/LitPumpkin.php index d14276d0b..9f8ae8652 100644 --- a/src/PocketMine/block/LitPumpkin.php +++ b/src/PocketMine/block/LitPumpkin.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class LitPumpkin extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Melon.php b/src/PocketMine/block/Melon.php index 1949af1af..8a9bc5d56 100644 --- a/src/PocketMine/block/Melon.php +++ b/src/PocketMine/block/Melon.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Melon extends Transparent{ public function __construct(){ diff --git a/src/PocketMine/block/MelonStem.php b/src/PocketMine/block/MelonStem.php index 6ebfdccc9..7ea5d2852 100644 --- a/src/PocketMine/block/MelonStem.php +++ b/src/PocketMine/block/MelonStem.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class MelonStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/MossStone.php b/src/PocketMine/block/MossStone.php index c8ca85aff..36c062109 100644 --- a/src/PocketMine/block/MossStone.php +++ b/src/PocketMine/block/MossStone.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class MossStone extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/NetherBrick.php b/src/PocketMine/block/NetherBrick.php index 6731cfa5f..737889219 100644 --- a/src/PocketMine/block/NetherBrick.php +++ b/src/PocketMine/block/NetherBrick.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class NetherBrick extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/NetherBrickStairs.php b/src/PocketMine/block/NetherBrickStairs.php index bf1e6317f..b9f4955cd 100644 --- a/src/PocketMine/block/NetherBrickStairs.php +++ b/src/PocketMine/block/NetherBrickStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class NetherBrickStairs extends Stair{ diff --git a/src/PocketMine/block/NetherReactor.php b/src/PocketMine/block/NetherReactor.php index d950a0853..58fe72591 100644 --- a/src/PocketMine/block/NetherReactor.php +++ b/src/PocketMine/block/NetherReactor.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class NetherReactor extends Solid{ diff --git a/src/PocketMine/block/Netherrack.php b/src/PocketMine/block/Netherrack.php index 94dc2da0a..93d54c4dd 100644 --- a/src/PocketMine/block/Netherrack.php +++ b/src/PocketMine/block/Netherrack.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Netherrack extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Obsidian.php b/src/PocketMine/block/Obsidian.php index 7cebe3f26..9227b3c7e 100644 --- a/src/PocketMine/block/Obsidian.php +++ b/src/PocketMine/block/Obsidian.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Obsidian extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Planks.php b/src/PocketMine/block/Planks.php index 0b9acb504..431b9aecc 100644 --- a/src/PocketMine/block/Planks.php +++ b/src/PocketMine/block/Planks.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Planks extends Solid{ diff --git a/src/PocketMine/block/Potato.php b/src/PocketMine/block/Potato.php index e7666f034..c11b3532f 100644 --- a/src/PocketMine/block/Potato.php +++ b/src/PocketMine/block/Potato.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Potato extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Pumpkin.php b/src/PocketMine/block/Pumpkin.php index c33603f17..fd179f062 100644 --- a/src/PocketMine/block/Pumpkin.php +++ b/src/PocketMine/block/Pumpkin.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Pumpkin extends Solid{ diff --git a/src/PocketMine/block/PumpkinStem.php b/src/PocketMine/block/PumpkinStem.php index 348578db0..d85536b89 100644 --- a/src/PocketMine/block/PumpkinStem.php +++ b/src/PocketMine/block/PumpkinStem.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class PumpkinStem extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Quartz.php b/src/PocketMine/block/Quartz.php index e0aa4c9a1..db5aa2ac3 100644 --- a/src/PocketMine/block/Quartz.php +++ b/src/PocketMine/block/Quartz.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Quartz extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/QuartzStairs.php b/src/PocketMine/block/QuartzStairs.php index 97cb99070..7fa1f37ed 100644 --- a/src/PocketMine/block/QuartzStairs.php +++ b/src/PocketMine/block/QuartzStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class QuartzStairs extends Stair{ diff --git a/src/PocketMine/block/RedMushroom.php b/src/PocketMine/block/RedMushroom.php index a191d967d..1f75e6f9b 100644 --- a/src/PocketMine/block/RedMushroom.php +++ b/src/PocketMine/block/RedMushroom.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class RedMushroom extends Flowable{ public function __construct(){ diff --git a/src/PocketMine/block/RedstoneOre.php b/src/PocketMine/block/RedstoneOre.php index 839bcead3..d6272cf36 100644 --- a/src/PocketMine/block/RedstoneOre.php +++ b/src/PocketMine/block/RedstoneOre.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; +use pocketmine\item\Item; +use pocketmine\level\Level; class RedstoneOre extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/Sand.php b/src/PocketMine/block/Sand.php index 681b44a6d..6963273b7 100644 --- a/src/PocketMine/block/Sand.php +++ b/src/PocketMine/block/Sand.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Sand extends Fallable{ diff --git a/src/PocketMine/block/Sandstone.php b/src/PocketMine/block/Sandstone.php index 3a73dc61c..f9f83ffc4 100644 --- a/src/PocketMine/block/Sandstone.php +++ b/src/PocketMine/block/Sandstone.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Sandstone extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/SandstoneStairs.php b/src/PocketMine/block/SandstoneStairs.php index d1c28cd89..a8496a0f6 100644 --- a/src/PocketMine/block/SandstoneStairs.php +++ b/src/PocketMine/block/SandstoneStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class SandstoneStairs extends Stair{ diff --git a/src/PocketMine/block/Sapling.php b/src/PocketMine/block/Sapling.php index bbe0ae363..082ef8014 100644 --- a/src/PocketMine/block/Sapling.php +++ b/src/PocketMine/block/Sapling.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Generator\Object\Tree; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Utils\Random; +use pocketmine\item\Item; +use pocketmine\level\generator\object\Tree; +use pocketmine\level\Level; +use pocketmine\Player; +use pocketmine\utils\Random; class Sapling extends Flowable{ const OAK = 0; diff --git a/src/PocketMine/block/SignPost.php b/src/PocketMine/block/SignPost.php index edfe3c4b1..d325507ae 100644 --- a/src/PocketMine/block/SignPost.php +++ b/src/PocketMine/block/SignPost.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class SignPost extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Slab.php b/src/PocketMine/block/Slab.php index da9b0d53b..59e7da69a 100644 --- a/src/PocketMine/block/Slab.php +++ b/src/PocketMine/block/Slab.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Slab extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Snow.php b/src/PocketMine/block/Snow.php index f1ea46456..e841621d7 100644 --- a/src/PocketMine/block/Snow.php +++ b/src/PocketMine/block/Snow.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Snow extends Solid{ diff --git a/src/PocketMine/block/SnowLayer.php b/src/PocketMine/block/SnowLayer.php index 2bcda0b77..8ebe11dc6 100644 --- a/src/PocketMine/block/SnowLayer.php +++ b/src/PocketMine/block/SnowLayer.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class SnowLayer extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Solid.php b/src/PocketMine/block/Solid.php index 5e193c3d0..ed3d7af6e 100644 --- a/src/PocketMine/block/Solid.php +++ b/src/PocketMine/block/Solid.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Solid extends Generic{ diff --git a/src/PocketMine/block/SoulSand.php b/src/PocketMine/block/SoulSand.php index 9127a583a..17932de93 100644 --- a/src/PocketMine/block/SoulSand.php +++ b/src/PocketMine/block/SoulSand.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class SoulSand extends Solid{ diff --git a/src/PocketMine/block/Sponge.php b/src/PocketMine/block/Sponge.php index 7a6e91b0e..fcc482f77 100644 --- a/src/PocketMine/block/Sponge.php +++ b/src/PocketMine/block/Sponge.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Sponge extends Solid{ diff --git a/src/PocketMine/block/SpruceWoodStairs.php b/src/PocketMine/block/SpruceWoodStairs.php index b2a28c0c1..22bb4f2fe 100644 --- a/src/PocketMine/block/SpruceWoodStairs.php +++ b/src/PocketMine/block/SpruceWoodStairs.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class SpruceWoodStairs extends Stair{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Stair.php b/src/PocketMine/block/Stair.php index 4f637d524..d8d3a8971 100644 --- a/src/PocketMine/block/Stair.php +++ b/src/PocketMine/block/Stair.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Stair extends Transparent{ diff --git a/src/PocketMine/block/StillLava.php b/src/PocketMine/block/StillLava.php index 0bce7a9ec..33808bcdd 100644 --- a/src/PocketMine/block/StillLava.php +++ b/src/PocketMine/block/StillLava.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class StillLava extends Liquid{ diff --git a/src/PocketMine/block/StillWater.php b/src/PocketMine/block/StillWater.php index eeacb17f6..1ef791042 100644 --- a/src/PocketMine/block/StillWater.php +++ b/src/PocketMine/block/StillWater.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class StillWater extends Water{ diff --git a/src/PocketMine/block/Stone.php b/src/PocketMine/block/Stone.php index e58d8bf4d..987ee5207 100644 --- a/src/PocketMine/block/Stone.php +++ b/src/PocketMine/block/Stone.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Stone extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/StoneBrickStairs.php b/src/PocketMine/block/StoneBrickStairs.php index cb4398969..ede6833fc 100644 --- a/src/PocketMine/block/StoneBrickStairs.php +++ b/src/PocketMine/block/StoneBrickStairs.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class StoneBrickStairs extends Stair{ diff --git a/src/PocketMine/block/StoneBricks.php b/src/PocketMine/block/StoneBricks.php index d4b90860e..97f6a2298 100644 --- a/src/PocketMine/block/StoneBricks.php +++ b/src/PocketMine/block/StoneBricks.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class StoneBricks extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/StoneWall.php b/src/PocketMine/block/StoneWall.php index 4d0d73fb7..2e6bda3a2 100644 --- a/src/PocketMine/block/StoneWall.php +++ b/src/PocketMine/block/StoneWall.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class StoneWall extends Transparent{ diff --git a/src/PocketMine/block/Stonecutter.php b/src/PocketMine/block/Stonecutter.php index 85dea642b..31a19a9c7 100644 --- a/src/PocketMine/block/Stonecutter.php +++ b/src/PocketMine/block/Stonecutter.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Stonecutter extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Sugarcane.php b/src/PocketMine/block/Sugarcane.php index 57a2586f2..aefbe8b10 100644 --- a/src/PocketMine/block/Sugarcane.php +++ b/src/PocketMine/block/Sugarcane.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\Player; class Sugarcane extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/TNT.php b/src/PocketMine/block/TNT.php index bed597ae5..c10efaeda 100644 --- a/src/PocketMine/block/TNT.php +++ b/src/PocketMine/block/TNT.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class TNT extends Solid{ public function __construct(){ diff --git a/src/PocketMine/block/TallGrass.php b/src/PocketMine/block/TallGrass.php index 0e5a4eb4d..fdc35983d 100644 --- a/src/PocketMine/block/TallGrass.php +++ b/src/PocketMine/block/TallGrass.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; +use pocketmine\item\Item; +use pocketmine\level\Level; class TallGrass extends Flowable{ public function __construct($meta = 1){ diff --git a/src/PocketMine/block/Torch.php b/src/PocketMine/block/Torch.php index 1c02c290b..9c7595f4f 100644 --- a/src/PocketMine/block/Torch.php +++ b/src/PocketMine/block/Torch.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Torch extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Transparent.php b/src/PocketMine/block/Transparent.php index 1ea353f2f..c2b33b24e 100644 --- a/src/PocketMine/block/Transparent.php +++ b/src/PocketMine/block/Transparent.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Transparent extends Generic{ diff --git a/src/PocketMine/block/Trapdoor.php b/src/PocketMine/block/Trapdoor.php index 1cfdd0260..2dcb9f4c5 100644 --- a/src/PocketMine/block/Trapdoor.php +++ b/src/PocketMine/block/Trapdoor.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Trapdoor extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/WallSign.php b/src/PocketMine/block/WallSign.php index 702cbbb48..76c535533 100644 --- a/src/PocketMine/block/WallSign.php +++ b/src/PocketMine/block/WallSign.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class WallSign extends SignPost{ diff --git a/src/PocketMine/block/Water.php b/src/PocketMine/block/Water.php index c29c22a15..f37611467 100644 --- a/src/PocketMine/block/Water.php +++ b/src/PocketMine/block/Water.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\Player; +use pocketmine\Server; class Water extends Liquid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Wheat.php b/src/PocketMine/block/Wheat.php index 1f5d3825a..0f6119047 100644 --- a/src/PocketMine/block/Wheat.php +++ b/src/PocketMine/block/Wheat.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\Player; class Wheat extends Flowable{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Wood.php b/src/PocketMine/block/Wood.php index db3f1832b..b3229fcfe 100644 --- a/src/PocketMine/block/Wood.php +++ b/src/PocketMine/block/Wood.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Wood extends Solid{ const OAK = 0; diff --git a/src/PocketMine/block/WoodDoor.php b/src/PocketMine/block/WoodDoor.php index b508966f3..2041be6b5 100644 --- a/src/PocketMine/block/WoodDoor.php +++ b/src/PocketMine/block/WoodDoor.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class WoodDoor extends Door{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/WoodSlab.php b/src/PocketMine/block/WoodSlab.php index 03ce5a664..2167b6108 100644 --- a/src/PocketMine/block/WoodSlab.php +++ b/src/PocketMine/block/WoodSlab.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class WoodSlab extends Transparent{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/WoodStairs.php b/src/PocketMine/block/WoodStairs.php index 013653e8c..4efe0e701 100644 --- a/src/PocketMine/block/WoodStairs.php +++ b/src/PocketMine/block/WoodStairs.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; +use pocketmine\item\Item; class WoodStairs extends Stair{ public function __construct($meta = 0){ diff --git a/src/PocketMine/block/Wool.php b/src/PocketMine/block/Wool.php index 727a7e1f9..0285e0ef0 100644 --- a/src/PocketMine/block/Wool.php +++ b/src/PocketMine/block/Wool.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; class Wool extends Solid{ diff --git a/src/PocketMine/block/Workbench.php b/src/PocketMine/block/Workbench.php index bf95ceb55..da5ffda3d 100644 --- a/src/PocketMine/block/Workbench.php +++ b/src/PocketMine/block/Workbench.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Block; +namespace pocketmine\block; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\item\Item; +use pocketmine\Player; class Workbench extends Solid{ public function __construct($meta = 0){ diff --git a/src/PocketMine/command/Command.php b/src/PocketMine/command/Command.php index b4d62bbc1..e04959bcb 100644 --- a/src/PocketMine/command/Command.php +++ b/src/PocketMine/command/Command.php @@ -22,10 +22,10 @@ /** * Command handling related classes */ -namespace PocketMine\Command; +namespace pocketmine\command; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\Server; +use pocketmine\utils\TextFormat; abstract class Command{ /** @var string */ diff --git a/src/PocketMine/command/CommandExecutor.php b/src/PocketMine/command/CommandExecutor.php index db7fc49f6..4e7dcabc6 100644 --- a/src/PocketMine/command/CommandExecutor.php +++ b/src/PocketMine/command/CommandExecutor.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; interface CommandExecutor{ diff --git a/src/PocketMine/command/CommandMap.php b/src/PocketMine/command/CommandMap.php index ea6d29428..76823ec9d 100644 --- a/src/PocketMine/command/CommandMap.php +++ b/src/PocketMine/command/CommandMap.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; interface CommandMap{ diff --git a/src/PocketMine/command/CommandReader.php b/src/PocketMine/command/CommandReader.php index 34b158959..e479c4c60 100644 --- a/src/PocketMine/command/CommandReader.php +++ b/src/PocketMine/command/CommandReader.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; class CommandReader extends \Thread{ diff --git a/src/PocketMine/command/CommandSender.php b/src/PocketMine/command/CommandSender.php index 3467cce0e..3b03cb063 100644 --- a/src/PocketMine/command/CommandSender.php +++ b/src/PocketMine/command/CommandSender.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; -use PocketMine\Permission\Permissible; +use pocketmine\permission\Permissible; interface CommandSender extends Permissible{ @@ -31,7 +31,7 @@ interface CommandSender extends Permissible{ public function sendMessage($message); /** - * @return \PocketMine\Server + * @return \pocketmine\Server */ public function getServer(); diff --git a/src/PocketMine/command/ConsoleCommandSender.php b/src/PocketMine/command/ConsoleCommandSender.php index 4a475f9da..02beea79b 100644 --- a/src/PocketMine/command/ConsoleCommandSender.php +++ b/src/PocketMine/command/ConsoleCommandSender.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; -use PocketMine\Permission\PermissibleBase; -use PocketMine\Permission\PermissionAttachment; -use PocketMine\Plugin\Plugin; -use PocketMine\Server; +use pocketmine\permission\PermissibleBase; +use pocketmine\permission\PermissionAttachment; +use pocketmine\plugin\Plugin; +use pocketmine\Server; class ConsoleCommandSender implements CommandSender{ @@ -35,7 +35,7 @@ class ConsoleCommandSender implements CommandSender{ } /** - * @param \PocketMine\Permission\Permission|string $name + * @param \pocketmine\permission\Permission|string $name * * @return bool */ @@ -44,7 +44,7 @@ class ConsoleCommandSender implements CommandSender{ } /** - * @param \PocketMine\Permission\Permission|string $name + * @param \pocketmine\permission\Permission|string $name * * @return bool */ @@ -57,7 +57,7 @@ class ConsoleCommandSender implements CommandSender{ * @param string $name * @param bool $value * - * @return \PocketMine\Permission\PermissionAttachment + * @return \pocketmine\permission\PermissionAttachment */ public function addAttachment(Plugin $plugin, $name = null, $value = null){ return $this->perm->addAttachment($plugin, $name, $value); @@ -77,7 +77,7 @@ class ConsoleCommandSender implements CommandSender{ } /** - * @return \PocketMine\Permission\PermissionAttachmentInfo[] + * @return \pocketmine\permission\PermissionAttachmentInfo[] */ public function getEffectivePermissions(){ return $this->perm->getEffectivePermissions(); @@ -91,7 +91,7 @@ class ConsoleCommandSender implements CommandSender{ } /** - * @return \PocketMine\Server + * @return \pocketmine\Server */ public function getServer(){ return Server::getInstance(); diff --git a/src/PocketMine/command/PluginCommand.php b/src/PocketMine/command/PluginCommand.php index 0459dc2fa..daa7a2c79 100644 --- a/src/PocketMine/command/PluginCommand.php +++ b/src/PocketMine/command/PluginCommand.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; -use PocketMine\Plugin\Plugin; -use PocketMine\Utils\TextFormat; +use pocketmine\plugin\Plugin; +use pocketmine\utils\TextFormat; class PluginCommand extends Command{ diff --git a/src/PocketMine/command/RemoteConsoleCommandSender.php b/src/PocketMine/command/RemoteConsoleCommandSender.php index 0e51a4e0a..8d537a0b7 100644 --- a/src/PocketMine/command/RemoteConsoleCommandSender.php +++ b/src/PocketMine/command/RemoteConsoleCommandSender.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; interface RemoteConsoleCommandSender extends CommandSender{ diff --git a/src/PocketMine/command/SimpleCommandMap.php b/src/PocketMine/command/SimpleCommandMap.php index 5e66c3d1d..366c98266 100644 --- a/src/PocketMine/command/SimpleCommandMap.php +++ b/src/PocketMine/command/SimpleCommandMap.php @@ -19,26 +19,26 @@ * */ -namespace PocketMine\Command; +namespace pocketmine\command; -use PocketMine\Command\Defaults\BanCommand; -use PocketMine\Command\Defaults\BanIpCommand; -use PocketMine\Command\Defaults\BanListCommand; -use PocketMine\Command\Defaults\DefaultGamemodeCommand; -use PocketMine\Command\Defaults\DifficultyCommand; -use PocketMine\Command\Defaults\HelpCommand; -use PocketMine\Command\Defaults\ListCommand; -use PocketMine\Command\Defaults\MeCommand; -use PocketMine\Command\Defaults\PardonCommand; -use PocketMine\Command\Defaults\PardonIpCommand; -use PocketMine\Command\Defaults\PluginsCommand; -use PocketMine\Command\Defaults\SayCommand; -use PocketMine\Command\Defaults\SeedCommand; -use PocketMine\Command\Defaults\StopCommand; -use PocketMine\Command\Defaults\TellCommand; -use PocketMine\Command\Defaults\VanillaCommand; -use PocketMine\Command\Defaults\VersionCommand; -use PocketMine\Server; +use pocketmine\command\defaults\BanCommand; +use pocketmine\command\defaults\BanIpCommand; +use pocketmine\command\defaults\BanListCommand; +use pocketmine\command\defaults\DefaultGamemodeCommand; +use pocketmine\command\defaults\DifficultyCommand; +use pocketmine\command\defaults\HelpCommand; +use pocketmine\command\defaults\ListCommand; +use pocketmine\command\defaults\MeCommand; +use pocketmine\command\defaults\PardonCommand; +use pocketmine\command\defaults\PardonIpCommand; +use pocketmine\command\defaults\PluginsCommand; +use pocketmine\command\defaults\SayCommand; +use pocketmine\command\defaults\SeedCommand; +use pocketmine\command\defaults\StopCommand; +use pocketmine\command\defaults\TellCommand; +use pocketmine\command\defaults\VanillaCommand; +use pocketmine\command\defaults\VersionCommand; +use pocketmine\Server; class SimpleCommandMap implements CommandMap{ diff --git a/src/PocketMine/command/defaults/BanCommand.php b/src/PocketMine/command/defaults/BanCommand.php index d7db39d26..2367a3667 100644 --- a/src/PocketMine/command/defaults/BanCommand.php +++ b/src/PocketMine/command/defaults/BanCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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 33a6d0e3a..5aaa7e92f 100644 --- a/src/PocketMine/command/defaults/BanIpCommand.php +++ b/src/PocketMine/command/defaults/BanIpCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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 6b8a4f7f4..3a7472b8a 100644 --- a/src/PocketMine/command/defaults/BanListCommand.php +++ b/src/PocketMine/command/defaults/BanListCommand.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Server; +use pocketmine\command\CommandSender; +use pocketmine\Server; class BanListCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/DefaultGamemodeCommand.php b/src/PocketMine/command/defaults/DefaultGamemodeCommand.php index c7ed0d2ea..7c20da1cf 100644 --- a/src/PocketMine/command/defaults/DefaultGamemodeCommand.php +++ b/src/PocketMine/command/defaults/DefaultGamemodeCommand.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\command\CommandSender; +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 dab58cc56..c907f1a18 100644 --- a/src/PocketMine/command/defaults/DifficultyCommand.php +++ b/src/PocketMine/command/defaults/DifficultyCommand.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\command\CommandSender; +use pocketmine\Server; +use pocketmine\utils\TextFormat; class DifficultyCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/HelpCommand.php b/src/PocketMine/command/defaults/HelpCommand.php index 9ef93cf64..ca0e98daf 100644 --- a/src/PocketMine/command/defaults/HelpCommand.php +++ b/src/PocketMine/command/defaults/HelpCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Command\ConsoleCommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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/ListCommand.php b/src/PocketMine/command/defaults/ListCommand.php index b0f07b281..0db5fdc8e 100644 --- a/src/PocketMine/command/defaults/ListCommand.php +++ b/src/PocketMine/command/defaults/ListCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\command\Command; +use pocketmine\command\CommandSender; +use pocketmine\Player; +use pocketmine\Server; +use pocketmine\utils\TextFormat; class ListCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/MeCommand.php b/src/PocketMine/command/defaults/MeCommand.php index f762cf024..232511c42 100644 --- a/src/PocketMine/command/defaults/MeCommand.php +++ b/src/PocketMine/command/defaults/MeCommand.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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/PardonCommand.php b/src/PocketMine/command/defaults/PardonCommand.php index 991ec271c..914290c55 100644 --- a/src/PocketMine/command/defaults/PardonCommand.php +++ b/src/PocketMine/command/defaults/PardonCommand.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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 335f70f80..44f693a57 100644 --- a/src/PocketMine/command/defaults/PardonIpCommand.php +++ b/src/PocketMine/command/defaults/PardonIpCommand.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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 ff4c41983..6b97c7fe4 100644 --- a/src/PocketMine/command/defaults/PluginsCommand.php +++ b/src/PocketMine/command/defaults/PluginsCommand.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\command\CommandSender; +use pocketmine\Server; +use pocketmine\utils\TextFormat; class PluginsCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/SayCommand.php b/src/PocketMine/command/defaults/SayCommand.php index 4151bc063..710aac1f9 100644 --- a/src/PocketMine/command/defaults/SayCommand.php +++ b/src/PocketMine/command/defaults/SayCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Command\ConsoleCommandSender; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +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 d5f1b1719..2cfd38f4e 100644 --- a/src/PocketMine/command/defaults/SeedCommand.php +++ b/src/PocketMine/command/defaults/SeedCommand.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\command\CommandSender; +use pocketmine\level\Level; +use pocketmine\Player; class SeedCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/StopCommand.php b/src/PocketMine/command/defaults/StopCommand.php index 93f7bf04b..ff867749d 100644 --- a/src/PocketMine/command/defaults/StopCommand.php +++ b/src/PocketMine/command/defaults/StopCommand.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\command\Command; +use pocketmine\command\CommandSender; +use pocketmine\Player; +use pocketmine\Server; class StopCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/TellCommand.php b/src/PocketMine/command/defaults/TellCommand.php index df68239e4..7b5825ef5 100644 --- a/src/PocketMine/command/defaults/TellCommand.php +++ b/src/PocketMine/command/defaults/TellCommand.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Player; -use PocketMine\Utils\TextFormat; +use pocketmine\command\CommandSender; +use pocketmine\Player; +use pocketmine\utils\TextFormat; class TellCommand extends VanillaCommand{ diff --git a/src/PocketMine/command/defaults/VanillaCommand.php b/src/PocketMine/command/defaults/VanillaCommand.php index 48cbf8403..2c5546872 100644 --- a/src/PocketMine/command/defaults/VanillaCommand.php +++ b/src/PocketMine/command/defaults/VanillaCommand.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\Command; -use PocketMine\Command\CommandSender; +use pocketmine\command\Command; +use pocketmine\command\CommandSender; abstract class VanillaCommand extends Command{ //TODO: increment chunk indexes diff --git a/src/PocketMine/command/defaults/VersionCommand.php b/src/PocketMine/command/defaults/VersionCommand.php index 1f989073b..d92e36b83 100644 --- a/src/PocketMine/command/defaults/VersionCommand.php +++ b/src/PocketMine/command/defaults/VersionCommand.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Command\Defaults; +namespace pocketmine\command\defaults; -use PocketMine\Command\CommandSender; -use PocketMine\Network\Protocol\Info; -use PocketMine\Plugin\Plugin; -use PocketMine\Server; -use PocketMine\Utils\TextFormat; +use pocketmine\command\CommandSender; +use pocketmine\network\protocol\Info; +use pocketmine\plugin\Plugin; +use pocketmine\Server; +use pocketmine\utils\TextFormat; class VersionCommand extends VanillaCommand{ @@ -46,8 +46,8 @@ class VersionCommand extends VanillaCommand{ if(count($args) === 0){ $output = "This server is running PocketMine-MP version " . Server::getInstance()->getPocketMineVersion() . " 「" . Server::getInstance()->getCodename() . "」 (Implementing API version " . Server::getInstance()->getApiVersion() . " for Minecraft: PE " . Server::getInstance()->getVersion() . " protocol version " . Info::CURRENT_PROTOCOL . ")"; - if(\PocketMine\GIT_COMMIT !== str_repeat("00", 20)){ - $output .= " [git " . \PocketMine\GIT_COMMIT . "]"; + if(\pocketmine\GIT_COMMIT !== str_repeat("00", 20)){ + $output .= " [git " . \pocketmine\GIT_COMMIT . "]"; } $sender->sendMessage($output); }else{ diff --git a/src/PocketMine/constants/GeneralConstants.php b/src/PocketMine/constants/GeneralConstants.php index 3735fc664..6f1544bf9 100644 --- a/src/PocketMine/constants/GeneralConstants.php +++ b/src/PocketMine/constants/GeneralConstants.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine; +namespace pocketmine; //Entities const ENTITY_PLAYER = 1; diff --git a/src/PocketMine/entity/Ageable.php b/src/PocketMine/entity/Ageable.php index 07a4c1237..871c8efec 100644 --- a/src/PocketMine/entity/Ageable.php +++ b/src/PocketMine/entity/Ageable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Ageable{ diff --git a/src/PocketMine/entity/Animal.php b/src/PocketMine/entity/Animal.php index 681881721..7803e2140 100644 --- a/src/PocketMine/entity/Animal.php +++ b/src/PocketMine/entity/Animal.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Animal extends Creature implements Ageable{ diff --git a/src/PocketMine/entity/Arrow.php b/src/PocketMine/entity/Arrow.php index 93b1965f9..6e555cda5 100644 --- a/src/PocketMine/entity/Arrow.php +++ b/src/PocketMine/entity/Arrow.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Arrow extends Projectile{ diff --git a/src/PocketMine/entity/Attachable.php b/src/PocketMine/entity/Attachable.php index 766153f2e..554807c2b 100644 --- a/src/PocketMine/entity/Attachable.php +++ b/src/PocketMine/entity/Attachable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Attachable{ diff --git a/src/PocketMine/entity/Chicken.php b/src/PocketMine/entity/Chicken.php index 5e0d51fbf..56190eb73 100644 --- a/src/PocketMine/entity/Chicken.php +++ b/src/PocketMine/entity/Chicken.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Chicken extends Animal{ diff --git a/src/PocketMine/entity/Colorable.php b/src/PocketMine/entity/Colorable.php index b69bd207b..f5530bdac 100644 --- a/src/PocketMine/entity/Colorable.php +++ b/src/PocketMine/entity/Colorable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Colorable{ diff --git a/src/PocketMine/entity/Cow.php b/src/PocketMine/entity/Cow.php index 7fade6df9..c954d803e 100644 --- a/src/PocketMine/entity/Cow.php +++ b/src/PocketMine/entity/Cow.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Cow extends Animal{ diff --git a/src/PocketMine/entity/Creature.php b/src/PocketMine/entity/Creature.php index 3e51bf441..5d9c2a1d5 100644 --- a/src/PocketMine/entity/Creature.php +++ b/src/PocketMine/entity/Creature.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Creature extends Living{ diff --git a/src/PocketMine/entity/Creeper.php b/src/PocketMine/entity/Creeper.php index d9cfac870..d6c06afd9 100644 --- a/src/PocketMine/entity/Creeper.php +++ b/src/PocketMine/entity/Creeper.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Creeper extends Monster implements Explosive{ diff --git a/src/PocketMine/entity/Damageable.php b/src/PocketMine/entity/Damageable.php index b4f083156..10eedc406 100644 --- a/src/PocketMine/entity/Damageable.php +++ b/src/PocketMine/entity/Damageable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Damageable{ diff --git a/src/PocketMine/entity/DroppedItem.php b/src/PocketMine/entity/DroppedItem.php index 7ef2f144a..02103ff63 100644 --- a/src/PocketMine/entity/DroppedItem.php +++ b/src/PocketMine/entity/DroppedItem.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class DroppedItem extends Entity{ diff --git a/src/PocketMine/entity/Egg.php b/src/PocketMine/entity/Egg.php index 5ee019fa4..cef660eab 100644 --- a/src/PocketMine/entity/Egg.php +++ b/src/PocketMine/entity/Egg.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Egg extends Projectile{ diff --git a/src/PocketMine/entity/EnderPearl.php b/src/PocketMine/entity/EnderPearl.php index 91256e671..702a4a922 100644 --- a/src/PocketMine/entity/EnderPearl.php +++ b/src/PocketMine/entity/EnderPearl.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class EnderPearl extends Projectile{ diff --git a/src/PocketMine/entity/Enderman.php b/src/PocketMine/entity/Enderman.php index 16e1f511c..642519397 100644 --- a/src/PocketMine/entity/Enderman.php +++ b/src/PocketMine/entity/Enderman.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Enderman extends Monster implements InventorySource{ diff --git a/src/PocketMine/entity/Entity.php b/src/PocketMine/entity/Entity.php index dc0c23e2b..52e65f05f 100644 --- a/src/PocketMine/entity/Entity.php +++ b/src/PocketMine/entity/Entity.php @@ -22,26 +22,27 @@ /** * All the entity classes */ -namespace PocketMine\Entity; +namespace pocketmine\entity; -use PocketMine\Event\Entity\EntityDespawnEvent; -use PocketMine\Event\Entity\EntityLevelChangeEvent; -use PocketMine\Event\Entity\EntityMotionEvent; -use PocketMine\Event\Entity\EntityMoveEvent; -use PocketMine\Event\Entity\EntitySpawnEvent; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\Math\AxisAlignedBB; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\NBT\Tag\Compound; -use PocketMine\Network\Protocol\MoveEntityPacket_PosRot; -use PocketMine\Network\Protocol\MovePlayerPacket; -use PocketMine\Network\Protocol\RemoveEntityPacket; -use PocketMine\Network\Protocol\SetEntityMotionPacket; -use PocketMine\Network; -use PocketMine\Player; -use PocketMine\PMF\LevelFormat; -use PocketMine\Server; +use pocketmine\event\entity\EntityDespawnEvent; +use pocketmine\event\entity\EntityLevelChangeEvent; +use pocketmine\event\entity\EntityMotionEvent; +use pocketmine\event\entity\EntityMoveEvent; +use pocketmine\event\entity\EntitySpawnEvent; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\math\AxisAlignedBB; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\nbt\tag\Compound; +use pocketmine\network\protocol\MoveEntityPacket_PosRot; +use pocketmine\network\protocol\MovePlayerPacket; +use pocketmine\network\protocol\RemoveEntityPacket; +use pocketmine\network\protocol\SetEntityMotionPacket; +use pocketmine\Network; +use pocketmine\network\protocol\SetTimePacket; +use pocketmine\Player; +use pocketmine\pmf\LevelFormat; +use pocketmine\Server; abstract class Entity extends Position{ public static $entityCount = 1; @@ -377,7 +378,7 @@ abstract class Entity extends Position{ $this->level->entities[$this->id] = $this; if($this instanceof Player){ $this->chunksLoaded = array(); - $pk = new Network\Protocol\SetTimePacket; + $pk = new SetTimePacket(); $pk->time = $this->level->getTime(); $pk->started = $this->level->stopTime == false; $this->dataPacket($pk); diff --git a/src/PocketMine/entity/Explosive.php b/src/PocketMine/entity/Explosive.php index 44afe651e..d728861cc 100644 --- a/src/PocketMine/entity/Explosive.php +++ b/src/PocketMine/entity/Explosive.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Explosive{ diff --git a/src/PocketMine/entity/FallingBlock.php b/src/PocketMine/entity/FallingBlock.php index 37ed3379d..8e2db1dce 100644 --- a/src/PocketMine/entity/FallingBlock.php +++ b/src/PocketMine/entity/FallingBlock.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class FallingBlock extends Entity{ diff --git a/src/PocketMine/entity/Hanging.php b/src/PocketMine/entity/Hanging.php index 366a8da55..11123f733 100644 --- a/src/PocketMine/entity/Hanging.php +++ b/src/PocketMine/entity/Hanging.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Hanging extends Entity implements Attachable{ diff --git a/src/PocketMine/entity/Human.php b/src/PocketMine/entity/Human.php index aebbf9920..ce9697808 100644 --- a/src/PocketMine/entity/Human.php +++ b/src/PocketMine/entity/Human.php @@ -19,24 +19,25 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; -use PocketMine\Event\Entity\EntityArmorChangeEvent; -use PocketMine\Event\Entity\EntityInventoryChangeEvent; -use PocketMine\Item\Item; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Byte; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Enum; -use PocketMine\NBT\Tag\Short; -use PocketMine\Network\Protocol\AddPlayerPacket; -use PocketMine\Network\Protocol\ContainerSetContentPacket; -use PocketMine\Network\Protocol\PlayerEquipmentPacket; -use PocketMine\Network\Protocol\RemovePlayerPacket; -use PocketMine\Network\Protocol\SetEntityMotionPacket; -use PocketMine\Network; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\event\entity\EntityArmorChangeEvent; +use pocketmine\event\entity\EntityInventoryChangeEvent; +use pocketmine\item\Item; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Byte; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Enum; +use pocketmine\nbt\tag\Short; +use pocketmine\network\protocol\AddPlayerPacket; +use pocketmine\network\protocol\ContainerSetContentPacket; +use pocketmine\network\protocol\PlayerArmorEquipmentPacket; +use pocketmine\network\protocol\PlayerEquipmentPacket; +use pocketmine\network\protocol\RemovePlayerPacket; +use pocketmine\network\protocol\SetEntityMotionPacket; +use pocketmine\Network; +use pocketmine\Player; +use pocketmine\Server; class Human extends Creature implements ProjectileSource, InventorySource{ @@ -231,7 +232,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{ } } if($player instanceof Player){ - $pk = new Network\Protocol\PlayerArmorEquipmentPacket; + $pk = new PlayerArmorEquipmentPacket(); $pk->eid = $this->id; $pk->slots = $slots; $player->dataPacket($pk); diff --git a/src/PocketMine/entity/InventorySource.php b/src/PocketMine/entity/InventorySource.php index ba4a879dd..d2fad5006 100644 --- a/src/PocketMine/entity/InventorySource.php +++ b/src/PocketMine/entity/InventorySource.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; -use PocketMine\Item\Item; +use pocketmine\item\Item; interface InventorySource{ diff --git a/src/PocketMine/entity/Living.php b/src/PocketMine/entity/Living.php index 0f3c5acfd..72e41007e 100644 --- a/src/PocketMine/entity/Living.php +++ b/src/PocketMine/entity/Living.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Living extends Entity implements Damageable{ diff --git a/src/PocketMine/entity/Minecart.php b/src/PocketMine/entity/Minecart.php index d313f4eee..8dc3881cf 100644 --- a/src/PocketMine/entity/Minecart.php +++ b/src/PocketMine/entity/Minecart.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Minecart extends Vehicle{ diff --git a/src/PocketMine/entity/Monster.php b/src/PocketMine/entity/Monster.php index bdc544f26..b2a560ccc 100644 --- a/src/PocketMine/entity/Monster.php +++ b/src/PocketMine/entity/Monster.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Monster extends Creature{ diff --git a/src/PocketMine/entity/NPC.php b/src/PocketMine/entity/NPC.php index 0afc595e8..79470c467 100644 --- a/src/PocketMine/entity/NPC.php +++ b/src/PocketMine/entity/NPC.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface NPC{ diff --git a/src/PocketMine/entity/Ocelot.php b/src/PocketMine/entity/Ocelot.php index 2deffec30..d9d9f03ac 100644 --- a/src/PocketMine/entity/Ocelot.php +++ b/src/PocketMine/entity/Ocelot.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Ocelot extends Animal implements Tameable{ diff --git a/src/PocketMine/entity/Painting.php b/src/PocketMine/entity/Painting.php index ae71692b4..4e6c4e05f 100644 --- a/src/PocketMine/entity/Painting.php +++ b/src/PocketMine/entity/Painting.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Painting extends Hanging{ diff --git a/src/PocketMine/entity/Pig.php b/src/PocketMine/entity/Pig.php index fc0cf0965..9505d4956 100644 --- a/src/PocketMine/entity/Pig.php +++ b/src/PocketMine/entity/Pig.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Pig extends Animal implements Rideable{ diff --git a/src/PocketMine/entity/PigZombie.php b/src/PocketMine/entity/PigZombie.php index aa40cd014..fdc82726e 100644 --- a/src/PocketMine/entity/PigZombie.php +++ b/src/PocketMine/entity/PigZombie.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class PigZombie extends Zombie{ diff --git a/src/PocketMine/entity/Projectile.php b/src/PocketMine/entity/Projectile.php index 8e4c92c9f..320a49e53 100644 --- a/src/PocketMine/entity/Projectile.php +++ b/src/PocketMine/entity/Projectile.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Projectile extends Entity{ diff --git a/src/PocketMine/entity/ProjectileSource.php b/src/PocketMine/entity/ProjectileSource.php index 4d069160b..fcfdad16d 100644 --- a/src/PocketMine/entity/ProjectileSource.php +++ b/src/PocketMine/entity/ProjectileSource.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface ProjectileSource{ diff --git a/src/PocketMine/entity/Rideable.php b/src/PocketMine/entity/Rideable.php index 33cd1c9c3..cb437e17a 100644 --- a/src/PocketMine/entity/Rideable.php +++ b/src/PocketMine/entity/Rideable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Rideable{ diff --git a/src/PocketMine/entity/Sheep.php b/src/PocketMine/entity/Sheep.php index ec5b6404a..bf2e1fa8c 100644 --- a/src/PocketMine/entity/Sheep.php +++ b/src/PocketMine/entity/Sheep.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Sheep extends Animal implements Colorable{ diff --git a/src/PocketMine/entity/Silverfish.php b/src/PocketMine/entity/Silverfish.php index 0bddcf11f..da67d7c2a 100644 --- a/src/PocketMine/entity/Silverfish.php +++ b/src/PocketMine/entity/Silverfish.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Silverfish extends Monster{ diff --git a/src/PocketMine/entity/Skeleton.php b/src/PocketMine/entity/Skeleton.php index 5617f0a71..913b91653 100644 --- a/src/PocketMine/entity/Skeleton.php +++ b/src/PocketMine/entity/Skeleton.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Skeleton extends Monster implements ProjectileSource{ diff --git a/src/PocketMine/entity/Slime.php b/src/PocketMine/entity/Slime.php index 6684efb01..66f78d473 100644 --- a/src/PocketMine/entity/Slime.php +++ b/src/PocketMine/entity/Slime.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Slime extends Living{ diff --git a/src/PocketMine/entity/Snowball.php b/src/PocketMine/entity/Snowball.php index f58f27fd8..6f48e75f6 100644 --- a/src/PocketMine/entity/Snowball.php +++ b/src/PocketMine/entity/Snowball.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Snowball extends Projectile{ diff --git a/src/PocketMine/entity/Spider.php b/src/PocketMine/entity/Spider.php index 9f9f408e4..4e510f2f7 100644 --- a/src/PocketMine/entity/Spider.php +++ b/src/PocketMine/entity/Spider.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Spider extends Monster{ diff --git a/src/PocketMine/entity/TNTPrimed.php b/src/PocketMine/entity/TNTPrimed.php index 92fdcf352..b3142bf1f 100644 --- a/src/PocketMine/entity/TNTPrimed.php +++ b/src/PocketMine/entity/TNTPrimed.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class TNTPrimed extends Entity implements Explosive{ diff --git a/src/PocketMine/entity/Tameable.php b/src/PocketMine/entity/Tameable.php index f51e4d644..2b978b8d0 100644 --- a/src/PocketMine/entity/Tameable.php +++ b/src/PocketMine/entity/Tameable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; interface Tameable{ diff --git a/src/PocketMine/entity/Vehicle.php b/src/PocketMine/entity/Vehicle.php index b39e5118b..22fc3e9a8 100644 --- a/src/PocketMine/entity/Vehicle.php +++ b/src/PocketMine/entity/Vehicle.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; abstract class Vehicle extends Entity implements Rideable{ diff --git a/src/PocketMine/entity/Villager.php b/src/PocketMine/entity/Villager.php index 4acfe4b89..27d324de8 100644 --- a/src/PocketMine/entity/Villager.php +++ b/src/PocketMine/entity/Villager.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Villager extends Creature implements NPC, Ageable{ diff --git a/src/PocketMine/entity/Wolf.php b/src/PocketMine/entity/Wolf.php index fff2bed24..481268eba 100644 --- a/src/PocketMine/entity/Wolf.php +++ b/src/PocketMine/entity/Wolf.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Wolf extends Animal implements Tameable{ diff --git a/src/PocketMine/entity/Zombie.php b/src/PocketMine/entity/Zombie.php index f95925f53..6670ee65f 100644 --- a/src/PocketMine/entity/Zombie.php +++ b/src/PocketMine/entity/Zombie.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Entity; +namespace pocketmine\entity; class Zombie extends Monster{ diff --git a/src/PocketMine/event/Cancellable.php b/src/PocketMine/event/Cancellable.php index 72f0fc0fa..ea7f18268 100644 --- a/src/PocketMine/event/Cancellable.php +++ b/src/PocketMine/event/Cancellable.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Event; +namespace pocketmine\event; /** diff --git a/src/PocketMine/event/Event.php b/src/PocketMine/event/Event.php index e145ff1c6..a5575f47a 100644 --- a/src/PocketMine/event/Event.php +++ b/src/PocketMine/event/Event.php @@ -22,7 +22,7 @@ /** * Event related classes */ -namespace PocketMine\Event; +namespace pocketmine\event; abstract class Event{ diff --git a/src/PocketMine/event/EventPriority.php b/src/PocketMine/event/EventPriority.php index 7de4b4d5d..5f453ea0c 100644 --- a/src/PocketMine/event/EventPriority.php +++ b/src/PocketMine/event/EventPriority.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Event; +namespace pocketmine\event; /** diff --git a/src/PocketMine/event/HandlerList.php b/src/PocketMine/event/HandlerList.php index 1c7323594..c7019ce0a 100644 --- a/src/PocketMine/event/HandlerList.php +++ b/src/PocketMine/event/HandlerList.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event; +namespace pocketmine\event; -use PocketMine\Plugin\Plugin; -use PocketMine\Plugin\RegisteredListener; +use pocketmine\plugin\Plugin; +use pocketmine\plugin\RegisteredListener; class HandlerList{ diff --git a/src/PocketMine/event/Listener.php b/src/PocketMine/event/Listener.php index d9afbbd36..75361bd00 100644 --- a/src/PocketMine/event/Listener.php +++ b/src/PocketMine/event/Listener.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Event; +namespace pocketmine\event; interface Listener{ diff --git a/src/PocketMine/event/block/BlockBreakEvent.php b/src/PocketMine/event/block/BlockBreakEvent.php index 71d1d2237..2c4c14257 100644 --- a/src/PocketMine/event/block/BlockBreakEvent.php +++ b/src/PocketMine/event/block/BlockBreakEvent.php @@ -19,20 +19,20 @@ * */ -namespace PocketMine\Event\Block; +namespace pocketmine\event\block; -use PocketMine\Block\Block; -use PocketMine\Event\Cancellable; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\block\Block; +use pocketmine\event\Cancellable; +use pocketmine\item\Item; +use pocketmine\Player; class BlockBreakEvent extends BlockEvent implements Cancellable{ public static $handlerList = null; - /** @var \PocketMine\Player */ + /** @var \pocketmine\Player */ protected $player; - /** @var \PocketMine\Item\Item */ + /** @var \pocketmine\item\Item */ protected $item; /** @var bool */ diff --git a/src/PocketMine/event/block/BlockEvent.php b/src/PocketMine/event/block/BlockEvent.php index 91d65333e..e5bb1eb61 100644 --- a/src/PocketMine/event/block/BlockEvent.php +++ b/src/PocketMine/event/block/BlockEvent.php @@ -22,12 +22,12 @@ /** * Block related events */ -namespace PocketMine\Event\Block; +namespace pocketmine\event\block; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class BlockEvent extends Event{ - /** @var \PocketMine\Block\Block */ + /** @var \pocketmine\block\Block */ protected $block; public function getBlock(){ diff --git a/src/PocketMine/event/block/BlockPlaceEvent.php b/src/PocketMine/event/block/BlockPlaceEvent.php index 362616662..c57755e1c 100644 --- a/src/PocketMine/event/block/BlockPlaceEvent.php +++ b/src/PocketMine/event/block/BlockPlaceEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Block; +namespace pocketmine\event\block; -use PocketMine\Block\Block; -use PocketMine\Event\Cancellable; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\block\Block; +use pocketmine\event\Cancellable; +use pocketmine\item\Item; +use pocketmine\Player; /** * Called when a player places a block @@ -32,10 +32,10 @@ use PocketMine\Player; class BlockPlaceEvent extends BlockEvent implements Cancellable{ public static $handlerList = null; - /** @var \PocketMine\Player */ + /** @var \pocketmine\Player */ protected $player; - /** @var \PocketMine\Item\Item */ + /** @var \pocketmine\item\Item */ protected $item; diff --git a/src/PocketMine/event/entity/EntityArmorChangeEvent.php b/src/PocketMine/event/entity/EntityArmorChangeEvent.php index 8701b465e..7af762da5 100644 --- a/src/PocketMine/event/entity/EntityArmorChangeEvent.php +++ b/src/PocketMine/event/entity/EntityArmorChangeEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Item\Item; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\item\Item; class EntityArmorChangeEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/entity/EntityDespawnEvent.php b/src/PocketMine/event/entity/EntityDespawnEvent.php index 147477a9e..736578837 100644 --- a/src/PocketMine/event/entity/EntityDespawnEvent.php +++ b/src/PocketMine/event/entity/EntityDespawnEvent.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Creature; -use PocketMine\Entity\DroppedItem; -use PocketMine\Entity\Entity; -use PocketMine\Entity\Human; -use PocketMine\Entity\Projectile; -use PocketMine\Entity\Vehicle; +use pocketmine\entity\Creature; +use pocketmine\entity\DroppedItem; +use pocketmine\entity\Entity; +use pocketmine\entity\Human; +use pocketmine\entity\Projectile; +use pocketmine\entity\Vehicle; /** * Called when a entity is despawned diff --git a/src/PocketMine/event/entity/EntityEvent.php b/src/PocketMine/event/entity/EntityEvent.php index fcc959858..2cd83d454 100644 --- a/src/PocketMine/event/entity/EntityEvent.php +++ b/src/PocketMine/event/entity/EntityEvent.php @@ -22,12 +22,12 @@ /** * Entity related Events, like spawn, inventory, attack... */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class EntityEvent extends Event{ - /** @var \PocketMine\Entity\Entity */ + /** @var \pocketmine\entity\Entity */ protected $entity; public function getEntity(){ diff --git a/src/PocketMine/event/entity/EntityExplodeEvent.php b/src/PocketMine/event/entity/EntityExplodeEvent.php index 8102c505e..46476a6eb 100644 --- a/src/PocketMine/event/entity/EntityExplodeEvent.php +++ b/src/PocketMine/event/entity/EntityExplodeEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Block\Block; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Level\Position; +use pocketmine\block\Block; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\level\Position; /** * Called when a entity explodes diff --git a/src/PocketMine/event/entity/EntityInventoryChangeEvent.php b/src/PocketMine/event/entity/EntityInventoryChangeEvent.php index f8a6e6c5b..10e6f1434 100644 --- a/src/PocketMine/event/entity/EntityInventoryChangeEvent.php +++ b/src/PocketMine/event/entity/EntityInventoryChangeEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Item\Item; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\item\Item; class EntityInventoryChangeEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/entity/EntityLevelChangeEvent.php b/src/PocketMine/event/entity/EntityLevelChangeEvent.php index fe466953a..3c875f6ec 100644 --- a/src/PocketMine/event/entity/EntityLevelChangeEvent.php +++ b/src/PocketMine/event/entity/EntityLevelChangeEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Level\Level; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\level\Level; class EntityLevelChangeEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/entity/EntityMotionEvent.php b/src/PocketMine/event/entity/EntityMotionEvent.php index dbbf0abb5..3e1887491 100644 --- a/src/PocketMine/event/entity/EntityMotionEvent.php +++ b/src/PocketMine/event/entity/EntityMotionEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Math\Vector3 as Vector3; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\math\Vector3 as Vector3; class EntityMotionEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/entity/EntityMoveEvent.php b/src/PocketMine/event/entity/EntityMoveEvent.php index 1f702479d..432d1945a 100644 --- a/src/PocketMine/event/entity/EntityMoveEvent.php +++ b/src/PocketMine/event/entity/EntityMoveEvent.php @@ -19,17 +19,17 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Entity; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Math\Vector3 as Vector3; +use pocketmine\entity\Entity; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\math\Vector3 as Vector3; class EntityMoveEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; - /** @var \PocketMine\Math\Vector3 */ + /** @var \pocketmine\math\Vector3 */ private $pos; public function __construct(Entity $entity, Vector3 $pos){ diff --git a/src/PocketMine/event/entity/EntitySpawnEvent.php b/src/PocketMine/event/entity/EntitySpawnEvent.php index 83a8c7f41..490f19a73 100644 --- a/src/PocketMine/event/entity/EntitySpawnEvent.php +++ b/src/PocketMine/event/entity/EntitySpawnEvent.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Event\Entity; +namespace pocketmine\event\entity; -use PocketMine\Entity\Creature; -use PocketMine\Entity\DroppedItem; -use PocketMine\Entity\Entity; -use PocketMine\Entity\Human; -use PocketMine\Entity\Projectile; -use PocketMine\Entity\Vehicle; +use pocketmine\entity\Creature; +use pocketmine\entity\DroppedItem; +use pocketmine\entity\Entity; +use pocketmine\entity\Human; +use pocketmine\entity\Projectile; +use pocketmine\entity\Vehicle; /** * Called when a entity is spawned @@ -42,7 +42,7 @@ class EntitySpawnEvent extends EntityEvent{ } /** - * @return \PocketMine\Level\Position + * @return \pocketmine\level\Position */ public function getPosition(){ return $this->entity->getPosition(); diff --git a/src/PocketMine/event/inventory/InventoryEvent.php b/src/PocketMine/event/inventory/InventoryEvent.php index 1849888fc..afcfc1041 100644 --- a/src/PocketMine/event/inventory/InventoryEvent.php +++ b/src/PocketMine/event/inventory/InventoryEvent.php @@ -22,9 +22,9 @@ /** * Inventory related events */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class InventoryEvent extends Event{ @@ -39,7 +39,7 @@ abstract class InventoryEvent extends Event{ } /** - * @return \PocketMine\Entity\Human[] + * @return \pocketmine\entity\Human[] */ public function getViewers(){ return $this->inventory->getViewers(); diff --git a/src/PocketMine/event/player/PlayerAchievementAwardedEvent.php b/src/PocketMine/event/player/PlayerAchievementAwardedEvent.php index 2af50cbd6..671f391fc 100644 --- a/src/PocketMine/event/player/PlayerAchievementAwardedEvent.php +++ b/src/PocketMine/event/player/PlayerAchievementAwardedEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when a player is awarded an achievement diff --git a/src/PocketMine/event/player/PlayerChatEvent.php b/src/PocketMine/event/player/PlayerChatEvent.php index bdbb92c53..31a1779b5 100644 --- a/src/PocketMine/event/player/PlayerChatEvent.php +++ b/src/PocketMine/event/player/PlayerChatEvent.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\event\Cancellable; +use pocketmine\Player; +use pocketmine\Server; /** * Called when a player chats something diff --git a/src/PocketMine/event/player/PlayerCommandPreprocessEvent.php b/src/PocketMine/event/player/PlayerCommandPreprocessEvent.php index 2ea30af2c..bd54b7797 100644 --- a/src/PocketMine/event/player/PlayerCommandPreprocessEvent.php +++ b/src/PocketMine/event/player/PlayerCommandPreprocessEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when a player runs a command or chats, early in the process diff --git a/src/PocketMine/event/player/PlayerEvent.php b/src/PocketMine/event/player/PlayerEvent.php index eb4740283..23d59f89f 100644 --- a/src/PocketMine/event/player/PlayerEvent.php +++ b/src/PocketMine/event/player/PlayerEvent.php @@ -22,12 +22,12 @@ /** * Player-only related events */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class PlayerEvent extends Event{ - /** @var \PocketMine\Player */ + /** @var \pocketmine\Player */ protected $player; public function getPlayer(){ diff --git a/src/PocketMine/event/player/PlayerGameModeChangeEvent.php b/src/PocketMine/event/player/PlayerGameModeChangeEvent.php index bebaf0ca9..dedce2fc9 100644 --- a/src/PocketMine/event/player/PlayerGameModeChangeEvent.php +++ b/src/PocketMine/event/player/PlayerGameModeChangeEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when a player has its gamemode changed diff --git a/src/PocketMine/event/player/PlayerInteractEvent.php b/src/PocketMine/event/player/PlayerInteractEvent.php index 2ae9202df..20a7c2f6a 100644 --- a/src/PocketMine/event/player/PlayerInteractEvent.php +++ b/src/PocketMine/event/player/PlayerInteractEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Block\Block; -use PocketMine\Event\Cancellable; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\block\Block; +use pocketmine\event\Cancellable; +use pocketmine\item\Item; +use pocketmine\Player; /** * Called when a player interacts or touches a block (including air?) @@ -33,14 +33,14 @@ class PlayerInteractEvent extends PlayerEvent implements Cancellable{ public static $handlerList = null; /** - * @var \PocketMine\Block\Block; + * @var \pocketmine\block\Block; */ protected $blockTouched; /** @var int */ protected $blockFace; - /** @var \PocketMine\Item\Item */ + /** @var \pocketmine\item\Item */ protected $item; public function __construct(Player $player, Item $item, Block $block, $face){ diff --git a/src/PocketMine/event/player/PlayerItemHeldEvent.php b/src/PocketMine/event/player/PlayerItemHeldEvent.php index 67a6df6b6..2802e5492 100644 --- a/src/PocketMine/event/player/PlayerItemHeldEvent.php +++ b/src/PocketMine/event/player/PlayerItemHeldEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Item\Item; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\item\Item; +use pocketmine\Player; class PlayerItemHeldEvent extends PlayerEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/player/PlayerJoinEvent.php b/src/PocketMine/event/player/PlayerJoinEvent.php index 650cb3cbf..52f5a7bb7 100644 --- a/src/PocketMine/event/player/PlayerJoinEvent.php +++ b/src/PocketMine/event/player/PlayerJoinEvent.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Player; +use pocketmine\Player; /** * Called when a player joins the server, after sending all the spawn packets diff --git a/src/PocketMine/event/player/PlayerKickEvent.php b/src/PocketMine/event/player/PlayerKickEvent.php index 5e80110ca..27f612fd3 100644 --- a/src/PocketMine/event/player/PlayerKickEvent.php +++ b/src/PocketMine/event/player/PlayerKickEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when a player leaves the server diff --git a/src/PocketMine/event/player/PlayerLoginEvent.php b/src/PocketMine/event/player/PlayerLoginEvent.php index 21302287e..6d05df41a 100644 --- a/src/PocketMine/event/player/PlayerLoginEvent.php +++ b/src/PocketMine/event/player/PlayerLoginEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when a player joins, after things have been correctly set up (you can change anything now) diff --git a/src/PocketMine/event/player/PlayerPreLoginEvent.php b/src/PocketMine/event/player/PlayerPreLoginEvent.php index c52c816f1..b3df86a1f 100644 --- a/src/PocketMine/event/player/PlayerPreLoginEvent.php +++ b/src/PocketMine/event/player/PlayerPreLoginEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Event\Cancellable; -use PocketMine\Player; +use pocketmine\event\Cancellable; +use pocketmine\Player; /** * Called when the player logs in, before things have been set up diff --git a/src/PocketMine/event/player/PlayerQuitEvent.php b/src/PocketMine/event/player/PlayerQuitEvent.php index 955fb2fd5..713426960 100644 --- a/src/PocketMine/event/player/PlayerQuitEvent.php +++ b/src/PocketMine/event/player/PlayerQuitEvent.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Player; +use pocketmine\Player; /** * Called when a player leaves the server diff --git a/src/PocketMine/event/player/PlayerRespawnEvent.php b/src/PocketMine/event/player/PlayerRespawnEvent.php index 38d676769..64cc2b6b0 100644 --- a/src/PocketMine/event/player/PlayerRespawnEvent.php +++ b/src/PocketMine/event/player/PlayerRespawnEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Player; +namespace pocketmine\event\player; -use PocketMine\Level\Position; -use PocketMine\Player; +use pocketmine\level\Position; +use pocketmine\Player; /** * Called when a player is respawned (or first time spawned) diff --git a/src/PocketMine/event/plugin/PluginDisableEvent.php b/src/PocketMine/event/plugin/PluginDisableEvent.php index b955f91e4..13f95f295 100644 --- a/src/PocketMine/event/plugin/PluginDisableEvent.php +++ b/src/PocketMine/event/plugin/PluginDisableEvent.php @@ -20,10 +20,10 @@ */ -namespace PocketMine\Event\Plugin; +namespace pocketmine\event\plugin; -use PocketMine\Event\Event; -use PocketMine\Plugin\Plugin; +use pocketmine\event\Event; +use pocketmine\plugin\Plugin; class PluginDisableEvent extends Event{ diff --git a/src/PocketMine/event/plugin/PluginEnableEvent.php b/src/PocketMine/event/plugin/PluginEnableEvent.php index 42980550e..bcf72e11f 100644 --- a/src/PocketMine/event/plugin/PluginEnableEvent.php +++ b/src/PocketMine/event/plugin/PluginEnableEvent.php @@ -20,10 +20,10 @@ */ -namespace PocketMine\Event\Plugin; +namespace pocketmine\event\plugin; -use PocketMine\Event\Event; -use PocketMine\Plugin\Plugin; +use pocketmine\event\Event; +use pocketmine\plugin\Plugin; class PluginEnableEvent extends Event{ diff --git a/src/PocketMine/event/plugin/PluginEvent.php b/src/PocketMine/event/plugin/PluginEvent.php index 37c0b49b1..066d4f8e6 100644 --- a/src/PocketMine/event/plugin/PluginEvent.php +++ b/src/PocketMine/event/plugin/PluginEvent.php @@ -22,10 +22,10 @@ /** * Events related Plugin enable / disable events */ -namespace PocketMine\Event\Plugin; +namespace pocketmine\event\plugin; -use PocketMine\Event\Event; -use PocketMine\Plugin\Plugin; +use pocketmine\event\Event; +use pocketmine\plugin\Plugin; abstract class PluginEvent extends Event{ diff --git a/src/PocketMine/event/server/DataPacketReceiveEvent.php b/src/PocketMine/event/server/DataPacketReceiveEvent.php index 37a3a3801..b93101a35 100644 --- a/src/PocketMine/event/server/DataPacketReceiveEvent.php +++ b/src/PocketMine/event/server/DataPacketReceiveEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Event; -use PocketMine\Event\Cancellable; -use PocketMine\Network\Protocol\DataPacket; -use PocketMine\Player; +use pocketmine\Event; +use pocketmine\event\Cancellable; +use pocketmine\network\protocol\DataPacket; +use pocketmine\Player; class DataPacketReceiveEvent extends ServerEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/server/DataPacketSendEvent.php b/src/PocketMine/event/server/DataPacketSendEvent.php index b371bbe38..3b211c311 100644 --- a/src/PocketMine/event/server/DataPacketSendEvent.php +++ b/src/PocketMine/event/server/DataPacketSendEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Event; -use PocketMine\Event\Cancellable; -use PocketMine\Network\Protocol\DataPacket; -use PocketMine\Player; +use pocketmine\Event; +use pocketmine\event\Cancellable; +use pocketmine\network\protocol\DataPacket; +use pocketmine\Player; class DataPacketSendEvent extends ServerEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/server/PacketReceiveEvent.php b/src/PocketMine/event/server/PacketReceiveEvent.php index 1dd58ca42..d1b7d04cd 100644 --- a/src/PocketMine/event/server/PacketReceiveEvent.php +++ b/src/PocketMine/event/server/PacketReceiveEvent.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Network\Packet; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\network\Packet; class PacketReceiveEvent extends ServerEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/server/PacketSendEvent.php b/src/PocketMine/event/server/PacketSendEvent.php index 789258872..ec3f88083 100644 --- a/src/PocketMine/event/server/PacketSendEvent.php +++ b/src/PocketMine/event/server/PacketSendEvent.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Event\Cancellable; -use PocketMine\Event; -use PocketMine\Network\Packet; +use pocketmine\event\Cancellable; +use pocketmine\Event; +use pocketmine\network\Packet; class PacketSendEvent extends ServerEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/event/server/ServerCommandEvent.php b/src/PocketMine/event/server/ServerCommandEvent.php index 7b7b9983d..6b3ef2a98 100644 --- a/src/PocketMine/event/server/ServerCommandEvent.php +++ b/src/PocketMine/event/server/ServerCommandEvent.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Command\CommandSender; -use PocketMine\Event\Cancellable; +use pocketmine\command\CommandSender; +use pocketmine\event\Cancellable; /** * Called when the console runs a command, early in the process diff --git a/src/PocketMine/event/server/ServerEvent.php b/src/PocketMine/event/server/ServerEvent.php index 68b1166cd..3806343f3 100644 --- a/src/PocketMine/event/server/ServerEvent.php +++ b/src/PocketMine/event/server/ServerEvent.php @@ -22,9 +22,9 @@ /** * Events related to the server core, like networking, stop, level loading */ -namespace PocketMine\Event\Server; +namespace pocketmine\event\server; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class ServerEvent extends Event{ diff --git a/src/PocketMine/event/tile/TileEvent.php b/src/PocketMine/event/tile/TileEvent.php index 6de1c7c4d..5ac9eab6e 100644 --- a/src/PocketMine/event/tile/TileEvent.php +++ b/src/PocketMine/event/tile/TileEvent.php @@ -22,9 +22,9 @@ /** * Events used by Tiles */ -namespace PocketMine\Event\Tile; +namespace pocketmine\event\tile; -use PocketMine\Event\Event; +use pocketmine\event\Event; abstract class TileEvent extends Event{ protected $tile; diff --git a/src/PocketMine/event/tile/TileInventoryChangeEvent.php b/src/PocketMine/event/tile/TileInventoryChangeEvent.php index 5fd3e7182..30d7c21e1 100644 --- a/src/PocketMine/event/tile/TileInventoryChangeEvent.php +++ b/src/PocketMine/event/tile/TileInventoryChangeEvent.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Event\Tile; +namespace pocketmine\event\tile; -use PocketMine\Event; -use PocketMine\Event\Cancellable; -use PocketMine\Item\Item; -use PocketMine\Tile\Tile; +use pocketmine\Event; +use pocketmine\event\Cancellable; +use pocketmine\item\Item; +use pocketmine\tile\Tile; class TileInventoryChangeEvent extends TileEvent implements Cancellable{ public static $handlerList = null; diff --git a/src/PocketMine/item/Apple.php b/src/PocketMine/item/Apple.php index cdd6adb14..d54b34b83 100644 --- a/src/PocketMine/item/Apple.php +++ b/src/PocketMine/item/Apple.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Apple extends Item{ diff --git a/src/PocketMine/item/Bed.php b/src/PocketMine/item/Bed.php index 304028738..e4abebc1b 100644 --- a/src/PocketMine/item/Bed.php +++ b/src/PocketMine/item/Bed.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Bed extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/BeetrootSeeds.php b/src/PocketMine/item/BeetrootSeeds.php index c27530568..15a774449 100644 --- a/src/PocketMine/item/BeetrootSeeds.php +++ b/src/PocketMine/item/BeetrootSeeds.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class BeetrootSeeds extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/BeetrootSoup.php b/src/PocketMine/item/BeetrootSoup.php index 18fc8de95..323ec397e 100644 --- a/src/PocketMine/item/BeetrootSoup.php +++ b/src/PocketMine/item/BeetrootSoup.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class BeetrootSoup extends Item{ diff --git a/src/PocketMine/item/Block.php b/src/PocketMine/item/Block.php index ef4ed7088..936121f44 100644 --- a/src/PocketMine/item/Block.php +++ b/src/PocketMine/item/Block.php @@ -19,15 +19,12 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block as BlockBlock; +use pocketmine\block\Block as BlockBlock; /** * Class used for Items that can be Blocks - * - * Class Block - * @package PocketMine\Item */ class Block extends Item{ public function __construct(BlockBlock $block, $meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Bowl.php b/src/PocketMine/item/Bowl.php index d7cea47c0..76f7feb6e 100644 --- a/src/PocketMine/item/Bowl.php +++ b/src/PocketMine/item/Bowl.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Bowl extends Item{ diff --git a/src/PocketMine/item/Brick.php b/src/PocketMine/item/Brick.php index 0a6f75a80..1f3592f50 100644 --- a/src/PocketMine/item/Brick.php +++ b/src/PocketMine/item/Brick.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Brick extends Item{ diff --git a/src/PocketMine/item/Bucket.php b/src/PocketMine/item/Bucket.php index 449273938..19d5a5fe7 100644 --- a/src/PocketMine/item/Bucket.php +++ b/src/PocketMine/item/Bucket.php @@ -19,15 +19,15 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Air; -use PocketMine\Block\Block; -use PocketMine\Block\Lava; -use PocketMine\Block\Liquid; -use PocketMine\Block\Water; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\block\Air; +use pocketmine\block\Block; +use pocketmine\block\Lava; +use pocketmine\block\Liquid; +use pocketmine\block\Water; +use pocketmine\level\Level; +use pocketmine\Player; class Bucket extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Cake.php b/src/PocketMine/item/Cake.php index 8af86f46b..dc0710d97 100644 --- a/src/PocketMine/item/Cake.php +++ b/src/PocketMine/item/Cake.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Cake extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Carrot.php b/src/PocketMine/item/Carrot.php index a874c8a8b..719f3a58c 100644 --- a/src/PocketMine/item/Carrot.php +++ b/src/PocketMine/item/Carrot.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Carrot extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Coal.php b/src/PocketMine/item/Coal.php index 107629d7c..8da79aeca 100644 --- a/src/PocketMine/item/Coal.php +++ b/src/PocketMine/item/Coal.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Coal extends Item{ diff --git a/src/PocketMine/item/Diamond.php b/src/PocketMine/item/Diamond.php index 120cc662d..c70f68f6c 100644 --- a/src/PocketMine/item/Diamond.php +++ b/src/PocketMine/item/Diamond.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Diamond extends Item{ diff --git a/src/PocketMine/item/Feather.php b/src/PocketMine/item/Feather.php index f07ccf874..c73ce56fb 100644 --- a/src/PocketMine/item/Feather.php +++ b/src/PocketMine/item/Feather.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Feather extends Item{ diff --git a/src/PocketMine/item/FlintSteel.php b/src/PocketMine/item/FlintSteel.php index 3ef6165dc..cb52f4b0c 100644 --- a/src/PocketMine/item/FlintSteel.php +++ b/src/PocketMine/item/FlintSteel.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; -use PocketMine\Block\Fire; -use PocketMine\Block\Solid; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\block\Block; +use pocketmine\block\Fire; +use pocketmine\block\Solid; +use pocketmine\level\Level; +use pocketmine\Player; class FlintSteel extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/GoldIngot.php b/src/PocketMine/item/GoldIngot.php index c57853351..130745214 100644 --- a/src/PocketMine/item/GoldIngot.php +++ b/src/PocketMine/item/GoldIngot.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class GoldIngot extends Item{ diff --git a/src/PocketMine/item/IronAxe.php b/src/PocketMine/item/IronAxe.php index 5533835dc..5b3583cad 100644 --- a/src/PocketMine/item/IronAxe.php +++ b/src/PocketMine/item/IronAxe.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class IronAxe extends Item{ diff --git a/src/PocketMine/item/IronDoor.php b/src/PocketMine/item/IronDoor.php index 3fa815de3..5cf28b3f8 100644 --- a/src/PocketMine/item/IronDoor.php +++ b/src/PocketMine/item/IronDoor.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class IronDoor extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/IronHoe.php b/src/PocketMine/item/IronHoe.php index 3f841cd8d..533d88915 100644 --- a/src/PocketMine/item/IronHoe.php +++ b/src/PocketMine/item/IronHoe.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class IronHoe extends Item{ diff --git a/src/PocketMine/item/IronIngot.php b/src/PocketMine/item/IronIngot.php index 54d76e01f..b8eb791eb 100644 --- a/src/PocketMine/item/IronIngot.php +++ b/src/PocketMine/item/IronIngot.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class IronIngot extends Item{ diff --git a/src/PocketMine/item/IronPickaxe.php b/src/PocketMine/item/IronPickaxe.php index 7e74f31a5..bee25b1c1 100644 --- a/src/PocketMine/item/IronPickaxe.php +++ b/src/PocketMine/item/IronPickaxe.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class IronPickaxe extends Item{ diff --git a/src/PocketMine/item/IronShovel.php b/src/PocketMine/item/IronShovel.php index 6aec87c93..b860435c2 100644 --- a/src/PocketMine/item/IronShovel.php +++ b/src/PocketMine/item/IronShovel.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class IronShovel extends Item{ diff --git a/src/PocketMine/item/Item.php b/src/PocketMine/item/Item.php index 8f9c2940b..23ea870d4 100644 --- a/src/PocketMine/item/Item.php +++ b/src/PocketMine/item/Item.php @@ -22,15 +22,15 @@ /** * All the Item classes */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; -use PocketMine\Entity\Entity; -use PocketMine\Item\Block as ItemBlock; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Recipes\Fuel; -use PocketMine\Recipes\Smelt; +use pocketmine\block\Block; +use pocketmine\entity\Entity; +use pocketmine\item\Block as ItemBlock; +use pocketmine\level\Level; +use pocketmine\Player; +use pocketmine\recipes\Fuel; +use pocketmine\recipes\Smelt; class Item{ //All Block IDs are here too @@ -442,8 +442,8 @@ class Item{ $meta = ((int) $b[1]) & 0xFFFF; } - if(defined("PocketMine\\Item\\Item::" . strtoupper($b[0]))){ - $item = self::get(constant("PocketMine\\Item\\Item::" . strtoupper($b[0])), $meta); + if(defined("pocketmine\\item\\Item::" . strtoupper($b[0]))){ + $item = self::get(constant("pocketmine\\item\\Item::" . strtoupper($b[0])), $meta); if($item->getID() === self::AIR and strtoupper($b[0]) !== "AIR"){ $item = self::get(((int) $b[0]) & 0xFFFF, $meta); } diff --git a/src/PocketMine/item/MelonSeeds.php b/src/PocketMine/item/MelonSeeds.php index 7f8bfffe0..37b2e598f 100644 --- a/src/PocketMine/item/MelonSeeds.php +++ b/src/PocketMine/item/MelonSeeds.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class MelonSeeds extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/MushroomStew.php b/src/PocketMine/item/MushroomStew.php index 672a24501..61a9b610a 100644 --- a/src/PocketMine/item/MushroomStew.php +++ b/src/PocketMine/item/MushroomStew.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class MushroomStew extends Item{ diff --git a/src/PocketMine/item/Painting.php b/src/PocketMine/item/Painting.php index ca3d96905..d7cd4b961 100644 --- a/src/PocketMine/item/Painting.php +++ b/src/PocketMine/item/Painting.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Server; +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/Potato.php b/src/PocketMine/item/Potato.php index 21723c5ec..d68f86f9e 100644 --- a/src/PocketMine/item/Potato.php +++ b/src/PocketMine/item/Potato.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Potato extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/PumpkinSeeds.php b/src/PocketMine/item/PumpkinSeeds.php index de45c387c..e15546331 100644 --- a/src/PocketMine/item/PumpkinSeeds.php +++ b/src/PocketMine/item/PumpkinSeeds.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class PumpkinSeeds extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Sign.php b/src/PocketMine/item/Sign.php index f99a549a4..ed06c6a16 100644 --- a/src/PocketMine/item/Sign.php +++ b/src/PocketMine/item/Sign.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Sign extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/SpawnEgg.php b/src/PocketMine/item/SpawnEgg.php index 6a5b0ed8e..547be3082 100644 --- a/src/PocketMine/item/SpawnEgg.php +++ b/src/PocketMine/item/SpawnEgg.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; -use PocketMine\Entity; -use PocketMine\Level\Level; -use PocketMine\Player; +use pocketmine\block\Block; +use pocketmine\Entity; +use pocketmine\level\Level; +use pocketmine\Player; class SpawnEgg extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/Stick.php b/src/PocketMine/item/Stick.php index e296342ce..a71c5cb6c 100644 --- a/src/PocketMine/item/Stick.php +++ b/src/PocketMine/item/Stick.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class Stick extends Item{ diff --git a/src/PocketMine/item/Sugarcane.php b/src/PocketMine/item/Sugarcane.php index 2df1e5a18..4b7b14b9b 100644 --- a/src/PocketMine/item/Sugarcane.php +++ b/src/PocketMine/item/Sugarcane.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class Sugarcane extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/WheatSeeds.php b/src/PocketMine/item/WheatSeeds.php index a65724896..2746fde9a 100644 --- a/src/PocketMine/item/WheatSeeds.php +++ b/src/PocketMine/item/WheatSeeds.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class WheatSeeds extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/WoodenAxe.php b/src/PocketMine/item/WoodenAxe.php index ca06cd9e9..59b7d3d7c 100644 --- a/src/PocketMine/item/WoodenAxe.php +++ b/src/PocketMine/item/WoodenAxe.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class WoodenAxe extends Item{ diff --git a/src/PocketMine/item/WoodenDoor.php b/src/PocketMine/item/WoodenDoor.php index b53c93335..251ba68bc 100644 --- a/src/PocketMine/item/WoodenDoor.php +++ b/src/PocketMine/item/WoodenDoor.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; -use PocketMine\Block\Block; +use pocketmine\block\Block; class WoodenDoor extends Item{ public function __construct($meta = 0, $count = 1){ diff --git a/src/PocketMine/item/WoodenPickaxe.php b/src/PocketMine/item/WoodenPickaxe.php index ff171a86b..599d255c1 100644 --- a/src/PocketMine/item/WoodenPickaxe.php +++ b/src/PocketMine/item/WoodenPickaxe.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class WoodenPickaxe extends Item{ diff --git a/src/PocketMine/item/WoodenShovel.php b/src/PocketMine/item/WoodenShovel.php index 927c82cb4..4acfca747 100644 --- a/src/PocketMine/item/WoodenShovel.php +++ b/src/PocketMine/item/WoodenShovel.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class WoodenShovel extends Item{ diff --git a/src/PocketMine/item/WoodenSword.php b/src/PocketMine/item/WoodenSword.php index 356b1748f..43633d700 100644 --- a/src/PocketMine/item/WoodenSword.php +++ b/src/PocketMine/item/WoodenSword.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Item; +namespace pocketmine\item; class WoodenSword extends Item{ diff --git a/src/PocketMine/level/Explosion.php b/src/PocketMine/level/Explosion.php index 4cb44869a..76a0fe8fc 100644 --- a/src/PocketMine/level/Explosion.php +++ b/src/PocketMine/level/Explosion.php @@ -19,17 +19,17 @@ * */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\Block\Block; -use PocketMine\Block\TNT; -use PocketMine\Entity\Entity; -use PocketMine\Event\Entity\EntityExplodeEvent; -use PocketMine\Item\Item; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Network\Protocol\ExplodePacket; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\block\Block; +use pocketmine\block\TNT; +use pocketmine\entity\Entity; +use pocketmine\event\entity\EntityExplodeEvent; +use pocketmine\item\Item; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\network\protocol\ExplodePacket; +use pocketmine\Player; +use pocketmine\Server; class Explosion{ public static $specialDrops = array( diff --git a/src/PocketMine/level/Level.php b/src/PocketMine/level/Level.php index 575540d0d..da021e4dc 100644 --- a/src/PocketMine/level/Level.php +++ b/src/PocketMine/level/Level.php @@ -22,44 +22,42 @@ /** * All Level related classes are here, like Generators, Populators, Noise, ... */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\Block\Air; -use PocketMine\Block\Block; -use PocketMine\Entity\Entity; -use PocketMine\Event\Block\BlockBreakEvent; -use PocketMine\Event\Block\BlockPlaceEvent; -use PocketMine\Event\Player\PlayerInteractEvent; -use PocketMine\Item\Item; -use PocketMine\Level\Generator\Flat; -use PocketMine\Level\Generator\Generator; -use PocketMine\Level\Generator\Normal; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\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; -use PocketMine\Network\Protocol\SetTimePacket; -use PocketMine\Network\Protocol\UpdateBlockPacket; -use PocketMine\Player; -use PocketMine\PMF\LevelFormat; -use PocketMine\Server; -use PocketMine\Tile\Chest; -use PocketMine\Tile\Furnace; -use PocketMine\Tile\Sign; -use PocketMine\Tile\Tile; -use PocketMine\Utils\Cache; -use PocketMine\Utils\Config; -use PocketMine\Utils\Random; -use PocketMine\Utils\Utils; +use pocketmine\block\Air; +use pocketmine\block\Block; +use pocketmine\entity\Entity; +use pocketmine\event\block\BlockBreakEvent; +use pocketmine\event\block\BlockPlaceEvent; +use pocketmine\event\player\PlayerInteractEvent; +use pocketmine\item\Item; +use pocketmine\level\generator\Flat; +use pocketmine\level\generator\Generator; +use pocketmine\level\generator\Normal; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\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; +use pocketmine\network\protocol\SetTimePacket; +use pocketmine\network\protocol\UpdateBlockPacket; +use pocketmine\Player; +use pocketmine\pmf\LevelFormat; +use pocketmine\Server; +use pocketmine\tile\Chest; +use pocketmine\tile\Furnace; +use pocketmine\tile\Sign; +use pocketmine\tile\Tile; +use pocketmine\utils\Cache; +use pocketmine\utils\Config; +use pocketmine\utils\Random; +use pocketmine\utils\Utils; /** - * Class Level * Main Level handling class, includes all the methods used on them. - * @package PocketMine\Level */ class Level{ @@ -189,7 +187,7 @@ class Level{ return false; } - $path = \PocketMine\DATA . "worlds/" . $name . "/"; + $path = \pocketmine\DATA . "worlds/" . $name . "/"; console("[INFO] Preparing level \"" . $name . "\""); $level = new LevelFormat($path . "level.pmf"); if(!$level->isLoaded){ @@ -350,7 +348,7 @@ class Level{ if($name === ""){ return false; } - $path = \PocketMine\DATA . "worlds/" . $name . "/"; + $path = \pocketmine\DATA . "worlds/" . $name . "/"; if(self::get($name) === false and !file_exists($path . "level.pmf")){ if(file_exists($path)){ $level = new LevelImport($path); diff --git a/src/PocketMine/level/LevelImport.php b/src/PocketMine/level/LevelImport.php index d89e3197b..73d24e0ae 100644 --- a/src/PocketMine/level/LevelImport.php +++ b/src/PocketMine/level/LevelImport.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\NBT\NBT; -use PocketMine\PMF\LevelFormat; -use PocketMine\Utils\Config; +use pocketmine\nbt\NBT; +use pocketmine\pmf\LevelFormat; +use pocketmine\utils\Config; class LevelImport{ private $path; diff --git a/src/PocketMine/level/PocketChunkParser.php b/src/PocketMine/level/PocketChunkParser.php index b8daad8a7..b5187115a 100644 --- a/src/PocketMine/level/PocketChunkParser.php +++ b/src/PocketMine/level/PocketChunkParser.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; /** * WARNING: This code is old, and only supports the file format partially (reverse engineering) diff --git a/src/PocketMine/level/Position.php b/src/PocketMine/level/Position.php index cd332ec4b..bfdeee699 100644 --- a/src/PocketMine/level/Position.php +++ b/src/PocketMine/level/Position.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\Math\Vector3 as Vector3; +use pocketmine\math\Vector3 as Vector3; class Position extends Vector3{ diff --git a/src/PocketMine/level/WorldGenerator.php b/src/PocketMine/level/WorldGenerator.php index 998096e27..2d8995d59 100644 --- a/src/PocketMine/level/WorldGenerator.php +++ b/src/PocketMine/level/WorldGenerator.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Level; +namespace pocketmine\level; -use PocketMine\Level\Generator\Generator; -use PocketMine\PMF\LevelFormat; -use PocketMine\Utils\Config; -use PocketMine\Utils\Random; -use PocketMine\Utils\Utils; +use pocketmine\level\generator\Generator; +use pocketmine\pmf\LevelFormat; +use pocketmine\utils\Config; +use pocketmine\utils\Random; +use pocketmine\utils\Utils; class WorldGenerator{ private $seed, $level, $path, $random, $generator, $height; @@ -34,7 +34,7 @@ class WorldGenerator{ $this->seed = $seed !== false ? (int) $seed : Utils::readInt(Utils::getRandomBytes(4, false)); $this->random = new Random($this->seed); $this->height = (int) $height; - $this->path = \PocketMine\DATA . "worlds/" . $name . "/"; + $this->path = \pocketmine\DATA . "worlds/" . $name . "/"; $this->generator = $generator; $level = new LevelFormat($this->path . "level.pmf", array( "name" => $name, diff --git a/src/PocketMine/level/generator/Flat.php b/src/PocketMine/level/generator/Flat.php index f486bd036..6523b6581 100644 --- a/src/PocketMine/level/generator/Flat.php +++ b/src/PocketMine/level/generator/Flat.php @@ -19,22 +19,22 @@ * */ -namespace PocketMine\Level\Generator; +namespace pocketmine\level\generator; -use PocketMine\Block\Air; -use PocketMine\Block\CoalOre; -use PocketMine\Block\DiamondOre; -use PocketMine\Block\Dirt; -use PocketMine\Block\GoldOre; -use PocketMine\Block\Gravel; -use PocketMine\Block\IronOre; -use PocketMine\Block\LapisOre; -use PocketMine\Block\RedstoneOre; -use PocketMine\Item\Item; -use PocketMine\Level\Generator\Populator\Ore; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Air; +use pocketmine\block\CoalOre; +use pocketmine\block\DiamondOre; +use pocketmine\block\Dirt; +use pocketmine\block\GoldOre; +use pocketmine\block\Gravel; +use pocketmine\block\IronOre; +use pocketmine\block\LapisOre; +use pocketmine\block\RedstoneOre; +use pocketmine\item\Item; +use pocketmine\level\generator\populator\Ore; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Flat extends Generator{ private $level, $random, $structure, $chunks, $options, $floorLevel, $preset, $populators = array(); @@ -58,14 +58,14 @@ class Flat extends Generator{ if(isset($this->options["decoration"])){ $ores = new Ore(); $ores->setOreTypes(array( - new Object\OreType(new CoalOre(), 20, 16, 0, 128), - new Object\OreType(New IronOre(), 20, 8, 0, 64), - new Object\OreType(new RedstoneOre(), 8, 7, 0, 16), - new Object\OreType(new LapisOre(), 1, 6, 0, 32), - new Object\OreType(new GoldOre(), 2, 8, 0, 32), - new Object\OreType(new DiamondOre(), 1, 7, 0, 16), - new Object\OreType(new Dirt(), 20, 32, 0, 128), - new Object\OreType(new Gravel(), 10, 16, 0, 128), + new object\OreType(new CoalOre(), 20, 16, 0, 128), + new object\OreType(New IronOre(), 20, 8, 0, 64), + new object\OreType(new RedstoneOre(), 8, 7, 0, 16), + new object\OreType(new LapisOre(), 1, 6, 0, 32), + new object\OreType(new GoldOre(), 2, 8, 0, 32), + new object\OreType(new DiamondOre(), 1, 7, 0, 16), + new object\OreType(new Dirt(), 20, 32, 0, 128), + new object\OreType(new Gravel(), 10, 16, 0, 128), )); $this->populators[] = $ores; } diff --git a/src/PocketMine/level/generator/Generator.php b/src/PocketMine/level/generator/Generator.php index b29fae700..6ee1c3644 100644 --- a/src/PocketMine/level/generator/Generator.php +++ b/src/PocketMine/level/generator/Generator.php @@ -22,16 +22,16 @@ /** * Generator classes used in Levels */ -namespace PocketMine\Level\Generator; +namespace pocketmine\level\generator; -use PocketMine\Level\Level; -use PocketMine\Utils\Random; +use pocketmine\level\Level; +use pocketmine\utils\Random; abstract class Generator{ private static $list = array(); public static function addGenerator($object, $name){ - if(is_subclass_of($object, "\\PocketMine\\Level\\Generator\\Generator") and !isset(Generator::$list[$name])){ + if(is_subclass_of($object, "pocketmine\\level\\generator\\Generator") and !isset(Generator::$list[$name])){ Generator::$list[$name] = $object; return true; @@ -45,7 +45,7 @@ abstract class Generator{ return Generator::$list[$name]; } - return "\\PocketMine\\Level\\Generator\\Normal"; + return "pocketmine\\level\\generator\\Normal"; } public abstract function __construct(array $settings = array()); diff --git a/src/PocketMine/level/generator/Normal.php b/src/PocketMine/level/generator/Normal.php index b366345bd..f9d462fc6 100644 --- a/src/PocketMine/level/generator/Normal.php +++ b/src/PocketMine/level/generator/Normal.php @@ -19,24 +19,24 @@ * */ -namespace PocketMine\Level\Generator; +namespace pocketmine\level\generator; -use PocketMine\Block\CoalOre; -use PocketMine\Block\DiamondOre; -use PocketMine\Block\Dirt; -use PocketMine\Block\GoldOre; -use PocketMine\Block\Gravel; -use PocketMine\Block\IronOre; -use PocketMine\Block\LapisOre; -use PocketMine\Block\RedstoneOre; -use PocketMine\Level\Generator\Noise\Simplex; -use PocketMine\Level\Generator\Object\OreType; -use PocketMine\Level\Generator\Populator\Ore; -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; +use pocketmine\block\CoalOre; +use pocketmine\block\DiamondOre; +use pocketmine\block\Dirt; +use pocketmine\block\GoldOre; +use pocketmine\block\Gravel; +use pocketmine\block\IronOre; +use pocketmine\block\LapisOre; +use pocketmine\block\RedstoneOre; +use pocketmine\level\generator\noise\Simplex; +use pocketmine\level\generator\object\OreType; +use pocketmine\level\generator\populator\Ore; +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; class Normal extends Generator{ diff --git a/src/PocketMine/level/generator/noise/Generator.php b/src/PocketMine/level/generator/noise/Generator.php index ef27aa867..95de68ad2 100644 --- a/src/PocketMine/level/generator/noise/Generator.php +++ b/src/PocketMine/level/generator/noise/Generator.php @@ -22,7 +22,7 @@ /** * Different noise generators for level generation */ -namespace PocketMine\Level\Generator\Noise; +namespace pocketmine\level\generator\noise; abstract class Generator{ diff --git a/src/PocketMine/level/generator/noise/Perlin.php b/src/PocketMine/level/generator/noise/Perlin.php index eba9e1d57..1b7c653e7 100644 --- a/src/PocketMine/level/generator/noise/Perlin.php +++ b/src/PocketMine/level/generator/noise/Perlin.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Level\Generator\Noise; +namespace pocketmine\level\generator\noise; -use PocketMine\Utils\Random; +use pocketmine\utils\Random; class Perlin extends Generator{ public static $grad3 = [ diff --git a/src/PocketMine/level/generator/noise/Simplex.php b/src/PocketMine/level/generator/noise/Simplex.php index 9f568a1e4..abcd6ce30 100644 --- a/src/PocketMine/level/generator/noise/Simplex.php +++ b/src/PocketMine/level/generator/noise/Simplex.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Level\Generator\Noise; +namespace pocketmine\level\generator\noise; -use PocketMine\Utils\Random; +use pocketmine\utils\Random; /** * Generates simplex-based noise. diff --git a/src/PocketMine/level/generator/object/BigTree.php b/src/PocketMine/level/generator/object/BigTree.php index 278fcfc75..b7fbad7ca 100644 --- a/src/PocketMine/level/generator/object/BigTree.php +++ b/src/PocketMine/level/generator/object/BigTree.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; class BigTree extends Tree{ private $trunkHeightMultiplier = 0.618; diff --git a/src/PocketMine/level/generator/object/Object.php b/src/PocketMine/level/generator/object/Object.php index 50e478a2c..ac1fa9707 100644 --- a/src/PocketMine/level/generator/object/Object.php +++ b/src/PocketMine/level/generator/object/Object.php @@ -22,7 +22,7 @@ /** * All the different object classes used in populators */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; abstract class Object{ diff --git a/src/PocketMine/level/generator/object/Ore.php b/src/PocketMine/level/generator/object/Ore.php index 389830512..efdc10ddc 100644 --- a/src/PocketMine/level/generator/object/Ore.php +++ b/src/PocketMine/level/generator/object/Ore.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Math\VectorMath; -use PocketMine\Utils\Random; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\math\VectorMath; +use pocketmine\utils\Random; class Ore{ private $random; diff --git a/src/PocketMine/level/generator/object/OreType.php b/src/PocketMine/level/generator/object/OreType.php index 1e23ed5aa..b5de566dd 100644 --- a/src/PocketMine/level/generator/object/OreType.php +++ b/src/PocketMine/level/generator/object/OreType.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Block; +use pocketmine\block\Block; class OreType{ public $material, $clusterCount, $clusterSize, $maxHeight, $minHeight; diff --git a/src/PocketMine/level/generator/object/PineTree.php b/src/PocketMine/level/generator/object/PineTree.php index 7c9d5352c..e85f9823f 100644 --- a/src/PocketMine/level/generator/object/PineTree.php +++ b/src/PocketMine/level/generator/object/PineTree.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Dirt; -use PocketMine\Block\Leaves; -use PocketMine\Block\Wood; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Dirt; +use pocketmine\block\Leaves; +use pocketmine\block\Wood; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class PineTree extends Tree{ var $type = 1; diff --git a/src/PocketMine/level/generator/object/Pond.php b/src/PocketMine/level/generator/object/Pond.php index e95e11017..d4697c221 100644 --- a/src/PocketMine/level/generator/object/Pond.php +++ b/src/PocketMine/level/generator/object/Pond.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Block; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Block; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Pond{ private $random; diff --git a/src/PocketMine/level/generator/object/SmallTree.php b/src/PocketMine/level/generator/object/SmallTree.php index 958e61d4d..911077b5f 100644 --- a/src/PocketMine/level/generator/object/SmallTree.php +++ b/src/PocketMine/level/generator/object/SmallTree.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Dirt; -use PocketMine\Block\Leaves; -use PocketMine\Block\Wood; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Dirt; +use pocketmine\block\Leaves; +use pocketmine\block\Wood; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class SmallTree extends Tree{ public $type = 0; diff --git a/src/PocketMine/level/generator/object/SpruceTree.php b/src/PocketMine/level/generator/object/SpruceTree.php index e59818436..803be97c8 100644 --- a/src/PocketMine/level/generator/object/SpruceTree.php +++ b/src/PocketMine/level/generator/object/SpruceTree.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Dirt; -use PocketMine\Block\Leaves; -use PocketMine\Block\Wood; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Dirt; +use pocketmine\block\Leaves; +use pocketmine\block\Wood; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class SpruceTree extends Tree{ var $type = 1; diff --git a/src/PocketMine/level/generator/object/TallGrass.php b/src/PocketMine/level/generator/object/TallGrass.php index 4d7aa7fba..a6ac29f8a 100644 --- a/src/PocketMine/level/generator/object/TallGrass.php +++ b/src/PocketMine/level/generator/object/TallGrass.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Block; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Block; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class TallGrass{ public static function growGrass(Level $level, Vector3 $pos, Random $random, $count = 15, $radius = 10){ diff --git a/src/PocketMine/level/generator/object/Tree.php b/src/PocketMine/level/generator/object/Tree.php index c60dcb43c..f9349c582 100644 --- a/src/PocketMine/level/generator/object/Tree.php +++ b/src/PocketMine/level/generator/object/Tree.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Object; +namespace pocketmine\level\generator\object; -use PocketMine\Block\Sapling; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Sapling; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Tree{ public $overridable = array( diff --git a/src/PocketMine/level/generator/populator/Mineshaft.php b/src/PocketMine/level/generator/populator/Mineshaft.php index f4349ad25..6acebb8c2 100644 --- a/src/PocketMine/level/generator/populator/Mineshaft.php +++ b/src/PocketMine/level/generator/populator/Mineshaft.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Level\Level; -use PocketMine\Utils\Random; +use pocketmine\level\Level; +use pocketmine\utils\Random; class Mineshaft extends Populator{ private static $DISTANCE = 256; diff --git a/src/PocketMine/level/generator/populator/Ore.php b/src/PocketMine/level/generator/populator/Ore.php index 3b61f19bd..991d0ba88 100644 --- a/src/PocketMine/level/generator/populator/Ore.php +++ b/src/PocketMine/level/generator/populator/Ore.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Level\Generator\Object\Ore as ObjectOre; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\level\generator\object\Ore as ObjectOre; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Ore extends Populator{ private $oreTypes = array(); diff --git a/src/PocketMine/level/generator/populator/Pond.php b/src/PocketMine/level/generator/populator/Pond.php index 03ec4ffc3..dbc63a22c 100644 --- a/src/PocketMine/level/generator/populator/Pond.php +++ b/src/PocketMine/level/generator/populator/Pond.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Block\Water; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Water; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Pond extends Populator{ private $waterOdd = 4; @@ -38,7 +38,7 @@ class Pond extends Populator{ $random->nextRange(0, 128), $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 16) ); - $pond = new \PocketMine\Level\Generator\Object\Pond($random, new Water()); + $pond = new \pocketmine\level\generator\object\Pond($random, new Water()); if($pond->canPlaceObject($level, $v)){ $pond->placeObject($level, $v); } diff --git a/src/PocketMine/level/generator/populator/Populator.php b/src/PocketMine/level/generator/populator/Populator.php index c898a3a9e..fa44c8e63 100644 --- a/src/PocketMine/level/generator/populator/Populator.php +++ b/src/PocketMine/level/generator/populator/Populator.php @@ -22,10 +22,10 @@ /** * All the Object populator classes */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Level\Level; -use PocketMine\Utils\Random; +use pocketmine\level\Level; +use pocketmine\utils\Random; abstract class Populator{ public abstract function populate(Level $level, $chunkX, $chunkZ, Random $random); diff --git a/src/PocketMine/level/generator/populator/TallGrass.php b/src/PocketMine/level/generator/populator/TallGrass.php index 1e7de098b..17b6b3254 100644 --- a/src/PocketMine/level/generator/populator/TallGrass.php +++ b/src/PocketMine/level/generator/populator/TallGrass.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Block\Block; -use PocketMine\Block\TallGrass as BlockTallGrass; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Block; +use pocketmine\block\TallGrass as BlockTallGrass; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class TallGrass extends Populator{ /** @var Level */ diff --git a/src/PocketMine/level/generator/populator/Tree.php b/src/PocketMine/level/generator/populator/Tree.php index 223d7307f..6369faf38 100644 --- a/src/PocketMine/level/generator/populator/Tree.php +++ b/src/PocketMine/level/generator/populator/Tree.php @@ -19,14 +19,14 @@ * */ -namespace PocketMine\Level\Generator\Populator; +namespace pocketmine\level\generator\populator; -use PocketMine\Block\Block; -use PocketMine\Block\Sapling; -use PocketMine\Level\Generator\Object\Tree as ObjectTree; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\Utils\Random; +use pocketmine\block\Block; +use pocketmine\block\Sapling; +use pocketmine\level\generator\object\Tree as ObjectTree; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\utils\Random; class Tree extends Populator{ private $level; diff --git a/src/PocketMine/math/AxisAlignedBB.php b/src/PocketMine/math/AxisAlignedBB.php index c2a1ac56f..b16120653 100644 --- a/src/PocketMine/math/AxisAlignedBB.php +++ b/src/PocketMine/math/AxisAlignedBB.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Math; +namespace pocketmine\math; class AxisAlignedBB{ diff --git a/src/PocketMine/math/Math.php b/src/PocketMine/math/Math.php index c79cccaf5..6d48b77d2 100644 --- a/src/PocketMine/math/Math.php +++ b/src/PocketMine/math/Math.php @@ -22,7 +22,7 @@ /** * Math related classes, like matrices, bounding boxes and vector */ -namespace PocketMine\Math; +namespace pocketmine\math; abstract class Math{ diff --git a/src/PocketMine/math/Matrix.php b/src/PocketMine/math/Matrix.php index c3200ad9a..76505b3bb 100644 --- a/src/PocketMine/math/Matrix.php +++ b/src/PocketMine/math/Matrix.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Math; +namespace pocketmine\math; class Matrix implements \ArrayAccess{ diff --git a/src/PocketMine/math/Vector2.php b/src/PocketMine/math/Vector2.php index 44eb7f236..8cee4e103 100644 --- a/src/PocketMine/math/Vector2.php +++ b/src/PocketMine/math/Vector2.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Math; +namespace pocketmine\math; class Vector2{ diff --git a/src/PocketMine/math/Vector3.php b/src/PocketMine/math/Vector3.php index 8cff8edc8..fcc6c04cc 100644 --- a/src/PocketMine/math/Vector3.php +++ b/src/PocketMine/math/Vector3.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Math; +namespace pocketmine\math; class Vector3{ diff --git a/src/PocketMine/math/VectorMath.php b/src/PocketMine/math/VectorMath.php index 1dae131b3..8bf57c8da 100644 --- a/src/PocketMine/math/VectorMath.php +++ b/src/PocketMine/math/VectorMath.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Math; +namespace pocketmine\math; abstract class VectorMath{ diff --git a/src/PocketMine/nbt/NBT.php b/src/PocketMine/nbt/NBT.php index aa8a048e5..d29f93fbc 100644 --- a/src/PocketMine/nbt/NBT.php +++ b/src/PocketMine/nbt/NBT.php @@ -22,29 +22,26 @@ /** * Named Binary Tag handling classes */ -namespace PocketMine\NBT; +namespace pocketmine\nbt; -use PocketMine\NBT\Tag\Byte; -use PocketMine\NBT\Tag\Byte_Array; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Double; -use PocketMine\NBT\Tag\End; -use PocketMine\NBT\Tag\Enum; -use PocketMine\NBT\Tag\Float; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\Int_Array; -use PocketMine\NBT\Tag\Long; -use PocketMine\NBT\Tag\NamedTAG; -use PocketMine\NBT\Tag\Short; -use PocketMine\NBT\Tag\String; -use PocketMine\NBT\Tag\Tag; -use PocketMine\Utils\Utils; +use pocketmine\nbt\tag\Byte; +use pocketmine\nbt\tag\Byte_Array; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Double; +use pocketmine\nbt\tag\End; +use pocketmine\nbt\tag\Enum; +use pocketmine\nbt\tag\Float; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\Int_Array; +use pocketmine\nbt\tag\Long; +use pocketmine\nbt\tag\NamedTAG; +use pocketmine\nbt\tag\Short; +use pocketmine\nbt\tag\String; +use pocketmine\nbt\tag\Tag; +use pocketmine\utils\Utils; /** * Named Binary Tag encoder/decoder - * - * Class NBT - * @package PocketMine\NBT */ class NBT{ const LITTLE_ENDIAN = 0; diff --git a/src/PocketMine/nbt/tag/Byte.php b/src/PocketMine/nbt/tag/Byte.php index 865e3258a..883ff834a 100644 --- a/src/PocketMine/nbt/tag/Byte.php +++ b/src/PocketMine/nbt/tag/Byte.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Byte extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Byte_Array.php b/src/PocketMine/nbt/tag/Byte_Array.php index 076e9f0db..ad43191a1 100644 --- a/src/PocketMine/nbt/tag/Byte_Array.php +++ b/src/PocketMine/nbt/tag/Byte_Array.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Byte_Array extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Compound.php b/src/PocketMine/nbt/tag/Compound.php index 8e32be03a..1163bf67b 100644 --- a/src/PocketMine/nbt/tag/Compound.php +++ b/src/PocketMine/nbt/tag/Compound.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Compound extends NamedTag implements \ArrayAccess{ diff --git a/src/PocketMine/nbt/tag/Double.php b/src/PocketMine/nbt/tag/Double.php index 8aaa957c3..ecac412cb 100644 --- a/src/PocketMine/nbt/tag/Double.php +++ b/src/PocketMine/nbt/tag/Double.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Double extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/End.php b/src/PocketMine/nbt/tag/End.php index c34ec2b65..660998b93 100644 --- a/src/PocketMine/nbt/tag/End.php +++ b/src/PocketMine/nbt/tag/End.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class End extends Tag{ diff --git a/src/PocketMine/nbt/tag/Enum.php b/src/PocketMine/nbt/tag/Enum.php index 323c861a4..ecef94a9a 100644 --- a/src/PocketMine/nbt/tag/Enum.php +++ b/src/PocketMine/nbt/tag/Enum.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Enum as TagEnum; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Enum as TagEnum; class Enum extends NamedTag implements \ArrayAccess{ diff --git a/src/PocketMine/nbt/tag/Float.php b/src/PocketMine/nbt/tag/Float.php index 441e6de33..5294ff45f 100644 --- a/src/PocketMine/nbt/tag/Float.php +++ b/src/PocketMine/nbt/tag/Float.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Float extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Int.php b/src/PocketMine/nbt/tag/Int.php index 7afd4bc76..4f4bf8091 100644 --- a/src/PocketMine/nbt/tag/Int.php +++ b/src/PocketMine/nbt/tag/Int.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Int extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Int_Array.php b/src/PocketMine/nbt/tag/Int_Array.php index 9c78e9d9b..76fa777ee 100644 --- a/src/PocketMine/nbt/tag/Int_Array.php +++ b/src/PocketMine/nbt/tag/Int_Array.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Int_Array extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Long.php b/src/PocketMine/nbt/tag/Long.php index bbfa319c8..6e1031663 100644 --- a/src/PocketMine/nbt/tag/Long.php +++ b/src/PocketMine/nbt/tag/Long.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Long extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/NamedTag.php b/src/PocketMine/nbt/tag/NamedTag.php index d0a081bb8..70fca449e 100644 --- a/src/PocketMine/nbt/tag/NamedTag.php +++ b/src/PocketMine/nbt/tag/NamedTag.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; abstract class NamedTag extends Tag{ diff --git a/src/PocketMine/nbt/tag/Short.php b/src/PocketMine/nbt/tag/Short.php index 9a09b401f..56f79b1b5 100644 --- a/src/PocketMine/nbt/tag/Short.php +++ b/src/PocketMine/nbt/tag/Short.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class Short extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/String.php b/src/PocketMine/nbt/tag/String.php index 962412a63..2edf10b00 100644 --- a/src/PocketMine/nbt/tag/String.php +++ b/src/PocketMine/nbt/tag/String.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; class String extends NamedTag{ diff --git a/src/PocketMine/nbt/tag/Tag.php b/src/PocketMine/nbt/tag/Tag.php index 1c726033d..4730acf3f 100644 --- a/src/PocketMine/nbt/tag/Tag.php +++ b/src/PocketMine/nbt/tag/Tag.php @@ -22,9 +22,9 @@ /** * All the NBT Tags */ -namespace PocketMine\NBT\Tag; +namespace pocketmine\nbt\tag; -use PocketMine\NBT\NBT; +use pocketmine\nbt\NBT; abstract class Tag extends \stdClass{ diff --git a/src/PocketMine/network/Packet.php b/src/PocketMine/network/Packet.php index 2554f45ca..3f7a3d3d4 100644 --- a/src/PocketMine/network/Packet.php +++ b/src/PocketMine/network/Packet.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network; +namespace pocketmine\network; class Packet extends \stdClass{ diff --git a/src/PocketMine/network/ThreadedHandler.php b/src/PocketMine/network/ThreadedHandler.php index cfc4f9f61..1a5421f19 100644 --- a/src/PocketMine/network/ThreadedHandler.php +++ b/src/PocketMine/network/ThreadedHandler.php @@ -22,11 +22,11 @@ /** * Network-related classes */ -namespace PocketMine\Network; +namespace pocketmine\network; -use PocketMine\Network\Query\QueryPacket; -use PocketMine\Network\RakNet\Info; -use PocketMine\Network\RakNet\Packet as RakNetPacket; +use pocketmine\network\query\QueryPacket; +use pocketmine\network\raknet\Info; +use pocketmine\network\raknet\Packet as RakNetPacket; class ThreadedHandler extends \Thread{ protected $bandwidthUp; @@ -106,8 +106,8 @@ class ThreadedHandler extends \Thread{ public function run(){ $autoloader = new \SplClassLoader(); - $autoloader->add("PocketMine", array( - \PocketMine\PATH . "src" + $autoloader->add("pocketmine", array( + \pocketmine\PATH . "src" )); $autoloader->register(true); diff --git a/src/PocketMine/network/protocol/AddEntityPacket.php b/src/PocketMine/network/protocol/AddEntityPacket.php index eb2dd931d..784ca4d2b 100644 --- a/src/PocketMine/network/protocol/AddEntityPacket.php +++ b/src/PocketMine/network/protocol/AddEntityPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class AddEntityPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/AddItemEntityPacket.php b/src/PocketMine/network/protocol/AddItemEntityPacket.php index 4ba15d5f8..8a7fa8384 100644 --- a/src/PocketMine/network/protocol/AddItemEntityPacket.php +++ b/src/PocketMine/network/protocol/AddItemEntityPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class AddItemEntityPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/AddMobPacket.php b/src/PocketMine/network/protocol/AddMobPacket.php index 6fa746939..31d95812e 100644 --- a/src/PocketMine/network/protocol/AddMobPacket.php +++ b/src/PocketMine/network/protocol/AddMobPacket.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; class AddMobPacket extends DataPacket{ public $eid; diff --git a/src/PocketMine/network/protocol/AddPaintingPacket.php b/src/PocketMine/network/protocol/AddPaintingPacket.php index 1311b1102..97ff094b3 100644 --- a/src/PocketMine/network/protocol/AddPaintingPacket.php +++ b/src/PocketMine/network/protocol/AddPaintingPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class AddPaintingPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/AddPlayerPacket.php b/src/PocketMine/network/protocol/AddPlayerPacket.php index 15c42e622..4e32892e6 100644 --- a/src/PocketMine/network/protocol/AddPlayerPacket.php +++ b/src/PocketMine/network/protocol/AddPlayerPacket.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; class AddPlayerPacket extends DataPacket{ public $clientID; diff --git a/src/PocketMine/network/protocol/AdventureSettingsPacket.php b/src/PocketMine/network/protocol/AdventureSettingsPacket.php index 39b4eb805..66ad09d91 100644 --- a/src/PocketMine/network/protocol/AdventureSettingsPacket.php +++ b/src/PocketMine/network/protocol/AdventureSettingsPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class AdventureSettingsPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/AnimatePacket.php b/src/PocketMine/network/protocol/AnimatePacket.php index d917db928..b418cc148 100644 --- a/src/PocketMine/network/protocol/AnimatePacket.php +++ b/src/PocketMine/network/protocol/AnimatePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class AnimatePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ChatPacket.php b/src/PocketMine/network/protocol/ChatPacket.php index c7a2d1ba0..4dd9dc762 100644 --- a/src/PocketMine/network/protocol/ChatPacket.php +++ b/src/PocketMine/network/protocol/ChatPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ChatPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ChunkDataPacket.php b/src/PocketMine/network/protocol/ChunkDataPacket.php index d5d44df41..045704209 100644 --- a/src/PocketMine/network/protocol/ChunkDataPacket.php +++ b/src/PocketMine/network/protocol/ChunkDataPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ChunkDataPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ClientConnectPacket.php b/src/PocketMine/network/protocol/ClientConnectPacket.php index 2b6cc9e05..1f6ac57fd 100644 --- a/src/PocketMine/network/protocol/ClientConnectPacket.php +++ b/src/PocketMine/network/protocol/ClientConnectPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ClientConnectPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ClientHandshakePacket.php b/src/PocketMine/network/protocol/ClientHandshakePacket.php index 1880f8ff0..d742986ab 100644 --- a/src/PocketMine/network/protocol/ClientHandshakePacket.php +++ b/src/PocketMine/network/protocol/ClientHandshakePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ClientHandshakePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ContainerClosePacket.php b/src/PocketMine/network/protocol/ContainerClosePacket.php index f1fb04536..46f2be2d8 100644 --- a/src/PocketMine/network/protocol/ContainerClosePacket.php +++ b/src/PocketMine/network/protocol/ContainerClosePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ContainerClosePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ContainerOpenPacket.php b/src/PocketMine/network/protocol/ContainerOpenPacket.php index 476725d1f..e7713242c 100644 --- a/src/PocketMine/network/protocol/ContainerOpenPacket.php +++ b/src/PocketMine/network/protocol/ContainerOpenPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ContainerOpenPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ContainerSetContentPacket.php b/src/PocketMine/network/protocol/ContainerSetContentPacket.php index f1e02ef6b..5163e0697 100644 --- a/src/PocketMine/network/protocol/ContainerSetContentPacket.php +++ b/src/PocketMine/network/protocol/ContainerSetContentPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ContainerSetContentPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ContainerSetDataPacket.php b/src/PocketMine/network/protocol/ContainerSetDataPacket.php index 248088bfa..160453832 100644 --- a/src/PocketMine/network/protocol/ContainerSetDataPacket.php +++ b/src/PocketMine/network/protocol/ContainerSetDataPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ContainerSetDataPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ContainerSetSlotPacket.php b/src/PocketMine/network/protocol/ContainerSetSlotPacket.php index f3e7c7e1a..c74ecb783 100644 --- a/src/PocketMine/network/protocol/ContainerSetSlotPacket.php +++ b/src/PocketMine/network/protocol/ContainerSetSlotPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ContainerSetSlotPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/DataPacket.php b/src/PocketMine/network/protocol/DataPacket.php index 6f4112bed..798751ce8 100644 --- a/src/PocketMine/network/protocol/DataPacket.php +++ b/src/PocketMine/network/protocol/DataPacket.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; -use PocketMine\Item\Item; -use PocketMine\Utils\Utils; +use pocketmine\item\Item; +use pocketmine\utils\Utils; abstract class DataPacket extends \stdClass{ private $offset = 0; diff --git a/src/PocketMine/network/protocol/DisconnectPacket.php b/src/PocketMine/network/protocol/DisconnectPacket.php index 0c5b673bb..2128a3b89 100644 --- a/src/PocketMine/network/protocol/DisconnectPacket.php +++ b/src/PocketMine/network/protocol/DisconnectPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class DisconnectPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/DropItemPacket.php b/src/PocketMine/network/protocol/DropItemPacket.php index dd908d689..99de843b3 100644 --- a/src/PocketMine/network/protocol/DropItemPacket.php +++ b/src/PocketMine/network/protocol/DropItemPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class DropItemPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/EntityDataPacket.php b/src/PocketMine/network/protocol/EntityDataPacket.php index c3a26b001..3a8ba854f 100644 --- a/src/PocketMine/network/protocol/EntityDataPacket.php +++ b/src/PocketMine/network/protocol/EntityDataPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class EntityDataPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/EntityEventPacket.php b/src/PocketMine/network/protocol/EntityEventPacket.php index 109946915..2e27bcd91 100644 --- a/src/PocketMine/network/protocol/EntityEventPacket.php +++ b/src/PocketMine/network/protocol/EntityEventPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class EntityEventPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ExplodePacket.php b/src/PocketMine/network/protocol/ExplodePacket.php index 74570b609..7363ff4d2 100644 --- a/src/PocketMine/network/protocol/ExplodePacket.php +++ b/src/PocketMine/network/protocol/ExplodePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ExplodePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/HurtArmorPacket.php b/src/PocketMine/network/protocol/HurtArmorPacket.php index 3974457ab..503e2a174 100644 --- a/src/PocketMine/network/protocol/HurtArmorPacket.php +++ b/src/PocketMine/network/protocol/HurtArmorPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class HurtArmorPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/Info.php b/src/PocketMine/network/protocol/Info.php index d1616d3c7..c302fa334 100644 --- a/src/PocketMine/network/protocol/Info.php +++ b/src/PocketMine/network/protocol/Info.php @@ -22,7 +22,7 @@ /** * Minecraft: PE multiplayer protocol implementation */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; abstract class Info{ diff --git a/src/PocketMine/network/protocol/InteractPacket.php b/src/PocketMine/network/protocol/InteractPacket.php index b546c29bb..1b7de5ff3 100644 --- a/src/PocketMine/network/protocol/InteractPacket.php +++ b/src/PocketMine/network/protocol/InteractPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class InteractPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/LevelEventPacket.php b/src/PocketMine/network/protocol/LevelEventPacket.php index 1ca354588..f2ff40118 100644 --- a/src/PocketMine/network/protocol/LevelEventPacket.php +++ b/src/PocketMine/network/protocol/LevelEventPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class LevelEventPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/LoginPacket.php b/src/PocketMine/network/protocol/LoginPacket.php index 635c5f43a..d02c47cff 100644 --- a/src/PocketMine/network/protocol/LoginPacket.php +++ b/src/PocketMine/network/protocol/LoginPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class LoginPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/LoginStatusPacket.php b/src/PocketMine/network/protocol/LoginStatusPacket.php index 77979bf47..1de99be2e 100644 --- a/src/PocketMine/network/protocol/LoginStatusPacket.php +++ b/src/PocketMine/network/protocol/LoginStatusPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class LoginStatusPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/MessagePacket.php b/src/PocketMine/network/protocol/MessagePacket.php index 0c278939a..a4a36e810 100644 --- a/src/PocketMine/network/protocol/MessagePacket.php +++ b/src/PocketMine/network/protocol/MessagePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class MessagePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/MoveEntityPacket.php b/src/PocketMine/network/protocol/MoveEntityPacket.php index 9f2fc0e77..f4246b4c8 100644 --- a/src/PocketMine/network/protocol/MoveEntityPacket.php +++ b/src/PocketMine/network/protocol/MoveEntityPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class MoveEntityPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/MoveEntityPacket_PosRot.php b/src/PocketMine/network/protocol/MoveEntityPacket_PosRot.php index 1a2e80990..17f3a4f20 100644 --- a/src/PocketMine/network/protocol/MoveEntityPacket_PosRot.php +++ b/src/PocketMine/network/protocol/MoveEntityPacket_PosRot.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class MoveEntityPacket_PosRot extends DataPacket{ diff --git a/src/PocketMine/network/protocol/MovePlayerPacket.php b/src/PocketMine/network/protocol/MovePlayerPacket.php index d660b22f1..e5a318553 100644 --- a/src/PocketMine/network/protocol/MovePlayerPacket.php +++ b/src/PocketMine/network/protocol/MovePlayerPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class MovePlayerPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/PingPacket.php b/src/PocketMine/network/protocol/PingPacket.php index 77c79c306..6312217b2 100644 --- a/src/PocketMine/network/protocol/PingPacket.php +++ b/src/PocketMine/network/protocol/PingPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class PingPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/PlayerActionPacket.php b/src/PocketMine/network/protocol/PlayerActionPacket.php index 6bd787a0f..4c322a1bf 100644 --- a/src/PocketMine/network/protocol/PlayerActionPacket.php +++ b/src/PocketMine/network/protocol/PlayerActionPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class PlayerActionPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/PlayerArmorEquipmentPacket.php b/src/PocketMine/network/protocol/PlayerArmorEquipmentPacket.php index 380568f35..d31eeb9c4 100644 --- a/src/PocketMine/network/protocol/PlayerArmorEquipmentPacket.php +++ b/src/PocketMine/network/protocol/PlayerArmorEquipmentPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class PlayerArmorEquipmentPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/PlayerEquipmentPacket.php b/src/PocketMine/network/protocol/PlayerEquipmentPacket.php index 5de0f9a36..52cbf64ce 100644 --- a/src/PocketMine/network/protocol/PlayerEquipmentPacket.php +++ b/src/PocketMine/network/protocol/PlayerEquipmentPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class PlayerEquipmentPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/PongPacket.php b/src/PocketMine/network/protocol/PongPacket.php index c05d668bc..3eee77d12 100644 --- a/src/PocketMine/network/protocol/PongPacket.php +++ b/src/PocketMine/network/protocol/PongPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class PongPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ReadyPacket.php b/src/PocketMine/network/protocol/ReadyPacket.php index 11b77b766..c28ae60e9 100644 --- a/src/PocketMine/network/protocol/ReadyPacket.php +++ b/src/PocketMine/network/protocol/ReadyPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ReadyPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RemoveBlockPacket.php b/src/PocketMine/network/protocol/RemoveBlockPacket.php index 6e78456ff..75cdd6eb3 100644 --- a/src/PocketMine/network/protocol/RemoveBlockPacket.php +++ b/src/PocketMine/network/protocol/RemoveBlockPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RemoveBlockPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RemoveEntityPacket.php b/src/PocketMine/network/protocol/RemoveEntityPacket.php index db082df7a..d5306fae3 100644 --- a/src/PocketMine/network/protocol/RemoveEntityPacket.php +++ b/src/PocketMine/network/protocol/RemoveEntityPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RemoveEntityPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RemovePlayerPacket.php b/src/PocketMine/network/protocol/RemovePlayerPacket.php index f004bcf3c..bc35b25e6 100644 --- a/src/PocketMine/network/protocol/RemovePlayerPacket.php +++ b/src/PocketMine/network/protocol/RemovePlayerPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RemovePlayerPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RequestChunkPacket.php b/src/PocketMine/network/protocol/RequestChunkPacket.php index 6272777e1..bdba239d9 100644 --- a/src/PocketMine/network/protocol/RequestChunkPacket.php +++ b/src/PocketMine/network/protocol/RequestChunkPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RequestChunkPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RespawnPacket.php b/src/PocketMine/network/protocol/RespawnPacket.php index cef17c131..076c9b4dd 100644 --- a/src/PocketMine/network/protocol/RespawnPacket.php +++ b/src/PocketMine/network/protocol/RespawnPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RespawnPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/RotateHeadPacket.php b/src/PocketMine/network/protocol/RotateHeadPacket.php index 0482bc474..81458b9d2 100644 --- a/src/PocketMine/network/protocol/RotateHeadPacket.php +++ b/src/PocketMine/network/protocol/RotateHeadPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class RotateHeadPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/SendInventoryPacket.php b/src/PocketMine/network/protocol/SendInventoryPacket.php index 45026c72b..f3348e07e 100644 --- a/src/PocketMine/network/protocol/SendInventoryPacket.php +++ b/src/PocketMine/network/protocol/SendInventoryPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class SendInventoryPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/ServerHandshakePacket.php b/src/PocketMine/network/protocol/ServerHandshakePacket.php index f8b852f1f..97fc199c3 100644 --- a/src/PocketMine/network/protocol/ServerHandshakePacket.php +++ b/src/PocketMine/network/protocol/ServerHandshakePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class ServerHandshakePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/SetEntityDataPacket.php b/src/PocketMine/network/protocol/SetEntityDataPacket.php index 37a7acfb5..21bcc38c5 100644 --- a/src/PocketMine/network/protocol/SetEntityDataPacket.php +++ b/src/PocketMine/network/protocol/SetEntityDataPacket.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; class SetEntityDataPacket extends DataPacket{ public $eid; diff --git a/src/PocketMine/network/protocol/SetEntityMotionPacket.php b/src/PocketMine/network/protocol/SetEntityMotionPacket.php index 85e104f49..7661557e7 100644 --- a/src/PocketMine/network/protocol/SetEntityMotionPacket.php +++ b/src/PocketMine/network/protocol/SetEntityMotionPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class SetEntityMotionPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/SetHealthPacket.php b/src/PocketMine/network/protocol/SetHealthPacket.php index 5b4fe228f..036402faa 100644 --- a/src/PocketMine/network/protocol/SetHealthPacket.php +++ b/src/PocketMine/network/protocol/SetHealthPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class SetHealthPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/SetSpawnPositionPacket.php b/src/PocketMine/network/protocol/SetSpawnPositionPacket.php index 1b9957300..0862adcad 100644 --- a/src/PocketMine/network/protocol/SetSpawnPositionPacket.php +++ b/src/PocketMine/network/protocol/SetSpawnPositionPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class SetSpawnPositionPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/SetTimePacket.php b/src/PocketMine/network/protocol/SetTimePacket.php index 7af737583..2f013bd34 100644 --- a/src/PocketMine/network/protocol/SetTimePacket.php +++ b/src/PocketMine/network/protocol/SetTimePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class SetTimePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/StartGamePacket.php b/src/PocketMine/network/protocol/StartGamePacket.php index c5b94621b..4a7e097d1 100644 --- a/src/PocketMine/network/protocol/StartGamePacket.php +++ b/src/PocketMine/network/protocol/StartGamePacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class StartGamePacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/TakeItemEntityPacket.php b/src/PocketMine/network/protocol/TakeItemEntityPacket.php index 4493ef979..918382c18 100644 --- a/src/PocketMine/network/protocol/TakeItemEntityPacket.php +++ b/src/PocketMine/network/protocol/TakeItemEntityPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class TakeItemEntityPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/TileEventPacket.php b/src/PocketMine/network/protocol/TileEventPacket.php index e003b5084..28c01b7d6 100644 --- a/src/PocketMine/network/protocol/TileEventPacket.php +++ b/src/PocketMine/network/protocol/TileEventPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class TileEventPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/UnknownPacket.php b/src/PocketMine/network/protocol/UnknownPacket.php index 7edb8db99..f873d1919 100644 --- a/src/PocketMine/network/protocol/UnknownPacket.php +++ b/src/PocketMine/network/protocol/UnknownPacket.php @@ -20,7 +20,7 @@ */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class UnknownPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/UpdateBlockPacket.php b/src/PocketMine/network/protocol/UpdateBlockPacket.php index eba051cb2..b24b86b30 100644 --- a/src/PocketMine/network/protocol/UpdateBlockPacket.php +++ b/src/PocketMine/network/protocol/UpdateBlockPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class UpdateBlockPacket extends DataPacket{ diff --git a/src/PocketMine/network/protocol/UseItemPacket.php b/src/PocketMine/network/protocol/UseItemPacket.php index 7f102b9a6..9697b0e2e 100644 --- a/src/PocketMine/network/protocol/UseItemPacket.php +++ b/src/PocketMine/network/protocol/UseItemPacket.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Network\Protocol; +namespace pocketmine\network\protocol; class UseItemPacket extends DataPacket{ diff --git a/src/PocketMine/network/query/QueryHandler.php b/src/PocketMine/network/query/QueryHandler.php index fe1cb5d26..ae218568f 100644 --- a/src/PocketMine/network/query/QueryHandler.php +++ b/src/PocketMine/network/query/QueryHandler.php @@ -23,12 +23,12 @@ * Implementation of the UT3 Query Protocol (GameSpot) * Source: http://wiki.unrealadmin.org/UT3_query_protocol */ -namespace PocketMine\Network\Query; +namespace pocketmine\network\query; -use PocketMine\Level\Level; -use PocketMine\Player; -use PocketMine\Server; -use PocketMine\Utils\Utils; +use pocketmine\level\Level; +use pocketmine\Player; +use pocketmine\Server; +use pocketmine\utils\Utils; class QueryHandler{ private $socket, $server, $lastToken, $token, $longData, $timeout; diff --git a/src/PocketMine/network/query/QueryPacket.php b/src/PocketMine/network/query/QueryPacket.php index 531e83f01..adf42a85b 100644 --- a/src/PocketMine/network/query/QueryPacket.php +++ b/src/PocketMine/network/query/QueryPacket.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Network\Query; +namespace pocketmine\network\query; -use PocketMine\Network\Packet; -use PocketMine\Utils\Utils; +use pocketmine\network\Packet; +use pocketmine\utils\Utils; class QueryPacket extends Packet{ const HANDSHAKE = 9; diff --git a/src/PocketMine/network/raknet/Info.php b/src/PocketMine/network/raknet/Info.php index 9e6143f7e..743ccd5a4 100644 --- a/src/PocketMine/network/raknet/Info.php +++ b/src/PocketMine/network/raknet/Info.php @@ -22,7 +22,7 @@ /** * RakNet UDP library implementation */ -namespace PocketMine\Network\RakNet; +namespace pocketmine\network\raknet; abstract class Info{ diff --git a/src/PocketMine/network/raknet/Packet.php b/src/PocketMine/network/raknet/Packet.php index f1eb116c8..208e6576d 100644 --- a/src/PocketMine/network/raknet/Packet.php +++ b/src/PocketMine/network/raknet/Packet.php @@ -19,66 +19,66 @@ * */ -namespace PocketMine\Network\RakNet; +namespace pocketmine\network\raknet; -use PocketMine\Network\Packet as NetworkPacket; -use PocketMine\Network\Protocol\AddEntityPacket; -use PocketMine\Network\Protocol\AddItemEntityPacket; -use PocketMine\Network\Protocol\AddMobPacket; -use PocketMine\Network\Protocol\AddPaintingPacket; -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\ClientConnectPacket; -use PocketMine\Network\Protocol\ContainerClosePacket; -use PocketMine\Network\Protocol\ContainerOpenPacket; -use PocketMine\Network\Protocol\ContainerSetContentPacket; -use PocketMine\Network\Protocol\ContainerSetDataPacket; -use PocketMine\Network\Protocol\ContainerSetSlotPacket; -use PocketMine\Network\Protocol\DataPacket; -use PocketMine\Network\Protocol\DisconnectPacket; -use PocketMine\Network\Protocol\DropItemPacket; -use PocketMine\Network\Protocol\EntityDataPacket; -use PocketMine\Network\Protocol\EntityEventPacket; -use PocketMine\Network\Protocol\ExplodePacket; -use PocketMine\Network\Protocol\HurtArmorPacket; -use PocketMine\Network\Protocol\Info as ProtocolInfo; -use PocketMine\Network\Protocol\InteractPacket; -use PocketMine\Network\Protocol\LevelEventPacket; -use PocketMine\Network\Protocol\LoginPacket; -use PocketMine\Network\Protocol\LoginStatusPacket; -use PocketMine\Network\Protocol\MessagePacket; -use PocketMine\Network\Protocol\MoveEntityPacket; -use PocketMine\Network\Protocol\MoveEntityPacket_PosRot; -use PocketMine\Network\Protocol\MovePlayerPacket; -use PocketMine\Network\Protocol\PingPacket; -use PocketMine\Network\Protocol\PlayerActionPacket; -use PocketMine\Network\Protocol\PlayerArmorEquipmentPacket; -use PocketMine\Network\Protocol\PlayerEquipmentPacket; -use PocketMine\Network\Protocol\PongPacket; -use PocketMine\Network\Protocol\ReadyPacket; -use PocketMine\Network\Protocol\RemoveBlockPacket; -use PocketMine\Network\Protocol\RemoveEntityPacket; -use PocketMine\Network\Protocol\RemovePlayerPacket; -use PocketMine\Network\Protocol\RequestChunkPacket; -use PocketMine\Network\Protocol\RespawnPacket; -use PocketMine\Network\Protocol\RotateHeadPacket; -use PocketMine\Network\Protocol\SendInventoryPacket; -use PocketMine\Network\Protocol\ServerHandshakePacket; -use PocketMine\Network\Protocol\SetEntityDataPacket; -use PocketMine\Network\Protocol\SetEntityMotionPacket; -use PocketMine\Network\Protocol\SetHealthPacket; -use PocketMine\Network\Protocol\SetSpawnPositionPacket; -use PocketMine\Network\Protocol\SetTimePacket; -use PocketMine\Network\Protocol\StartGamePacket; -use PocketMine\Network\Protocol\TakeItemEntityPacket; -use PocketMine\Network\Protocol\TileEventPacket; -use PocketMine\Network\Protocol\UnknownPacket; -use PocketMine\Network\Protocol\UpdateBlockPacket; -use PocketMine\Network\Protocol\UseItemPacket; -use PocketMine\Utils\Utils; +use pocketmine\network\Packet as NetworkPacket; +use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\protocol\AddItemEntityPacket; +use pocketmine\network\protocol\AddMobPacket; +use pocketmine\network\protocol\AddPaintingPacket; +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\ClientConnectPacket; +use pocketmine\network\protocol\ContainerClosePacket; +use pocketmine\network\protocol\ContainerOpenPacket; +use pocketmine\network\protocol\ContainerSetContentPacket; +use pocketmine\network\protocol\ContainerSetDataPacket; +use pocketmine\network\protocol\ContainerSetSlotPacket; +use pocketmine\network\protocol\DataPacket; +use pocketmine\network\protocol\DisconnectPacket; +use pocketmine\network\protocol\DropItemPacket; +use pocketmine\network\protocol\EntityDataPacket; +use pocketmine\network\protocol\EntityEventPacket; +use pocketmine\network\protocol\ExplodePacket; +use pocketmine\network\protocol\HurtArmorPacket; +use pocketmine\network\protocol\Info as ProtocolInfo; +use pocketmine\network\protocol\InteractPacket; +use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\protocol\LoginPacket; +use pocketmine\network\protocol\LoginStatusPacket; +use pocketmine\network\protocol\MessagePacket; +use pocketmine\network\protocol\MoveEntityPacket; +use pocketmine\network\protocol\MoveEntityPacket_PosRot; +use pocketmine\network\protocol\MovePlayerPacket; +use pocketmine\network\protocol\PingPacket; +use pocketmine\network\protocol\PlayerActionPacket; +use pocketmine\network\protocol\PlayerArmorEquipmentPacket; +use pocketmine\network\protocol\PlayerEquipmentPacket; +use pocketmine\network\protocol\PongPacket; +use pocketmine\network\protocol\ReadyPacket; +use pocketmine\network\protocol\RemoveBlockPacket; +use pocketmine\network\protocol\RemoveEntityPacket; +use pocketmine\network\protocol\RemovePlayerPacket; +use pocketmine\network\protocol\RequestChunkPacket; +use pocketmine\network\protocol\RespawnPacket; +use pocketmine\network\protocol\RotateHeadPacket; +use pocketmine\network\protocol\SendInventoryPacket; +use pocketmine\network\protocol\ServerHandshakePacket; +use pocketmine\network\protocol\SetEntityDataPacket; +use pocketmine\network\protocol\SetEntityMotionPacket; +use pocketmine\network\protocol\SetHealthPacket; +use pocketmine\network\protocol\SetSpawnPositionPacket; +use pocketmine\network\protocol\SetTimePacket; +use pocketmine\network\protocol\StartGamePacket; +use pocketmine\network\protocol\TakeItemEntityPacket; +use pocketmine\network\protocol\TileEventPacket; +use pocketmine\network\protocol\UnknownPacket; +use pocketmine\network\protocol\UpdateBlockPacket; +use pocketmine\network\protocol\UseItemPacket; +use pocketmine\utils\Utils; class Packet extends NetworkPacket{ private $packetID; diff --git a/src/PocketMine/network/rcon/RCON.php b/src/PocketMine/network/rcon/RCON.php index 235d432f8..fbc143e82 100644 --- a/src/PocketMine/network/rcon/RCON.php +++ b/src/PocketMine/network/rcon/RCON.php @@ -23,9 +23,9 @@ * Implementation of the Source RCON Protocol to allow remote console commands * Source: https://developer.valvesoftware.com/wiki/Source_RCON_Protocol */ -namespace PocketMine\Network\RCON; +namespace pocketmine\network\rcon; -use PocketMine\Server; +use pocketmine\Server; class RCON{ diff --git a/src/PocketMine/network/rcon/RCONInstance.php b/src/PocketMine/network/rcon/RCONInstance.php index cf4102691..5be2c440d 100644 --- a/src/PocketMine/network/rcon/RCONInstance.php +++ b/src/PocketMine/network/rcon/RCONInstance.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Network\RCON; +namespace pocketmine\network\rcon; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; class RCONInstance extends \Thread{ public $stop; diff --git a/src/PocketMine/network/upnp/UPnP.php b/src/PocketMine/network/upnp/UPnP.php index 65bc47065..e9b116dc2 100644 --- a/src/PocketMine/network/upnp/UPnP.php +++ b/src/PocketMine/network/upnp/UPnP.php @@ -22,9 +22,9 @@ /** * UPnP port forwarding support. Only for Windows */ -namespace PocketMine\Network\UPnP; +namespace pocketmine\network\upnp; -use PocketMine\Utils\Utils; +use pocketmine\utils\Utils; abstract class UPnP{ public static function PortForward($port){ diff --git a/src/PocketMine/permission/BanEntry.php b/src/PocketMine/permission/BanEntry.php index 7d963a6cd..4ca3a3c45 100644 --- a/src/PocketMine/permission/BanEntry.php +++ b/src/PocketMine/permission/BanEntry.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; class BanEntry{ public static $format = "Y-m-d H:i:s O"; diff --git a/src/PocketMine/permission/BanList.php b/src/PocketMine/permission/BanList.php index 63f6469d8..63c8508dd 100644 --- a/src/PocketMine/permission/BanList.php +++ b/src/PocketMine/permission/BanList.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Server; +use pocketmine\Server; class BanList{ diff --git a/src/PocketMine/permission/DefaultPermissions.php b/src/PocketMine/permission/DefaultPermissions.php index 698ae6bcf..ca94f28e0 100644 --- a/src/PocketMine/permission/DefaultPermissions.php +++ b/src/PocketMine/permission/DefaultPermissions.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Server; +use pocketmine\Server; abstract class DefaultPermissions{ const ROOT = "pocketmine"; diff --git a/src/PocketMine/permission/Permissible.php b/src/PocketMine/permission/Permissible.php index 1556104b2..777337fb8 100644 --- a/src/PocketMine/permission/Permissible.php +++ b/src/PocketMine/permission/Permissible.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Plugin\Plugin; +use pocketmine\plugin\Plugin; interface Permissible extends ServerOperator{ diff --git a/src/PocketMine/permission/PermissibleBase.php b/src/PocketMine/permission/PermissibleBase.php index 1674ae617..5d94f8796 100644 --- a/src/PocketMine/permission/PermissibleBase.php +++ b/src/PocketMine/permission/PermissibleBase.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Plugin\Plugin; -use PocketMine\Server; +use pocketmine\plugin\Plugin; +use pocketmine\Server; class PermissibleBase implements Permissible{ /** @var ServerOperator */ diff --git a/src/PocketMine/permission/Permission.php b/src/PocketMine/permission/Permission.php index 213bed729..35da701c8 100644 --- a/src/PocketMine/permission/Permission.php +++ b/src/PocketMine/permission/Permission.php @@ -22,9 +22,9 @@ /** * Permission related classes */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Server; +use pocketmine\Server; /** * Represents a permission diff --git a/src/PocketMine/permission/PermissionAttachment.php b/src/PocketMine/permission/PermissionAttachment.php index 7444d2872..f70010d5e 100644 --- a/src/PocketMine/permission/PermissionAttachment.php +++ b/src/PocketMine/permission/PermissionAttachment.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; -use PocketMine\Plugin\Plugin; +use pocketmine\plugin\Plugin; class PermissionAttachment{ /** @var PermissionRemovedExecutor */ diff --git a/src/PocketMine/permission/PermissionAttachmentInfo.php b/src/PocketMine/permission/PermissionAttachmentInfo.php index b100e4983..5bb3aba6b 100644 --- a/src/PocketMine/permission/PermissionAttachmentInfo.php +++ b/src/PocketMine/permission/PermissionAttachmentInfo.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; class PermissionAttachmentInfo{ diff --git a/src/PocketMine/permission/PermissionRemovedExecutor.php b/src/PocketMine/permission/PermissionRemovedExecutor.php index 8fda3e418..2ecfeed58 100644 --- a/src/PocketMine/permission/PermissionRemovedExecutor.php +++ b/src/PocketMine/permission/PermissionRemovedExecutor.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; interface PermissionRemovedExecutor{ diff --git a/src/PocketMine/permission/ServerOperator.php b/src/PocketMine/permission/ServerOperator.php index 8613be726..0bbcecbfc 100644 --- a/src/PocketMine/permission/ServerOperator.php +++ b/src/PocketMine/permission/ServerOperator.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Permission; +namespace pocketmine\permission; interface ServerOperator{ diff --git a/src/PocketMine/plugin/EventExecutor.php b/src/PocketMine/plugin/EventExecutor.php index ddee9dd94..b7f94e709 100644 --- a/src/PocketMine/plugin/EventExecutor.php +++ b/src/PocketMine/plugin/EventExecutor.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Event\Event; -use PocketMine\Event\Listener; +use pocketmine\event\Event; +use pocketmine\event\Listener; interface EventExecutor{ diff --git a/src/PocketMine/plugin/FolderPluginLoader.php b/src/PocketMine/plugin/FolderPluginLoader.php index 80ce1f3e9..00a0ffde4 100644 --- a/src/PocketMine/plugin/FolderPluginLoader.php +++ b/src/PocketMine/plugin/FolderPluginLoader.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Event\Plugin\PluginDisableEvent; -use PocketMine\Event\Plugin\PluginEnableEvent; -use PocketMine\Server; +use pocketmine\event\plugin\PluginDisableEvent; +use pocketmine\event\plugin\PluginEnableEvent; +use pocketmine\Server; /** * Handles different types of plugins diff --git a/src/PocketMine/plugin/MethodEventExecutor.php b/src/PocketMine/plugin/MethodEventExecutor.php index 94eae0abe..a735f2954 100644 --- a/src/PocketMine/plugin/MethodEventExecutor.php +++ b/src/PocketMine/plugin/MethodEventExecutor.php @@ -19,10 +19,10 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Event\Event; -use PocketMine\Event\Listener; +use pocketmine\event\Event; +use pocketmine\event\Listener; class MethodEventExecutor implements EventExecutor{ diff --git a/src/PocketMine/plugin/PharPluginLoader.php b/src/PocketMine/plugin/PharPluginLoader.php index 4f5154539..169516ca8 100644 --- a/src/PocketMine/plugin/PharPluginLoader.php +++ b/src/PocketMine/plugin/PharPluginLoader.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Event\Plugin\PluginDisableEvent; -use PocketMine\Event\Plugin\PluginEnableEvent; -use PocketMine\Server; +use pocketmine\event\plugin\PluginDisableEvent; +use pocketmine\event\plugin\PluginEnableEvent; +use pocketmine\Server; /** * Handles different types of plugins @@ -49,7 +49,6 @@ class PharPluginLoader implements PluginLoader{ */ public function loadPlugin($file){ if(\Phar::isValidPharFilename($file) and ($description = $this->getPluginDescription($file)) instanceof PluginDescription){ - $phar = new \Phar($file); console("[INFO] Loading " . $description->getName()); $dataFolder = dirname($file) . DIRECTORY_SEPARATOR . $description->getName(); if(file_exists($dataFolder) and !is_dir($dataFolder)){ diff --git a/src/PocketMine/plugin/Plugin.php b/src/PocketMine/plugin/Plugin.php index f987b2f5b..5348e58b1 100644 --- a/src/PocketMine/plugin/Plugin.php +++ b/src/PocketMine/plugin/Plugin.php @@ -22,7 +22,7 @@ /** * Plugin related classes */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; /** diff --git a/src/PocketMine/plugin/PluginBase.php b/src/PocketMine/plugin/PluginBase.php index f7d90e71b..093cdfd0c 100644 --- a/src/PocketMine/plugin/PluginBase.php +++ b/src/PocketMine/plugin/PluginBase.php @@ -19,21 +19,21 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Command\Command; -use PocketMine\Command\CommandExecutor; -use PocketMine\Command\CommandSender; -use PocketMine\Command\PluginCommand; -use PocketMine\Server; -use PocketMine\Utils\Config; +use pocketmine\command\Command; +use pocketmine\command\CommandExecutor; +use pocketmine\command\CommandSender; +use pocketmine\command\PluginCommand; +use pocketmine\Server; +use pocketmine\utils\Config; abstract class PluginBase implements Plugin, CommandExecutor{ /** @var PluginLoader */ private $loader; - /** @var \PocketMine\Server */ + /** @var \pocketmine\Server */ private $server; /** @var bool */ diff --git a/src/PocketMine/plugin/PluginDescription.php b/src/PocketMine/plugin/PluginDescription.php index bd97df726..7a66945cb 100644 --- a/src/PocketMine/plugin/PluginDescription.php +++ b/src/PocketMine/plugin/PluginDescription.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Permission\Permission; +use pocketmine\permission\Permission; class PluginDescription{ private $name; @@ -60,7 +60,7 @@ class PluginDescription{ $this->version = $plugin["version"]; $this->main = $plugin["main"]; $this->api = !is_array($plugin["api"]) ? array($plugin["api"]) : $plugin["api"]; - if(stripos($this->main, "PocketMine\\") === 0){ + if(stripos($this->main, "pocketmine\\") === 0){ trigger_error("Invalid PluginDescription main, cannot start within the PocketMine namespace", E_USER_ERROR); return; @@ -88,12 +88,12 @@ class PluginDescription{ } if(isset($plugin["load"])){ $order = strtoupper($plugin["load"]); - if(!defined("PocketMine\\Plugin\\PluginLoadOrder::" . $order)){ + if(!defined("pocketmine\\plugin\\PluginLoadOrder::" . $order)){ trigger_error("Invalid PluginDescription load", E_USER_ERROR); return; }else{ - $this->order = constant("PocketMine\\Plugin\\PluginLoadOrder::" . $order); + $this->order = constant("pocketmine\\plugin\\PluginLoadOrder::" . $order); } } $this->authors = array(); diff --git a/src/PocketMine/plugin/PluginLoadOrder.php b/src/PocketMine/plugin/PluginLoadOrder.php index 1317499c6..85bd3da40 100644 --- a/src/PocketMine/plugin/PluginLoadOrder.php +++ b/src/PocketMine/plugin/PluginLoadOrder.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; abstract class PluginLoadOrder{ diff --git a/src/PocketMine/plugin/PluginLoader.php b/src/PocketMine/plugin/PluginLoader.php index 07a5d05a2..4cdeab66b 100644 --- a/src/PocketMine/plugin/PluginLoader.php +++ b/src/PocketMine/plugin/PluginLoader.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; /** * Handles different types of plugins diff --git a/src/PocketMine/plugin/PluginManager.php b/src/PocketMine/plugin/PluginManager.php index 9f3742e08..c16d6cdcf 100644 --- a/src/PocketMine/plugin/PluginManager.php +++ b/src/PocketMine/plugin/PluginManager.php @@ -19,17 +19,17 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Command\PluginCommand; -use PocketMine\Command\SimpleCommandMap; -use PocketMine\Event\Event; -use PocketMine\Event\EventPriority; -use PocketMine\Event\HandlerList; -use PocketMine\Event\Listener; -use PocketMine\Permission\Permissible; -use PocketMine\Permission\Permission; -use PocketMine\Server; +use pocketmine\command\PluginCommand; +use pocketmine\command\SimpleCommandMap; +use pocketmine\event\Event; +use pocketmine\event\EventPriority; +use pocketmine\event\HandlerList; +use pocketmine\event\Listener; +use pocketmine\permission\Permissible; +use pocketmine\permission\Permission; +use pocketmine\Server; /** * Manages all the plugins, Permissions and Permissibles @@ -120,7 +120,7 @@ class PluginManager{ * @return boolean */ public function registerInterface($loader){ - if(is_subclass_of($loader, "PocketMine\\Plugin\\PluginLoader")){ + if(is_subclass_of($loader, "pocketmine\\plugin\\PluginLoader")){ $loader = new $loader($this->server); }else{ return false; @@ -627,8 +627,8 @@ class PluginManager{ $ignoreCancelled = false; if(preg_match("/^[\t ]*\\* @priority[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){ $matches[1] = strtoupper($matches[1]); - if(defined("PocketMine\\Event\\EventPriority::".$matches[1])){ - $priority = constant("PocketMine\\Event\\EventPriority::".$matches[1]); + if(defined("pocketmine\\event\\EventPriority::".$matches[1])){ + $priority = constant("pocketmine\\event\\EventPriority::".$matches[1]); } } if(preg_match("/^[\t ]*\\* @ignoreCancelled[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){ @@ -640,7 +640,7 @@ class PluginManager{ } } $parameters = $method->getParameters(); - if(count($parameters) === 1 and $parameters[0]->getClass() instanceof \ReflectionClass and is_subclass_of($parameters[0]->getClass()->getName(), "PocketMine\\Event\\Event")){ + if(count($parameters) === 1 and $parameters[0]->getClass() instanceof \ReflectionClass and is_subclass_of($parameters[0]->getClass()->getName(), "pocketmine\\event\\Event")){ $this->registerEvent($parameters[0]->getClass()->getName(), $listener, $priority, new MethodEventExecutor($method->getName()), $plugin, $ignoreCancelled); } } @@ -656,7 +656,7 @@ class PluginManager{ * @param bool $ignoreCancelled */ public function registerEvent($event, Listener $listener, $priority, EventExecutor $executor, Plugin $plugin, $ignoreCancelled = false){ - if(!is_subclass_of($event, "PocketMine\\Event\\Event")){ + if(!is_subclass_of($event, "pocketmine\\event\\Event")){ trigger_error($event . " is not a valid Event", E_USER_WARNING); return; diff --git a/src/PocketMine/plugin/RegisteredListener.php b/src/PocketMine/plugin/RegisteredListener.php index 3b6ab7b56..b24e01e5e 100644 --- a/src/PocketMine/plugin/RegisteredListener.php +++ b/src/PocketMine/plugin/RegisteredListener.php @@ -19,11 +19,11 @@ * */ -namespace PocketMine\Plugin; +namespace pocketmine\plugin; -use PocketMine\Event\Cancellable; -use PocketMine\Event\Event; -use PocketMine\Event\Listener; +use pocketmine\event\Cancellable; +use pocketmine\event\Event; +use pocketmine\event\Listener; class RegisteredListener{ diff --git a/src/PocketMine/pmf/LevelFormat.php b/src/PocketMine/pmf/LevelFormat.php index 7267944f3..4d48a27e0 100644 --- a/src/PocketMine/pmf/LevelFormat.php +++ b/src/PocketMine/pmf/LevelFormat.php @@ -19,13 +19,13 @@ * */ -namespace PocketMine\PMF; +namespace pocketmine\pmf; -use PocketMine\Level\Level; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Enum; -use PocketMine\Utils\Utils; +use pocketmine\level\Level; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Enum; +use pocketmine\utils\Utils; class LevelFormat extends PMF{ const VERSION = 2; diff --git a/src/PocketMine/pmf/PMF.php b/src/PocketMine/pmf/PMF.php index 1ac49f1d8..8d009a6e3 100644 --- a/src/PocketMine/pmf/PMF.php +++ b/src/PocketMine/pmf/PMF.php @@ -23,7 +23,7 @@ * PMF (PocketMine Format) handling * TODO: Remove in favor of NBT */ -namespace PocketMine\PMF; +namespace pocketmine\pmf; class PMF{ diff --git a/src/PocketMine/recipes/Crafting.php b/src/PocketMine/recipes/Crafting.php index 91d470b33..bd6843854 100644 --- a/src/PocketMine/recipes/Crafting.php +++ b/src/PocketMine/recipes/Crafting.php @@ -22,9 +22,9 @@ /** * Crafting / Smelting / Fuel data and fast search databases */ -namespace PocketMine\Recipes; +namespace pocketmine\recipes; -use PocketMine\Item\Item; +use pocketmine\item\Item; abstract class Crafting{ diff --git a/src/PocketMine/recipes/Fuel.php b/src/PocketMine/recipes/Fuel.php index cf9989379..3f0663b0c 100644 --- a/src/PocketMine/recipes/Fuel.php +++ b/src/PocketMine/recipes/Fuel.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Recipes; +namespace pocketmine\recipes; -use PocketMine\Item\Item; +use pocketmine\item\Item; abstract class Fuel{ public static $duration = array( diff --git a/src/PocketMine/recipes/Smelt.php b/src/PocketMine/recipes/Smelt.php index 7b1187875..abbdd5445 100644 --- a/src/PocketMine/recipes/Smelt.php +++ b/src/PocketMine/recipes/Smelt.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Recipes; +namespace pocketmine\recipes; -use PocketMine\Item\Item; +use pocketmine\item\Item; class Smelt{ public static $product = array( diff --git a/src/PocketMine/scheduler/CallbackTask.php b/src/PocketMine/scheduler/CallbackTask.php index 831bae18f..1cfc65804 100644 --- a/src/PocketMine/scheduler/CallbackTask.php +++ b/src/PocketMine/scheduler/CallbackTask.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; /** * Allows the creation if simple callbacks with extra data diff --git a/src/PocketMine/scheduler/PluginTask.php b/src/PocketMine/scheduler/PluginTask.php index d2ab8cae4..124ca27a6 100644 --- a/src/PocketMine/scheduler/PluginTask.php +++ b/src/PocketMine/scheduler/PluginTask.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; -use PocketMine\Plugin\Plugin; +use pocketmine\plugin\Plugin; /** * Base class for plugin tasks. Allows the Server to delete them easily when needed diff --git a/src/PocketMine/scheduler/ServerScheduler.php b/src/PocketMine/scheduler/ServerScheduler.php index ea4ed4502..528ee22fd 100644 --- a/src/PocketMine/scheduler/ServerScheduler.php +++ b/src/PocketMine/scheduler/ServerScheduler.php @@ -22,9 +22,9 @@ /** * Task scheduling related classes */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; -use PocketMine\Plugin\Plugin; +use pocketmine\plugin\Plugin; class ServerScheduler{ diff --git a/src/PocketMine/scheduler/Task.php b/src/PocketMine/scheduler/Task.php index 1ffa1d460..0b4d2bded 100644 --- a/src/PocketMine/scheduler/Task.php +++ b/src/PocketMine/scheduler/Task.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; abstract class Task{ diff --git a/src/PocketMine/scheduler/TaskHandler.php b/src/PocketMine/scheduler/TaskHandler.php index 905474d4d..4cd09563b 100644 --- a/src/PocketMine/scheduler/TaskHandler.php +++ b/src/PocketMine/scheduler/TaskHandler.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; class TaskHandler{ diff --git a/src/PocketMine/scheduler/TaskQueue.php b/src/PocketMine/scheduler/TaskQueue.php index 8b9827bbf..d872f2610 100644 --- a/src/PocketMine/scheduler/TaskQueue.php +++ b/src/PocketMine/scheduler/TaskQueue.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; class TaskQueue extends \SplPriorityQueue{ diff --git a/src/PocketMine/scheduler/TickScheduler.php b/src/PocketMine/scheduler/TickScheduler.php index 40bdb8210..a4d6c8b97 100644 --- a/src/PocketMine/scheduler/TickScheduler.php +++ b/src/PocketMine/scheduler/TickScheduler.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Scheduler; +namespace pocketmine\scheduler; class TickScheduler extends \Thread{ protected $sleepTime; diff --git a/src/PocketMine/tile/Chest.php b/src/PocketMine/tile/Chest.php index 5f389a14e..aa0a8ab16 100644 --- a/src/PocketMine/tile/Chest.php +++ b/src/PocketMine/tile/Chest.php @@ -19,16 +19,16 @@ * */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Level\Level; -use PocketMine\Math\Vector3 as Vector3; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\String; -use PocketMine\Network\Protocol\EntityDataPacket; -use PocketMine\Player; +use pocketmine\level\Level; +use pocketmine\math\Vector3 as Vector3; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\String; +use pocketmine\network\protocol\EntityDataPacket; +use pocketmine\Player; class Chest extends Spawnable{ use Container; diff --git a/src/PocketMine/tile/Container.php b/src/PocketMine/tile/Container.php index 39782550c..191ce5161 100644 --- a/src/PocketMine/tile/Container.php +++ b/src/PocketMine/tile/Container.php @@ -19,16 +19,19 @@ * */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Event\Tile\TileInventoryChangeEvent; -use PocketMine\Item\Item; -use PocketMine\NBT\Tag\Byte; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Short; -use PocketMine\Network; -use PocketMine\Player; -use PocketMine\Server; +use pocketmine\event\tile\TileInventoryChangeEvent; +use pocketmine\item\Item; +use pocketmine\nbt\tag\Byte; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Short; +use pocketmine\Network; +use pocketmine\network\protocol\ContainerOpenPacket; +use pocketmine\network\protocol\ContainerSetContentPacket; +use pocketmine\network\protocol\TileEventPacket; +use pocketmine\Player; +use pocketmine\Server; trait Container{ public function openInventory(Player $player){ @@ -51,7 +54,7 @@ trait Container{ $player->windows[$id] = $this; } - $pk = new Network\Protocol\ContainerOpenPacket; + $pk = new ContainerOpenPacket(); $pk->windowid = $id; $pk->type = 0; $pk->slots = is_array($player->windows[$id]) ? Chest::SLOTS << 1 : Chest::SLOTS; @@ -64,7 +67,7 @@ trait Container{ if(is_array($player->windows[$id])){ $all = $this->level->getPlayers(); foreach($player->windows[$id] as $ob){ - $pk = new Network\Protocol\TileEventPacket; + $pk = new TileEventPacket(); $pk->x = $ob->x; $pk->y = $ob->y; $pk->z = $ob->z; @@ -81,7 +84,7 @@ trait Container{ } } }else{ - $pk = new Network\Protocol\TileEventPacket; + $pk = new TileEventPacket(); $pk->x = $this->x; $pk->y = $this->y; $pk->z = $this->z; @@ -98,7 +101,7 @@ trait Container{ } } - $pk = new Network\Protocol\ContainerSetContentPacket; + $pk = new ContainerSetContentPacket(); $pk->windowid = $id; $pk->slots = $slots; $player->dataPacket($pk); @@ -109,7 +112,7 @@ trait Container{ $player->windowCnt = $id = max(2, $player->windowCnt % 99); $player->windows[$id] = $this; - $pk = new Network\Protocol\ContainerOpenPacket; + $pk = new ContainerOpenPacket(); $pk->windowid = $id; $pk->type = 2; $pk->slots = Furnace::SLOTS; @@ -127,7 +130,7 @@ trait Container{ $slots[] = Item::get(Item::AIR, 0, 0); } } - $pk = new Network\Protocol\ContainerSetContentPacket; + $pk = new ContainerSetContentPacket(); $pk->windowid = $id; $pk->slots = $slots; $player->dataPacket($pk); diff --git a/src/PocketMine/tile/Furnace.php b/src/PocketMine/tile/Furnace.php index 4a9d97eb0..ca0b35864 100644 --- a/src/PocketMine/tile/Furnace.php +++ b/src/PocketMine/tile/Furnace.php @@ -19,12 +19,12 @@ * */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Block\Block; -use PocketMine\Item\Item; -use PocketMine\Level\Level; -use PocketMine\NBT\Tag\Compound; +use pocketmine\block\Block; +use pocketmine\item\Item; +use pocketmine\level\Level; +use pocketmine\nbt\tag\Compound; class Furnace extends Tile{ use Container; diff --git a/src/PocketMine/tile/Sign.php b/src/PocketMine/tile/Sign.php index 04358acce..76b5fe0ec 100644 --- a/src/PocketMine/tile/Sign.php +++ b/src/PocketMine/tile/Sign.php @@ -19,15 +19,15 @@ * */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Level\Level; -use PocketMine\NBT\NBT; -use PocketMine\NBT\Tag\Compound; -use PocketMine\NBT\Tag\Int; -use PocketMine\NBT\Tag\String; -use PocketMine\Network\Protocol\EntityDataPacket; -use PocketMine\Player; +use pocketmine\level\Level; +use pocketmine\nbt\NBT; +use pocketmine\nbt\tag\Compound; +use pocketmine\nbt\tag\Int; +use pocketmine\nbt\tag\String; +use pocketmine\network\protocol\EntityDataPacket; +use pocketmine\Player; class Sign extends Spawnable{ diff --git a/src/PocketMine/tile/Spawnable.php b/src/PocketMine/tile/Spawnable.php index b2beab77d..9bf873066 100644 --- a/src/PocketMine/tile/Spawnable.php +++ b/src/PocketMine/tile/Spawnable.php @@ -19,9 +19,9 @@ * */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Player; +use pocketmine\Player; abstract class Spawnable extends Tile{ public abstract function spawnTo(Player $player); diff --git a/src/PocketMine/tile/Tile.php b/src/PocketMine/tile/Tile.php index 9e2942407..2b73db6f4 100644 --- a/src/PocketMine/tile/Tile.php +++ b/src/PocketMine/tile/Tile.php @@ -23,13 +23,13 @@ * All the Tile classes and related classes * TODO: Add Nether Reactor tile */ -namespace PocketMine\Tile; +namespace pocketmine\tile; -use PocketMine\Level\Level; -use PocketMine\Level\Position; -use PocketMine\NBT\Tag\Compound; -use PocketMine\PMF\LevelFormat; -use PocketMine\Server; +use pocketmine\level\Level; +use pocketmine\level\Position; +use pocketmine\nbt\tag\Compound; +use pocketmine\pmf\LevelFormat; +use pocketmine\Server; abstract class Tile extends Position{ const SIGN = "Sign"; diff --git a/src/PocketMine/utils/Cache.php b/src/PocketMine/utils/Cache.php index ceb5f5feb..8733a31c2 100644 --- a/src/PocketMine/utils/Cache.php +++ b/src/PocketMine/utils/Cache.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Utils; +namespace pocketmine\utils; class Cache{ diff --git a/src/PocketMine/utils/Config.php b/src/PocketMine/utils/Config.php index dd4c25aa8..4b9245c8f 100644 --- a/src/PocketMine/utils/Config.php +++ b/src/PocketMine/utils/Config.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Utils; +namespace pocketmine\utils; /** diff --git a/src/PocketMine/utils/Random.php b/src/PocketMine/utils/Random.php index 07db4a6b0..b688fa392 100644 --- a/src/PocketMine/utils/Random.php +++ b/src/PocketMine/utils/Random.php @@ -19,15 +19,11 @@ * */ -namespace PocketMine\Utils; +namespace pocketmine\utils; /** - * Class Random - * * Unsecure Random Number Generator, used for fast seeded values - * - * @package PocketMine\Utils */ class Random{ private $z, $w; diff --git a/src/PocketMine/utils/TextFormat.php b/src/PocketMine/utils/TextFormat.php index edcd1e660..16dd1cba0 100644 --- a/src/PocketMine/utils/TextFormat.php +++ b/src/PocketMine/utils/TextFormat.php @@ -19,15 +19,11 @@ * */ -namespace PocketMine\Utils; +namespace pocketmine\utils; /** - * Class TextFormat - * * Class used to handle Minecraft chat format, and convert it to other formats like ANSI or HTML - * - * @package PocketMine\Utils */ class TextFormat{ const BLACK = "§0"; diff --git a/src/PocketMine/utils/Utils.php b/src/PocketMine/utils/Utils.php index fcd5fa2b7..a5daf896b 100644 --- a/src/PocketMine/utils/Utils.php +++ b/src/PocketMine/utils/Utils.php @@ -22,9 +22,9 @@ /** * Various Utilities used around the code */ -namespace PocketMine\Utils; +namespace pocketmine\utils; -use PocketMine\Item\Item; +use pocketmine\item\Item; /** * Class Utils @@ -826,4 +826,4 @@ class Utils{ } -define("PocketMine\\Utils\\ENDIANNESS", (pack("d", 1) === "\77\360\0\0\0\0\0\0" ? Utils::BIG_ENDIAN : Utils::LITTLE_ENDIAN)); \ No newline at end of file +define("pocketmine\\utils\\ENDIANNESS", (pack("d", 1) === "\77\360\0\0\0\0\0\0" ? Utils::BIG_ENDIAN : Utils::LITTLE_ENDIAN)); \ No newline at end of file diff --git a/src/PocketMine/utils/VersionString.php b/src/PocketMine/utils/VersionString.php index 2ff122b0f..33a18451d 100644 --- a/src/PocketMine/utils/VersionString.php +++ b/src/PocketMine/utils/VersionString.php @@ -19,14 +19,11 @@ * */ -namespace PocketMine\Utils; +namespace pocketmine\utils; /** - * Class VersionString - * Manages PocketMine-MP Version strings, and compares them - * - * @package PocketMine\Utils + * Manages PocketMine-MP version strings, and compares them */ class VersionString{ public static $stageOrder = array( @@ -44,7 +41,7 @@ class VersionString{ private $development = false; private $generation; - public function __construct($version = \PocketMine\VERSION){ + public function __construct($version = \pocketmine\VERSION){ if(is_int($version)){ $this->minor = $version & 0x1F; $this->major = ($version >> 5) & 0x0F; diff --git a/src/PocketMine/wizard/Installer.php b/src/PocketMine/wizard/Installer.php index ea9f9e938..d7cf2e6d1 100644 --- a/src/PocketMine/wizard/Installer.php +++ b/src/PocketMine/wizard/Installer.php @@ -23,10 +23,10 @@ * Set-up wizard used on the first run * Can be disabled with --no-wizard */ -namespace PocketMine\Wizard; +namespace pocketmine\wizard; -use PocketMine\Utils\Config; -use PocketMine\Utils\Utils; +use pocketmine\utils\Config; +use pocketmine\utils\Utils; class Installer{ const DEFAULT_NAME = "Minecraft: PE Server"; @@ -90,7 +90,7 @@ LICENSE; } private function generateBaseConfig(){ - $config = new Config(\PocketMine\DATA . "server.properties", Config::PROPERTIES); + $config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); echo "[?] " . $this->lang->name_your_server . " (" . self::DEFAULT_NAME . "): "; $config->set("server-name", $this->getInput(self::DEFAULT_NAME)); echo "[*] " . $this->lang->port_warning . "\n"; @@ -130,13 +130,13 @@ LICENSE; if($op === ""){ echo "[!] " . $this->lang->op_warning . "\n"; }else{ - $ops = new Config(\PocketMine\DATA . "ops.txt", Config::ENUM); + $ops = new Config(\pocketmine\DATA . "ops.txt", Config::ENUM); $ops->set($op, true); $ops->save(); } echo "[*] " . $this->lang->whitelist_info . "\n"; echo "[?] " . $this->lang->whitelist_enable . " (y/N): "; - $config = new Config(\PocketMine\DATA . "server.properties", Config::PROPERTIES); + $config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); if(strtolower($this->getInput("n")) === "y"){ echo "[!] " . $this->lang->whitelist_warning . "\n"; $config->set("white-list", true); @@ -147,7 +147,7 @@ LICENSE; } private function networkFunctions(){ - $config = new Config(\PocketMine\DATA . "server.properties", Config::PROPERTIES); + $config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); echo "[!] " . $this->lang->query_warning1 . "\n"; echo "[!] " . $this->lang->query_warning2 . "\n"; echo "[?] " . $this->lang->query_disable . " (y/N): "; diff --git a/src/PocketMine/wizard/InstallerLang.php b/src/PocketMine/wizard/InstallerLang.php index 7194f9c7d..fc8c3bee9 100644 --- a/src/PocketMine/wizard/InstallerLang.php +++ b/src/PocketMine/wizard/InstallerLang.php @@ -19,7 +19,7 @@ * */ -namespace PocketMine\Wizard; +namespace pocketmine\wizard; class InstallerLang{ @@ -47,11 +47,11 @@ class InstallerLang{ private $langfile; public function __construct($lang = ""){ - if(file_exists(\PocketMine\PATH . "src/lang/Installer/" . $lang . ".ini")){ + if(file_exists(\pocketmine\PATH . "src/lang/Installer/" . $lang . ".ini")){ $this->lang = $lang; - $this->langfile = \PocketMine\PATH . "src/lang/Installer/" . $lang . ".ini"; + $this->langfile = \pocketmine\PATH . "src/lang/Installer/" . $lang . ".ini"; }else{ - $l = glob(\PocketMine\PATH . "src/lang/Installer/" . $lang . "_*.ini"); + $l = glob(\pocketmine\PATH . "src/lang/Installer/" . $lang . "_*.ini"); if(count($l) > 0){ $files = array(); foreach($l as $file){ @@ -62,14 +62,14 @@ class InstallerLang{ $l = key($files); $l = substr($l, strrpos($l, "/") + 1, -4); $this->lang = isset(self::$languages[$l]) ? $l : $lang; - $this->langfile = \PocketMine\PATH . "src/lang/Installer/" . $l . ".ini"; + $this->langfile = \pocketmine\PATH . "src/lang/Installer/" . $l . ".ini"; }else{ $this->lang = "en"; - $this->langfile = \PocketMine\PATH . "src/lang/Installer/en.ini"; + $this->langfile = \pocketmine\PATH . "src/lang/Installer/en.ini"; } } - $this->loadLang(\PocketMine\PATH . "src/lang/Installer/en.ini", "en"); + $this->loadLang(\pocketmine\PATH . "src/lang/Installer/en.ini", "en"); if($this->lang !== "en"){ $this->loadLang($this->langfile, $this->lang); } diff --git a/src/SPL/SplClassLoader.php b/src/SPL/SplClassLoader.php index a15ce485b..d081b8d95 100644 --- a/src/SPL/SplClassLoader.php +++ b/src/SPL/SplClassLoader.php @@ -181,7 +181,6 @@ class SplClassLoader implements SplAutoloader{ return false; } - /** * Transform resource name into its relative resource path representation. * diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php index 25ad732a5..17aa965d3 100644 --- a/src/tests/ServerSuiteTest.php +++ b/src/tests/ServerSuiteTest.php @@ -1,6 +1,6 @@ load(); testCase("event attached", is_integer($server->event("server.start", array($this, "hook"))), true); $server->init(); @@ -58,7 +58,7 @@ class ServerSuiteTest{ public function hook(){ testCase("event fired", true, true); - $server = \PocketMine\Server::getInstance(); + $server = \pocketmine\Server::getInstance(); testCase("defaultgamemode", $server->getGamemode(), "survival"); diff --git a/start.cmd b/start.cmd index fd5d738b0..61390b088 100644 --- a/start.cmd +++ b/start.cmd @@ -7,8 +7,8 @@ if exist bin\php\php.exe ( set PHP_BINARY=php ) -if exist src\PocketMine\PocketMine.php ( - set POCKETMINE_FILE=src\PocketMine\PocketMine.php +if exist src\pocketmine\PocketMine.php ( + set POCKETMINE_FILE=src\pocketmine\PocketMine.php ) else ( if exist PocketMine-MP.phar ( set POCKETMINE_FILE=PocketMine-MP.phar diff --git a/start.sh b/start.sh index 6ed3d1b29..b427aa26f 100755 --- a/start.sh +++ b/start.sh @@ -35,7 +35,7 @@ fi if [ "$POCKETMINE_FILE" == "" ]; then if [ -f ./src/PocketMine/PocketMine.php ]; then - POCKETMINE_FILE="./src/PocketMine/PocketMine.php" + POCKETMINE_FILE="./src/pocketmine/PocketMine.php" elif [ -f ./PocketMine-MP.phar ]; then POCKETMINE_FILE="./PocketMine-MP.phar" else