mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

StartGamePacket: allow specifying a custom runtimeID table

Browse Source 
this is not the intended goal, but it's a happy side effect of making it easier to extract structured information from the client.
This commit is contained in:
Dylan K. Taylor 2019-04-24 18:40:29 +01:00
parent 15ae323bcb
commit fc76d04dcb
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/pocketmine/network/mcpe/protocol/StartGamePacket.php
View File

@ -37,7 +37,7 @@ class StartGamePacket extends DataPacket{
public const NETWORK_ID = ProtocolInfo::START_GAME_PACKET; public const NETWORK_ID = ProtocolInfo::START_GAME_PACKET;
/** @var string|null */ /** @var string|null */
private static $runtimeIdTable; private static $runtimeIdTableCache;
/** @var int */ /** @var int */
public $entityUniqueId; public $entityUniqueId;
@ -138,6 +138,9 @@ class StartGamePacket extends DataPacket{
/** @var string */ /** @var string */
public $multiplayerCorrelationId = ""; //TODO: this should be filled with a UUID of some sort public $multiplayerCorrelationId = ""; //TODO: this should be filled with a UUID of some sort
/** @var array|null each entry must have a "name" (string) and "data" (int16) element */
public $runtimeIdTable = null;
protected function decodePayload(){ protected function decodePayload(){
$this->entityUniqueId = $this->getEntityUniqueId(); $this->entityUniqueId = $this->getEntityUniqueId();
$this->entityRuntimeId = $this->getEntityRuntimeId(); $this->entityRuntimeId = $this->getEntityRuntimeId();
@ -189,10 +192,14 @@ class StartGamePacket extends DataPacket{
$this->enchantmentSeed = $this->getVarInt(); $this->enchantmentSeed = $this->getVarInt();
$count = $this->getUnsignedVarInt(); $count = $this->getUnsignedVarInt();
$table = [];
for($i = 0; $i < $count; ++$i){ for($i = 0; $i < $count; ++$i){
$this->getString(); $id = $this->getString();
$this->getLShort(); $data = $this->getLShort();
$table[$i] = ["name" => $id, "data" => $data];
} }
$this->runtimeIdTable = $table;
$this->multiplayerCorrelationId = $this->getString(); $this->multiplayerCorrelationId = $this->getString();
} }
@ -247,20 +254,27 @@ class StartGamePacket extends DataPacket{
$this->putVarInt($this->enchantmentSeed); $this->putVarInt($this->enchantmentSeed);
if(self::$runtimeIdTable === null){ if($this->runtimeIdTable === null){
if(self::$runtimeIdTableCache === null){
//this is a really nasty hack, but it'll do for now //this is a really nasty hack, but it'll do for now
self::$runtimeIdTableCache = self::serializeBlockTable(RuntimeBlockMapping::getBedrockKnownStates());
}
$this->put(self::$runtimeIdTableCache);
}else{
$this->put(self::serializeBlockTable($this->runtimeIdTable));
}
$this->putString($this->multiplayerCorrelationId);
}
private static function serializeBlockTable(array $table) : string{
$stream = new NetworkBinaryStream(); $stream = new NetworkBinaryStream();
$data = RuntimeBlockMapping::getBedrockKnownStates(); $stream->putUnsignedVarInt(count($table));
$stream->putUnsignedVarInt(count($data)); foreach($table as $v){
foreach($data as $v){
$stream->putString($v["name"]); $stream->putString($v["name"]);
$stream->putLShort($v["data"]); $stream->putLShort($v["data"]);
} }
self::$runtimeIdTable = $stream->buffer; return $stream->getBuffer();
}
$this->put(self::$runtimeIdTable);
$this->putString($this->multiplayerCorrelationId);
} }
public function handle(NetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{