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

Merge branch 'master' into mcpe-1.1

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-05-30 16:09:46 +01:00
parent 63358a8065 db3cd1829c
commit 8382970d56
9 changed files with 389 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/pocketmine/utils/Binary.php
View File

@ -341,13 +341,14 @@ class Binary{
/**
* Reads a 32-bit zigzag-encoded variable-length integer from the supplied stream.
*
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int
*/
public static function readVarInt($stream){
public static function readVarInt(string $buffer, int &$offset){
$shift = PHP_INT_SIZE === 8 ? 63 : 31;
$raw = self::readUnsignedVarInt($stream);
$raw = self::readUnsignedVarInt($buffer, $offset);
$temp = ((($raw << $shift) >> $shift) ^ $raw) >> 1;
return $temp ^ ($raw & (1 << $shift));
}
@ -355,18 +356,21 @@ class Binary{
/**
* Reads a 32-bit variable-length unsigned integer from the supplied stream.
*
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int
*/
public static function readUnsignedVarInt($stream){
public static function readUnsignedVarInt(string $buffer, int &$offset){
$value = 0;
for($i = 0; $i <= 35; $i += 7){
$b = $stream->getByte();
$b = ord($buffer{$offset++});
$value |= (($b & 0x7f) << $i);
if(($b & 0x80) === 0){
return $value;
}elseif(!isset($buffer{$offset})){
throw new \UnexpectedValueException("Expected more bytes, none left to read");
}
}
@ -414,27 +418,29 @@ class Binary{
/**
* Reads a 64-bit zigzag-encoded variable-length integer from the supplied stream.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int|string
*/
public static function readVarLong($stream){
public static function readVarLong(string $buffer, int &$offset){
if(PHP_INT_SIZE === 8){
return self::readVarLong_64($stream);
return self::readVarLong_64($buffer, $offset);
}else{
return self::readVarLong_32($stream);
return self::readVarLong_32($buffer, $offset);
}
}
/**
* Legacy BC Math zigzag VarLong reader. Will work on 32-bit or 64-bit, but will be slower than the regular 64-bit method.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return string
*/
public static function readVarLong_32($stream){
public static function readVarLong_32(string $buffer, int &$offset){
/** @var string $raw */
$raw = self::readUnsignedVarLong_32($stream);
$raw = self::readUnsignedVarLong_32($buffer, $offset);
$result = bcdiv($raw, "2");
if(bcmod($raw, "2") === "1"){
$result = bcsub(bcmul($result, "-1"), "1");
@ -445,44 +451,49 @@ class Binary{
/**
* 64-bit zizgag VarLong reader.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int
*/
public static function readVarLong_64($stream){
$raw = self::readUnsignedVarLong_64($stream);
public static function readVarLong_64(string $buffer, int &$offset){
$raw = self::readUnsignedVarLong_64($buffer, $offset);
$temp = ((($raw << 63) >> 63) ^ $raw) >> 1;
return $temp ^ ($raw & (1 << 63));
}
/**
* Reads an unsigned VarLong from the supplied stream.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int|string
*/
public static function readUnsignedVarLong($stream){
public static function readUnsignedVarLong(string $buffer, int &$offset){
if(PHP_INT_SIZE === 8){
return self::readUnsignedVarLong_64($stream);
return self::readUnsignedVarLong_64($buffer, $offset);
}else{
return self::readUnsignedVarLong_32($stream);
return self::readUnsignedVarLong_32($buffer, $offset);
}
}
/**
* Legacy BC Math unsigned VarLong reader.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return string
*/
public static function readUnsignedVarLong_32($stream){
public static function readUnsignedVarLong_32(string $buffer, int &$offset){
$value = "0";
for($i = 0; $i <= 63; $i += 7){
$b = $stream->getByte();
$b = ord($buffer{$offset++});
$value = bcadd($value, bcmul($b & 0x7f, bcpow("2", "$i")));
if(($b & 0x80) === 0){
return $value;
}elseif(!isset($buffer{$offset})){
throw new \UnexpectedValueException("Expected more bytes, none left to read");
}
}
@ -491,18 +502,21 @@ class Binary{
/**
* 64-bit unsigned VarLong reader.
* @param \pocketmine\nbt\NBT|BinaryStream $stream
* @param string $buffer
* @param int &$offset
*
* @return int
*/
public static function readUnsignedVarLong_64($stream){
public static function readUnsignedVarLong_64(string $buffer, int &$offset){
$value = 0;
for($i = 0; $i <= 63; $i += 7){
$b = $stream->getByte();
$b = ord($buffer{$offset++});
$value |= (($b & 0x7f) << $i);
if(($b & 0x80) === 0){
return $value;
}elseif(!isset($buffer{$offset})){
throw new \UnexpectedValueException("Expected more bytes, none left to read");
}
}

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

@ -261,7 +261,7 @@ class BinaryStream{
* @return int
*/
public function getUnsignedVarInt(){
return Binary::readUnsignedVarInt($this);
return Binary::readUnsignedVarInt($this->buffer, $this->offset);
}
/**
@ -277,7 +277,7 @@ class BinaryStream{
* @return int
*/
public function getVarInt(){
return Binary::readVarInt($this);
return Binary::readVarInt($this->buffer, $this->offset);
}
/**
@ -293,7 +293,7 @@ class BinaryStream{
* @return int|string int, or the string representation of an int64 on 32-bit platforms
*/
public function getUnsignedVarLong(){
return Binary::readUnsignedVarLong($this);
return Binary::readUnsignedVarLong($this->buffer, $this->offset);
}
/**
@ -309,7 +309,7 @@ class BinaryStream{
* @return int|string int, or the string representation of an int64 on 32-bit platforms
*/
public function getVarLong(){
return Binary::readVarLong($this);
return Binary::readVarLong($this->buffer, $this->offset);
}
/**