Update ext-encoding, tidy some nonsensical sign/unsign calls

Author: dktapps

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           ini-values: xdebug.max_nesting_level=3000
-          extensions: encoding-pmmp/ext-encoding@0.5.1
+          extensions: encoding-pmmp/ext-encoding@1.0.0
 
       - name: Load Composer package cache
         uses: actions/cache@v4

composer.json

@@ -4,7 +4,7 @@
     "type": "library",
     "require": {
         "php": "^8.1",
-        "ext-encoding": "~0.5.0",
+        "ext-encoding": "~1.0.0",
         "ext-json": "*",
         "pocketmine/binaryutils": "^0.2.0",
         "pocketmine/color": "^0.2.0 || ^0.3.0",

src/PacketPool.php

@@ -14,7 +14,7 @@
 
 namespace pocketmine\network\mcpe\protocol;
 
-use pocketmine\utils\Binary;
+use pmmp\encoding\VarInt;
 use pocketmine\utils\BinaryDataException;
 
 class PacketPool{
@@ -254,7 +254,6 @@ public function getPacketById(int $pid) : ?Packet{
 	 * @throws BinaryDataException
 	 */
 	public function getPacket(string $buffer) : ?Packet{
-		$offset = 0;
-		return $this->getPacketById(Binary::readUnsignedVarInt($buffer, $offset) & DataPacket::PID_MASK);
+		return $this->getPacketById(VarInt::unpackUnsignedInt($buffer) & DataPacket::PID_MASK);
 	}
 }

src/types/SubChunkPacketHeightMapInfo.php

@@ -17,7 +17,6 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\Binary;
 use function array_fill;
 use function count;
 
@@ -43,14 +42,14 @@ public function getHeight(int $x, int $z) : int{
 	public static function read(ByteBufferReader $in) : self{
 		$heights = [];
 		for($i = 0; $i < 256; ++$i){
-			$heights[] = Binary::signByte(Byte::readUnsigned($in));
+			$heights[] = Byte::readSigned($in);
 		}
 		return new self($heights);
 	}
 
 	public function write(ByteBufferWriter $out) : void{
 		for($i = 0; $i < 256; ++$i){
-			Byte::writeUnsigned($out, Binary::unsignByte($this->heights[$i]));
+			Byte::writeSigned($out, $this->heights[$i]);
 		}
 	}
 

src/types/SubChunkPositionOffset.php

@@ -17,7 +17,6 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\Binary;
 use pocketmine\utils\Limits;
 
 final class SubChunkPositionOffset{
@@ -45,16 +44,16 @@ public function getYOffset() : int{ return $this->yOffset; }
 	public function getZOffset() : int{ return $this->zOffset; }
 
 	public static function read(ByteBufferReader $in) : self{
-		$xOffset = Binary::signByte(Byte::readUnsigned($in));
-		$yOffset = Binary::signByte(Byte::readUnsigned($in));
-		$zOffset = Binary::signByte(Byte::readUnsigned($in));
+		$xOffset = Byte::readSigned($in);
+		$yOffset = Byte::readSigned($in);
+		$zOffset = Byte::readSigned($in);
 
 		return new self($xOffset, $yOffset, $zOffset);
 	}
 
 	public function write(ByteBufferWriter $out) : void{
-		Byte::writeUnsigned($out, $this->xOffset);
-		Byte::writeUnsigned($out, $this->yOffset);
-		Byte::writeUnsigned($out, $this->zOffset);
+		Byte::writeSigned($out, $this->xOffset);
+		Byte::writeSigned($out, $this->yOffset);
+		Byte::writeSigned($out, $this->zOffset);
 	}
 }

src/types/entity/ByteMetadataProperty.php

@@ -18,7 +18,6 @@
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
 use pocketmine\network\mcpe\protocol\types\GetTypeIdFromConstTrait;
-use pocketmine\utils\Binary;
 
 final class ByteMetadataProperty implements MetadataProperty{
 	use GetTypeIdFromConstTrait;
@@ -35,10 +34,10 @@ protected function max() : int{
 	}
 
 	public static function read(ByteBufferReader $in) : self{
-		return new self(Binary::signByte(Byte::readUnsigned($in)));
+		return new self(Byte::readSigned($in));
 	}
 
 	public function write(ByteBufferWriter $out) : void{
-		Byte::writeUnsigned($out, $this->value);
+		Byte::writeSigned($out, $this->value);
 	}
 }