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

Sync NBT dependency

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-07 22:26:22 +00:00
parent 9c16caf27b
commit 2924303169
12 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/network/mcpe/NetworkBinaryStream.php
View File

@ -30,7 +30,7 @@ use pocketmine\entity\Entity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\math\Vector3;
use pocketmine\nbt\LittleEndianNBTStream;
use pocketmine\nbt\LittleEndianNbtSerializer;
use pocketmine\network\mcpe\protocol\types\CommandOriginData;
use pocketmine\network\mcpe\protocol\types\EntityLink;
use pocketmine\utils\BinaryStream;
@ -39,7 +39,7 @@ use function count;
use function strlen;
class NetworkBinaryStream extends BinaryStream{
/** @var LittleEndianNBTStream */
/** @var LittleEndianNbtSerializer */
private static $itemNbtSerializer = null;
public function getString() : string{
@ -85,7 +85,7 @@ class NetworkBinaryStream extends BinaryStream{
$compound = null;
if($nbtLen > 0){
if(self::$itemNbtSerializer === null){
self::$itemNbtSerializer = new LittleEndianNBTStream();
self::$itemNbtSerializer = new LittleEndianNbtSerializer();
}
$compound = self::$itemNbtSerializer->read($this->get($nbtLen));
}
@ -119,7 +119,7 @@ class NetworkBinaryStream extends BinaryStream{
$nbtLen = 0;
if($item->hasNamedTag()){
if(self::$itemNbtSerializer === null){
self::$itemNbtSerializer = new LittleEndianNBTStream();
self::$itemNbtSerializer = new LittleEndianNbtSerializer();
}
$nbt = self::$itemNbtSerializer->write($item->getNamedTag());
$nbtLen = strlen($nbt);

46
src/pocketmine/network/mcpe/NetworkLittleEndianNBTStream.php → src/pocketmine/network/mcpe/NetworkNbtSerializer.php
View File

@ -23,59 +23,55 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe;
use pocketmine\nbt\LittleEndianNBTStream;
use pocketmine\nbt\LittleEndianNbtSerializer;
use function count;
use function strlen;
#ifndef COMPILE
use pocketmine\utils\Binary;
#endif
#include <rules/NBT.h>
class NetworkNbtSerializer extends LittleEndianNbtSerializer{
class NetworkLittleEndianNBTStream extends LittleEndianNBTStream{
public function getInt() : int{
return Binary::readVarInt($this->buffer, $this->offset);
public function readInt() : int{
return $this->buffer->getVarInt();
}
public function putInt(int $v) : void{
$this->put(Binary::writeVarInt($v));
public function writeInt(int $v) : void{
$this->buffer->putVarInt($v);
}
public function getLong() : int{
return Binary::readVarLong($this->buffer, $this->offset);
public function readLong() : int{
return $this->buffer->getVarLong();
}
public function putLong(int $v) : void{
$this->put(Binary::writeVarLong($v));
public function writeLong(int $v) : void{
$this->buffer->putVarLong($v);
}
public function getString() : string{
return $this->get(Binary::readUnsignedVarInt($this->buffer, $this->offset));
public function readString() : string{
return $this->buffer->get($this->buffer->getUnsignedVarInt());
}
public function putString(string $v) : void{
public function writeString(string $v) : void{
$len = strlen($v);
if($len > 32767){
throw new \InvalidArgumentException("NBT strings cannot be longer than 32767 bytes, got $len bytes");
}
$this->put(Binary::writeUnsignedVarInt($len) . $v);
$this->buffer->putUnsignedVarInt($len);
$this->buffer->put($v);
}
public function getIntArray() : array{
$len = $this->getInt(); //varint
public function readIntArray() : array{
$len = $this->readInt(); //varint
$ret = [];
for($i = 0; $i < $len; ++$i){
$ret[] = $this->getInt(); //varint
$ret[] = $this->readInt(); //varint
}
return $ret;
}
public function putIntArray(array $array) : void{
$this->putInt(count($array)); //varint
public function writeIntArray(array $array) : void{
$this->writeInt(count($array)); //varint
foreach($array as $v){
$this->putInt($v); //varint
$this->writeInt($v); //varint
}
}
}