From 4d1e2d1b3a52dc70cd78404b332bf59bfdcdbbd5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 18 Jul 2018 11:03:21 +0100 Subject: [PATCH] Rename SourceInterface -> NetworkInterface SourceInterface doesn't make sense really... --- src/pocketmine/Player.php | 12 +++++------ src/pocketmine/Server.php | 12 +++++------ .../event/player/PlayerCreationEvent.php | 20 +++++++++---------- .../server/NetworkInterfaceCrashEvent.php | 4 ++-- .../event/server/NetworkInterfaceEvent.php | 12 +++++------ ...rface.php => AdvancedNetworkInterface.php} | 2 +- src/pocketmine/network/Network.php | 18 ++++++++--------- ...urceInterface.php => NetworkInterface.php} | 2 +- .../network/mcpe/RakLibInterface.php | 4 ++-- src/pocketmine/network/query/QueryHandler.php | 4 ++-- 10 files changed, 45 insertions(+), 45 deletions(-) rename src/pocketmine/network/{AdvancedSourceInterface.php => AdvancedNetworkInterface.php} (96%) rename src/pocketmine/network/{SourceInterface.php => NetworkInterface.php} (98%) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 58f03b5f2..4c6c49ca4 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -144,7 +144,7 @@ use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\VerifyLoginTask; -use pocketmine\network\SourceInterface; +use pocketmine\network\NetworkInterface; use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissionAttachment; use pocketmine\permission\PermissionAttachmentInfo; @@ -186,7 +186,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } - /** @var SourceInterface */ + /** @var NetworkInterface */ protected $interface; /** @@ -705,11 +705,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } /** - * @param SourceInterface $interface - * @param string $ip - * @param int $port + * @param NetworkInterface $interface + * @param string $ip + * @param int $port */ - public function __construct(SourceInterface $interface, string $ip, int $port){ + public function __construct(NetworkInterface $interface, string $ip, int $port){ $this->interface = $interface; $this->perm = new PermissibleBase($this); $this->namedtag = new CompoundTag(); diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index cee185ba2..3e7a46c64 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -68,7 +68,7 @@ use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\LongTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\AdvancedSourceInterface; +use pocketmine\network\AdvancedNetworkInterface; use pocketmine\network\mcpe\CompressBatchedTask; use pocketmine\network\mcpe\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\DataPacket; @@ -2459,14 +2459,14 @@ class Server{ } /** - * @param AdvancedSourceInterface $interface - * @param string $address - * @param int $port - * @param string $payload + * @param AdvancedNetworkInterface $interface + * @param string $address + * @param int $port + * @param string $payload * * TODO: move this to Network */ - public function handlePacket(AdvancedSourceInterface $interface, string $address, int $port, string $payload){ + public function handlePacket(AdvancedNetworkInterface $interface, string $address, int $port, string $payload){ try{ if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){ $this->queryHandler->handle($interface, $address, $port, $payload); diff --git a/src/pocketmine/event/player/PlayerCreationEvent.php b/src/pocketmine/event/player/PlayerCreationEvent.php index 1f3c406f1..a7485a21b 100644 --- a/src/pocketmine/event/player/PlayerCreationEvent.php +++ b/src/pocketmine/event/player/PlayerCreationEvent.php @@ -24,14 +24,14 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\event\Event; -use pocketmine\network\SourceInterface; +use pocketmine\network\NetworkInterface; use pocketmine\Player; /** * Allows the creation of players overriding the base Player class */ class PlayerCreationEvent extends Event{ - /** @var SourceInterface */ + /** @var NetworkInterface */ private $interface; /** @var string */ private $address; @@ -44,13 +44,13 @@ class PlayerCreationEvent extends Event{ private $playerClass; /** - * @param SourceInterface $interface - * @param Player::class $baseClass - * @param Player::class $playerClass - * @param string $address - * @param int $port + * @param NetworkInterface $interface + * @param Player::class $baseClass + * @param Player::class $playerClass + * @param string $address + * @param int $port */ - public function __construct(SourceInterface $interface, $baseClass, $playerClass, string $address, int $port){ + public function __construct(NetworkInterface $interface, $baseClass, $playerClass, string $address, int $port){ $this->interface = $interface; $this->address = $address; $this->port = $port; @@ -69,9 +69,9 @@ class PlayerCreationEvent extends Event{ } /** - * @return SourceInterface + * @return NetworkInterface */ - public function getInterface() : SourceInterface{ + public function getInterface() : NetworkInterface{ return $this->interface; } diff --git a/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php b/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php index 4d8396579..f0d109427 100644 --- a/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php +++ b/src/pocketmine/event/server/NetworkInterfaceCrashEvent.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\server; -use pocketmine\network\SourceInterface; +use pocketmine\network\NetworkInterface; /** * Called when a network interface crashes, with relevant crash information. @@ -34,7 +34,7 @@ class NetworkInterfaceCrashEvent extends NetworkInterfaceEvent{ */ private $exception; - public function __construct(SourceInterface $interface, \Throwable $throwable){ + public function __construct(NetworkInterface $interface, \Throwable $throwable){ parent::__construct($interface); $this->exception = $throwable; } diff --git a/src/pocketmine/event/server/NetworkInterfaceEvent.php b/src/pocketmine/event/server/NetworkInterfaceEvent.php index 6269394c0..f6ed969c6 100644 --- a/src/pocketmine/event/server/NetworkInterfaceEvent.php +++ b/src/pocketmine/event/server/NetworkInterfaceEvent.php @@ -23,23 +23,23 @@ declare(strict_types=1); namespace pocketmine\event\server; -use pocketmine\network\SourceInterface; +use pocketmine\network\NetworkInterface; class NetworkInterfaceEvent extends ServerEvent{ - /** @var SourceInterface */ + /** @var NetworkInterface */ protected $interface; /** - * @param SourceInterface $interface + * @param NetworkInterface $interface */ - public function __construct(SourceInterface $interface){ + public function __construct(NetworkInterface $interface){ $this->interface = $interface; } /** - * @return SourceInterface + * @return NetworkInterface */ - public function getInterface() : SourceInterface{ + public function getInterface() : NetworkInterface{ return $this->interface; } } diff --git a/src/pocketmine/network/AdvancedSourceInterface.php b/src/pocketmine/network/AdvancedNetworkInterface.php similarity index 96% rename from src/pocketmine/network/AdvancedSourceInterface.php rename to src/pocketmine/network/AdvancedNetworkInterface.php index 94b3c6e5d..85afc739e 100644 --- a/src/pocketmine/network/AdvancedSourceInterface.php +++ b/src/pocketmine/network/AdvancedNetworkInterface.php @@ -30,7 +30,7 @@ namespace pocketmine\network; * Advanced network interfaces have some additional capabilities, such as being able to ban addresses and process raw * packets. */ -interface AdvancedSourceInterface extends SourceInterface{ +interface AdvancedNetworkInterface extends NetworkInterface{ /** * Prevents packets received from the IP address getting processed for the given timeout. diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index af907d77c..0b315faab 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -39,10 +39,10 @@ class Network{ /** @var Server */ private $server; - /** @var SourceInterface[] */ + /** @var NetworkInterface[] */ private $interfaces = []; - /** @var AdvancedSourceInterface[] */ + /** @var AdvancedNetworkInterface[] */ private $advancedInterfaces = []; private $upload = 0; @@ -77,7 +77,7 @@ class Network{ } /** - * @return SourceInterface[] + * @return NetworkInterface[] */ public function getInterfaces() : array{ return $this->interfaces; @@ -89,7 +89,7 @@ class Network{ } } - public function processInterface(SourceInterface $interface) : void{ + public function processInterface(NetworkInterface $interface) : void{ try{ $interface->process(); }catch(\Throwable $e){ @@ -107,14 +107,14 @@ class Network{ } /** - * @param SourceInterface $interface + * @param NetworkInterface $interface */ - public function registerInterface(SourceInterface $interface) : void{ + public function registerInterface(NetworkInterface $interface) : void{ $this->server->getPluginManager()->callEvent($ev = new NetworkInterfaceRegisterEvent($interface)); if(!$ev->isCancelled()){ $interface->start(); $this->interfaces[$hash = spl_object_hash($interface)] = $interface; - if($interface instanceof AdvancedSourceInterface){ + if($interface instanceof AdvancedNetworkInterface){ $this->advancedInterfaces[$hash] = $interface; $interface->setNetwork($this); } @@ -123,9 +123,9 @@ class Network{ } /** - * @param SourceInterface $interface + * @param NetworkInterface $interface */ - public function unregisterInterface(SourceInterface $interface) : void{ + public function unregisterInterface(NetworkInterface $interface) : void{ $this->server->getPluginManager()->callEvent(new NetworkInterfaceUnregisterEvent($interface)); unset($this->interfaces[$hash = spl_object_hash($interface)], $this->advancedInterfaces[$hash]); } diff --git a/src/pocketmine/network/SourceInterface.php b/src/pocketmine/network/NetworkInterface.php similarity index 98% rename from src/pocketmine/network/SourceInterface.php rename to src/pocketmine/network/NetworkInterface.php index 5db9c9f17..0818234fc 100644 --- a/src/pocketmine/network/SourceInterface.php +++ b/src/pocketmine/network/NetworkInterface.php @@ -32,7 +32,7 @@ use pocketmine\Player; /** * Network interfaces are transport layers which can be used to transmit packets between the server and clients. */ -interface SourceInterface{ +interface NetworkInterface{ /** * Performs actions needed to start the interface after it is registered. diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php index 2f180ddf2..08c46ee85 100644 --- a/src/pocketmine/network/mcpe/RakLibInterface.php +++ b/src/pocketmine/network/mcpe/RakLibInterface.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe; use pocketmine\event\player\PlayerCreationEvent; -use pocketmine\network\AdvancedSourceInterface; +use pocketmine\network\AdvancedNetworkInterface; use pocketmine\network\mcpe\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\network\mcpe\protocol\PacketPool; @@ -41,7 +41,7 @@ use raklib\server\ServerHandler; use raklib\server\ServerInstance; use raklib\utils\InternetAddress; -class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ +class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{ /** * Sometimes this gets changed when the MCPE-layer protocol gets broken to the point where old and new can't * communicate. It's important that we check this to avoid catastrophes. diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php index 427952994..2a64c5804 100644 --- a/src/pocketmine/network/query/QueryHandler.php +++ b/src/pocketmine/network/query/QueryHandler.php @@ -27,7 +27,7 @@ declare(strict_types=1); */ namespace pocketmine\network\query; -use pocketmine\network\AdvancedSourceInterface; +use pocketmine\network\AdvancedNetworkInterface; use pocketmine\Server; use pocketmine\utils\Binary; @@ -79,7 +79,7 @@ class QueryHandler{ return Binary::readInt(substr(hash("sha512", $salt . ":" . $token, true), 7, 4)); } - public function handle(AdvancedSourceInterface $interface, string $address, int $port, string $packet) : void{ + public function handle(AdvancedNetworkInterface $interface, string $address, int $port, string $packet) : void{ $offset = 2; $packetType = ord($packet{$offset++}); $sessionID = Binary::readInt(substr($packet, $offset, 4));