From 092d4ba7e1ab1cb11dd4a897d21ab58c16c2cf0a Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Wed, 26 Apr 2023 01:06:08 +0900 Subject: [PATCH 1/6] Composer update --- composer.lock | 224 +++++++++++++++++++++++++++++++------------------- 1 file changed, 140 insertions(+), 84 deletions(-) diff --git a/composer.lock b/composer.lock index 14332a2..6774c47 100644 --- a/composer.lock +++ b/composer.lock @@ -103,26 +103,25 @@ }, { "name": "brick/math", - "version": "0.10.2", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", + "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", "shasum": "" }, "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^9.0", - "vimeo/psalm": "4.25.0" + "vimeo/psalm": "5.0.0" }, "type": "library", "autoload": { @@ -147,7 +146,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.10.2" + "source": "https://github.com/brick/math/tree/0.11.0" }, "funding": [ { @@ -155,7 +154,7 @@ "type": "github" } ], - "time": "2022-08-10T22:54:19+00:00" + "time": "2023-01-15T23:15:59+00:00" }, { "name": "fgrosse/phpasn1", @@ -235,16 +234,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -280,22 +279,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "name": "phpstan/phpstan", - "version": "1.9.17", + "version": "1.10.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2" + "reference": "d232901b09e67538e5c86a724be841bea5768a7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2", - "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c", + "reference": "d232901b09e67538e5c86a724be841bea5768a7c", "shasum": "" }, "require": { @@ -324,8 +323,11 @@ "static analysis" ], "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.17" + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" }, "funding": [ { @@ -341,20 +343,46 @@ "type": "tidelift" } ], - "time": "2023-02-08T12:25:00+00:00" + "time": "2023-04-19T13:47:27+00:00" + }, + { + "name": "pocketmine/bedrock-block-upgrade-schema", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", + "reference": "e0540343e649a92126a1d4071ec401a811416c76" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/e0540343e649a92126a1d4071ec401a811416c76", + "reference": "e0540343e649a92126a1d4071ec401a811416c76", + "shasum": "" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "CC0-1.0" + ], + "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves", + "support": { + "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues", + "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/1.1.1" + }, + "time": "2023-03-08T23:45:59+00:00" }, { "name": "pocketmine/bedrock-data", - "version": "1.14.0+bedrock-1.19.60", + "version": "2.1.1+bedrock-1.19.70", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "7b06234ec6e1f4fb06ad4b2f177e606c25df9b46" + "reference": "cba0567bcb25f987f2712092f8d662056719e82d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/7b06234ec6e1f4fb06ad4b2f177e606c25df9b46", - "reference": "7b06234ec6e1f4fb06ad4b2f177e606c25df9b46", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/cba0567bcb25f987f2712092f8d662056719e82d", + "reference": "cba0567bcb25f987f2712092f8d662056719e82d", "shasum": "" }, "type": "library", @@ -365,22 +393,48 @@ "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/BedrockData/issues", - "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.19.60" + "source": "https://github.com/pmmp/BedrockData/tree/2.1.1+bedrock-1.19.70" }, - "time": "2023-02-08T18:32:01+00:00" + "time": "2023-03-14T18:03:19+00:00" + }, + { + "name": "pocketmine/bedrock-item-upgrade-schema", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", + "reference": "aab89a1f121a0c127557a4a0cf981330301c9c45" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/aab89a1f121a0c127557a4a0cf981330301c9c45", + "reference": "aab89a1f121a0c127557a4a0cf981330301c9c45", + "shasum": "" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "CC0-1.0" + ], + "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves", + "support": { + "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues", + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.1.0" + }, + "time": "2023-03-08T22:27:13+00:00" }, { "name": "pocketmine/bedrock-protocol", - "version": "19.1.0+bedrock-1.19.60", + "version": "20.1.2+bedrock-1.19.70", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "b57d8145cb765110d599dd68241f2ebe68c80933" + "reference": "2787c531039b3d92fa3ec92f28b95158dc24b915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/b57d8145cb765110d599dd68241f2ebe68c80933", - "reference": "b57d8145cb765110d599dd68241f2ebe68c80933", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/2787c531039b3d92fa3ec92f28b95158dc24b915", + "reference": "2787c531039b3d92fa3ec92f28b95158dc24b915", "shasum": "" }, "require": { @@ -394,7 +448,7 @@ "ramsey/uuid": "^4.1" }, "require-dev": { - "phpstan/phpstan": "1.9.13", + "phpstan/phpstan": "1.10.7", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0", "phpunit/phpunit": "^9.5" @@ -412,9 +466,9 @@ "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP", "support": { "issues": "https://github.com/pmmp/BedrockProtocol/issues", - "source": "https://github.com/pmmp/BedrockProtocol/tree/19.1.0+bedrock-1.19.60" + "source": "https://github.com/pmmp/BedrockProtocol/tree/20.1.2+bedrock-1.19.70" }, - "time": "2023-02-15T12:35:51+00:00" + "time": "2023-04-10T11:40:32+00:00" }, { "name": "pocketmine/binaryutils", @@ -555,23 +609,23 @@ }, { "name": "pocketmine/color", - "version": "0.3.0", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/pmmp/Color.git", - "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249" + "reference": "a0421f1e9e0b0c619300fb92d593283378f6a5e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Color/zipball/8cb346d0a21ad3287cc8d7175e4b643416607249", - "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249", + "url": "https://api.github.com/repos/pmmp/Color/zipball/a0421f1e9e0b0c619300fb92d593283378f6a5e1", + "reference": "a0421f1e9e0b0c619300fb92d593283378f6a5e1", "shasum": "" }, "require": { "php": "^8.0" }, "require-dev": { - "phpstan/phpstan": "1.9.4", + "phpstan/phpstan": "1.10.3", "phpstan/phpstan-strict-rules": "^1.2.0" }, "type": "library", @@ -587,9 +641,9 @@ "description": "Color handling library used by PocketMine-MP and related projects", "support": { "issues": "https://github.com/pmmp/Color/issues", - "source": "https://github.com/pmmp/Color/tree/0.3.0" + "source": "https://github.com/pmmp/Color/tree/0.3.1" }, - "time": "2022-12-18T19:49:21+00:00" + "time": "2023-04-10T11:38:05+00:00" }, { "name": "pocketmine/errorhandler", @@ -632,16 +686,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.18.3", + "version": "2.19.5", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0" + "reference": "71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/da25bfe9ee4822a84feb9b7e620c56ad4000aed0", - "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0", + "url": "https://api.github.com/repos/pmmp/Language/zipball/71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d", + "reference": "71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d", "shasum": "" }, "type": "library", @@ -649,9 +703,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.18.3" + "source": "https://github.com/pmmp/Language/tree/2.19.5" }, - "time": "2023-01-17T21:43:36+00:00" + "time": "2023-03-19T16:45:15+00:00" }, { "name": "pocketmine/log", @@ -781,16 +835,16 @@ }, { "name": "pocketmine/nbt", - "version": "0.3.3", + "version": "0.3.4", "source": { "type": "git", "url": "https://github.com/pmmp/NBT.git", - "reference": "f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4" + "reference": "62c02464c6708b2467c1e1a2af01af09d5114eda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/NBT/zipball/f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4", - "reference": "f4321be50df1a18b9f4e94d428a2e68a6e2ac2b4", + "url": "https://api.github.com/repos/pmmp/NBT/zipball/62c02464c6708b2467c1e1a2af01af09d5114eda", + "reference": "62c02464c6708b2467c1e1a2af01af09d5114eda", "shasum": "" }, "require": { @@ -800,7 +854,7 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "1.7.7", + "phpstan/phpstan": "1.10.3", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5" }, @@ -817,22 +871,22 @@ "description": "PHP library for working with Named Binary Tags", "support": { "issues": "https://github.com/pmmp/NBT/issues", - "source": "https://github.com/pmmp/NBT/tree/0.3.3" + "source": "https://github.com/pmmp/NBT/tree/0.3.4" }, - "time": "2022-07-06T14:13:26+00:00" + "time": "2023-04-10T11:31:20+00:00" }, { "name": "pocketmine/pocketmine-mp", - "version": "4.14.1", + "version": "4.19.3", "source": { "type": "git", "url": "https://github.com/pmmp/PocketMine-MP.git", - "reference": "d7a0f5362e7d9617f239f02cb7f9c5e9d5b92407" + "reference": "11e34b3e5cdab7639031d8af53aeacf0242ab487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/d7a0f5362e7d9617f239f02cb7f9c5e9d5b92407", - "reference": "d7a0f5362e7d9617f239f02cb7f9c5e9d5b92407", + "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/11e34b3e5cdab7639031d8af53aeacf0242ab487", + "reference": "11e34b3e5cdab7639031d8af53aeacf0242ab487", "shasum": "" }, "require": { @@ -865,14 +919,16 @@ "netresearch/jsonmapper": "^4.0", "php": "^8.0", "php-64bit": "*", - "pocketmine/bedrock-data": "~1.14.0+bedrock-1.19.60", - "pocketmine/bedrock-protocol": "~19.1.0+bedrock-1.19.60", + "pocketmine/bedrock-block-upgrade-schema": "~1.1.1+bedrock-1.19.70", + "pocketmine/bedrock-data": "~2.1.1+bedrock-1.19.70", + "pocketmine/bedrock-item-upgrade-schema": "~1.1.0+bedrock-1.19.70", + "pocketmine/bedrock-protocol": "~20.1.1+bedrock-1.19.70", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/classloader": "^0.2.0", "pocketmine/color": "^0.3.0", "pocketmine/errorhandler": "^0.6.0", - "pocketmine/locale-data": "~2.18.0", + "pocketmine/locale-data": "~2.19.0", "pocketmine/log": "^0.4.0", "pocketmine/log-pthreads": "^0.4.0", "pocketmine/math": "^0.4.0", @@ -885,7 +941,7 @@ "webmozart/path-util": "^2.3" }, "require-dev": { - "phpstan/phpstan": "1.9.17", + "phpstan/phpstan": "1.10.13", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "^9.2" @@ -907,7 +963,7 @@ "homepage": "https://pmmp.io", "support": { "issues": "https://github.com/pmmp/PocketMine-MP/issues", - "source": "https://github.com/pmmp/PocketMine-MP/tree/4.14.1" + "source": "https://github.com/pmmp/PocketMine-MP/tree/4.19.3" }, "funding": [ { @@ -919,20 +975,20 @@ "type": "patreon" } ], - "time": "2023-02-15T15:19:38+00:00" + "time": "2023-04-21T14:53:02+00:00" }, { "name": "pocketmine/raklib", - "version": "0.14.5", + "version": "0.14.6", "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "85b4e5cb7117d37e010eeadb3ff53b21276c6f48" + "reference": "aeca667d5ecc4cc18fded612f29e3511bbf62f42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/85b4e5cb7117d37e010eeadb3ff53b21276c6f48", - "reference": "85b4e5cb7117d37e010eeadb3ff53b21276c6f48", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/aeca667d5ecc4cc18fded612f29e3511bbf62f42", + "reference": "aeca667d5ecc4cc18fded612f29e3511bbf62f42", "shasum": "" }, "require": { @@ -944,7 +1000,7 @@ "pocketmine/log": "^0.3.0 || ^0.4.0" }, "require-dev": { - "phpstan/phpstan": "1.7.7", + "phpstan/phpstan": "1.9.17", "phpstan/phpstan-strict-rules": "^1.0" }, "type": "library", @@ -960,9 +1016,9 @@ "description": "A RakNet server implementation written in PHP", "support": { "issues": "https://github.com/pmmp/RakLib/issues", - "source": "https://github.com/pmmp/RakLib/tree/0.14.5" + "source": "https://github.com/pmmp/RakLib/tree/0.14.6" }, - "time": "2022-08-25T16:16:44+00:00" + "time": "2023-03-07T15:10:23+00:00" }, { "name": "pocketmine/raklib-ipc", @@ -1137,20 +1193,20 @@ }, { "name": "ramsey/uuid", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2" + "reference": "60a4c63ab724854332900504274f6150ff26d286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286", + "reference": "60a4c63ab724854332900504274f6150ff26d286", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" @@ -1213,7 +1269,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.3" + "source": "https://github.com/ramsey/uuid/tree/4.7.4" }, "funding": [ { @@ -1225,20 +1281,20 @@ "type": "tidelift" } ], - "time": "2023-01-12T18:13:24+00:00" + "time": "2023-04-15T23:01:58+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.19", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8" + "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", + "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", "shasum": "" }, "require": { @@ -1273,7 +1329,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.19" + "source": "https://github.com/symfony/filesystem/tree/v5.4.21" }, "funding": [ { @@ -1289,7 +1345,7 @@ "type": "tidelift" } ], - "time": "2023-01-14T19:14:44+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/polyfill-ctype", From c16038ce73e88bf43d8b584b82449226284d5958 Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Wed, 26 Apr 2023 01:10:21 +0900 Subject: [PATCH 2/6] Update floating text packet to be a floating block like PMMPs example --- .../fuyutsuki/Texter/text/FloatingText.php | 51 +++++++------------ 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php index a66f83c..53146b8 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php +++ b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php @@ -9,10 +9,13 @@ use jp\mcbe\fuyutsuki\Texter\mineflow\variable\FloatingTextObjectVariable; use jp\mcbe\fuyutsuki\Texter\util\dependencies\Mineflow; use JsonException; +use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; use pocketmine\entity\Skin; use pocketmine\math\Vector3; +use pocketmine\network\mcpe\convert\RuntimeBlockMapping; use pocketmine\network\mcpe\convert\SkinAdapterSingleton; +use pocketmine\network\mcpe\protocol\AddActorPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; @@ -22,9 +25,12 @@ use pocketmine\network\mcpe\protocol\types\AbilitiesData; use pocketmine\network\mcpe\protocol\types\command\CommandPermissions; use pocketmine\network\mcpe\protocol\types\DeviceOS; +use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty; +use pocketmine\network\mcpe\protocol\types\entity\EntityIds; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\network\mcpe\protocol\types\entity\FloatMetadataProperty; +use pocketmine\network\mcpe\protocol\types\entity\IntMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\LongMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData; use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty; @@ -109,51 +115,32 @@ public function asPackets(Player $player, SendType $type): array { switch ($type) { # HACK: BlameMojuncrosoft case SendType::ADD(): - $uuid = Uuid::uuid4(); - - $apk = PlayerListPacket::add([ - PlayerListEntry::createAdditionEntry( - $uuid, - $this->actorRuntimeId, - "", - SkinAdapterSingleton::get()->toSkinData(new Skin( - "Standard_Custom", - str_repeat("\x00", 8192), - "", - "geometry.humanoid.custom" - )) - ) - ]); - - $pk = AddPlayerPacket::create( - $uuid, - $this->replaceVariables($player), + $pk = AddActorPacket::create( + Entity::nextRuntimeId(), $this->actorRuntimeId, - "", + EntityIds::FALLING_BLOCK, $this->position, null, 0.0, 0.0, 0.0, - ItemStackWrapper::legacy(ItemStack::null()), - GameMode::ADVENTURE()->id(), + 0.0, + [], [ EntityMetadataProperties::FLAGS => LongMetadataProperty::buildFromFlags([ EntityMetadataFlags::IMMOBILE => true, ]), - EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.0), + EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.01), //zero causes problems on debug builds + EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0), + EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0), + EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->replaceVariables($player)), + EntityMetadataProperties::VARIANT => new IntMetadataProperty(RuntimeBlockMapping::getInstance()->toRuntimeId(VanillaBlocks::AIR()->getFullId())), + EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1), ], new PropertySyncData([], []), - UpdateAbilitiesPacket::create(new AbilitiesData(CommandPermissions::NORMAL, PlayerPermissions::VISITOR, $this->actorRuntimeId, [])), - [], - "", - DeviceOS::UNKNOWN + [] ); - - $rpk = PlayerListPacket::remove([ - PlayerListEntry::createRemovalEntry($uuid), - ]); - $pks = [$apk, $pk, $rpk]; + $pks = [$pk]; break; case SendType::EDIT(): From ad92caa7468e08438391d29f3d675af9c2e556d2 Mon Sep 17 00:00:00 2001 From: xLordShadow Date: Tue, 7 Mar 2023 12:50:54 -0500 Subject: [PATCH 3/6] Remove unused imports --- src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php index 53146b8..daf422c 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php +++ b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php @@ -11,20 +11,13 @@ use JsonException; use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; -use pocketmine\entity\Skin; use pocketmine\math\Vector3; use pocketmine\network\mcpe\convert\RuntimeBlockMapping; -use pocketmine\network\mcpe\convert\SkinAdapterSingleton; use pocketmine\network\mcpe\protocol\AddActorPacket; -use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; -use pocketmine\network\mcpe\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket; -use pocketmine\network\mcpe\protocol\types\AbilitiesData; -use pocketmine\network\mcpe\protocol\types\command\CommandPermissions; -use pocketmine\network\mcpe\protocol\types\DeviceOS; use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; @@ -34,15 +27,8 @@ use pocketmine\network\mcpe\protocol\types\entity\LongMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData; use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty; -use pocketmine\network\mcpe\protocol\types\inventory\ItemStack; -use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper; -use pocketmine\network\mcpe\protocol\types\PlayerListEntry; -use pocketmine\network\mcpe\protocol\types\PlayerPermissions; -use pocketmine\network\mcpe\protocol\UpdateAbilitiesPacket; -use pocketmine\player\GameMode; use pocketmine\player\Player; use pocketmine\world\World; -use Ramsey\Uuid\Uuid; class FloatingText implements Sendable { From fd0c3afb1aef1946289a1bb9c9dc238198142aa9 Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Wed, 26 Apr 2023 01:33:30 +0900 Subject: [PATCH 4/6] Revert "Remove unused imports" This reverts commit ad92caa7468e08438391d29f3d675af9c2e556d2. --- src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php index daf422c..53146b8 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php +++ b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php @@ -11,13 +11,20 @@ use JsonException; use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; +use pocketmine\entity\Skin; use pocketmine\math\Vector3; use pocketmine\network\mcpe\convert\RuntimeBlockMapping; +use pocketmine\network\mcpe\convert\SkinAdapterSingleton; use pocketmine\network\mcpe\protocol\AddActorPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; +use pocketmine\network\mcpe\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket; +use pocketmine\network\mcpe\protocol\types\AbilitiesData; +use pocketmine\network\mcpe\protocol\types\command\CommandPermissions; +use pocketmine\network\mcpe\protocol\types\DeviceOS; use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; @@ -27,8 +34,15 @@ use pocketmine\network\mcpe\protocol\types\entity\LongMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData; use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty; +use pocketmine\network\mcpe\protocol\types\inventory\ItemStack; +use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper; +use pocketmine\network\mcpe\protocol\types\PlayerListEntry; +use pocketmine\network\mcpe\protocol\types\PlayerPermissions; +use pocketmine\network\mcpe\protocol\UpdateAbilitiesPacket; +use pocketmine\player\GameMode; use pocketmine\player\Player; use pocketmine\world\World; +use Ramsey\Uuid\Uuid; class FloatingText implements Sendable { From c40b074be32b2f1e11a898af2891aee0393994ff Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Wed, 26 Apr 2023 01:33:34 +0900 Subject: [PATCH 5/6] Revert "Update floating text packet to be a floating block like PMMPs example" This reverts commit c16038ce73e88bf43d8b584b82449226284d5958. --- .../fuyutsuki/Texter/text/FloatingText.php | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php index 53146b8..a66f83c 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php +++ b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php @@ -9,13 +9,10 @@ use jp\mcbe\fuyutsuki\Texter\mineflow\variable\FloatingTextObjectVariable; use jp\mcbe\fuyutsuki\Texter\util\dependencies\Mineflow; use JsonException; -use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; use pocketmine\entity\Skin; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\convert\RuntimeBlockMapping; use pocketmine\network\mcpe\convert\SkinAdapterSingleton; -use pocketmine\network\mcpe\protocol\AddActorPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; @@ -25,12 +22,9 @@ use pocketmine\network\mcpe\protocol\types\AbilitiesData; use pocketmine\network\mcpe\protocol\types\command\CommandPermissions; use pocketmine\network\mcpe\protocol\types\DeviceOS; -use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty; -use pocketmine\network\mcpe\protocol\types\entity\EntityIds; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\network\mcpe\protocol\types\entity\FloatMetadataProperty; -use pocketmine\network\mcpe\protocol\types\entity\IntMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\LongMetadataProperty; use pocketmine\network\mcpe\protocol\types\entity\PropertySyncData; use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty; @@ -115,32 +109,51 @@ public function asPackets(Player $player, SendType $type): array { switch ($type) { # HACK: BlameMojuncrosoft case SendType::ADD(): - $pk = AddActorPacket::create( - Entity::nextRuntimeId(), + $uuid = Uuid::uuid4(); + + $apk = PlayerListPacket::add([ + PlayerListEntry::createAdditionEntry( + $uuid, + $this->actorRuntimeId, + "", + SkinAdapterSingleton::get()->toSkinData(new Skin( + "Standard_Custom", + str_repeat("\x00", 8192), + "", + "geometry.humanoid.custom" + )) + ) + ]); + + $pk = AddPlayerPacket::create( + $uuid, + $this->replaceVariables($player), $this->actorRuntimeId, - EntityIds::FALLING_BLOCK, + "", $this->position, null, 0.0, 0.0, 0.0, - 0.0, - [], + ItemStackWrapper::legacy(ItemStack::null()), + GameMode::ADVENTURE()->id(), [ EntityMetadataProperties::FLAGS => LongMetadataProperty::buildFromFlags([ EntityMetadataFlags::IMMOBILE => true, ]), - EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.01), //zero causes problems on debug builds - EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0), - EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0), - EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->replaceVariables($player)), - EntityMetadataProperties::VARIANT => new IntMetadataProperty(RuntimeBlockMapping::getInstance()->toRuntimeId(VanillaBlocks::AIR()->getFullId())), - EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1), + EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.0), ], new PropertySyncData([], []), - [] + UpdateAbilitiesPacket::create(new AbilitiesData(CommandPermissions::NORMAL, PlayerPermissions::VISITOR, $this->actorRuntimeId, [])), + [], + "", + DeviceOS::UNKNOWN ); - $pks = [$pk]; + + $rpk = PlayerListPacket::remove([ + PlayerListEntry::createRemovalEntry($uuid), + ]); + $pks = [$apk, $pk, $rpk]; break; case SendType::EDIT(): From 4f5153bbb0a7740f06091aadb34fcb7843a3b201 Mon Sep 17 00:00:00 2001 From: Florian <38558911+xxFLORII@users.noreply.github.com> Date: Wed, 3 May 2023 04:57:47 +0200 Subject: [PATCH 6/6] Update development/4.2 (#140) * fix crash * update version & api * updated changelog * Patchy release, so this is 4.1.10 --------- Co-authored-by: yuko fuyutsuki --- .github/changelogs/4.x/en_us.md | 10 ++++++++++ .github/changelogs/4.x/ja_jp.md | 10 ++++++++++ plugin.yml | 4 ++-- src/jp/mcbe/fuyutsuki/Texter/EventListener.php | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/changelogs/4.x/en_us.md b/.github/changelogs/4.x/en_us.md index 6ad9d78..b7b7831 100644 --- a/.github/changelogs/4.x/en_us.md +++ b/.github/changelogs/4.x/en_us.md @@ -2,6 +2,16 @@ ## 4.1.x +### 4.1.10 + +#### :arrow_heading_up: follow PMMP changes + +- Added support for PMMP 4.20.x (Minecraft 1.19.80~) + +#### :bug: bug fixes + +- Fixed a server crash when a player entered the server. + ### 4.1.9 #### :arrow_heading_up: follow PMMP changes diff --git a/.github/changelogs/4.x/ja_jp.md b/.github/changelogs/4.x/ja_jp.md index 27ab0b4..0fbcb39 100644 --- a/.github/changelogs/4.x/ja_jp.md +++ b/.github/changelogs/4.x/ja_jp.md @@ -2,6 +2,16 @@ ## 4.1.x +### 4.1.10 + +#### :arrow_heading_up: PMMPの変更に追従 + +- PMMP 4.20.x (Minecraft 1.19.80~) に対応しました + +#### :bug: バグ修正 + +- プレイヤーがサーバーに入ったときにサーバーがクラッシュするのを修正しました。 + ### 4.1.9 #### :arrow_heading_up: PMMPの変更に追従 diff --git a/plugin.yml b/plugin.yml index effe816..283cf73 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,8 +1,8 @@ name: Texter prefix: Texter main: jp\mcbe\fuyutsuki\Texter\Main -version: 4.1.9 -api: 4.14.0 +version: 4.1.10 +api: 4.20.0 softdepend: # aieuo/Mineflow - Mineflow # >= 2.0 diff --git a/src/jp/mcbe/fuyutsuki/Texter/EventListener.php b/src/jp/mcbe/fuyutsuki/Texter/EventListener.php index f6fd38c..0d85a30 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/EventListener.php +++ b/src/jp/mcbe/fuyutsuki/Texter/EventListener.php @@ -85,7 +85,7 @@ public function onSendPacket(DataPacketSendEvent $ev) { if (isset($pk->commandData[TexterCommand::NAME])) { $locale = $ev->getTargets()[0]->getPlayerInfo()->getLocale(); $texterCommand = $pk->commandData[TexterCommand::NAME]; - $texterCommand->commandDescription = TexterLang::fromLocale($locale)->translateString(TexterCommand::DESCRIPTION); + $texterCommand->description = TexterLang::fromLocale($locale)->translateString(TexterCommand::DESCRIPTION); } } }