diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php index 207d0c6ca..19a5a14ba 100644 --- a/src/pocketmine/network/mcpe/NetworkSession.php +++ b/src/pocketmine/network/mcpe/NetworkSession.php @@ -34,6 +34,7 @@ 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\AnvilDamagePacket; use pocketmine\network\mcpe\protocol\AutomationClientConnectPacket; use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; @@ -62,6 +63,8 @@ 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\EducationSettingsPacket; +use pocketmine\network\mcpe\protocol\EmotePacket; use pocketmine\network\mcpe\protocol\EventPacket; use pocketmine\network\mcpe\protocol\GameRulesChangedPacket; use pocketmine\network\mcpe\protocol\GuiDataPickItemPacket; @@ -90,12 +93,15 @@ use pocketmine\network\mcpe\protocol\ModalFormResponsePacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; use pocketmine\network\mcpe\protocol\MoveActorDeltaPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket; +use pocketmine\network\mcpe\protocol\MultiplayerSettingsPacket; use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket; +use pocketmine\network\mcpe\protocol\NetworkSettingsPacket; use pocketmine\network\mcpe\protocol\NetworkStackLatencyPacket; use pocketmine\network\mcpe\protocol\NpcRequestPacket; use pocketmine\network\mcpe\protocol\OnScreenTextureAnimationPacket; use pocketmine\network\mcpe\protocol\PhotoTransferPacket; use pocketmine\network\mcpe\protocol\PlayerActionPacket; +use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket; use pocketmine\network\mcpe\protocol\PlayerHotbarPacket; use pocketmine\network\mcpe\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket; @@ -134,6 +140,7 @@ use pocketmine\network\mcpe\protocol\SetScoreboardIdentityPacket; use pocketmine\network\mcpe\protocol\SetScorePacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetTimePacket; +use pocketmine\network\mcpe\protocol\SettingsCommandPacket; use pocketmine\network\mcpe\protocol\SetTitlePacket; use pocketmine\network\mcpe\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\ShowProfilePacket; @@ -144,11 +151,12 @@ use pocketmine\network\mcpe\protocol\SpawnParticleEffectPacket; use pocketmine\network\mcpe\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\StopSoundPacket; use pocketmine\network\mcpe\protocol\StructureBlockUpdatePacket; -use pocketmine\network\mcpe\protocol\StructureTemplateDataExportRequestPacket; -use pocketmine\network\mcpe\protocol\StructureTemplateDataExportResponsePacket; +use pocketmine\network\mcpe\protocol\StructureTemplateDataRequestPacket; +use pocketmine\network\mcpe\protocol\StructureTemplateDataResponsePacket; use pocketmine\network\mcpe\protocol\SubClientLoginPacket; use pocketmine\network\mcpe\protocol\TakeItemActorPacket; use pocketmine\network\mcpe\protocol\TextPacket; +use pocketmine\network\mcpe\protocol\TickSyncPacket; use pocketmine\network\mcpe\protocol\TransferPacket; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket; @@ -247,6 +255,10 @@ abstract class NetworkSession{ return false; } + public function handleTickSync(TickSyncPacket $packet) : bool{ + return false; + } + public function handleLevelSoundEventPacketV1(LevelSoundEventPacketV1 $packet) : bool{ return false; } @@ -675,11 +687,11 @@ abstract class NetworkSession{ return false; } - public function handleStructureTemplateDataExportRequest(StructureTemplateDataExportRequestPacket $packet) : bool{ + public function handleStructureTemplateDataRequest(StructureTemplateDataRequestPacket $packet) : bool{ return false; } - public function handleStructureTemplateDataExportResponse(StructureTemplateDataExportResponsePacket $packet) : bool{ + public function handleStructureTemplateDataResponse(StructureTemplateDataResponsePacket $packet) : bool{ return false; } @@ -695,7 +707,35 @@ abstract class NetworkSession{ return false; } + public function handleEducationSettings(EducationSettingsPacket $packet) : bool{ + return false; + } + + public function handleEmote(EmotePacket $packet) : bool{ + return false; + } + + public function handleMultiplayerSettings(MultiplayerSettingsPacket $packet) : bool{ + return false; + } + + public function handleSettingsCommand(SettingsCommandPacket $packet) : bool{ + return false; + } + + public function handleAnvilDamage(AnvilDamagePacket $packet) : bool{ + return false; + } + public function handleCompletedUsingItem(CompletedUsingItemPacket $packet) : bool{ return false; } + + public function handleNetworkSettings(NetworkSettingsPacket $packet) : bool{ + return false; + } + + public function handlePlayerAuthInput(PlayerAuthInputPacket $packet) : bool{ + return false; + } } diff --git a/src/pocketmine/network/mcpe/protocol/AnvilDamagePacket.php b/src/pocketmine/network/mcpe/protocol/AnvilDamagePacket.php new file mode 100644 index 000000000..7209297ae --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/AnvilDamagePacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class AnvilDamagePacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::ANVIL_DAMAGE_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleAnvilDamage($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/EducationSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/EducationSettingsPacket.php new file mode 100644 index 000000000..684904bb6 --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/EducationSettingsPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class EducationSettingsPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::EDUCATION_SETTINGS_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleEducationSettings($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/EmotePacket.php b/src/pocketmine/network/mcpe/protocol/EmotePacket.php new file mode 100644 index 000000000..aabbd5e40 --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/EmotePacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class EmotePacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::EMOTE_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleEmote($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/MultiplayerSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/MultiplayerSettingsPacket.php new file mode 100644 index 000000000..28a0d9145 --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/MultiplayerSettingsPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class MultiplayerSettingsPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::MULTIPLAYER_SETTINGS_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleMultiplayerSettings($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/NetworkSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/NetworkSettingsPacket.php new file mode 100644 index 000000000..3342cdb4a --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/NetworkSettingsPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class NetworkSettingsPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::NETWORK_SETTINGS_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleNetworkSettings($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/PacketPool.php b/src/pocketmine/network/mcpe/protocol/PacketPool.php index 4c9f09d9e..3ca054104 100644 --- a/src/pocketmine/network/mcpe/protocol/PacketPool.php +++ b/src/pocketmine/network/mcpe/protocol/PacketPool.php @@ -54,6 +54,7 @@ class PacketPool{ static::registerPacket(new RiderJumpPacket()); static::registerPacket(new UpdateBlockPacket()); static::registerPacket(new AddPaintingPacket()); + static::registerPacket(new TickSyncPacket()); static::registerPacket(new LevelSoundEventPacketV1()); static::registerPacket(new LevelEventPacket()); static::registerPacket(new BlockEventPacket()); @@ -161,12 +162,19 @@ class PacketPool{ static::registerPacket(new ClientCacheStatusPacket()); static::registerPacket(new OnScreenTextureAnimationPacket()); static::registerPacket(new MapCreateLockedCopyPacket()); - static::registerPacket(new StructureTemplateDataExportRequestPacket()); - static::registerPacket(new StructureTemplateDataExportResponsePacket()); + static::registerPacket(new StructureTemplateDataRequestPacket()); + static::registerPacket(new StructureTemplateDataResponsePacket()); static::registerPacket(new UpdateBlockPropertiesPacket()); static::registerPacket(new ClientCacheBlobStatusPacket()); static::registerPacket(new ClientCacheMissResponsePacket()); + static::registerPacket(new EducationSettingsPacket()); + static::registerPacket(new EmotePacket()); + static::registerPacket(new MultiplayerSettingsPacket()); + static::registerPacket(new SettingsCommandPacket()); + static::registerPacket(new AnvilDamagePacket()); static::registerPacket(new CompletedUsingItemPacket()); + static::registerPacket(new NetworkSettingsPacket()); + static::registerPacket(new PlayerAuthInputPacket()); } /** diff --git a/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php new file mode 100644 index 000000000..26b018f5c --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/PlayerAuthInputPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class PlayerAuthInputPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::PLAYER_AUTH_INPUT_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handlePlayerAuthInput($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php index a0b459a55..242fe0695 100644 --- a/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php +++ b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php @@ -180,8 +180,8 @@ interface ProtocolInfo{ public const CLIENT_CACHE_STATUS_PACKET = 0x81; public const ON_SCREEN_TEXTURE_ANIMATION_PACKET = 0x82; public const MAP_CREATE_LOCKED_COPY_PACKET = 0x83; - public const STRUCTURE_TEMPLATE_DATA_EXPORT_REQUEST_PACKET = 0x84; - public const STRUCTURE_TEMPLATE_DATA_EXPORT_RESPONSE_PACKET = 0x85; + public const STRUCTURE_TEMPLATE_DATA_REQUEST_PACKET = 0x84; + public const STRUCTURE_TEMPLATE_DATA_RESPONSE_PACKET = 0x85; public const UPDATE_BLOCK_PROPERTIES_PACKET = 0x86; public const CLIENT_CACHE_BLOB_STATUS_PACKET = 0x87; public const CLIENT_CACHE_MISS_RESPONSE_PACKET = 0x88; diff --git a/src/pocketmine/network/mcpe/protocol/SettingsCommandPacket.php b/src/pocketmine/network/mcpe/protocol/SettingsCommandPacket.php new file mode 100644 index 000000000..cc097d9fd --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/SettingsCommandPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class SettingsCommandPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::SETTINGS_COMMAND_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleSettingsCommand($this); + } +} diff --git a/src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportRequestPacket.php b/src/pocketmine/network/mcpe/protocol/StructureTemplateDataRequestPacket.php similarity index 92% rename from src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportRequestPacket.php rename to src/pocketmine/network/mcpe/protocol/StructureTemplateDataRequestPacket.php index 6ae16cec4..ba100bb60 100644 --- a/src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/StructureTemplateDataRequestPacket.php @@ -28,8 +28,8 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\StructureSettings; -class StructureTemplateDataExportRequestPacket extends DataPacket{ - public const NETWORK_ID = ProtocolInfo::STRUCTURE_TEMPLATE_DATA_EXPORT_REQUEST_PACKET; +class StructureTemplateDataRequestPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::STRUCTURE_TEMPLATE_DATA_REQUEST_PACKET; public const TYPE_ALWAYS_LOAD = 1; public const TYPE_CREATE_AND_LOAD = 2; @@ -62,6 +62,6 @@ class StructureTemplateDataExportRequestPacket extends DataPacket{ } public function handle(NetworkSession $handler) : bool{ - return $handler->handleStructureTemplateDataExportRequest($this); + return $handler->handleStructureTemplateDataRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportResponsePacket.php b/src/pocketmine/network/mcpe/protocol/StructureTemplateDataResponsePacket.php similarity index 90% rename from src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportResponsePacket.php rename to src/pocketmine/network/mcpe/protocol/StructureTemplateDataResponsePacket.php index 2ff52b116..98afaaed7 100644 --- a/src/pocketmine/network/mcpe/protocol/StructureTemplateDataExportResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StructureTemplateDataResponsePacket.php @@ -27,8 +27,8 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; -class StructureTemplateDataExportResponsePacket extends DataPacket{ - public const NETWORK_ID = ProtocolInfo::STRUCTURE_TEMPLATE_DATA_EXPORT_RESPONSE_PACKET; +class StructureTemplateDataResponsePacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::STRUCTURE_TEMPLATE_DATA_RESPONSE_PACKET; /** @var string */ public $structureTemplateName; @@ -51,6 +51,6 @@ class StructureTemplateDataExportResponsePacket extends DataPacket{ } public function handle(NetworkSession $handler) : bool{ - return $handler->handleStructureTemplateDataExportResponse($this); + return $handler->handleStructureTemplateDataResponse($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/TickSyncPacket.php b/src/pocketmine/network/mcpe/protocol/TickSyncPacket.php new file mode 100644 index 000000000..5bc022c51 --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/TickSyncPacket.php @@ -0,0 +1,44 @@ + + +use pocketmine\network\mcpe\NetworkSession; + +class TickSyncPacket extends DataPacket{ + public const NETWORK_ID = ProtocolInfo::TICK_SYNC_PACKET; + + protected function decodePayload() : void{ + //TODO + } + + protected function encodePayload() : void{ + //TODO + } + + public function handle(NetworkSession $handler) : bool{ + return $handler->handleTickSync($this); + } +}