mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-22 00:33:59 +00:00
1.10.0 updates
This commit is contained in:
Dylan K. Taylor
parent
baa094a2d1
commit
cce99b07af
@ -104,6 +104,7 @@ use pocketmine\network\mcpe\protocol\AnimatePacket;
|
||||
use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
|
||||
use pocketmine\network\mcpe\protocol\AvailableEntityIdentifiersPacket;
|
||||
use pocketmine\network\mcpe\protocol\BatchPacket;
|
||||
use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
|
||||
use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
|
||||
use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
|
||||
use pocketmine\network\mcpe\protocol\BookEditPacket;
|
||||
@ -2147,6 +2148,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
||||
$this->dataPacket($pk);
|
||||
|
||||
$this->sendDataPacket(new AvailableEntityIdentifiersPacket());
|
||||
$this->sendDataPacket(new BiomeDefinitionListPacket());
|
||||
|
||||
$this->level->sendTime($this);
|
||||
|
||||
|
||||
@ -204,6 +204,7 @@ interface ItemIds extends BlockIds{
|
||||
public const DARK_OAK_DOOR = 431;
|
||||
public const CHORUS_FRUIT = 432;
|
||||
public const CHORUS_FRUIT_POPPED = 433;
|
||||
public const BANNER_PATTERN = 434;
|
||||
|
||||
public const DRAGON_BREATH = 437;
|
||||
public const SPLASH_POTION = 438;
|
||||
@ -237,6 +238,14 @@ interface ItemIds extends BlockIds{
|
||||
public const HEART_OF_THE_SEA = 467;
|
||||
public const TURTLE_SHELL_PIECE = 468;
|
||||
public const TURTLE_HELMET = 469;
|
||||
public const PHANTOM_MEMBRANE = 470;
|
||||
public const CROSSBOW = 471;
|
||||
public const SPRUCE_SIGN = 472;
|
||||
public const BIRCH_SIGN = 473;
|
||||
public const JUNGLE_SIGN = 474;
|
||||
public const ACACIA_SIGN = 475;
|
||||
public const DARKOAK_SIGN = 476;
|
||||
public const SWEET_BERRIES = 477;
|
||||
|
||||
public const COMPOUND = 499;
|
||||
public const RECORD_13 = 500;
|
||||
@ -252,4 +261,6 @@ interface ItemIds extends BlockIds{
|
||||
public const RECORD_11 = 510;
|
||||
public const RECORD_WAIT = 511;
|
||||
|
||||
public const SHIELD = 513;
|
||||
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@ use pocketmine\entity\Attribute;
|
||||
use pocketmine\entity\Entity;
|
||||
use pocketmine\item\Item;
|
||||
use pocketmine\item\ItemFactory;
|
||||
use pocketmine\item\ItemIds;
|
||||
use pocketmine\math\Vector3;
|
||||
use pocketmine\nbt\NetworkLittleEndianNBTStream;
|
||||
use pocketmine\nbt\tag\CompoundTag;
|
||||
@ -104,6 +105,10 @@ class NetworkBinaryStream extends BinaryStream{
|
||||
$this->getString();
|
||||
}
|
||||
|
||||
if($id === ItemIds::SHIELD){
|
||||
$this->getVarLong(); //"blocking tick" (ffs mojang)
|
||||
}
|
||||
|
||||
return ItemFactory::get($id, $data, $cnt, $nbt);
|
||||
}
|
||||
|
||||
@ -129,6 +134,10 @@ class NetworkBinaryStream extends BinaryStream{
|
||||
|
||||
$this->putVarInt(0); //CanPlaceOn entry count (TODO)
|
||||
$this->putVarInt(0); //CanDestroy entry count (TODO)
|
||||
|
||||
if($item->getId() === ItemIds::SHIELD){
|
||||
$this->putVarLong(0); //"blocking tick" (ffs mojang)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -30,6 +30,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\AutomationClientConnectPacket;
|
||||
use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
|
||||
use pocketmine\network\mcpe\protocol\AvailableEntityIdentifiersPacket;
|
||||
use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
|
||||
@ -68,6 +69,7 @@ use pocketmine\network\mcpe\protocol\InventorySlotPacket;
|
||||
use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
|
||||
use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
|
||||
use pocketmine\network\mcpe\protocol\LabTablePacket;
|
||||
use pocketmine\network\mcpe\protocol\LecternUpdatePacket;
|
||||
use pocketmine\network\mcpe\protocol\LevelEventPacket;
|
||||
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
|
||||
use pocketmine\network\mcpe\protocol\LevelSoundEventPacketV1;
|
||||
@ -144,7 +146,7 @@ use pocketmine\network\mcpe\protocol\UpdateBlockSyncedPacket;
|
||||
use pocketmine\network\mcpe\protocol\UpdateEquipPacket;
|
||||
use pocketmine\network\mcpe\protocol\UpdateSoftEnumPacket;
|
||||
use pocketmine\network\mcpe\protocol\UpdateTradePacket;
|
||||
use pocketmine\network\mcpe\protocol\WSConnectPacket;
|
||||
use pocketmine\network\mcpe\protocol\VideoStreamConnectPacket;
|
||||
|
||||
abstract class NetworkSession{
|
||||
|
||||
@ -522,7 +524,7 @@ abstract class NetworkSession{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function handleWSConnect(WSConnectPacket $packet) : bool{
|
||||
public function handleAutomationClientConnect(AutomationClientConnectPacket $packet) : bool{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -634,4 +636,12 @@ abstract class NetworkSession{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function handleLecternUpdate(LecternUpdatePacket $packet) : bool{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function handleVideoStreamConnect(VideoStreamConnectPacket $packet) : bool{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -27,8 +27,8 @@ namespace pocketmine\network\mcpe\protocol;
|
||||
|
||||
use pocketmine\network\mcpe\NetworkSession;
|
||||
|
||||
class WSConnectPacket extends DataPacket{
|
||||
public const NETWORK_ID = ProtocolInfo::W_S_CONNECT_PACKET;
|
||||
class AutomationClientConnectPacket extends DataPacket{
|
||||
public const NETWORK_ID = ProtocolInfo::AUTOMATION_CLIENT_CONNECT_PACKET;
|
||||
|
||||
/** @var string */
|
||||
public $serverUri;
|
||||
@ -42,6 +42,6 @@ class WSConnectPacket extends DataPacket{
|
||||
}
|
||||
|
||||
public function handle(NetworkSession $session) : bool{
|
||||
return $session->handleWSConnect($this);
|
||||
return $session->handleAutomationClientConnect($this);
|
||||
}
|
||||
}
|
||||
@ -220,21 +220,22 @@ class AvailableCommandsPacket extends DataPacket{
|
||||
$parameter->paramName = $this->getString();
|
||||
$parameter->paramType = $this->getLInt();
|
||||
$parameter->isOptional = $this->getBool();
|
||||
$parameter->byte1 = $this->getByte();
|
||||
|
||||
if($parameter->paramType & self::ARG_FLAG_ENUM){
|
||||
$index = ($parameter->paramType & 0xffff);
|
||||
$parameter->enum = $this->enums[$index] ?? null;
|
||||
if($parameter->enum === null){
|
||||
throw new \UnexpectedValueException("expected enum at $index, but got none");
|
||||
throw new \UnexpectedValueException("deserializing $retval->commandName parameter $parameter->paramName: expected enum at $index, but got none");
|
||||
}
|
||||
}elseif($parameter->paramType & self::ARG_FLAG_POSTFIX){
|
||||
$index = ($parameter->paramType & 0xffff);
|
||||
$parameter->postfix = $this->postfixes[$index] ?? null;
|
||||
if($parameter->postfix === null){
|
||||
throw new \UnexpectedValueException("expected postfix at $index, but got none");
|
||||
throw new \UnexpectedValueException("deserializing $retval->commandName parameter $parameter->paramName: expected postfix at $index, but got none");
|
||||
}
|
||||
}elseif(($parameter->paramType & self::ARG_FLAG_VALID) === 0){
|
||||
throw new \UnexpectedValueException("Invalid parameter type 0x" . dechex($parameter->paramType));
|
||||
throw new \UnexpectedValueException("deserializing $retval->commandName parameter $parameter->paramName: Invalid parameter type 0x" . dechex($parameter->paramType));
|
||||
}
|
||||
|
||||
$retval->overloads[$overloadIndex][$paramIndex] = $parameter;
|
||||
@ -277,6 +278,7 @@ class AvailableCommandsPacket extends DataPacket{
|
||||
|
||||
$this->putLInt($type);
|
||||
$this->putBool($parameter->isOptional);
|
||||
$this->putByte($parameter->byte1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -30,6 +30,7 @@ use pocketmine\network\mcpe\NetworkSession;
|
||||
class BiomeDefinitionListPacket extends DataPacket{
|
||||
public const NETWORK_ID = ProtocolInfo::BIOME_DEFINITION_LIST_PACKET;
|
||||
|
||||
public const HARDCODED_NBT_BLOB = "CgAKDWJhbWJvb19qdW5nbGUFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoTYmFtYm9vX2p1bmdsZV9oaWxscwUIZG93bmZhbGxmZmY/BQt0ZW1wZXJhdHVyZTMzcz8ACgViZWFjaAUIZG93bmZhbGzNzMw+BQt0ZW1wZXJhdHVyZc3MTD8ACgxiaXJjaF9mb3Jlc3QFCGRvd25mYWxsmpkZPwULdGVtcGVyYXR1cmWamRk/AAoSYmlyY2hfZm9yZXN0X2hpbGxzBQhkb3duZmFsbJqZGT8FC3RlbXBlcmF0dXJlmpkZPwAKGmJpcmNoX2ZvcmVzdF9oaWxsc19tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKFGJpcmNoX2ZvcmVzdF9tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKCmNvbGRfYmVhY2gFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw9AAoKY29sZF9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgpjb2xkX3RhaWdhBQhkb3duZmFsbM3MzD4FC3RlbXBlcmF0dXJlAAAAvwAKEGNvbGRfdGFpZ2FfaGlsbHMFCGRvd25mYWxszczMPgULdGVtcGVyYXR1cmUAAAC/AAoSY29sZF90YWlnYV9tdXRhdGVkBQhkb3duZmFsbM3MzD4FC3RlbXBlcmF0dXJlAAAAvwAKD2RlZXBfY29sZF9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8AChFkZWVwX2Zyb3plbl9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAAChNkZWVwX2x1a2V3YXJtX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKCmRlZXBfb2NlYW4FCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAA/AAoPZGVlcF93YXJtX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKBmRlc2VydAUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAACgxkZXNlcnRfaGlsbHMFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoOZGVzZXJ0X211dGF0ZWQFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoNZXh0cmVtZV9oaWxscwUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4AChJleHRyZW1lX2hpbGxzX2VkZ2UFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw+AAoVZXh0cmVtZV9oaWxsc19tdXRhdGVkBQhkb3duZmFsbJqZmT4FC3RlbXBlcmF0dXJlzcxMPgAKGGV4dHJlbWVfaGlsbHNfcGx1c190cmVlcwUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4ACiBleHRyZW1lX2hpbGxzX3BsdXNfdHJlZXNfbXV0YXRlZAUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4ACg1mbG93ZXJfZm9yZXN0BQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKBmZvcmVzdAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzMz8ACgxmb3Jlc3RfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUzMzM/AAoMZnJvemVuX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAAAAKDGZyb3plbl9yaXZlcgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAACgRoZWxsBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlAAAAQAAKDWljZV9tb3VudGFpbnMFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAAAAAoKaWNlX3BsYWlucwUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAAChFpY2VfcGxhaW5zX3NwaWtlcwUIZG93bmZhbGwAAIA/BQt0ZW1wZXJhdHVyZQAAAAAACgZqdW5nbGUFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoLanVuZ2xlX2VkZ2UFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUzM3M/AAoTanVuZ2xlX2VkZ2VfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzcz8ACgxqdW5nbGVfaGlsbHMFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoOanVuZ2xlX211dGF0ZWQFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoTbGVnYWN5X2Zyb3plbl9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAACg5sdWtld2FybV9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgptZWdhX3RhaWdhBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlmpmZPgAKEG1lZ2FfdGFpZ2FfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmWamZk+AAoEbWVzYQUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAACgptZXNhX2JyeWNlBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlAAAAQAAKDG1lc2FfcGxhdGVhdQUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAAChRtZXNhX3BsYXRlYXVfbXV0YXRlZAUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAAChJtZXNhX3BsYXRlYXVfc3RvbmUFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoabWVzYV9wbGF0ZWF1X3N0b25lX211dGF0ZWQFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoPbXVzaHJvb21faXNsYW5kBQhkb3duZmFsbAAAgD8FC3RlbXBlcmF0dXJlZmZmPwAKFW11c2hyb29tX2lzbGFuZF9zaG9yZQUIZG93bmZhbGwAAIA/BQt0ZW1wZXJhdHVyZWZmZj8ACgVvY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgZwbGFpbnMFCGRvd25mYWxszczMPgULdGVtcGVyYXR1cmXNzEw/AAobcmVkd29vZF90YWlnYV9oaWxsc19tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlmpmZPgAKFXJlZHdvb2RfdGFpZ2FfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZQAAgD4ACgVyaXZlcgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACg1yb29mZWRfZm9yZXN0BQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKFXJvb2ZlZF9mb3Jlc3RfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzMz8ACgdzYXZhbm5hBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlmpmZPwAKD3NhdmFubmFfbXV0YXRlZAUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZc3MjD8ACg9zYXZhbm5hX3BsYXRlYXUFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAIA/AAoXc2F2YW5uYV9wbGF0ZWF1X211dGF0ZWQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAIA/AAoLc3RvbmVfYmVhY2gFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw+AAoQc3VuZmxvd2VyX3BsYWlucwUIZG93bmZhbGzNzMw+BQt0ZW1wZXJhdHVyZc3MTD8ACglzd2FtcGxhbmQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmXNzEw/AAoRc3dhbXBsYW5kX211dGF0ZWQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmXNzEw/AAoFdGFpZ2EFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUAAIA+AAoLdGFpZ2FfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUAAIA+AAoNdGFpZ2FfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZQAAgD4ACgd0aGVfZW5kBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKCndhcm1fb2NlYW4FCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAA/AAA=";
|
||||
/** @var string */
|
||||
public $namedtag;
|
||||
|
||||
@ -38,7 +39,7 @@ class BiomeDefinitionListPacket extends DataPacket{
|
||||
}
|
||||
|
||||
protected function encodePayload(){
|
||||
$this->put($this->namedtag);
|
||||
$this->put($this->namedtag ?? self::HARDCODED_NBT_BLOB);
|
||||
}
|
||||
|
||||
public function handle(NetworkSession $session) : bool{
|
||||
|
||||
@ -92,6 +92,7 @@ class InventoryTransactionPacket extends DataPacket{
|
||||
$this->trData->itemInHand = $this->getSlot();
|
||||
$this->trData->playerPos = $this->getVector3();
|
||||
$this->trData->clickPos = $this->getVector3();
|
||||
$this->trData->blockRuntimeId = $this->getUnsignedVarInt();
|
||||
break;
|
||||
case self::TYPE_USE_ITEM_ON_ENTITY:
|
||||
$this->trData->entityRuntimeId = $this->getEntityRuntimeId();
|
||||
@ -132,6 +133,7 @@ class InventoryTransactionPacket extends DataPacket{
|
||||
$this->putSlot($this->trData->itemInHand);
|
||||
$this->putVector3($this->trData->playerPos);
|
||||
$this->putVector3($this->trData->clickPos);
|
||||
$this->putUnsignedVarInt($this->trData->blockRuntimeId);
|
||||
break;
|
||||
case self::TYPE_USE_ITEM_ON_ENTITY:
|
||||
$this->putEntityRuntimeId($this->trData->entityRuntimeId);
|
||||
|
||||
59
src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php
Normal file
59
src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php
Normal file
@ -0,0 +1,59 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
*
|
||||
* ____ _ _ __ __ _ __ __ ____
|
||||
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* @author PocketMine Team
|
||||
* @link http://www.pocketmine.net/
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\network\mcpe\protocol;
|
||||
|
||||
#include <rules/DataPacket.h>
|
||||
|
||||
use pocketmine\network\mcpe\NetworkSession;
|
||||
|
||||
class LecternUpdatePacket extends DataPacket/* implements ServerboundPacket*/{
|
||||
public const NETWORK_ID = ProtocolInfo::LECTERN_UPDATE_PACKET;
|
||||
|
||||
/** @var int */
|
||||
public $page;
|
||||
/** @var int */
|
||||
public $x;
|
||||
/** @var int */
|
||||
public $y;
|
||||
/** @var int */
|
||||
public $z;
|
||||
/** @var bool */
|
||||
public $dropBook;
|
||||
|
||||
protected function decodePayload() : void{
|
||||
$this->page = $this->getByte();
|
||||
$this->getBlockPosition($this->x, $this->y, $this->z);
|
||||
$this->dropBook = $this->getBool();
|
||||
}
|
||||
|
||||
protected function encodePayload() : void{
|
||||
$this->putByte($this->page);
|
||||
$this->putBlockPosition($this->x, $this->y, $this->z);
|
||||
$this->putBool($this->dropBook);
|
||||
}
|
||||
|
||||
public function handle(NetworkSession $session) : bool{
|
||||
return $session->handleLecternUpdate($this);
|
||||
}
|
||||
}
|
||||
@ -126,7 +126,7 @@ class PacketPool{
|
||||
static::registerPacket(new PurchaseReceiptPacket());
|
||||
static::registerPacket(new PlayerSkinPacket());
|
||||
static::registerPacket(new SubClientLoginPacket());
|
||||
static::registerPacket(new WSConnectPacket());
|
||||
static::registerPacket(new AutomationClientConnectPacket());
|
||||
static::registerPacket(new SetLastHurtByPacket());
|
||||
static::registerPacket(new BookEditPacket());
|
||||
static::registerPacket(new NpcRequestPacket());
|
||||
@ -154,6 +154,8 @@ class PacketPool{
|
||||
static::registerPacket(new NetworkChunkPublisherUpdatePacket());
|
||||
static::registerPacket(new BiomeDefinitionListPacket());
|
||||
static::registerPacket(new LevelSoundEventPacket());
|
||||
static::registerPacket(new LecternUpdatePacket());
|
||||
static::registerPacket(new VideoStreamConnectPacket());
|
||||
|
||||
static::registerPacket(new BatchPacket());
|
||||
}
|
||||
|
||||
@ -39,15 +39,15 @@ interface ProtocolInfo{
|
||||
/**
|
||||
* Actual Minecraft: PE protocol version
|
||||
*/
|
||||
public const CURRENT_PROTOCOL = 332;
|
||||
public const CURRENT_PROTOCOL = 340;
|
||||
/**
|
||||
* Current Minecraft PE version reported by the server. This is usually the earliest currently supported version.
|
||||
*/
|
||||
public const MINECRAFT_VERSION = 'v1.9.0';
|
||||
public const MINECRAFT_VERSION = 'v1.10.0';
|
||||
/**
|
||||
* Version number sent to clients in ping responses.
|
||||
*/
|
||||
public const MINECRAFT_VERSION_NETWORK = '1.9.0';
|
||||
public const MINECRAFT_VERSION_NETWORK = '1.10.0';
|
||||
|
||||
public const LOGIN_PACKET = 0x01;
|
||||
public const PLAY_STATUS_PACKET = 0x02;
|
||||
@ -143,7 +143,7 @@ interface ProtocolInfo{
|
||||
public const PURCHASE_RECEIPT_PACKET = 0x5c;
|
||||
public const PLAYER_SKIN_PACKET = 0x5d;
|
||||
public const SUB_CLIENT_LOGIN_PACKET = 0x5e;
|
||||
public const W_S_CONNECT_PACKET = 0x5f;
|
||||
public const AUTOMATION_CLIENT_CONNECT_PACKET = 0x5f;
|
||||
public const SET_LAST_HURT_BY_PACKET = 0x60;
|
||||
public const BOOK_EDIT_PACKET = 0x61;
|
||||
public const NPC_REQUEST_PACKET = 0x62;
|
||||
@ -172,5 +172,7 @@ interface ProtocolInfo{
|
||||
public const NETWORK_CHUNK_PUBLISHER_UPDATE_PACKET = 0x79;
|
||||
public const BIOME_DEFINITION_LIST_PACKET = 0x7a;
|
||||
public const LEVEL_SOUND_EVENT_PACKET = 0x7b;
|
||||
public const LECTERN_UPDATE_PACKET = 0x7c;
|
||||
public const VIDEO_STREAM_CONNECT_PACKET = 0x7d;
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
*
|
||||
* ____ _ _ __ __ _ __ __ ____
|
||||
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* @author PocketMine Team
|
||||
* @link http://www.pocketmine.net/
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\network\mcpe\protocol;
|
||||
|
||||
#include <rules/DataPacket.h>
|
||||
|
||||
use pocketmine\network\mcpe\NetworkSession;
|
||||
|
||||
class VideoStreamConnectPacket extends DataPacket/* implements ClientboundPacket*/{
|
||||
public const NETWORK_ID = ProtocolInfo::VIDEO_STREAM_CONNECT_PACKET;
|
||||
|
||||
public const ACTION_CONNECT = 0;
|
||||
public const ACTION_DISCONNECT = 1;
|
||||
|
||||
/** @var string */
|
||||
public $serverUri;
|
||||
/** @var float */
|
||||
public $frameSendFrequency;
|
||||
/** @var int */
|
||||
public $action;
|
||||
|
||||
protected function decodePayload() : void{
|
||||
$this->serverUri = $this->getString();
|
||||
$this->frameSendFrequency = $this->getLFloat();
|
||||
$this->action = $this->getByte();
|
||||
}
|
||||
|
||||
protected function encodePayload() : void{
|
||||
$this->putString($this->serverUri);
|
||||
$this->putLFloat($this->frameSendFrequency);
|
||||
$this->putByte($this->action);
|
||||
}
|
||||
|
||||
public function handle(NetworkSession $session) : bool{
|
||||
return $session->handleVideoStreamConnect($this);
|
||||
}
|
||||
}
|
||||
@ -30,6 +30,8 @@ class CommandParameter{
|
||||
public $paramType;
|
||||
/** @var bool */
|
||||
public $isOptional;
|
||||
/** @var int */
|
||||
public $byte1 = 0; //unknown, always zero except for in /gamerule command
|
||||
/** @var CommandEnum|null */
|
||||
public $enum;
|
||||
/** @var string|null */
|
||||
|
||||
@ -247,5 +247,214 @@
|
||||
"minecraft:structure_block": 252,
|
||||
"minecraft:hard_glass": 253,
|
||||
"minecraft:hard_stained_glass": 254,
|
||||
"minecraft:reserved6": 255
|
||||
}
|
||||
"minecraft:reserved6": 255,
|
||||
"minecraft:prismarine_stairs": 257,
|
||||
"minecraft:dark_prismarine_stairs": 258,
|
||||
"minecraft:prismarine_bricks_stairs": 259,
|
||||
"minecraft:stripped_spruce_log": 260,
|
||||
"minecraft:stripped_birch_log": 261,
|
||||
"minecraft:stripped_jungle_log": 262,
|
||||
"minecraft:stripped_acacia_log": 263,
|
||||
"minecraft:stripped_dark_oak_log": 264,
|
||||
"minecraft:stripped_oak_log": 265,
|
||||
"minecraft:blue_ice": 266,
|
||||
"minecraft:element_1": 267,
|
||||
"minecraft:element_2": 268,
|
||||
"minecraft:element_3": 269,
|
||||
"minecraft:element_4": 270,
|
||||
"minecraft:element_5": 271,
|
||||
"minecraft:element_6": 272,
|
||||
"minecraft:element_7": 273,
|
||||
"minecraft:element_8": 274,
|
||||
"minecraft:element_9": 275,
|
||||
"minecraft:element_10": 276,
|
||||
"minecraft:element_11": 277,
|
||||
"minecraft:element_12": 278,
|
||||
"minecraft:element_13": 279,
|
||||
"minecraft:element_14": 280,
|
||||
"minecraft:element_15": 281,
|
||||
"minecraft:element_16": 282,
|
||||
"minecraft:element_17": 283,
|
||||
"minecraft:element_18": 284,
|
||||
"minecraft:element_19": 285,
|
||||
"minecraft:element_20": 286,
|
||||
"minecraft:element_21": 287,
|
||||
"minecraft:element_22": 288,
|
||||
"minecraft:element_23": 289,
|
||||
"minecraft:element_24": 290,
|
||||
"minecraft:element_25": 291,
|
||||
"minecraft:element_26": 292,
|
||||
"minecraft:element_27": 293,
|
||||
"minecraft:element_28": 294,
|
||||
"minecraft:element_29": 295,
|
||||
"minecraft:element_30": 296,
|
||||
"minecraft:element_31": 297,
|
||||
"minecraft:element_32": 298,
|
||||
"minecraft:element_33": 299,
|
||||
"minecraft:element_34": 300,
|
||||
"minecraft:element_35": 301,
|
||||
"minecraft:element_36": 302,
|
||||
"minecraft:element_37": 303,
|
||||
"minecraft:element_38": 304,
|
||||
"minecraft:element_39": 305,
|
||||
"minecraft:element_40": 306,
|
||||
"minecraft:element_41": 307,
|
||||
"minecraft:element_42": 308,
|
||||
"minecraft:element_43": 309,
|
||||
"minecraft:element_44": 310,
|
||||
"minecraft:element_45": 311,
|
||||
"minecraft:element_46": 312,
|
||||
"minecraft:element_47": 313,
|
||||
"minecraft:element_48": 314,
|
||||
"minecraft:element_49": 315,
|
||||
"minecraft:element_50": 316,
|
||||
"minecraft:element_51": 317,
|
||||
"minecraft:element_52": 318,
|
||||
"minecraft:element_53": 319,
|
||||
"minecraft:element_54": 320,
|
||||
"minecraft:element_55": 321,
|
||||
"minecraft:element_56": 322,
|
||||
"minecraft:element_57": 323,
|
||||
"minecraft:element_58": 324,
|
||||
"minecraft:element_59": 325,
|
||||
"minecraft:element_60": 326,
|
||||
"minecraft:element_61": 327,
|
||||
"minecraft:element_62": 328,
|
||||
"minecraft:element_63": 329,
|
||||
"minecraft:element_64": 330,
|
||||
"minecraft:element_65": 331,
|
||||
"minecraft:element_66": 332,
|
||||
"minecraft:element_67": 333,
|
||||
"minecraft:element_68": 334,
|
||||
"minecraft:element_69": 335,
|
||||
"minecraft:element_70": 336,
|
||||
"minecraft:element_71": 337,
|
||||
"minecraft:element_72": 338,
|
||||
"minecraft:element_73": 339,
|
||||
"minecraft:element_74": 340,
|
||||
"minecraft:element_75": 341,
|
||||
"minecraft:element_76": 342,
|
||||
"minecraft:element_77": 343,
|
||||
"minecraft:element_78": 344,
|
||||
"minecraft:element_79": 345,
|
||||
"minecraft:element_80": 346,
|
||||
"minecraft:element_81": 347,
|
||||
"minecraft:element_82": 348,
|
||||
"minecraft:element_83": 349,
|
||||
"minecraft:element_84": 350,
|
||||
"minecraft:element_85": 351,
|
||||
"minecraft:element_86": 352,
|
||||
"minecraft:element_87": 353,
|
||||
"minecraft:element_88": 354,
|
||||
"minecraft:element_89": 355,
|
||||
"minecraft:element_90": 356,
|
||||
"minecraft:element_91": 357,
|
||||
"minecraft:element_92": 358,
|
||||
"minecraft:element_93": 359,
|
||||
"minecraft:element_94": 360,
|
||||
"minecraft:element_95": 361,
|
||||
"minecraft:element_96": 362,
|
||||
"minecraft:element_97": 363,
|
||||
"minecraft:element_98": 364,
|
||||
"minecraft:element_99": 365,
|
||||
"minecraft:element_100": 366,
|
||||
"minecraft:element_101": 367,
|
||||
"minecraft:element_102": 368,
|
||||
"minecraft:element_103": 369,
|
||||
"minecraft:element_104": 370,
|
||||
"minecraft:element_105": 371,
|
||||
"minecraft:element_106": 372,
|
||||
"minecraft:element_107": 373,
|
||||
"minecraft:element_108": 374,
|
||||
"minecraft:element_109": 375,
|
||||
"minecraft:element_110": 376,
|
||||
"minecraft:element_111": 377,
|
||||
"minecraft:element_112": 378,
|
||||
"minecraft:element_113": 379,
|
||||
"minecraft:element_114": 380,
|
||||
"minecraft:element_115": 381,
|
||||
"minecraft:element_116": 382,
|
||||
"minecraft:element_117": 383,
|
||||
"minecraft:element_118": 384,
|
||||
"minecraft:seagrass": 385,
|
||||
"minecraft:coral": 386,
|
||||
"minecraft:coral_block": 387,
|
||||
"minecraft:coral_fan": 388,
|
||||
"minecraft:coral_fan_dead": 389,
|
||||
"minecraft:coral_fan_hang": 390,
|
||||
"minecraft:coral_fan_hang2": 391,
|
||||
"minecraft:coral_fan_hang3": 392,
|
||||
"minecraft:kelp": 393,
|
||||
"minecraft:dried_kelp_block": 394,
|
||||
"minecraft:acacia_button": 395,
|
||||
"minecraft:birch_button": 396,
|
||||
"minecraft:dark_oak_button": 397,
|
||||
"minecraft:jungle_button": 398,
|
||||
"minecraft:spruce_button": 399,
|
||||
"minecraft:acacia_trapdoor": 400,
|
||||
"minecraft:birch_trapdoor": 401,
|
||||
"minecraft:dark_oak_trapdoor": 402,
|
||||
"minecraft:jungle_trapdoor": 403,
|
||||
"minecraft:spruce_trapdoor": 404,
|
||||
"minecraft:acacia_pressure_plate": 405,
|
||||
"minecraft:birch_pressure_plate": 406,
|
||||
"minecraft:dark_oak_pressure_plate": 407,
|
||||
"minecraft:jungle_pressure_plate": 408,
|
||||
"minecraft:spruce_pressure_plate": 409,
|
||||
"minecraft:carved_pumpkin": 410,
|
||||
"minecraft:sea_pickle": 411,
|
||||
"minecraft:conduit": 412,
|
||||
"minecraft:turtle_egg": 414,
|
||||
"minecraft:bubble_column": 415,
|
||||
"minecraft:barrier": 416,
|
||||
"minecraft:stone_slab3": 417,
|
||||
"minecraft:bamboo": 418,
|
||||
"minecraft:bamboo_sapling": 419,
|
||||
"minecraft:scaffolding": 420,
|
||||
"minecraft:stone_slab4": 421,
|
||||
"minecraft:double_stone_slab3": 422,
|
||||
"minecraft:double_stone_slab4": 423,
|
||||
"minecraft:granite_stairs": 424,
|
||||
"minecraft:diorite_stairs": 425,
|
||||
"minecraft:andesite_stairs": 426,
|
||||
"minecraft:polished_granite_stairs": 427,
|
||||
"minecraft:polished_diorite_stairs": 428,
|
||||
"minecraft:polished_andesite_stairs": 429,
|
||||
"minecraft:mossy_stone_brick_stairs": 430,
|
||||
"minecraft:smooth_red_sandstone_stairs": 431,
|
||||
"minecraft:smooth_sandstone_stairs": 432,
|
||||
"minecraft:end_brick_stairs": 433,
|
||||
"minecraft:mossy_cobblestone_stairs": 434,
|
||||
"minecraft:normal_stone_stairs": 435,
|
||||
"minecraft:spruce_standing_sign": 436,
|
||||
"minecraft:spruce_wall_sign": 437,
|
||||
"minecraft:smooth_stone": 438,
|
||||
"minecraft:red_nether_brick_stairs": 439,
|
||||
"minecraft:smooth_quartz_stairs": 440,
|
||||
"minecraft:birch_standing_sign": 441,
|
||||
"minecraft:birch_wall_sign": 442,
|
||||
"minecraft:jungle_standing_sign": 443,
|
||||
"minecraft:jungle_wall_sign": 444,
|
||||
"minecraft:acacia_standing_sign": 445,
|
||||
"minecraft:acacia_wall_sign": 446,
|
||||
"minecraft:darkoak_standing_sign": 447,
|
||||
"minecraft:darkoak_wall_sign": 448,
|
||||
"minecraft:lectern": 449,
|
||||
"minecraft:grindstone": 450,
|
||||
"minecraft:blast_furnace": 451,
|
||||
"minecraft:stonecutter_block": 452,
|
||||
"minecraft:smoker": 453,
|
||||
"minecraft:cartography_table": 455,
|
||||
"minecraft:fletching_table": 456,
|
||||
"minecraft:smithing_table": 457,
|
||||
"minecraft:barrel": 458,
|
||||
"minecraft:loom": 459,
|
||||
"minecraft:bell": 461,
|
||||
"minecraft:sweet_berry_bush": 462,
|
||||
"minecraft:lantern": 463,
|
||||
"minecraft:campfire": 464,
|
||||
"minecraft:lava_cauldron": 465,
|
||||
"minecraft:jigsaw": 466,
|
||||
"minecraft:wood": 467,
|
||||
"minecraft:composter": 468
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
Subproject commit 90c5fcd4ab8a839f84f686b42f671e3900977fde
|
||||
Subproject commit 33566f555fc720b3d4a5af1acf7c744a98e37170
|
||||
Loading…
x
Reference in New Issue
Block a user