Tidy exceptions

Author: dktapps

src/AvailableCommandsPacket.php

@@ -17,6 +17,7 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
+use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\LE;
 use pmmp\encoding\VarInt;
 use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
@@ -28,7 +29,6 @@
 use pocketmine\network\mcpe\protocol\types\command\CommandOverload;
 use pocketmine\network\mcpe\protocol\types\command\CommandParameter;
 use pocketmine\network\mcpe\protocol\types\command\CommandParameterTypes as ArgTypes;
-use pocketmine\utils\BinaryDataException;
 use function array_search;
 use function count;
 use function dechex;
@@ -217,7 +217,7 @@ protected function initSoftEnumsInCommandData() : void{
 	 * @param string[] $enumValueList
 	 *
 	 * @throws PacketDecodeException
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getEnum(array $enumValueList, ByteBufferReader $in) : CommandEnum{
 		$enumName = CommonTypes::getString($in);
@@ -238,7 +238,7 @@ protected function getEnum(array $enumValueList, ByteBufferReader $in) : Command
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getSoftEnum(ByteBufferReader $in) : CommandEnum{
 		$enumName = CommonTypes::getString($in);
@@ -280,7 +280,7 @@ protected function putSoftEnum(CommandEnum $enum, ByteBufferWriter $out) : void{
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getEnumValueIndex(int $valueCount, ByteBufferReader $in) : int{
 		if($valueCount < 256){
@@ -307,7 +307,7 @@ protected function putEnumValueIndex(int $index, int $valueCount, ByteBufferWrit
 	 * @param string[]      $enumValues
 	 *
 	 * @throws PacketDecodeException
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getEnumConstraint(array $enums, array $enumValues, ByteBufferReader $in) : CommandEnumConstraint{
 		//wtf, what was wrong with an offset inside the enum? :(
@@ -352,7 +352,7 @@ protected function putEnumConstraint(CommandEnumConstraint $constraint, array $e
 	 * @param ChainedSubCommandData[] $allChainedSubCommandData
 	 *
 	 * @throws PacketDecodeException
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getCommandData(array $enums, array $postfixes, array $allChainedSubCommandData, ByteBufferReader $in) : CommandData{
 		$name = CommonTypes::getString($in);

src/CommandOutputPacket.php

@@ -17,11 +17,11 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
+use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\VarInt;
 use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
 use pocketmine\network\mcpe\protocol\types\command\CommandOriginData;
 use pocketmine\network\mcpe\protocol\types\command\CommandOutputMessage;
-use pocketmine\utils\BinaryDataException;
 use function count;
 
 class CommandOutputPacket extends DataPacket implements ClientboundPacket{
@@ -54,7 +54,7 @@ protected function decodePayload(ByteBufferReader $in) : void{
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function getCommandMessage(ByteBufferReader $in) : CommandOutputMessage{
 		$message = new CommandOutputMessage();

src/DataPacket.php

@@ -18,7 +18,6 @@
 use pmmp\encoding\ByteBufferWriter;
 use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\VarInt;
-use pocketmine\utils\BinaryDataException;
 use function get_class;
 
 abstract class DataPacket implements Packet{
@@ -78,7 +77,7 @@ protected function decodeHeader(ByteBufferReader $in) : void{
 	 * Decodes the packet body, without the packet ID or other generic header fields.
 	 *
 	 * @throws PacketDecodeException
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	abstract protected function decodePayload(ByteBufferReader $in) : void;
 

src/MoveActorDeltaPacket.php

@@ -16,9 +16,9 @@
 
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
+use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\LE;
 use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
-use pocketmine\utils\BinaryDataException;
 
 class MoveActorDeltaPacket extends DataPacket implements ClientboundPacket{
 	public const NETWORK_ID = ProtocolInfo::MOVE_ACTOR_DELTA_PACKET;
@@ -42,19 +42,15 @@ class MoveActorDeltaPacket extends DataPacket implements ClientboundPacket{
 	public float $yaw = 0.0;
 	public float $headYaw = 0.0;
 
-	/**
-	 * @throws BinaryDataException
-	 */
+	/** @throws DataDecodeException */
 	private function maybeReadCoord(int $flag, ByteBufferReader $in) : float{
 		if(($this->flags & $flag) !== 0){
 			return LE::readFloat($in);
 		}
 		return 0;
 	}
 
-	/**
-	 * @throws BinaryDataException
-	 */
+	/** @throws DataDecodeException */
 	private function maybeReadRotation(int $flag, ByteBufferReader $in) : float{
 		if(($this->flags & $flag) !== 0){
 			return CommonTypes::getRotationByte($in);