From 2a2625158cad3e64d77b356963443bb7c84d6ad1 Mon Sep 17 00:00:00 2001 From: untitled <42160062+uteplenky@users.noreply.github.com> Date: Sat, 2 Mar 2024 11:38:15 +0600 Subject: [PATCH 1/4] Update Russian Language Localization (#158) * Update Russian Language Localization Updated the Russian language translations in the ru_ru.ini file to ensure accuracy and improve user experience --- resources/language/ru_ru.ini | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/language/ru_ru.ini b/resources/language/ru_ru.ini index fb1d364..926c23b 100644 --- a/resources/language/ru_ru.ini +++ b/resources/language/ru_ru.ini @@ -1,69 +1,69 @@ -; Языковой файл совместим с Minecraft: Bedrock Edition идентификаторами +; Языковой файл, совместим с идентификаторами Minecraft: Bedrock Edition ; -; Сообщения не должны отображаться корректно на стороне пользователя. -; Сообщения только для Texter здесь указаны. -; Автор перевода Денис Клюев (@iteplenky). +; Поэтому, измененное сообщение не обязательно должно быть там, чтобы правильно отображаться на клиенте. +; Здесь должны быть только сообщения отображаемые в самом Texter. +; Переведено @iteplenky language.name=Русский -language.selected=Выбран {%0} ({%1}) в роли основного языка. +language.selected=Выбран {%0} ({%1}) как основной язык -on.load.commands.on=Команды включены -on.load.commands.off=Команды отключены -on.load.version.dev=Эта версия находится под разработкой. Возможны критические ошибки. -on.load.update.nothing=Последняя версия: v{%0} / Обновления не нужны -on.load.update.available.1=Последняя версия: v{%0} / Текущая версия: v{%1} -on.load.update.available.2=Доступно обновление +on.load.commands.on=Использование команд включено +on.load.commands.off=Использование команд отключено +on.load.version.dev=Эта версия находится в стадии разработки. Возможны критические ошибки и сбои. +on.load.update.nothing=Последняя версия: {%0} / Обновление не требуется +on.load.update.available.1=Последняя версия: {%0} / Текущая версия: {%1} +on.load.update.available.2=Доступно обновление на новую версию! on.load.update.available.3=Ссылка: {%0} -on.load.update.offline=Из-за проблем с соединением не удалось получить информацию об обновлениях. -on.load.is.updater=Есть обновление config.yml. Переместите то, что Вы в данный момент используете в другой каталог и перезапустите сервер! -on.load.old.format.converting=Сконвертировано: {%0} файлов в новый формат... +on.load.update.offline=Проблемы с подключением к сети, не получилось проверить наличие обновлений. +on.load.is.updater=Файл config.yml обновлен. Необходима перезагрузка сервера! +on.load.old.format.converting=Преобразование старого формата: {%0} в новый... -on.enable.prepared=Летающих текстов "{%0}": {%1} было сгенерировано +on.enable.prepared="{%0}": {%1} текстов было сгенерировано -command.txt.description=Управление летающими текстами -command.txt.usage=/txt -command.txt.usage.new.line=Используйте §6\# §fесли хотите перенести строку. -command.txt.add.usage=/txt a(dd) [название] [содержание] -command.txt.add.success=Летающий текст: создано "{%0}" +command.txt.description=Редактор Летающих Текстов +command.txt.usage=/txt +command.txt.usage.new.line=Используйте §6\# §fчтобы продолжить с новой строки. +command.txt.add.usage=/txt a(dd) [название] [содержание текста] +command.txt.add.success=FloatingText: Создан новый текст "{%0}" command.txt.edit=/txt edit [название] -command.txt.edit.success=Летающий текст: измененен "{%0}" +command.txt.edit.success=FloatingText: Изменен существующий текст "{%0}" command.txt.move=/txt move [название] [here|x y z] -command.txt.move.success=Летающий текст перемещен с "{%0}" в {%1} -command.txt.remove=/txt remove <название> -command.txt.remove.success=Летающий текст: удален "{%0}" +command.txt.move.success=FloatingText: Перемещен с точки "{%0}" на {%1} +command.txt.remove=/txt remove [название] +command.txt.remove.success=FloatingText: Удален текст с названием "{%0}" form.close=Закрыть -form.ft.name=Название летающего текста -form.ft.name.unique=Уникальное название летающего текста +form.ft.name=Название текста +form.ft.name.unique=Уникальное название -form.add.description=Добавить летающий текст в мир. -form.add.more.ft=Добавить летающий текст -form.add.spacing.description=Пробелы между летающими текстами могут быть указаны в координатах, где -0.3 от Y - это интервал одной строки. -form.add.spacing.x=отступ (X) -form.add.spacing.y=отступ (Y) -form.add.spacing.z=отступ (Z) -form.add.text=text #{%0} -form.add.error.no.texts=Вы ничего не указали, чтобы создать летающий текст. +form.add.description=Добавить новый летающий текст. +form.add.more.ft=Добавить еще +form.add.spacing.description=Расстояние между летающим текстом можно указать в координатах, где -0,3 от Y — это примерно расстояние в одну строку.. +form.add.spacing.x=Отступ (X) +form.add.spacing.y=Отступ (Y) +form.add.spacing.z=Отступ (Z) +form.add.text=текст #{%0} +form.add.error.no.texts=Поле текста является обязательным для заполнения. form.edit=Редактирование form.edit.description=Изменить летающий текст form.move=Перемещение form.move.description=Переместить летающий текст -form.move.here=Ваша позиция -form.move.position=Указать позицию -form.move.position.description=Перемещает летающий текст на указанные координаты. +form.move.here=Мои координаты +form.move.position=Указать другие координаты +form.move.position.description=Перемещение летающего текста на определенные координаты. form.move.position.x=X form.move.position.y=Y form.move.position.z=Z form.move.position.error.is.not.valid=Координаты указаны неверно. -form.move.select.target.description=Вы можете выбрать куда переместить летающий текст. Если Вы выберете "Ваша позиция", летающий текст переместится как только вы его выберете. +form.move.select.target.description=Можно выбрать куда переместить летающий текст. При выборе "Мои координаты" будет перемещен к вам. form.remove=Удаление form.remove.description=Удалить летающий текст -form.list.description.1=Список изменяемых летающих текстов в радиусе 10 блоков от Вас. Подойдите ближе, если ничего не отображается. -form.list.description.2=Выбран летающий текст: {%0}\nПожалуйста, выберите действие: +form.list.description.1=Список доступных к редактированию летающих текстов в радиусе 10 блоков.\nНаходясь дальше список будет пустой. +form.list.description.2=Выбран: {%0}\nВыберите действие. -error.on.enable.not.packaged=Пожалуйста, используйте phar-файл скачанный с PoggitCI (https://poggit.pmmp.io/p/Texter). -error.ft.name.not.specified=Название летающего текста не указано. -error.ft.name.exists=Летающий текст с названием: {%0} уже существует. -error.ft.name.not.exists=Летающий текст с названием: {%0} не существует. -error.permission=У Вас нет прав на управление летающими текстами. -error.console=Используйте команду только в игре +error.on.enable.not.packaged=Пожалуйста, используйте файл с расширением phar с PoggitCI (https://poggit.pmmp.io/p/Texter). +error.ft.name.not.specified=Имя летающего текста не указано. +error.ft.name.exists=Летающий текст с названием {%0} уже существует. +error.ft.name.not.exists=Летающего текста с названием {%0} не существует. +error.permission=Недостаточно прав. +error.console=Только в игре. From 160ce47571eba2f701bf62889944d3d621f87783 Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Thu, 14 Mar 2024 03:50:27 +0900 Subject: [PATCH 2/4] Update Composer dependencies --- composer.lock | 199 +++++++++++++++++++++++++------------------------- 1 file changed, 99 insertions(+), 100 deletions(-) diff --git a/composer.lock b/composer.lock index dd83a44..5f5e8d1 100644 --- a/composer.lock +++ b/composer.lock @@ -141,16 +141,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "b66d11b7479109ab547f9405b97205640b17d385" + "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b66d11b7479109ab547f9405b97205640b17d385", - "reference": "b66d11b7479109ab547f9405b97205640b17d385", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", + "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", "shasum": "" }, "require": { @@ -197,7 +197,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.4.0" + "source": "https://github.com/composer/ca-bundle/tree/1.4.1" }, "funding": [ { @@ -213,7 +213,7 @@ "type": "tidelift" } ], - "time": "2023-12-18T12:05:55+00:00" + "time": "2024-02-23T10:16:52+00:00" }, { "name": "composer/class-map-generator", @@ -290,16 +290,16 @@ }, { "name": "composer/composer", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" + "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "url": "https://api.github.com/repos/composer/composer/zipball/b826edb791571ab1eaf281eb1bd6e181a1192adc", + "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc", "shasum": "" }, "require": { @@ -384,7 +384,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.1" + "source": "https://github.com/composer/composer/tree/2.7.2" }, "funding": [ { @@ -400,7 +400,7 @@ "type": "tidelift" } ], - "time": "2024-02-09T14:26:28+00:00" + "time": "2024-03-11T16:12:18+00:00" }, { "name": "composer/metadata-minifier", @@ -473,16 +473,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", "shasum": "" }, "require": { @@ -524,7 +524,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.2" }, "funding": [ { @@ -540,7 +540,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-03-07T15:38:35+00:00" }, { "name": "composer/semver", @@ -841,16 +841,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.62", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", "shasum": "" }, "require": { @@ -899,20 +899,20 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-03-13T12:27:20+00:00" }, { "name": "pocketmine/bedrock-block-upgrade-schema", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", - "reference": "1ed4ba738333c4b4afe4fef8e9326a45c89f12e3" + "reference": "1496e275db5148cb96bdaa998115e5e31a5c1e4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/1ed4ba738333c4b4afe4fef8e9326a45c89f12e3", - "reference": "1ed4ba738333c4b4afe4fef8e9326a45c89f12e3", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/1496e275db5148cb96bdaa998115e5e31a5c1e4d", + "reference": "1496e275db5148cb96bdaa998115e5e31a5c1e4d", "shasum": "" }, "type": "library", @@ -923,22 +923,22 @@ "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/3.5.0" + "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/3.6.0" }, - "time": "2024-02-07T11:46:50+00:00" + "time": "2024-02-28T19:25:25+00:00" }, { "name": "pocketmine/bedrock-data", - "version": "2.8.0+bedrock-1.20.60", + "version": "2.9.0+bedrock-1.20.70", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "d8ea0355b7c835564af9fe6e273e650ac62c84a2" + "reference": "10b6696b662fd80a282eff7dca6c99d321c5b9e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/d8ea0355b7c835564af9fe6e273e650ac62c84a2", - "reference": "d8ea0355b7c835564af9fe6e273e650ac62c84a2", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/10b6696b662fd80a282eff7dca6c99d321c5b9e3", + "reference": "10b6696b662fd80a282eff7dca6c99d321c5b9e3", "shasum": "" }, "type": "library", @@ -949,22 +949,22 @@ "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.20.60" + "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.20.70" }, - "time": "2024-02-07T11:23:46+00:00" + "time": "2024-03-13T13:55:05+00:00" }, { "name": "pocketmine/bedrock-item-upgrade-schema", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "69772dd58e2b2c7b7513fa2bcdc46e782228641c" + "reference": "4c4dc3bbceb944c5de429b6e752ab7a15652078c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/69772dd58e2b2c7b7513fa2bcdc46e782228641c", - "reference": "69772dd58e2b2c7b7513fa2bcdc46e782228641c", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/4c4dc3bbceb944c5de429b6e752ab7a15652078c", + "reference": "4c4dc3bbceb944c5de429b6e752ab7a15652078c", "shasum": "" }, "type": "library", @@ -975,27 +975,26 @@ "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.7.0" + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.8.0" }, - "time": "2024-02-07T11:58:05+00:00" + "time": "2024-02-28T19:25:53+00:00" }, { "name": "pocketmine/bedrock-protocol", - "version": "27.0.1+bedrock-1.20.60", + "version": "29.0.0+bedrock-1.20.70", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "0cebb55f6e904f722b14d420f6b2c84c7fa69f10" + "reference": "8d63f39bb2cded3d3e578fd3cf7bc769b9674857" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/0cebb55f6e904f722b14d420f6b2c84c7fa69f10", - "reference": "0cebb55f6e904f722b14d420f6b2c84c7fa69f10", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/8d63f39bb2cded3d3e578fd3cf7bc769b9674857", + "reference": "8d63f39bb2cded3d3e578fd3cf7bc769b9674857", "shasum": "" }, "require": { "ext-json": "*", - "netresearch/jsonmapper": "^4.0", "php": "^8.1", "pocketmine/binaryutils": "^0.2.0", "pocketmine/color": "^0.2.0 || ^0.3.0", @@ -1004,7 +1003,7 @@ "ramsey/uuid": "^4.1" }, "require-dev": { - "phpstan/phpstan": "1.10.39", + "phpstan/phpstan": "1.10.59", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0", "phpunit/phpunit": "^9.5 || ^10.0" @@ -1022,22 +1021,22 @@ "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/27.0.1+bedrock-1.20.60" + "source": "https://github.com/pmmp/BedrockProtocol/tree/29.0.0+bedrock-1.20.70" }, - "time": "2024-02-07T11:53:50+00:00" + "time": "2024-03-13T14:35:54+00:00" }, { "name": "pocketmine/binaryutils", - "version": "0.2.4", + "version": "0.2.6", "source": { "type": "git", "url": "https://github.com/pmmp/BinaryUtils.git", - "reference": "5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a" + "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a", - "reference": "5ac7eea91afbad8dc498f5ce34ce6297d5e6ea9a", + "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/ccfc1899b859d45814ea3592e20ebec4cb731c84", + "reference": "ccfc1899b859d45814ea3592e20ebec4cb731c84", "shasum": "" }, "require": { @@ -1046,10 +1045,10 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "1.3.0", + "phpstan/phpstan": "~1.10.3", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0.0", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0" }, "type": "library", "autoload": { @@ -1064,9 +1063,9 @@ "description": "Classes and methods for conveniently handling binary data", "support": { "issues": "https://github.com/pmmp/BinaryUtils/issues", - "source": "https://github.com/pmmp/BinaryUtils/tree/0.2.4" + "source": "https://github.com/pmmp/BinaryUtils/tree/0.2.6" }, - "time": "2022-01-12T18:06:33+00:00" + "time": "2024-03-04T15:04:17+00:00" }, { "name": "pocketmine/callback-validator", @@ -1197,16 +1196,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.19.11", + "version": "2.19.6", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "d67b3f27f3534f926a81812f4461c49cd39d3468" + "reference": "93e473e20e7f4515ecf45c5ef0f9155b9247a86e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/d67b3f27f3534f926a81812f4461c49cd39d3468", - "reference": "d67b3f27f3534f926a81812f4461c49cd39d3468", + "url": "https://api.github.com/repos/pmmp/Language/zipball/93e473e20e7f4515ecf45c5ef0f9155b9247a86e", + "reference": "93e473e20e7f4515ecf45c5ef0f9155b9247a86e", "shasum": "" }, "type": "library", @@ -1214,9 +1213,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.19.11" + "source": "https://github.com/pmmp/Language/tree/2.19.6" }, - "time": "2024-01-29T18:10:39+00:00" + "time": "2023-08-08T16:53:23+00:00" }, { "name": "pocketmine/log", @@ -1344,16 +1343,16 @@ }, { "name": "pocketmine/netresearch-jsonmapper", - "version": "v4.2.1000", + "version": "v4.4.999", "source": { "type": "git", "url": "https://github.com/pmmp/netresearch-jsonmapper.git", - "reference": "078764e869e9b732f97206ec9363480a77c35532" + "reference": "9a6610033d56e358e86a3e4fd5f87063c7318833" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/netresearch-jsonmapper/zipball/078764e869e9b732f97206ec9363480a77c35532", - "reference": "078764e869e9b732f97206ec9363480a77c35532", + "url": "https://api.github.com/repos/pmmp/netresearch-jsonmapper/zipball/9a6610033d56e358e86a3e4fd5f87063c7318833", + "reference": "9a6610033d56e358e86a3e4fd5f87063c7318833", "shasum": "" }, "require": { @@ -1367,7 +1366,7 @@ "netresearch/jsonmapper": "~4.2.0" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -1392,22 +1391,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/pmmp/netresearch-jsonmapper/tree/v4.2.1000" + "source": "https://github.com/pmmp/netresearch-jsonmapper/tree/v4.4.999" }, - "time": "2023-07-14T10:44:14+00:00" + "time": "2024-02-23T13:17:01+00:00" }, { "name": "pocketmine/pocketmine-mp", - "version": "5.11.0", + "version": "5.13.0", "source": { "type": "git", "url": "https://github.com/pmmp/PocketMine-MP.git", - "reference": "ce8fecc6ecd62433d28090f4bae1b5cb3e6b9710" + "reference": "f193a990b0bae8892637cb7fb2bdf862c8a1a759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/ce8fecc6ecd62433d28090f4bae1b5cb3e6b9710", - "reference": "ce8fecc6ecd62433d28090f4bae1b5cb3e6b9710", + "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/f193a990b0bae8892637cb7fb2bdf862c8a1a759", + "reference": "f193a990b0bae8892637cb7fb2bdf862c8a1a759", "shasum": "" }, "require": { @@ -1438,10 +1437,10 @@ "ext-zlib": ">=1.2.11", "php": "^8.1", "php-64bit": "*", - "pocketmine/bedrock-block-upgrade-schema": "~3.5.0+bedrock-1.20.60", - "pocketmine/bedrock-data": "~2.8.0+bedrock-1.20.60", - "pocketmine/bedrock-item-upgrade-schema": "~1.7.0+bedrock-1.20.60", - "pocketmine/bedrock-protocol": "~27.0.0+bedrock-1.20.60", + "pocketmine/bedrock-block-upgrade-schema": "~3.6.0+bedrock-1.20.70", + "pocketmine/bedrock-data": "~2.9.0+bedrock-1.20.70", + "pocketmine/bedrock-item-upgrade-schema": "~1.8.0+bedrock-1.20.70", + "pocketmine/bedrock-protocol": "~29.0.0+bedrock-1.20.70", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/color": "^0.3.0", @@ -1450,7 +1449,7 @@ "pocketmine/log": "^0.4.0", "pocketmine/math": "~1.0.0", "pocketmine/nbt": "~1.0.0", - "pocketmine/netresearch-jsonmapper": "~v4.2.1000", + "pocketmine/netresearch-jsonmapper": "~v4.4.999", "pocketmine/raklib": "^0.15.0", "pocketmine/raklib-ipc": "^0.2.0", "pocketmine/snooze": "^0.5.0", @@ -1458,7 +1457,7 @@ "symfony/filesystem": "~6.4.0" }, "require-dev": { - "phpstan/phpstan": "1.10.57", + "phpstan/phpstan": "1.10.60", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "~10.3.0 || ~10.2.0 || ~10.1.0" @@ -1480,7 +1479,7 @@ "homepage": "https://pmmp.io", "support": { "issues": "https://github.com/pmmp/PocketMine-MP/issues", - "source": "https://github.com/pmmp/PocketMine-MP/tree/5.11.0" + "source": "https://github.com/pmmp/PocketMine-MP/tree/5.13.0" }, "funding": [ { @@ -1492,7 +1491,7 @@ "type": "patreon" } ], - "time": "2024-02-07T13:01:30+00:00" + "time": "2024-03-13T14:59:21+00:00" }, { "name": "pocketmine/raklib", @@ -2198,16 +2197,16 @@ }, { "name": "symfony/console", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -2272,7 +2271,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.3" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -2288,7 +2287,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3036,16 +3035,16 @@ }, { "name": "symfony/process", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { @@ -3077,7 +3076,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.3" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -3093,7 +3092,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/service-contracts", @@ -3179,16 +3178,16 @@ }, { "name": "symfony/string", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -3245,7 +3244,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.3" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -3261,7 +3260,7 @@ "type": "tidelift" } ], - "time": "2024-01-25T09:26:29+00:00" + "time": "2024-02-01T13:16:41+00:00" } ], "aliases": [], From 0b3604ea4ea3943fc680343795a00d6fca577731 Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Thu, 14 Mar 2024 04:11:58 +0900 Subject: [PATCH 3/4] fix text disappearing --- .../fuyutsuki/Texter/text/FloatingText.php | 136 +++++++++++------- 1 file changed, 88 insertions(+), 48 deletions(-) diff --git a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php index 0448fb6..2d40229 100644 --- a/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php +++ b/src/jp/mcbe/fuyutsuki/Texter/text/FloatingText.php @@ -4,12 +4,11 @@ namespace jp\mcbe\fuyutsuki\Texter\text; -use http\Exception\InvalidArgumentException; +use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; use pocketmine\math\Vector3; +use pocketmine\network\mcpe\convert\TypeConverter; use pocketmine\network\mcpe\protocol\AddActorPacket; -use pocketmine\network\mcpe\protocol\ClientboundPacket; -use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket; use pocketmine\network\mcpe\protocol\types\entity\ByteMetadataProperty; @@ -17,6 +16,7 @@ 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; @@ -71,56 +71,96 @@ public function setParent(FloatingTextCluster $parent) { $this->parent = $parent; } - public function asPacket(SendType $type): ClientboundPacket { + public function asPackets(SendType $type): array { return match ($type) { - SendType::ADD => AddActorPacket::create( - $this->actorRuntimeId, - $this->actorRuntimeId, - EntityIds::ITEM, - $this->position, - motion: null, - pitch: 0.0, - yaw: 0.0, - headYaw: 0.0, - bodyYaw: 0.0, - attributes: [], - metadata: [ - EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1), - EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0), - EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0), - EntityMetadataProperties::FLAGS => LongMetadataProperty::buildFromFlags([ - EntityMetadataFlags::IMMOBILE => true, - ]), - EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->text), - EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.0), - ], - syncedProperties: new PropertySyncData([], []), - links: [] - ), - SendType::EDIT => SetActorDataPacket::create( - $this->actorRuntimeId, - metadata: [ - EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->text), - ], - syncedProperties: new PropertySyncData([], []), - tick: 0 - ), - SendType::MOVE => MoveActorAbsolutePacket::create( - $this->actorRuntimeId, - $this->position, - pitch: 0.0, - yaw: 0.0, - headYaw: 0.0, - flags: MoveActorAbsolutePacket::FLAG_TELEPORT - ), - SendType::REMOVE => RemoveActorPacket::create( - $this->actorRuntimeId - ), + SendType::ADD => [ + AddActorPacket::create( + $this->actorRuntimeId, + $this->actorRuntimeId, + EntityIds::FALLING_BLOCK, + $this->position, + motion: null, + pitch: 0.0, + yaw: 0.0, + headYaw: 0.0, + bodyYaw: 0.0, + attributes: [], + metadata: [ + EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1), + EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0), + EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0), + EntityMetadataProperties::FLAGS => LongMetadataProperty::buildFromFlags([ + EntityMetadataFlags::IMMOBILE => true, + ]), + EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->text), + EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.0), + EntityMetadataProperties::VARIANT => new IntMetadataProperty(TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId(VanillaBlocks::AIR()->getStateId())) + ], + syncedProperties: new PropertySyncData([], []), + links: [] + ), + ], + SendType::EDIT => [ + SetActorDataPacket::create( + $this->actorRuntimeId, + metadata: [ + EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->text), + ], + syncedProperties: new PropertySyncData([], []), + tick: 0 + ), + ], + SendType::MOVE => [ + // MoveActorAbsolutePacket::create( + // $this->actorRuntimeId, + // $this->position, + // pitch: 0.0, + // yaw: 0.0, + // headYaw: 0.0, + // flags: MoveActorAbsolutePacket::FLAG_TELEPORT + // ), + RemoveActorPacket::create( + $this->actorRuntimeId + ), + AddActorPacket::create( + $this->actorRuntimeId, + $this->actorRuntimeId, + EntityIds::FALLING_BLOCK, + $this->position, + motion: null, + pitch: 0.0, + yaw: 0.0, + headYaw: 0.0, + bodyYaw: 0.0, + attributes: [], + metadata: [ + EntityMetadataProperties::ALWAYS_SHOW_NAMETAG => new ByteMetadataProperty(1), + EntityMetadataProperties::BOUNDING_BOX_HEIGHT => new FloatMetadataProperty(0.0), + EntityMetadataProperties::BOUNDING_BOX_WIDTH => new FloatMetadataProperty(0.0), + EntityMetadataProperties::FLAGS => LongMetadataProperty::buildFromFlags([ + EntityMetadataFlags::IMMOBILE => true, + ]), + EntityMetadataProperties::NAMETAG => new StringMetadataProperty($this->text), + EntityMetadataProperties::SCALE => new FloatMetadataProperty(0.0), + EntityMetadataProperties::VARIANT => new IntMetadataProperty(TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId(VanillaBlocks::AIR()->getStateId())) + ], + syncedProperties: new PropertySyncData([], []), + links: [] + ), + ], + SendType::REMOVE => [ + RemoveActorPacket::create( + $this->actorRuntimeId + ), + ], }; } public function sendToPlayer(Player $player, SendType $type): void { - $player->getNetworkSession()->sendDataPacket($this->asPacket($type)); + $packets = $this->asPackets($type); + foreach ($packets as $packet) { + $player->getNetworkSession()->sendDataPacket($packet); + } } public function sendToPlayers(array $players, SendType $type): void { From 9b7a966925a9d5cf009e9fa8b1e21eda7aebeeae Mon Sep 17 00:00:00 2001 From: yuko fuyutsuki Date: Thu, 14 Mar 2024 04:13:58 +0900 Subject: [PATCH 4/4] release 4.3.1 --- .github/changelogs/4.x/en_us.md | 6 ++++++ .github/changelogs/4.x/ja_jp.md | 6 ++++++ plugin.yml | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/changelogs/4.x/en_us.md b/.github/changelogs/4.x/en_us.md index 8eb20f0..b95c8db 100644 --- a/.github/changelogs/4.x/en_us.md +++ b/.github/changelogs/4.x/en_us.md @@ -2,6 +2,12 @@ ## 4.3.x +### 4.3.1 + +#### :bug: Bug fixes + +- Fixed a bug that floating characters are hidden after a certain time (#159) + ### 4.3.0 #### :globe_with_meridians: More i18n diff --git a/.github/changelogs/4.x/ja_jp.md b/.github/changelogs/4.x/ja_jp.md index 93291a1..5764129 100644 --- a/.github/changelogs/4.x/ja_jp.md +++ b/.github/changelogs/4.x/ja_jp.md @@ -2,6 +2,12 @@ ## 4.3.x +### 4.3.1 + +#### :bug: バグ修正 + +- 浮き文字が一定時間で非表示になってしまう不具合を修正しました (#159) + ### 4.3.0 #### :globe_with_meridians: 国際化 diff --git a/plugin.yml b/plugin.yml index 520caeb..c9a3155 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: Texter prefix: Texter main: jp\mcbe\fuyutsuki\Texter\Main -version: 4.3.0 +version: 4.3.1 api: 5.11.0 load: postworld