diff --git a/composer.json b/composer.json index 8d28a7972..780f4f7d4 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.5.0", + "pocketmine/locale-data": "~2.6.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 3f87cee4f..f38eebaa1 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": "afc47e972ac67ed1e1ab564a63171fa6", + "content-hash": "7e7da4bafdfc9f2b9bfbb3dc7cda739c", "packages": [ { "name": "adhocore/json-comment", @@ -536,16 +536,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "df6fc7f2b48850b306c60466a11f7a27bb8fe1de" + "reference": "f226e74ceb780f1a78dec84e19f034829f820ef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/df6fc7f2b48850b306c60466a11f7a27bb8fe1de", - "reference": "df6fc7f2b48850b306c60466a11f7a27bb8fe1de", + "url": "https://api.github.com/repos/pmmp/Language/zipball/f226e74ceb780f1a78dec84e19f034829f820ef4", + "reference": "f226e74ceb780f1a78dec84e19f034829f820ef4", "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.5.0" + "source": "https://github.com/pmmp/Language/tree/2.6.0" }, - "time": "2022-04-01T22:36:58+00:00" + "time": "2022-04-10T20:20:32+00:00" }, { "name": "pocketmine/log", diff --git a/src/command/defaults/HelpCommand.php b/src/command/defaults/HelpCommand.php index f16049a69..f99be0b22 100644 --- a/src/command/defaults/HelpCommand.php +++ b/src/command/defaults/HelpCommand.php @@ -105,7 +105,7 @@ class HelpCommand extends VanillaCommand{ $lang = $sender->getLanguage(); $description = $cmd->getDescription(); $descriptionString = $description instanceof Translatable ? $lang->translate($description) : $description; - $sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_header($commandName) + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_header($cmd->getName()) ->format(TextFormat::YELLOW . "--------- " . TextFormat::WHITE, TextFormat::YELLOW . " ---------")); $sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_description(TextFormat::WHITE . $descriptionString) ->prefix(TextFormat::GOLD)); @@ -115,6 +115,11 @@ class HelpCommand extends VanillaCommand{ $sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_usage(TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $usageString))) ->prefix(TextFormat::GOLD)); + $aliases = $cmd->getAliases(); + sort($aliases, SORT_NATURAL); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_help_specificCommand_aliases(TextFormat::WHITE . implode(", ", $aliases)) + ->prefix(TextFormat::GOLD)); + return true; } } diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index f006f937b..7bff33d9b 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -1197,6 +1197,12 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_HELP_DESCRIPTION, []); } + public static function pocketmine_command_help_specificCommand_aliases(Translatable|string $aliasList) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_ALIASES, [ + "aliasList" => $aliasList, + ]); + } + public static function pocketmine_command_help_specificCommand_description(Translatable|string $description) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_DESCRIPTION, [ "description" => $description, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 038049d0a..ff3c448fe 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -262,6 +262,7 @@ final class KnownTranslationKeys{ public const POCKETMINE_COMMAND_GIVE_DESCRIPTION = "pocketmine.command.give.description"; public const POCKETMINE_COMMAND_GIVE_USAGE = "pocketmine.command.give.usage"; public const POCKETMINE_COMMAND_HELP_DESCRIPTION = "pocketmine.command.help.description"; + public const POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_ALIASES = "pocketmine.command.help.specificCommand.aliases"; public const POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_DESCRIPTION = "pocketmine.command.help.specificCommand.description"; public const POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_HEADER = "pocketmine.command.help.specificCommand.header"; public const POCKETMINE_COMMAND_HELP_SPECIFICCOMMAND_USAGE = "pocketmine.command.help.specificCommand.usage";