MCPE protocol gets its own namespace

src/pocketmine/network/Network.php

@@ -24,77 +24,76 @@
  */
 namespace pocketmine\network;
 
-use pocketmine\network\protocol\AddEntityPacket;
-use pocketmine\network\protocol\AddHangingEntityPacket;
-use pocketmine\network\protocol\AddItemEntityPacket;
-use pocketmine\network\protocol\AddItemPacket;
-use pocketmine\network\protocol\AddPaintingPacket;
-use pocketmine\network\protocol\AddPlayerPacket;
-use pocketmine\network\protocol\AdventureSettingsPacket;
-use pocketmine\network\protocol\AnimatePacket;
-use pocketmine\network\protocol\AvailableCommandsPacket;
-use pocketmine\network\protocol\BatchPacket;
-use pocketmine\network\protocol\BlockEntityDataPacket;
-use pocketmine\network\protocol\BlockEventPacket;
-use pocketmine\network\protocol\ChangeDimensionPacket;
-use pocketmine\network\protocol\ChunkRadiusUpdatedPacket;
-use pocketmine\network\protocol\CommandStepPacket;
-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\CraftingDataPacket;
-use pocketmine\network\protocol\CraftingEventPacket;
-use pocketmine\network\protocol\DataPacket;
-use pocketmine\network\protocol\DisconnectPacket;
-use pocketmine\network\protocol\DropItemPacket;
-use pocketmine\network\protocol\EntityEventPacket;
-use pocketmine\network\protocol\ExplodePacket;
-use pocketmine\network\protocol\FullChunkDataPacket;
-use pocketmine\network\protocol\HurtArmorPacket;
-use pocketmine\network\protocol\Info;
-use pocketmine\network\protocol\Info as ProtocolInfo;
-use pocketmine\network\protocol\InteractPacket;
-use pocketmine\network\protocol\InventoryActionPacket;
-use pocketmine\network\protocol\ItemFrameDropItemPacket;
-use pocketmine\network\protocol\LevelEventPacket;
-use pocketmine\network\protocol\LevelSoundEventPacket;
-use pocketmine\network\protocol\LoginPacket;
-use pocketmine\network\protocol\MobArmorEquipmentPacket;
-use pocketmine\network\protocol\MobEquipmentPacket;
-use pocketmine\network\protocol\MoveEntityPacket;
-use pocketmine\network\protocol\MovePlayerPacket;
-use pocketmine\network\protocol\PlayerActionPacket;
-use pocketmine\network\protocol\PlayerFallPacket;
-use pocketmine\network\protocol\PlayerInputPacket;
-use pocketmine\network\protocol\PlayerListPacket;
-use pocketmine\network\protocol\PlayStatusPacket;
-use pocketmine\network\protocol\RemoveBlockPacket;
-use pocketmine\network\protocol\RemoveEntityPacket;
-use pocketmine\network\protocol\ReplaceItemInSlotPacket;
-use pocketmine\network\protocol\RequestChunkRadiusPacket;
-use pocketmine\network\protocol\ResourcePackClientResponsePacket;
-use pocketmine\network\protocol\ResourcePacksInfoPacket;
-use pocketmine\network\protocol\RespawnPacket;
-use pocketmine\network\protocol\RiderJumpPacket;
-use pocketmine\network\protocol\SetCommandsEnabledPacket;
-use pocketmine\network\protocol\SetDifficultyPacket;
-use pocketmine\network\protocol\SetEntityDataPacket;
-use pocketmine\network\protocol\SetEntityLinkPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
-use pocketmine\network\protocol\SetHealthPacket;
-use pocketmine\network\protocol\SetPlayerGameTypePacket;
-use pocketmine\network\protocol\SetSpawnPositionPacket;
-use pocketmine\network\protocol\SetTimePacket;
-use pocketmine\network\protocol\ShowCreditsPacket;
-use pocketmine\network\protocol\SpawnExperienceOrbPacket;
-use pocketmine\network\protocol\StartGamePacket;
-use pocketmine\network\protocol\TakeItemEntityPacket;
-use pocketmine\network\protocol\TextPacket;
-use pocketmine\network\protocol\TransferPacket;
-use pocketmine\network\protocol\UpdateBlockPacket;
-use pocketmine\network\protocol\UseItemPacket;
+use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\network\mcpe\protocol\AddHangingEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemPacket;
+use pocketmine\network\mcpe\protocol\AddPaintingPacket;
+use pocketmine\network\mcpe\protocol\AddPlayerPacket;
+use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
+use pocketmine\network\mcpe\protocol\AnimatePacket;
+use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
+use pocketmine\network\mcpe\protocol\BatchPacket;
+use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
+use pocketmine\network\mcpe\protocol\BlockEventPacket;
+use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
+use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
+use pocketmine\network\mcpe\protocol\CommandStepPacket;
+use pocketmine\network\mcpe\protocol\ContainerClosePacket;
+use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
+use pocketmine\network\mcpe\protocol\CraftingDataPacket;
+use pocketmine\network\mcpe\protocol\CraftingEventPacket;
+use pocketmine\network\mcpe\protocol\DataPacket;
+use pocketmine\network\mcpe\protocol\DisconnectPacket;
+use pocketmine\network\mcpe\protocol\DropItemPacket;
+use pocketmine\network\mcpe\protocol\EntityEventPacket;
+use pocketmine\network\mcpe\protocol\ExplodePacket;
+use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
+use pocketmine\network\mcpe\protocol\HurtArmorPacket;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
+use pocketmine\network\mcpe\protocol\InteractPacket;
+use pocketmine\network\mcpe\protocol\InventoryActionPacket;
+use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\LoginPacket;
+use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
+use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
+use pocketmine\network\mcpe\protocol\MoveEntityPacket;
+use pocketmine\network\mcpe\protocol\MovePlayerPacket;
+use pocketmine\network\mcpe\protocol\PlayerActionPacket;
+use pocketmine\network\mcpe\protocol\PlayerFallPacket;
+use pocketmine\network\mcpe\protocol\PlayerInputPacket;
+use pocketmine\network\mcpe\protocol\PlayerListPacket;
+use pocketmine\network\mcpe\protocol\PlayStatusPacket;
+use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
+use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
+use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket;
+use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
+use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
+use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket;
+use pocketmine\network\mcpe\protocol\RespawnPacket;
+use pocketmine\network\mcpe\protocol\RiderJumpPacket;
+use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
+use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
+use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
+use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
+use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
+use pocketmine\network\mcpe\protocol\SetHealthPacket;
+use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
+use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
+use pocketmine\network\mcpe\protocol\SetTimePacket;
+use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
+use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
+use pocketmine\network\mcpe\protocol\StartGamePacket;
+use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
+use pocketmine\network\mcpe\protocol\TextPacket;
+use pocketmine\network\mcpe\protocol\TransferPacket;
+use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
+use pocketmine\network\mcpe\protocol\UseItemPacket;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\BinaryStream;
@@ -244,7 +243,7 @@ class Network{
 				$buf = $stream->getString();
 
 				if(($pk = $this->getPacket(ord($buf{0}))) !== null){
-					if($pk::NETWORK_ID === Info::BATCH_PACKET){
+					if($pk::NETWORK_ID === ProtocolInfo::BATCH_PACKET){
 						throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket");
 					}
 

src/pocketmine/network/SourceInterface.php

@@ -24,7 +24,7 @@
  */
 namespace pocketmine\network;
 
-use pocketmine\network\protocol\DataPacket;
+use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\Player;
 
 /**

src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php

@@ -19,7 +19,7 @@
  *
 */
 
-namespace pocketmine\network;
+namespace pocketmine\network\mcpe;
 
 use raklib\protocol\EncapsulatedPacket;
 

src/pocketmine/network/mcpe/NetworkSession.php

@@ -20,82 +20,82 @@
 */
 
 
-namespace pocketmine\network;
+namespace pocketmine\network\mcpe;
 
 
-use pocketmine\network\protocol\AddEntityPacket;
-use pocketmine\network\protocol\AddHangingEntityPacket;
-use pocketmine\network\protocol\AddItemEntityPacket;
-use pocketmine\network\protocol\AddItemPacket;
-use pocketmine\network\protocol\AddPaintingPacket;
-use pocketmine\network\protocol\AddPlayerPacket;
-use pocketmine\network\protocol\AdventureSettingsPacket;
-use pocketmine\network\protocol\AnimatePacket;
-use pocketmine\network\protocol\AvailableCommandsPacket;
-use pocketmine\network\protocol\BatchPacket;
-use pocketmine\network\protocol\BlockEntityDataPacket;
-use pocketmine\network\protocol\BlockEventPacket;
-use pocketmine\network\protocol\ChangeDimensionPacket;
-use pocketmine\network\protocol\ChunkRadiusUpdatedPacket;
-use pocketmine\network\protocol\CommandStepPacket;
-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\CraftingDataPacket;
-use pocketmine\network\protocol\CraftingEventPacket;
-use pocketmine\network\protocol\DisconnectPacket;
-use pocketmine\network\protocol\DropItemPacket;
-use pocketmine\network\protocol\EntityEventPacket;
-use pocketmine\network\protocol\ExplodePacket;
-use pocketmine\network\protocol\FullChunkDataPacket;
-use pocketmine\network\protocol\HurtArmorPacket;
-use pocketmine\network\protocol\InteractPacket;
-use pocketmine\network\protocol\InventoryActionPacket;
-use pocketmine\network\protocol\ItemFrameDropItemPacket;
-use pocketmine\network\protocol\LevelEventPacket;
-use pocketmine\network\protocol\LevelSoundEventPacket;
-use pocketmine\network\protocol\LoginPacket;
-use pocketmine\network\protocol\MobArmorEquipmentPacket;
-use pocketmine\network\protocol\MobEffectPacket;
-use pocketmine\network\protocol\MobEquipmentPacket;
-use pocketmine\network\protocol\MoveEntityPacket;
-use pocketmine\network\protocol\MovePlayerPacket;
-use pocketmine\network\protocol\PlayerActionPacket;
-use pocketmine\network\protocol\PlayerFallPacket;
-use pocketmine\network\protocol\PlayerInputPacket;
-use pocketmine\network\protocol\PlayerListPacket;
-use pocketmine\network\protocol\PlayStatusPacket;
-use pocketmine\network\protocol\RemoveBlockPacket;
-use pocketmine\network\protocol\RemoveEntityPacket;
-use pocketmine\network\protocol\ReplaceItemInSlotPacket;
-use pocketmine\network\protocol\RequestChunkRadiusPacket;
-use pocketmine\network\protocol\ResourcePackClientResponsePacket;
-use pocketmine\network\protocol\ResourcePacksInfoPacket;
-use pocketmine\network\protocol\ResourcePackStackPacket;
-use pocketmine\network\protocol\RespawnPacket;
-use pocketmine\network\protocol\RiderJumpPacket;
-use pocketmine\network\protocol\SetCommandsEnabledPacket;
-use pocketmine\network\protocol\SetDifficultyPacket;
-use pocketmine\network\protocol\SetEntityDataPacket;
-use pocketmine\network\protocol\SetEntityLinkPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
-use pocketmine\network\protocol\SetHealthPacket;
-use pocketmine\network\protocol\SetPlayerGameTypePacket;
-use pocketmine\network\protocol\SetSpawnPositionPacket;
-use pocketmine\network\protocol\SetTimePacket;
-use pocketmine\network\protocol\ShowCreditsPacket;
-use pocketmine\network\protocol\SpawnExperienceOrbPacket;
-use pocketmine\network\protocol\StartGamePacket;
-use pocketmine\network\protocol\TakeItemEntityPacket;
-use pocketmine\network\protocol\TextPacket;
-use pocketmine\network\protocol\TransferPacket;
-use pocketmine\network\protocol\UpdateAttributesPacket;
-use pocketmine\network\protocol\UpdateBlockPacket;
-use pocketmine\network\protocol\UseItemPacket;
+use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\network\mcpe\protocol\AddHangingEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemPacket;
+use pocketmine\network\mcpe\protocol\AddPaintingPacket;
+use pocketmine\network\mcpe\protocol\AddPlayerPacket;
+use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
+use pocketmine\network\mcpe\protocol\AnimatePacket;
+use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
+use pocketmine\network\mcpe\protocol\BatchPacket;
+use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
+use pocketmine\network\mcpe\protocol\BlockEventPacket;
+use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
+use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
+use pocketmine\network\mcpe\protocol\CommandStepPacket;
+use pocketmine\network\mcpe\protocol\ContainerClosePacket;
+use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
+use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
+use pocketmine\network\mcpe\protocol\CraftingDataPacket;
+use pocketmine\network\mcpe\protocol\CraftingEventPacket;
+use pocketmine\network\mcpe\protocol\DisconnectPacket;
+use pocketmine\network\mcpe\protocol\DropItemPacket;
+use pocketmine\network\mcpe\protocol\EntityEventPacket;
+use pocketmine\network\mcpe\protocol\ExplodePacket;
+use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
+use pocketmine\network\mcpe\protocol\HurtArmorPacket;
+use pocketmine\network\mcpe\protocol\InteractPacket;
+use pocketmine\network\mcpe\protocol\InventoryActionPacket;
+use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
+use pocketmine\network\mcpe\protocol\LevelEventPacket;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\LoginPacket;
+use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
+use pocketmine\network\mcpe\protocol\MobEffectPacket;
+use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
+use pocketmine\network\mcpe\protocol\MoveEntityPacket;
+use pocketmine\network\mcpe\protocol\MovePlayerPacket;
+use pocketmine\network\mcpe\protocol\PlayerActionPacket;
+use pocketmine\network\mcpe\protocol\PlayerFallPacket;
+use pocketmine\network\mcpe\protocol\PlayerInputPacket;
+use pocketmine\network\mcpe\protocol\PlayerListPacket;
+use pocketmine\network\mcpe\protocol\PlayStatusPacket;
+use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
+use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
+use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket;
+use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
+use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
+use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket;
+use pocketmine\network\mcpe\protocol\ResourcePackStackPacket;
+use pocketmine\network\mcpe\protocol\RespawnPacket;
+use pocketmine\network\mcpe\protocol\RiderJumpPacket;
+use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
+use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
+use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
+use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
+use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
+use pocketmine\network\mcpe\protocol\SetHealthPacket;
+use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
+use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
+use pocketmine\network\mcpe\protocol\SetTimePacket;
+use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
+use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
+use pocketmine\network\mcpe\protocol\StartGamePacket;
+use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
+use pocketmine\network\mcpe\protocol\TextPacket;
+use pocketmine\network\mcpe\protocol\TransferPacket;
+use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
+use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
+use pocketmine\network\mcpe\protocol\UseItemPacket;
 
-interface PocketEditionNetworkSession{
+interface NetworkSession{
 
 	public function handleLogin(LoginPacket $packet) : bool;
 

src/pocketmine/network/mcpe/RakLibInterface.php

@@ -19,12 +19,13 @@
  *
 */
 
-namespace pocketmine\network;
+namespace pocketmine\network\mcpe;
 
 use pocketmine\event\player\PlayerCreationEvent;
-use pocketmine\network\protocol\DataPacket;
-use pocketmine\network\protocol\Info;
-use pocketmine\network\protocol\Info as ProtocolInfo;
+use pocketmine\network\AdvancedSourceInterface;
+use pocketmine\network\mcpe\protocol\DataPacket;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
+use pocketmine\network\Network;
 use pocketmine\Player;
 use pocketmine\Server;
 use raklib\protocol\EncapsulatedPacket;
@@ -175,8 +176,8 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 
 		$this->interface->sendOption("name",
 			"MCPE;" . rtrim(addcslashes($name, ";"), '\\') . ";" .
-			Info::CURRENT_PROTOCOL . ";" .
-			Info::MINECRAFT_VERSION_NETWORK . ";" .
+			ProtocolInfo::CURRENT_PROTOCOL . ";" .
+			ProtocolInfo::MINECRAFT_VERSION_NETWORK . ";" .
 			$info->getPlayerCount() . ";" .
 			$info->getMaxPlayerCount()
 		);

src/pocketmine/network/mcpe/protocol/AddEntityPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 use pocketmine\entity\Attribute;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET;
 
 	public $eid;
 	public $type;
@@ -73,7 +73,7 @@ class AddEntityPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddEntity($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddHangingEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_HANGING_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET;
 
 	public $entityUniqueId;
 	public $entityRuntimeId;
@@ -47,7 +47,7 @@ class AddHangingEntityPacket extends DataPacket{
 		$this->putVarInt($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddHangingEntity($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddItemEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_ITEM_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET;
 
 	public $eid;
 	public $item;
@@ -51,7 +51,7 @@ class AddItemEntityPacket extends DataPacket{
 		$this->putVector3f($this->speedX, $this->speedY, $this->speedZ);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddItemEntity($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AddItemPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddItemPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_ITEM_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_ITEM_PACKET;
 
 	public $item;
 
@@ -40,7 +40,7 @@ class AddItemPacket extends DataPacket{
 		$this->putSlot($this->item);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddItem($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddPaintingPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_PAINTING_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET;
 
 	public $eid;
 	public $x;
@@ -49,7 +49,7 @@ class AddPaintingPacket extends DataPacket{
 		$this->putString($this->title);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddPainting($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AddPlayerPacket extends DataPacket{
-	const NETWORK_ID = Info::ADD_PLAYER_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET;
 
 	public $uuid;
 	public $username;
@@ -62,7 +62,7 @@ class AddPlayerPacket extends DataPacket{
 		$this->putEntityMetadata($this->metadata);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAddPlayer($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AdventureSettingsPacket extends DataPacket{
-	const NETWORK_ID = Info::ADVENTURE_SETTINGS_PACKET;
+	const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET;
 
 	const PERMISSION_NORMAL = 0;
 	const PERMISSION_OPERATOR = 1;
@@ -97,7 +97,7 @@ class AdventureSettingsPacket extends DataPacket{
 		$this->putUnsignedVarInt($this->userPermission);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAdventureSettings($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AnimatePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AnimatePacket extends DataPacket{
-	const NETWORK_ID = Info::ANIMATE_PACKET;
+	const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET;
 
 	public $action;
 	public $eid;
@@ -43,7 +43,7 @@ class AnimatePacket extends DataPacket{
 		$this->putEntityId($this->eid);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAnimate($this);
 	}
 

src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class AvailableCommandsPacket extends DataPacket{
-	const NETWORK_ID = Info::AVAILABLE_COMMANDS_PACKET;
+	const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET;
 
 	public $commands; //JSON-encoded command data
 	public $unknown;
@@ -41,7 +41,7 @@ class AvailableCommandsPacket extends DataPacket{
 		$this->putString($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleAvailableCommands($this);
 	}
 

src/pocketmine/network/mcpe/protocol/BatchPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class BatchPacket extends DataPacket{
-	const NETWORK_ID = Info::BATCH_PACKET;
+	const NETWORK_ID = ProtocolInfo::BATCH_PACKET;
 
 	public $payload;
 
@@ -40,7 +40,7 @@ class BatchPacket extends DataPacket{
 		$this->putString($this->payload);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleBatch($this);
 	}
 

src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class BlockEntityDataPacket extends DataPacket{
-	const NETWORK_ID = Info::BLOCK_ENTITY_DATA_PACKET;
+	const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET;
 
 	public $x;
 	public $y;
@@ -45,7 +45,7 @@ class BlockEntityDataPacket extends DataPacket{
 		$this->put($this->namedtag);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleBlockEntityData($this);
 	}
 

src/pocketmine/network/mcpe/protocol/BlockEventPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class BlockEventPacket extends DataPacket{
-	const NETWORK_ID = Info::BLOCK_EVENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET;
 
 	public $x;
 	public $y;
@@ -46,7 +46,7 @@ class BlockEventPacket extends DataPacket{
 		$this->putVarInt($this->case2);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleBlockEvent($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ChangeDimensionPacket extends DataPacket{
-	const NETWORK_ID = Info::CHANGE_DIMENSION_PACKET;
+	const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET;
 
 	const DIMENSION_OVERWORLD = 0;
 	const DIMENSION_NETHER = 1;
@@ -49,7 +49,7 @@ class ChangeDimensionPacket extends DataPacket{
 		$this->putBool($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleChangeDimension($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ChunkRadiusUpdatedPacket extends DataPacket{
-	const NETWORK_ID = Info::CHUNK_RADIUS_UPDATED_PACKET;
+	const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET;
 
 	public $radius;
 
@@ -39,7 +39,7 @@ class ChunkRadiusUpdatedPacket extends DataPacket{
 		$this->putVarInt($this->radius);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleChunkRadiusUpdated($this);
 	}
 

src/pocketmine/network/mcpe/protocol/CommandStepPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class CommandStepPacket extends DataPacket{
-	const NETWORK_ID = Info::COMMAND_STEP_PACKET;
+	const NETWORK_ID = ProtocolInfo::COMMAND_STEP_PACKET;
 
 	/**
 	 * unknown (string)
@@ -67,7 +67,7 @@ class CommandStepPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleCommandStep($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ContainerClosePacket extends DataPacket{
-	const NETWORK_ID = Info::CONTAINER_CLOSE_PACKET;
+	const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET;
 
 	public $windowid;
 
@@ -40,7 +40,7 @@ class ContainerClosePacket extends DataPacket{
 		$this->putByte($this->windowid);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleContainerClose($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ContainerOpenPacket extends DataPacket{
-	const NETWORK_ID = Info::CONTAINER_OPEN_PACKET;
+	const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET;
 
 	public $windowid;
 	public $type;
@@ -50,7 +50,7 @@ class ContainerOpenPacket extends DataPacket{
 		$this->putEntityId($this->entityId);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleContainerOpen($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ContainerSetContentPacket extends DataPacket{
-	const NETWORK_ID = Info::CONTAINER_SET_CONTENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::CONTAINER_SET_CONTENT_PACKET;
 
 	const SPECIAL_INVENTORY = 0;
 	const SPECIAL_ARMOR = 0x78;
@@ -75,7 +75,7 @@ class ContainerSetContentPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleContainerSetContent($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ContainerSetDataPacket extends DataPacket{
-	const NETWORK_ID = Info::CONTAINER_SET_DATA_PACKET;
+	const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET;
 
 	public $windowid;
 	public $property;
@@ -44,7 +44,7 @@ class ContainerSetDataPacket extends DataPacket{
 		$this->putVarInt($this->value);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleContainerSetData($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 use pocketmine\item\Item;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ContainerSetSlotPacket extends DataPacket{
-	const NETWORK_ID = Info::CONTAINER_SET_SLOT_PACKET;
+	const NETWORK_ID = ProtocolInfo::CONTAINER_SET_SLOT_PACKET;
 
 	public $windowid;
 	public $slot;
@@ -53,7 +53,7 @@ class ContainerSetSlotPacket extends DataPacket{
 		$this->putByte($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleContainerSetSlot($this);
 	}
 

src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php

@@ -19,21 +19,20 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
 use pocketmine\inventory\FurnaceRecipe;
-use pocketmine\inventory\MultiRecipe;
 use pocketmine\inventory\ShapedRecipe;
 use pocketmine\inventory\ShapelessRecipe;
 use pocketmine\item\Item;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\utils\BinaryStream;
 
 class CraftingDataPacket extends DataPacket{
-	const NETWORK_ID = Info::CRAFTING_DATA_PACKET;
+	const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET;
 
 	const ENTRY_SHAPELESS = 0;
 	const ENTRY_SHAPED = 1;
@@ -199,7 +198,7 @@ class CraftingDataPacket extends DataPacket{
 		$this->putBool($this->cleanRecipes);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleCraftingData($this);
 	}
 

src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 use pocketmine\item\Item;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class CraftingEventPacket extends DataPacket{
-	const NETWORK_ID = Info::CRAFTING_EVENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET;
 
 	public $windowId;
 	public $type;
@@ -63,7 +63,7 @@ class CraftingEventPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleCraftingEvent($this);
 	}
 

src/pocketmine/network/mcpe/protocol/DataPacket.php

@@ -19,13 +19,13 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\Utils;
 
@@ -44,7 +44,7 @@ abstract class DataPacket extends BinaryStream{
 
 	abstract public function decode();
 
-	abstract public function handle(PocketEditionNetworkSession $session) : bool;
+	abstract public function handle(NetworkSession $session) : bool;
 
 	public function reset(){
 		$this->buffer = chr($this::NETWORK_ID);

src/pocketmine/network/mcpe/protocol/DisconnectPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class DisconnectPacket extends DataPacket{
-	const NETWORK_ID = Info::DISCONNECT_PACKET;
+	const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET;
 
 	public $hideDisconnectionScreen = false;
 	public $message;
@@ -43,7 +43,7 @@ class DisconnectPacket extends DataPacket{
 		$this->putString($this->message);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleDisconnect($this);
 	}
 

src/pocketmine/network/mcpe/protocol/DropItemPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class DropItemPacket extends DataPacket{
-	const NETWORK_ID = Info::DROP_ITEM_PACKET;
+	const NETWORK_ID = ProtocolInfo::DROP_ITEM_PACKET;
 
 	public $type;
 	public $item;
@@ -41,7 +41,7 @@ class DropItemPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleDropItem($this);
 	}
 

src/pocketmine/network/mcpe/protocol/EntityEventPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class EntityEventPacket extends DataPacket{
-	const NETWORK_ID = Info::ENTITY_EVENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET;
 
 	const HURT_ANIMATION = 2;
 	const DEATH_ANIMATION = 3;
@@ -64,7 +64,7 @@ class EntityEventPacket extends DataPacket{
 		$this->putVarInt($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleEntityEvent($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ExplodePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ExplodePacket extends DataPacket{
-	const NETWORK_ID = Info::EXPLODE_PACKET;
+	const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET;
 
 	public $x;
 	public $y;
@@ -56,7 +56,7 @@ class ExplodePacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleExplode($this);
 	}
 

src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class FullChunkDataPacket extends DataPacket{
-	const NETWORK_ID = Info::FULL_CHUNK_DATA_PACKET;
+	const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET;
 
 	public $chunkX;
 	public $chunkZ;
@@ -44,7 +44,7 @@ class FullChunkDataPacket extends DataPacket{
 		$this->putString($this->data);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleFullChunkData($this);
 	}
 

src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class HurtArmorPacket extends DataPacket{
-	const NETWORK_ID = Info::HURT_ARMOR_PACKET;
+	const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET;
 
 	public $health;
 
@@ -40,7 +40,7 @@ class HurtArmorPacket extends DataPacket{
 		$this->putVarInt($this->health);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleHurtArmor($this);
 	}
 

src/pocketmine/network/mcpe/protocol/InteractPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class InteractPacket extends DataPacket{
-	const NETWORK_ID = Info::INTERACT_PACKET;
+	const NETWORK_ID = ProtocolInfo::INTERACT_PACKET;
 
 	const ACTION_RIGHT_CLICK = 1;
 	const ACTION_LEFT_CLICK = 2;
@@ -48,7 +48,7 @@ class InteractPacket extends DataPacket{
 		$this->putEntityId($this->target);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleInteract($this);
 	}
 

src/pocketmine/network/mcpe/protocol/InventoryActionPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class InventoryActionPacket extends DataPacket{
-	const NETWORK_ID = Info::INVENTORY_ACTION_PACKET;
+	const NETWORK_ID = ProtocolInfo::INVENTORY_ACTION_PACKET;
 
 	public $unknown;
 	public $item;
@@ -40,7 +40,7 @@ class InventoryActionPacket extends DataPacket{
 		$this->putSlot($this->item);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleInventoryAction($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ItemFrameDropItemPacket extends DataPacket{
 
-	const NETWORK_ID = Info::ITEM_FRAME_DROP_ITEM_PACKET;
+	const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET;
 
 	public $x;
 	public $y;
@@ -41,7 +41,7 @@ class ItemFrameDropItemPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleItemFrameDropItem($this);
 	}
 

src/pocketmine/network/mcpe/protocol/LevelEventPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class LevelEventPacket extends DataPacket{
-	const NETWORK_ID = Info::LEVEL_EVENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET;
 
 	const EVENT_SOUND_CLICK = 1000;
 	const EVENT_SOUND_CLICK_FAIL = 1001;
@@ -109,7 +109,7 @@ class LevelEventPacket extends DataPacket{
 		$this->putVarInt($this->data);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleLevelEvent($this);
 	}
 

src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class LevelSoundEventPacket extends DataPacket{
-	const NETWORK_ID = Info::LEVEL_SOUND_EVENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET;
 
 	const SOUND_ITEM_USE_ON = 0;
 	const SOUND_HIT = 1;
@@ -149,7 +149,7 @@ class LevelSoundEventPacket extends DataPacket{
 		$this->putBool($this->unknownBool2);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleLevelSoundEvent($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/LoginPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class LoginPacket extends DataPacket{
-	const NETWORK_ID = Info::LOGIN_PACKET;
+	const NETWORK_ID = ProtocolInfo::LOGIN_PACKET;
 
 	const EDITION_POCKET = 0;
 
@@ -47,7 +47,7 @@ class LoginPacket extends DataPacket{
 	public function decode(){
 		$this->protocol = $this->getInt();
 
-		if($this->protocol !== Info::CURRENT_PROTOCOL){
+		if($this->protocol !== ProtocolInfo::CURRENT_PROTOCOL){
 			$this->buffer = null;
 			return; //Do not attempt to decode for non-accepted protocols
 		}
@@ -96,7 +96,7 @@ class LoginPacket extends DataPacket{
 		return json_decode(base64_decode($payloadB64), true);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleLogin($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class MobArmorEquipmentPacket extends DataPacket{
-	const NETWORK_ID = Info::MOB_ARMOR_EQUIPMENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET;
 
 	public $eid;
 	public $slots = [];
@@ -49,7 +49,7 @@ class MobArmorEquipmentPacket extends DataPacket{
 		$this->putSlot($this->slots[3]);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleMobArmorEquipment($this);
 	}
 

src/pocketmine/network/mcpe/protocol/MobEffectPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class MobEffectPacket extends DataPacket{
-	const NETWORK_ID = Info::MOB_EFFECT_PACKET;
+	const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET;
 
 	const EVENT_ADD = 1;
 	const EVENT_MODIFY = 2;
@@ -54,7 +54,7 @@ class MobEffectPacket extends DataPacket{
 		$this->putVarInt($this->duration);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleMobEffect($this);
 	}
 

src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class MobEquipmentPacket extends DataPacket{
-	const NETWORK_ID = Info::MOB_EQUIPMENT_PACKET;
+	const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET;
 
 	public $eid;
 	public $item;
@@ -52,7 +52,7 @@ class MobEquipmentPacket extends DataPacket{
 		$this->putByte($this->unknownByte);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleMobEquipment($this);
 	}
 

src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class MoveEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::MOVE_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_PACKET;
 
 	public $eid;
 	public $x;
@@ -54,7 +54,7 @@ class MoveEntityPacket extends DataPacket{
 		$this->putByte($this->headYaw / (360.0 / 256));
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleMoveEntity($this);
 	}
 

src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class MovePlayerPacket extends DataPacket{
-	const NETWORK_ID = Info::MOVE_PLAYER_PACKET;
+	const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET;
 
 	const MODE_NORMAL = 0;
 	const MODE_RESET = 1;
@@ -64,7 +64,7 @@ class MovePlayerPacket extends DataPacket{
 		$this->putBool($this->onGround);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleMovePlayer($this);
 	}
 

src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class PlayStatusPacket extends DataPacket{
-	const NETWORK_ID = Info::PLAY_STATUS_PACKET;
+	const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET;
 
 	const LOGIN_SUCCESS = 0;
 	const LOGIN_FAILED_CLIENT = 1;
@@ -47,7 +47,7 @@ class PlayStatusPacket extends DataPacket{
 		$this->putInt($this->status);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handlePlayStatus($this);
 	}
 

src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class PlayerActionPacket extends DataPacket{
-	const NETWORK_ID = Info::PLAYER_ACTION_PACKET;
+	const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET;
 
 	const ACTION_START_BREAK = 0;
 	const ACTION_ABORT_BREAK = 1;
@@ -69,7 +69,7 @@ class PlayerActionPacket extends DataPacket{
 		$this->putVarInt($this->face);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handlePlayerAction($this);
 	}
 

src/pocketmine/network/mcpe/protocol/PlayerFallPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class PlayerFallPacket extends DataPacket{
-	const NETWORK_ID = Info::PLAYER_FALL_PACKET;
+	const NETWORK_ID = ProtocolInfo::PLAYER_FALL_PACKET;
 
 	public $fallDistance;
 
@@ -39,7 +39,7 @@ class PlayerFallPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handlePlayerFall($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class PlayerInputPacket extends DataPacket{
-	const NETWORK_ID = Info::PLAYER_INPUT_PACKET;
+	const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET;
 
 	public $motionX;
 	public $motionY;
@@ -45,7 +45,7 @@ class PlayerInputPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handlePlayerInput($this);
 	}
 

src/pocketmine/network/mcpe/protocol/PlayerListPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class PlayerListPacket extends DataPacket{
-	const NETWORK_ID = Info::PLAYER_LIST_PACKET;
+	const NETWORK_ID = ProtocolInfo::PLAYER_LIST_PACKET;
 
 	const TYPE_ADD = 0;
 	const TYPE_REMOVE = 1;
@@ -63,7 +63,7 @@ class PlayerListPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handlePlayerList($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ProtocolInfo.php

@@ -22,10 +22,10 @@
 /**
  * Minecraft: PE multiplayer protocol implementation
  */
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 
-interface Info{
+interface ProtocolInfo{
 
 	/**
 	 * Actual Minecraft: PE protocol version

src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class RemoveBlockPacket extends DataPacket{
-	const NETWORK_ID = Info::REMOVE_BLOCK_PACKET;
+	const NETWORK_ID = ProtocolInfo::REMOVE_BLOCK_PACKET;
 
 	public $x;
 	public $y;
@@ -41,7 +41,7 @@ class RemoveBlockPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleRemoveBlock($this);
 	}
 

src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class RemoveEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::REMOVE_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET;
 
 	public $eid;
 
@@ -40,7 +40,7 @@ class RemoveEntityPacket extends DataPacket{
 		$this->putEntityId($this->eid);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleRemoveEntity($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ReplaceItemInSlotPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ReplaceItemInSlotPacket extends DataPacket{
-	const NETWORK_ID = Info::REPLACE_ITEM_IN_SLOT_PACKET;
+	const NETWORK_ID = ProtocolInfo::REPLACE_ITEM_IN_SLOT_PACKET;
 
 	public $item;
 
@@ -40,7 +40,7 @@ class ReplaceItemInSlotPacket extends DataPacket{
 		$this->putSlot($this->item);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleReplaceItemInSlot($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class RequestChunkRadiusPacket extends DataPacket{
-	const NETWORK_ID = Info::REQUEST_CHUNK_RADIUS_PACKET;
+	const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET;
 
 	public $radius;
 
@@ -39,7 +39,7 @@ class RequestChunkRadiusPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleRequestChunkRadius($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ResourcePackClientResponsePacket extends DataPacket{
-	const NETWORK_ID = Info::RESOURCE_PACK_CLIENT_RESPONSE_PACKET;
+	const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CLIENT_RESPONSE_PACKET;
 
 	const STATUS_REFUSED = 1;
 	const STATUS_SEND_PACKS = 2;
@@ -54,7 +54,7 @@ class ResourcePackClientResponsePacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleResourcePackClientResponse($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php

@@ -20,16 +20,16 @@
 */
 
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\resourcepacks\ResourcePackInfoEntry;
 
 class ResourcePackStackPacket extends DataPacket{
-	const NETWORK_ID = Info::RESOURCE_PACK_STACK_PACKET;
+	const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_STACK_PACKET;
 
 	public $mustAccept = false;
 
@@ -41,7 +41,7 @@ class ResourcePackStackPacket extends DataPacket{
 	public function decode(){
 		$this->mustAccept = $this->getBool();
 		$behaviorPackCount = $this->getLShort();
-		while($behaviorPackCountCount-- > 0){
+		while($behaviorPackCount-- > 0){
 			$packId = $this->getString();
 			$version = $this->getString();
 			$this->behaviorPackStack[] = new ResourcePackInfoEntry($packId, $version);
@@ -72,7 +72,7 @@ class ResourcePackStackPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleResourcePackStack($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php

@@ -19,16 +19,16 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\resourcepacks\ResourcePackInfoEntry;
 
 class ResourcePacksInfoPacket extends DataPacket{
-	const NETWORK_ID = Info::RESOURCE_PACKS_INFO_PACKET;
+	const NETWORK_ID = ProtocolInfo::RESOURCE_PACKS_INFO_PACKET;
 
 	public $mustAccept = false; //if true, forces client to use selected resource packs
 	/** @var ResourcePackInfoEntry[] */
@@ -73,7 +73,7 @@ class ResourcePacksInfoPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleResourcePacksInfo($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/RespawnPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class RespawnPacket extends DataPacket{
-	const NETWORK_ID = Info::RESPAWN_PACKET;
+	const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET;
 
 	public $x;
 	public $y;
@@ -46,7 +46,7 @@ class RespawnPacket extends DataPacket{
 		$this->putLFloat($this->z);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleRespawn($this);
 	}
 

src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php

@@ -20,15 +20,15 @@
 */
 
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class RiderJumpPacket extends DataPacket{
-	const NETWORK_ID = Info::RIDER_JUMP_PACKET;
+	const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET;
 
 	public $unknown;
 
@@ -41,7 +41,7 @@ class RiderJumpPacket extends DataPacket{
 		$this->putVarInt($this->unknown);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleRiderJump($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetCommandsEnabledPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_COMMANDS_ENABLED_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET;
 
 	public $enabled;
 
@@ -40,7 +40,7 @@ class SetCommandsEnabledPacket extends DataPacket{
 		$this->putBool($this->enabled);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetCommandsEnabled($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetDifficultyPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_DIFFICULTY_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET;
 
 	public $difficulty;
 
@@ -40,7 +40,7 @@ class SetDifficultyPacket extends DataPacket{
 		$this->putUnsignedVarInt($this->difficulty);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetDifficulty($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetEntityDataPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_ENTITY_DATA_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET;
 
 	public $eid;
 	public $metadata;
@@ -42,7 +42,7 @@ class SetEntityDataPacket extends DataPacket{
 		$this->putEntityMetadata($this->metadata);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetEntityData($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetEntityLinkPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_ENTITY_LINK_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_ENTITY_LINK_PACKET;
 
 	public $from;
 	public $to;
@@ -44,7 +44,7 @@ class SetEntityLinkPacket extends DataPacket{
 		$this->putByte($this->type);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetEntityLink($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetEntityMotionPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_ENTITY_MOTION_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_ENTITY_MOTION_PACKET;
 
 	public $eid;
 	public $motionX;
@@ -44,7 +44,7 @@ class SetEntityMotionPacket extends DataPacket{
 		$this->putVector3f($this->motionX, $this->motionY, $this->motionZ);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetEntityMotion($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetHealthPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetHealthPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_HEALTH_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET;
 
 	public $health;
 
@@ -40,7 +40,7 @@ class SetHealthPacket extends DataPacket{
 		$this->putVarInt($this->health);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetHealth($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetPlayerGameTypePacket extends DataPacket{
-	const NETWORK_ID = Info::SET_PLAYER_GAME_TYPE_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET;
 
 	public $gamemode;
 
@@ -40,7 +40,7 @@ class SetPlayerGameTypePacket extends DataPacket{
 		$this->putVarInt($this->gamemode);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetPlayerGameType($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetSpawnPositionPacket extends DataPacket{
-	const NETWORK_ID = Info::SET_SPAWN_POSITION_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET;
 
 	public $unknown;
 	public $x;
@@ -46,7 +46,7 @@ class SetSpawnPositionPacket extends DataPacket{
 		$this->putBool($this->unknownBool);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetSpawnPosition($this);
 	}
 

src/pocketmine/network/mcpe/protocol/SetTimePacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SetTimePacket extends DataPacket{
-	const NETWORK_ID = Info::SET_TIME_PACKET;
+	const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET;
 
 	public $time;
 	public $started = true;
@@ -41,7 +41,7 @@ class SetTimePacket extends DataPacket{
 		$this->putBool($this->started);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSetTime($this);
 	}
 

src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php

@@ -20,15 +20,15 @@
 */
 
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class ShowCreditsPacket extends DataPacket{
-	const NETWORK_ID = Info::SHOW_CREDITS_PACKET;
+	const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET;
 
 	const STATUS_START_CREDITS = 0;
 	const STATUS_END_CREDITS = 1;
@@ -47,7 +47,7 @@ class ShowCreditsPacket extends DataPacket{
 		$this->putVarInt($this->status);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleShowCredits($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class SpawnExperienceOrbPacket extends DataPacket{
-	const NETWORK_ID = Info::SPAWN_EXPERIENCE_ORB_PACKET;
+	const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET;
 
 	public $x;
 	public $y;
@@ -44,7 +44,7 @@ class SpawnExperienceOrbPacket extends DataPacket{
 		$this->putVarInt($this->amount);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleSpawnExperienceOrb($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/StartGamePacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class StartGamePacket extends DataPacket{
-	const NETWORK_ID = Info::START_GAME_PACKET;
+	const NETWORK_ID = ProtocolInfo::START_GAME_PACKET;
 
 	public $entityUniqueId;
 	public $entityRuntimeId;
@@ -80,7 +80,7 @@ class StartGamePacket extends DataPacket{
 		$this->putString($this->worldName);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleStartGame($this);
 	}
 

src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class TakeItemEntityPacket extends DataPacket{
-	const NETWORK_ID = Info::TAKE_ITEM_ENTITY_PACKET;
+	const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET;
 
 	public $target;
 	public $eid;
@@ -42,7 +42,7 @@ class TakeItemEntityPacket extends DataPacket{
 		$this->putEntityId($this->eid);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleTakeItemEntity($this);
 	}
 }

src/pocketmine/network/mcpe/protocol/TextPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class TextPacket extends DataPacket{
-	const NETWORK_ID = Info::TEXT_PACKET;
+	const NETWORK_ID = ProtocolInfo::TEXT_PACKET;
 
 	const TYPE_RAW = 0;
 	const TYPE_CHAT = 1;
@@ -89,7 +89,7 @@ class TextPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleText($this);
 	}
 

src/pocketmine/network/mcpe/protocol/TransferPacket.php

@@ -19,14 +19,14 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class TransferPacket extends DataPacket{
-	const NETWORK_ID = Info::TRANSFER_PACKET;
+	const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET;
 
 	public $address;
 	public $port = 19132;
@@ -41,7 +41,7 @@ class TransferPacket extends DataPacket{
 		$this->putLShort($this->port);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleTransfer($this);
 	}
 

src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php

@@ -19,16 +19,16 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
 use pocketmine\entity\Attribute;
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class UpdateAttributesPacket extends DataPacket{
-	const NETWORK_ID = Info::UPDATE_ATTRIBUTES_PACKET;
+	const NETWORK_ID = ProtocolInfo::UPDATE_ATTRIBUTES_PACKET;
 
 
 	public $entityId;
@@ -52,7 +52,7 @@ class UpdateAttributesPacket extends DataPacket{
 		}
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleUpdateAttributes($this);
 	}
 

src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class UpdateBlockPacket extends DataPacket{
-	const NETWORK_ID = Info::UPDATE_BLOCK_PACKET;
+	const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET;
 
 	const FLAG_NONE      = 0b0000;
 	const FLAG_NEIGHBORS = 0b0001;
@@ -56,7 +56,7 @@ class UpdateBlockPacket extends DataPacket{
 		$this->putUnsignedVarInt(($this->flags << 4) | $this->blockData);
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleUpdateBlock($this);
 	}
 

src/pocketmine/network/mcpe/protocol/UseItemPacket.php

@@ -19,15 +19,15 @@
  *
 */
 
-namespace pocketmine\network\protocol;
+namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
 
-use pocketmine\network\PocketEditionNetworkSession;
+use pocketmine\network\mcpe\NetworkSession;
 
 class UseItemPacket extends DataPacket{
-	const NETWORK_ID = Info::USE_ITEM_PACKET;
+	const NETWORK_ID = ProtocolInfo::USE_ITEM_PACKET;
 
 	public $x;
 	public $y;
@@ -57,7 +57,7 @@ class UseItemPacket extends DataPacket{
 
 	}
 
-	public function handle(PocketEditionNetworkSession $session) : bool{
+	public function handle(NetworkSession $session) : bool{
 		return $session->handleUseItem($this);
 	}