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

Move SkinAnimation and changed SerializedImage to SkinImage

Browse Source 
Also change putImage and getImage to getSkinImage and putSkinImage
This commit is contained in:
Stephen 2019-11-11 15:23:48 -05:00
parent 3eb78fb0ff
commit 7b152def7d
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -160,8 +160,6 @@ use pocketmine\tile\ItemFrame;
use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile;
use pocketmine\timings\Timings;
use pocketmine\utils\SerializedImage;
use pocketmine\utils\SkinAnimation;
use pocketmine\utils\TextFormat;
use pocketmine\utils\UUID;
use function abs;

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

@ -38,10 +38,10 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\network\mcpe\protocol\types\CommandOriginData;
use pocketmine\network\mcpe\protocol\types\EntityLink;
use pocketmine\network\mcpe\protocol\types\SkinImage;
use pocketmine\network\mcpe\protocol\types\SkinAnimation;
use pocketmine\network\mcpe\protocol\types\StructureSettings;
use pocketmine\utils\BinaryStream;
use pocketmine\utils\SerializedImage;
use pocketmine\utils\SkinAnimation;
use pocketmine\utils\UUID;
use function count;
use function strlen;
@ -80,13 +80,13 @@ class NetworkBinaryStream extends BinaryStream{
public function getSkin() : Skin{
$skinId = $this->getString();
$skinResourcePatch = $this->getString();
$skinData = $this->getImage();
$skinData = $this->getSkinImage();
$animationCount = $this->getLInt();
$animations = [];
for($i = 0; $i < $animationCount; ++$i){
$animations[] = new SkinAnimation($this->getImage(), $this->getLInt(), $this->getLFloat());
$animations[] = new SkinAnimation($this->getSkinImage(), $this->getLInt(), $this->getLFloat());
}
$capeData = $this->getImage();
$capeData = $this->getSkinImage();
$geometryData = $this->getString();
$animationData = $this->getString();
$premium = $this->getBool();
@ -101,16 +101,16 @@ class NetworkBinaryStream extends BinaryStream{
public function putSkin(Skin $skin){
$this->putString($skin->getSkinId());
$this->putString($skin->getGeometryName()); //resource patch
$this->putImage(SerializedImage::fromLegacy($skin->getSkinData()));
$this->putSkinImage(SkinImage::fromLegacy($skin->getSkinData()));
/** @var SkinAnimation[] $animations */
$animations = [];
$this->putLInt(count($animations));
foreach($animations as $animation){
$this->putImage($animation->getImage());
$this->putSkinImage($animation->getImage());
$this->putLInt($animation->getType());
$this->putLFloat($animation->getFrames());
}
$this->putImage(new SerializedImage(0, 0, $skin->getCapeData()));
$this->putSkinImage(new SkinImage(0, 0, $skin->getCapeData()));
$this->putString($skin->getGeometryData());
$this->putString(""); //animation data
$this->putBool(false); //isPremium
@ -120,14 +120,14 @@ class NetworkBinaryStream extends BinaryStream{
$this->putString(""); //fullskinId
}
public function getImage() : SerializedImage{
public function getSkinImage() : SkinImage{
$width = $this->getLInt();
$height = $this->getLInt();
$data = $this->getString();
return new SerializedImage($height, $width, $data);
return new SkinImage($height, $width, $data);
}
public function putImage(SerializedImage $image) : void{
public function putSkinImage(SkinImage $image) : void{
$this->putLInt($image->getWidth());
$this->putLInt($image->getHeight());
$this->putString($image->getData());

2
src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php
View File

@ -27,8 +27,6 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\entity\Skin;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\SerializedImage;
use pocketmine\utils\SkinAnimation;
use pocketmine\utils\UUID;
class PlayerSkinPacket extends DataPacket{

10
src/pocketmine/utils/SkinAnimation.php → src/pocketmine/network/mcpe/protocol/types/SkinAnimation.php
View File

@ -21,7 +21,7 @@
declare(strict_types=1);
namespace pocketmine\utils;
namespace pocketmine\network\mcpe\protocol\types;
class SkinAnimation{
@ -29,14 +29,14 @@ class SkinAnimation{
public const TYPE_BODY_32 = 2;
public const TYPE_BODY_64 = 3;
/** @var SerializedImage */
/** @var SkinImage */
private $image;
/** @var int */
private $type;
/** @var float */
private $frames;
public function __construct(SerializedImage $image, int $type, float $frames){
public function __construct(SkinImage $image, int $type, float $frames){
$this->image = $image;
$this->type = $type;
$this->frames = $frames;
@ -45,9 +45,9 @@ class SkinAnimation{
/**
* Image of the animation.
*
* @return SerializedImage
* @return SkinImage
*/
public function getImage() : SerializedImage{
public function getImage() : SkinImage{
return $this->image;
}

6
src/pocketmine/utils/SerializedImage.php → src/pocketmine/network/mcpe/protocol/types/SkinImage.php
View File

@ -21,9 +21,9 @@
declare(strict_types=1);
namespace pocketmine\utils;
namespace pocketmine\network\mcpe\protocol\types;
class SerializedImage{
class SkinImage{
/** @var int */
private $height;
@ -38,7 +38,7 @@ class SerializedImage{
$this->data = $data;
}
public static function fromLegacy(string $data) : SerializedImage{
public static function fromLegacy(string $data) : SkinImage{
switch(strlen($data)){
case 64 * 32 * 4:
return new self(64, 32, $data);