mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 08:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Start saving new skin data

Browse Source
This commit is contained in:
Stephen 2019-11-05 21:01:01 -05:00
parent 8b912c1363
commit 4ea907ae1a
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pocketmine/entity/Human.php
View File

@ -42,6 +42,7 @@ use pocketmine\item\Totem;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\ByteArrayTag; use pocketmine\nbt\tag\ByteArrayTag;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
@ -54,6 +55,8 @@ use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\SerializedImage;
use pocketmine\utils\SkinAnimation;
use pocketmine\utils\UUID; use pocketmine\utils\UUID;
use function array_filter; use function array_filter;
use function array_merge; use function array_merge;
@ -117,10 +120,16 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
protected static function deserializeSkinNBT(CompoundTag $skinTag) : Skin{ protected static function deserializeSkinNBT(CompoundTag $skinTag) : Skin{
$skin = new Skin( $skin = new Skin(
$skinTag->getString("Name"), $skinTag->getString("Name"),
$skinTag->hasTag("Data", StringTag::class) ? $skinTag->getString("Data") : $skinTag->getByteArray("Data"), //old data (this used to be saved as a StringTag in older versions of PM) $skinTag->getString("SkinResourcePatch", ""),
$skinTag->getByteArray("CapeData", ""), new SerializedImage($skinTag->getInt("SkinImageHeight"), $skinTag->getInt("SkinImageWidth"), $skinTag->getByteArray("Data")),
$skinTag->getString("GeometryName", ""), "", //TODO: animations
$skinTag->getByteArray("GeometryData", "") new SerializedImage($skinTag->getInt("CapeImageHeight"), $skinTag->getInt("CapeImageWidth"), $skinTag->getByteArray("CapeData")),
$skinTag->getByteArray("GeometryData", ""),
$skinTag->getByteArray("AnimationData", ""),
$skinTag->getByte("PremiumSkin") === 1,
$skinTag->getByte("PersonaSkin") === 1,
$skinTag->getByte("CapeOnClassic") === 1,
$skinTag->getString("CapeId", "")
); );
$skin->validate(); $skin->validate();
return $skin; return $skin;
@ -826,13 +835,23 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$this->namedtag->setTag(new ListTag("EnderChestInventory", $items, NBT::TAG_Compound)); $this->namedtag->setTag(new ListTag("EnderChestInventory", $items, NBT::TAG_Compound));
} }
//TODO: Save animations
if($this->skin !== null){ if($this->skin !== null){
$this->namedtag->setTag(new CompoundTag("Skin", [ $this->namedtag->setTag(new CompoundTag("Skin", [
new StringTag("Name", $this->skin->getSkinId()), new StringTag("Name", $this->skin->getSkinId()),
new ByteArrayTag("Data", $this->skin->getSkinData()), new StringTag("SkinResourcePatch", $this->skin->getSkinResourcePatch()),
new ByteArrayTag("CapeData", $this->skin->getCapeData()), new ByteArrayTag("Data", $this->skin->getSkinData()->getData()),
new StringTag("GeometryName", $this->skin->getGeometryName()), new IntTag("SkinImageHeight", $this->skin->getSkinData()->getHeight()),
new ByteArrayTag("GeometryData", $this->skin->getGeometryData()) new IntTag("SkinImageWidth", $this->skin->getSkinData()->getWidth()),
new ByteArrayTag("CapeData", $this->skin->getCapeData()->getData()),
new IntTag("CapeImageHeight", $this->skin->getCapeData()->getHeight()),
new IntTag("CapeImageWidth", $this->skin->getCapeData()->getWidth()),
new ByteArrayTag("GeometryData", $this->skin->getGeometryData()),
new ByteArrayTag("AnimationData", $this->skin->getAnimationData()),
new ByteTag("PremiumSkin", $this->skin->getPremium() ? 1 : 0),
new ByteTag("PersonaSkin", $this->skin->getPersona() ? 1 : 0),
new ByteTag("CapeOnClassic", $this->skin->getCapeOnClassic() ? 1 : 0),
new StringTag("CapeId", $this->skin->getCapeId())
])); ]));
} }
} }