diff --git a/README.md b/README.md index 9e14364..473f343 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Select Language: [English](#eng), [日本語](#jpn) ## Texter Texter is plugin that displays and deletes FloatingTextPerticle supported to multi-world. -Latest: ver **3.3.1** +Latest: ver **3.4.0** ### Supporting - [x] Minecraft(Bedrock) @@ -85,7 +85,7 @@ Latest: ver **3.3.1** ## Texter TexterはFloatingTextPerticleを複数ワールドに渡り表示、編集、移動、削除ができるプラグインです。 -最新バージョン: **3.3.1** +最新バージョン: **3.4.0** ### 対応状況 - [x] Minecraft(Bedrock) diff --git a/composer.json b/composer.json index e5e9178..1bce462 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-yaml": ">=2.0.0", "ext-zip": "*", "ext-zlib": ">=1.2.11", - "pocketmine/pocketmine-mp": "dev-bedrock-1.13", + "pocketmine/pocketmine-mp": "^3.10.0", "pocketmine/raklib": "^0.12.0", "pocketmine/spl": "^0.3.0", "pocketmine/binaryutils": "^0.1.0", @@ -39,7 +39,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/NetherGamesMC/PocketMine-MP" + "url": "https://github.com/pmmp/PocketMine-MP" }, { "type": "vcs", diff --git a/composer.lock b/composer.lock index d661978..cf799f4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9f96e72b532125e5d8115310ddbfc1f2", + "content-hash": "f4651b7229fbf4c3ff766b492bb5cfc8", "packages": [ { "name": "adhocore/json-comment", @@ -160,16 +160,16 @@ }, { "name": "pocketmine/nbt", - "version": "0.2.11", + "version": "0.2.12", "source": { "type": "git", "url": "https://github.com/pmmp/NBT.git", - "reference": "78784b93632c51f0fad0719b2d6ffe072529db6d" + "reference": "b5777265329753b74dd40bb105eedabeefb98724" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/NBT/zipball/78784b93632c51f0fad0719b2d6ffe072529db6d", - "reference": "78784b93632c51f0fad0719b2d6ffe072529db6d", + "url": "https://api.github.com/repos/pmmp/NBT/zipball/b5777265329753b74dd40bb105eedabeefb98724", + "reference": "b5777265329753b74dd40bb105eedabeefb98724", "shasum": "" }, "require": { @@ -194,23 +194,23 @@ ], "description": "PHP library for working with Named Binary Tags", "support": { - "source": "https://github.com/pmmp/NBT/tree/0.2.11", + "source": "https://github.com/pmmp/NBT/tree/0.2.12", "issues": "https://github.com/pmmp/NBT/issues" }, - "time": "2019-10-21T14:50:43+00:00" + "time": "2019-12-01T08:20:26+00:00" }, { "name": "pocketmine/pocketmine-mp", - "version": "dev-bedrock-1.13", + "version": "3.10.1", "source": { "type": "git", - "url": "https://github.com/NetherGamesMC/PocketMine-MP.git", - "reference": "ff2288e2fe678857eb5f53330a8aee45327744e2" + "url": "https://github.com/pmmp/PocketMine-MP.git", + "reference": "4eb59c03723566f859e9c433287af440008574a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NetherGamesMC/PocketMine-MP/zipball/ff2288e2fe678857eb5f53330a8aee45327744e2", - "reference": "ff2288e2fe678857eb5f53330a8aee45327744e2", + "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/4eb59c03723566f859e9c433287af440008574a2", + "reference": "4eb59c03723566f859e9c433287af440008574a2", "shasum": "" }, "require": { @@ -265,22 +265,23 @@ "description": "A server software for Minecraft: Pocket Edition written in PHP", "homepage": "https://pmmp.io", "support": { - "source": "https://github.com/NetherGamesMC/PocketMine-MP/tree/bedrock-1.13" + "source": "https://github.com/pmmp/PocketMine-MP/tree/3.10.1", + "issues": "https://github.com/pmmp/PocketMine-MP/issues" }, - "time": "2019-11-11T23:36:47+00:00" + "time": "2019-12-07T16:41:41+00:00" }, { "name": "pocketmine/raklib", - "version": "0.12.5", + "version": "0.12.6", "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "874db2d3c24117db2221c1e4550380478aeea852" + "reference": "18450e01185e6064790bda563ac672e7141c6992" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/874db2d3c24117db2221c1e4550380478aeea852", - "reference": "874db2d3c24117db2221c1e4550380478aeea852", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/18450e01185e6064790bda563ac672e7141c6992", + "reference": "18450e01185e6064790bda563ac672e7141c6992", "shasum": "" }, "require": { @@ -305,10 +306,10 @@ ], "description": "A RakNet server implementation written in PHP", "support": { - "source": "https://github.com/pmmp/RakLib/tree/0.12.5", + "source": "https://github.com/pmmp/RakLib/tree/0.12.6", "issues": "https://github.com/pmmp/RakLib/issues" }, - "time": "2019-07-22T14:38:20+00:00" + "time": "2019-12-07T13:43:34+00:00" }, { "name": "pocketmine/snooze", @@ -380,7 +381,6 @@ "minimum-stability": "stable", "stability-flags": { "ext-pthreads": 20, - "pocketmine/pocketmine-mp": 20, "daverandom/callback-validator": 20 }, "prefer-stable": false, diff --git a/plugin.yml b/plugin.yml index b0b1e59..d582892 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,8 +1,8 @@ name: Texter prefix: Texter main: tokyo\pmmp\Texter\Core -version: 3.3.1 -api: 3.9.0 # pmmp/PocketMine-MP +version: 3.4.0 +api: 3.10.0 # pmmp/PocketMine-MP mcpe-protocol: 388 # for the future softdepend: - FormAPI # jojoe77777/FormAPI diff --git a/src/tokyo/pmmp/Texter/text/FloatingText.php b/src/tokyo/pmmp/Texter/text/FloatingText.php index 114bb64..7271f1a 100644 --- a/src/tokyo/pmmp/Texter/text/FloatingText.php +++ b/src/tokyo/pmmp/Texter/text/FloatingText.php @@ -39,8 +39,8 @@ use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; +use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton; use pocketmine\Player; -use pocketmine\utils\SerializedImage; use pocketmine\utils\TextFormat; use pocketmine\utils\UUID; use tokyo\pmmp\Texter\data\Data; @@ -176,12 +176,6 @@ public function asPackets(int $type = Text::SEND_TYPE_ADD, bool $owned = false): case Text::SEND_TYPE_ADD: case Text::SEND_TYPE_EDIT: $uuid = UUID::fromRandom(); - $skinData = str_repeat("\x00", 8192); - $transparentSkin = new Skin( - hash("md5", $skinData), - Skin::convertLegacyGeometryName("geometry.humanoid.custom"), - SerializedImage::fromLegacy($skinData) - ); $apk = new PlayerListPacket; $apk->type = PlayerListPacket::TYPE_ADD; @@ -189,7 +183,12 @@ public function asPackets(int $type = Text::SEND_TYPE_ADD, bool $owned = false): $uuid, $this->eid, $this->getIndentedTexts($owned), - $transparentSkin + SkinAdapterSingleton::get()->toSkinData(new Skin( + "Standard_Custom", + str_repeat("\x00", 8192), + "", + "geometry.humanoid.custom" + )) )]; $pk = new AddPlayerPacket; @@ -208,14 +207,10 @@ public function asPackets(int $type = Text::SEND_TYPE_ADD, bool $owned = false): Entity::DATA_SCALE => [Entity::DATA_TYPE_FLOAT, 0] ]; - $spk = new PlayerSkinPacket; - $spk->uuid = $uuid; - $spk->skin = $transparentSkin; - $rpk = new PlayerListPacket; $rpk->type = PlayerListPacket::TYPE_REMOVE; $rpk->entries = [PlayerListEntry::createRemovalEntry($uuid)]; - $pks = [$apk, $pk, $spk, $rpk]; + $pks = [$apk, $pk, $rpk]; break; case Text::SEND_TYPE_MOVE: