From 642630a4d2d95211620b2ce543bee97ff58c576a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 25 Nov 2022 14:57:47 +0000 Subject: [PATCH 1/2] ... --- composer.lock | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/composer.lock b/composer.lock index b8f472c5c..fe777d489 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": "b1d1d3a85ef8a8aec19b53f80d10e189", + "content-hash": "c471cf28062595a981064058c8b12dbb", "packages": [ { "name": "adhocore/json-comment", @@ -536,16 +536,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.10.2", + "version": "2.10.3", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "c2b8b63a85269304409406922181dd5438bcaff2" + "reference": "d641577c8b15d9e60750dd681c0d684b89ae55e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/c2b8b63a85269304409406922181dd5438bcaff2", - "reference": "c2b8b63a85269304409406922181dd5438bcaff2", + "url": "https://api.github.com/repos/pmmp/Language/zipball/d641577c8b15d9e60750dd681c0d684b89ae55e1", + "reference": "d641577c8b15d9e60750dd681c0d684b89ae55e1", "shasum": "" }, "type": "library", @@ -553,9 +553,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.10.2" + "source": "https://github.com/pmmp/Language/tree/2.10.3" }, - "time": "2022-11-15T13:55:05+00:00" + "time": "2022-11-25T14:21:36+00:00" }, { "name": "pocketmine/log", @@ -1086,16 +1086,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -1110,7 +1110,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1148,7 +1148,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -1164,20 +1164,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -1192,7 +1192,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1231,7 +1231,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -1247,20 +1247,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -1269,7 +1269,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1314,7 +1314,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -1330,20 +1330,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -1352,7 +1352,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1393,7 +1393,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -1409,7 +1409,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "webmozart/assert", @@ -1653,16 +1653,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v4.15.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", "shasum": "" }, "require": { @@ -1703,9 +1703,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" }, - "time": "2022-09-04T07:30:47+00:00" + "time": "2022-11-12T15:38:23+00:00" }, { "name": "phar-io/manifest", @@ -1820,16 +1820,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f" + "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", - "reference": "a59c8b5bfd4a236f27efc8b5ce72c313c2b54b5f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa", + "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa", "shasum": "" }, "require": { @@ -1859,7 +1859,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.1" + "source": "https://github.com/phpstan/phpstan/tree/1.9.2" }, "funding": [ { @@ -1875,7 +1875,7 @@ "type": "tidelift" } ], - "time": "2022-11-04T13:35:59+00:00" + "time": "2022-11-10T09:56:11+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -1979,16 +1979,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.18", + "version": "9.2.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", "shasum": "" }, "require": { @@ -2044,7 +2044,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" }, "funding": [ { @@ -2052,7 +2052,7 @@ "type": "github" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2022-11-18T07:47:47+00:00" }, { "name": "phpunit/php-file-iterator", From 641d35a30f032c4a15ffd13fd0b4de415988b6f9 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 25 Nov 2022 14:59:58 +0000 Subject: [PATCH 2/2] Updated pocketmine/locale-data to get new translations --- composer.json | 2 +- composer.lock | 14 +++++----- src/lang/KnownTranslationFactory.php | 41 ++++++++++++++++++++++++++++ src/lang/KnownTranslationKeys.php | 9 ++++++ 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index e365b3fbe..e47286f4a 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "pocketmine/classloader": "^0.2.0", "pocketmine/color": "^0.2.0", "pocketmine/errorhandler": "^0.6.0", - "pocketmine/locale-data": "~2.10.0", + "pocketmine/locale-data": "~2.11.0", "pocketmine/log": "^0.4.0", "pocketmine/log-pthreads": "^0.4.0", "pocketmine/math": "^0.4.0", diff --git a/composer.lock b/composer.lock index fe777d489..6843484d2 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": "c471cf28062595a981064058c8b12dbb", + "content-hash": "ff2bc73e9b0acccb1e63ddef2412fe31", "packages": [ { "name": "adhocore/json-comment", @@ -536,16 +536,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.10.3", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "d641577c8b15d9e60750dd681c0d684b89ae55e1" + "reference": "4b33d8fa53eda53d9662a7478806ebae2e4a5c53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/d641577c8b15d9e60750dd681c0d684b89ae55e1", - "reference": "d641577c8b15d9e60750dd681c0d684b89ae55e1", + "url": "https://api.github.com/repos/pmmp/Language/zipball/4b33d8fa53eda53d9662a7478806ebae2e4a5c53", + "reference": "4b33d8fa53eda53d9662a7478806ebae2e4a5c53", "shasum": "" }, "type": "library", @@ -553,9 +553,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.10.3" + "source": "https://github.com/pmmp/Language/tree/2.11.0" }, - "time": "2022-11-25T14:21:36+00:00" + "time": "2022-11-25T14:24:34+00:00" }, { "name": "pocketmine/log", diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 64dcf0305..f1db1c6d1 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -43,6 +43,34 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::ACCEPT_LICENSE, []); } + public static function action_interact_armorstand_equip() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_ARMORSTAND_EQUIP, []); + } + + public static function action_interact_armorstand_pose() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_ARMORSTAND_POSE, []); + } + + public static function action_interact_exit_boat() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_EXIT_BOAT, []); + } + + public static function action_interact_fishing() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_FISHING, []); + } + + public static function action_interact_name() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_NAME, []); + } + + public static function action_interact_ride_boat() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_RIDE_BOAT, []); + } + + public static function action_interact_ride_minecart() : Translatable{ + return new Translatable(KnownTranslationKeys::ACTION_INTERACT_RIDE_MINECART, []); + } + public static function chat_type_achievement(Translatable|string $param0, Translatable|string $param1) : Translatable{ return new Translatable(KnownTranslationKeys::CHAT_TYPE_ACHIEVEMENT, [ 0 => $param0, @@ -627,6 +655,12 @@ final class KnownTranslationFactory{ ]); } + public static function death_attack_fallingBlock(Translatable|string $param0) : Translatable{ + return new Translatable(KnownTranslationKeys::DEATH_ATTACK_FALLINGBLOCK, [ + 0 => $param0, + ]); + } + public static function death_attack_generic(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::DEATH_ATTACK_GENERIC, [ 0 => $param0, @@ -691,6 +725,13 @@ final class KnownTranslationFactory{ ]); } + public static function death_attack_trident(Translatable|string $param0, Translatable|string $param1) : Translatable{ + return new Translatable(KnownTranslationKeys::DEATH_ATTACK_TRIDENT, [ + 0 => $param0, + 1 => $param1, + ]); + } + public static function death_attack_wither(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::DEATH_ATTACK_WITHER, [ 0 => $param0, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 82a060223..bd98496cb 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -33,6 +33,13 @@ final class KnownTranslationKeys{ public const ABILITY_FLIGHT = "ability.flight"; public const ABILITY_NOCLIP = "ability.noclip"; public const ACCEPT_LICENSE = "accept_license"; + public const ACTION_INTERACT_ARMORSTAND_EQUIP = "action.interact.armorstand.equip"; + public const ACTION_INTERACT_ARMORSTAND_POSE = "action.interact.armorstand.pose"; + public const ACTION_INTERACT_EXIT_BOAT = "action.interact.exit.boat"; + public const ACTION_INTERACT_FISHING = "action.interact.fishing"; + public const ACTION_INTERACT_NAME = "action.interact.name"; + public const ACTION_INTERACT_RIDE_BOAT = "action.interact.ride.boat"; + public const ACTION_INTERACT_RIDE_MINECART = "action.interact.ride.minecart"; public const CHAT_TYPE_ACHIEVEMENT = "chat.type.achievement"; public const CHAT_TYPE_ADMIN = "chat.type.admin"; public const CHAT_TYPE_ANNOUNCEMENT = "chat.type.announcement"; @@ -138,6 +145,7 @@ final class KnownTranslationKeys{ public const DEATH_ATTACK_EXPLOSION = "death.attack.explosion"; public const DEATH_ATTACK_EXPLOSION_PLAYER = "death.attack.explosion.player"; public const DEATH_ATTACK_FALL = "death.attack.fall"; + public const DEATH_ATTACK_FALLINGBLOCK = "death.attack.fallingBlock"; public const DEATH_ATTACK_GENERIC = "death.attack.generic"; public const DEATH_ATTACK_INFIRE = "death.attack.inFire"; public const DEATH_ATTACK_INWALL = "death.attack.inWall"; @@ -148,6 +156,7 @@ final class KnownTranslationKeys{ public const DEATH_ATTACK_OUTOFWORLD = "death.attack.outOfWorld"; public const DEATH_ATTACK_PLAYER = "death.attack.player"; public const DEATH_ATTACK_PLAYER_ITEM = "death.attack.player.item"; + public const DEATH_ATTACK_TRIDENT = "death.attack.trident"; public const DEATH_ATTACK_WITHER = "death.attack.wither"; public const DEATH_FELL_ACCIDENT_GENERIC = "death.fell.accident.generic"; public const DEFAULT_GAMEMODE = "default_gamemode";