mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Consolidated MCPE network binary handling methods into one class, remove protocol-specific methods from BinaryStream

Browse Source 
Remove MCPE-network specific stuff from BinaryStream, added NetworkBinaryStream
This removes dependencies of BinaryStream on core code, while providing some consolidation of network handling code.
This commit is contained in:
Dylan K. Taylor
2018-01-11 12:28:56 +00:00
parent 7daca754b1
commit e6bd12dc2f
5 changed files with 557 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/pocketmine/utils/BinaryStream.php
View File

@ -25,9 +25,6 @@ namespace pocketmine\utils;
#include <rules/BinaryIO.h>
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
class BinaryStream{
/** @var int */
@ -219,91 +216,6 @@ class BinaryStream{
$this->buffer .= Binary::writeLLong($v);
}
public function getString() : string{
return $this->get($this->getUnsignedVarInt());
}
public function putString(string $v){
$this->putUnsignedVarInt(strlen($v));
$this->put($v);
}
public function getUUID() : UUID{
//This is actually two little-endian longs: UUID Most followed by UUID Least
$part1 = $this->getLInt();
$part0 = $this->getLInt();
$part3 = $this->getLInt();
$part2 = $this->getLInt();
return new UUID($part0, $part1, $part2, $part3);
}
public function putUUID(UUID $uuid){
$this->putLInt($uuid->getPart(1));
$this->putLInt($uuid->getPart(0));
$this->putLInt($uuid->getPart(3));
$this->putLInt($uuid->getPart(2));
}
public function getSlot() : Item{
$id = $this->getVarInt();
if($id <= 0){
return ItemFactory::get(0, 0, 0);
}
$auxValue = $this->getVarInt();
$data = $auxValue >> 8;
if($data === 0x7fff){
$data = -1;
}
$cnt = $auxValue & 0xff;
$nbtLen = $this->getLShort();
$nbt = "";
if($nbtLen > 0){
$nbt = $this->get($nbtLen);
}
//TODO
$canPlaceOn = $this->getVarInt();
if($canPlaceOn > 0){
for($i = 0; $i < $canPlaceOn; ++$i){
$this->getString();
}
}
//TODO
$canDestroy = $this->getVarInt();
if($canDestroy > 0){
for($i = 0; $i < $canDestroy; ++$i){
$this->getString();
}
}
return ItemFactory::get($id, $data, $cnt, $nbt);
}
public function putSlot(Item $item){
if($item->getId() === 0){
$this->putVarInt(0);
return;
}
$this->putVarInt($item->getId());
$auxValue = (($item->getDamage() & 0x7fff) << 8) | $item->getCount();
$this->putVarInt($auxValue);
$nbt = $item->getCompoundTag();
$this->putLShort(strlen($nbt));
$this->put($nbt);
$this->putVarInt(0); //CanPlaceOn entry count (TODO)
$this->putVarInt(0); //CanDestroy entry count (TODO)
}
/**
* Reads a 32-bit variable-length unsigned integer from the buffer and returns it.
* @return int