From 3b7580688c575b8585bb4f95b23b9691f0a7aca1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 11 Sep 2021 16:46:40 +0100 Subject: [PATCH] Stop auto-translating string descriptions/usages for commands Require usage of Translatable for translations. --- src/command/Command.php | 14 +++++++------- src/command/SimpleCommandMap.php | 2 +- src/command/defaults/BanCommand.php | 5 ++--- src/command/defaults/BanIpCommand.php | 5 ++--- src/command/defaults/BanListCommand.php | 5 ++--- src/command/defaults/ClearCommand.php | 5 ++--- .../defaults/DefaultGamemodeCommand.php | 5 ++--- src/command/defaults/DeopCommand.php | 5 ++--- src/command/defaults/DifficultyCommand.php | 5 ++--- src/command/defaults/EffectCommand.php | 5 ++--- src/command/defaults/EnchantCommand.php | 5 ++--- src/command/defaults/GamemodeCommand.php | 5 ++--- .../defaults/GarbageCollectorCommand.php | 5 ++--- src/command/defaults/GiveCommand.php | 5 ++--- src/command/defaults/HelpCommand.php | 19 +++++++++++++------ src/command/defaults/KickCommand.php | 5 ++--- src/command/defaults/KillCommand.php | 5 ++--- src/command/defaults/ListCommand.php | 5 ++--- src/command/defaults/MeCommand.php | 5 ++--- src/command/defaults/OpCommand.php | 5 ++--- src/command/defaults/PardonCommand.php | 5 ++--- src/command/defaults/PardonIpCommand.php | 5 ++--- src/command/defaults/ParticleCommand.php | 5 ++--- src/command/defaults/PluginsCommand.php | 5 ++--- src/command/defaults/SaveCommand.php | 5 ++--- src/command/defaults/SaveOffCommand.php | 5 ++--- src/command/defaults/SaveOnCommand.php | 5 ++--- src/command/defaults/SayCommand.php | 5 ++--- src/command/defaults/SeedCommand.php | 5 ++--- src/command/defaults/SetWorldSpawnCommand.php | 5 ++--- src/command/defaults/SpawnpointCommand.php | 5 ++--- src/command/defaults/StatusCommand.php | 6 +++--- src/command/defaults/StopCommand.php | 5 ++--- src/command/defaults/TeleportCommand.php | 5 ++--- src/command/defaults/TellCommand.php | 5 ++--- src/command/defaults/TimeCommand.php | 5 ++--- src/command/defaults/TimingsCommand.php | 5 ++--- src/command/defaults/TitleCommand.php | 5 ++--- .../defaults/TransferServerCommand.php | 6 +++--- src/command/defaults/VersionCommand.php | 5 ++--- src/command/defaults/WhitelistCommand.php | 5 ++--- src/network/mcpe/NetworkSession.php | 4 +++- .../check-explicit-mixed-baseline.neon | 4 ++-- 43 files changed, 104 insertions(+), 131 deletions(-) diff --git a/src/command/Command.php b/src/command/Command.php index fbd979784..ff08620f1 100644 --- a/src/command/Command.php +++ b/src/command/Command.php @@ -58,10 +58,10 @@ abstract class Command{ /** @var CommandMap|null */ private $commandMap = null; - /** @var string */ + /** @var Translatable|string */ protected $description = ""; - /** @var string */ + /** @var Translatable|string */ protected $usageMessage; /** @var string|null */ @@ -76,7 +76,7 @@ abstract class Command{ /** * @param string[] $aliases */ - public function __construct(string $name, string $description = "", ?string $usageMessage = null, array $aliases = []){ + public function __construct(string $name, Translatable|string $description = "", Translatable|string|null $usageMessage = null, array $aliases = []){ $this->name = $name; $this->setLabel($name); $this->setDescription($description); @@ -200,11 +200,11 @@ abstract class Command{ return $this->permissionMessage; } - public function getDescription() : string{ + public function getDescription() : Translatable|string{ return $this->description; } - public function getUsage() : string{ + public function getUsage() : Translatable|string{ return $this->usageMessage; } @@ -218,7 +218,7 @@ abstract class Command{ } } - public function setDescription(string $description) : void{ + public function setDescription(Translatable|string $description) : void{ $this->description = $description; } @@ -226,7 +226,7 @@ abstract class Command{ $this->permissionMessage = $permissionMessage; } - public function setUsage(string $usage) : void{ + public function setUsage(Translatable|string $usage) : void{ $this->usageMessage = $usage; } diff --git a/src/command/SimpleCommandMap.php b/src/command/SimpleCommandMap.php index aab3a9e8e..638e10740 100644 --- a/src/command/SimpleCommandMap.php +++ b/src/command/SimpleCommandMap.php @@ -224,7 +224,7 @@ class SimpleCommandMap implements CommandMap{ try{ $target->execute($sender, $sentCommandLabel, $args); }catch(InvalidCommandSyntaxException $e){ - $sender->sendMessage($sender->getLanguage()->translate(KnownTranslationFactory::commands_generic_usage($sender->getLanguage()->translateString($target->getUsage())))); + $sender->sendMessage($sender->getLanguage()->translate(KnownTranslationFactory::commands_generic_usage($target->getUsage()))); }finally{ $target->timings->stopTiming(); } diff --git a/src/command/defaults/BanCommand.php b/src/command/defaults/BanCommand.php index 3e264abf8..4b734303d 100644 --- a/src/command/defaults/BanCommand.php +++ b/src/command/defaults/BanCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function array_shift; @@ -39,8 +38,8 @@ class BanCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_BAN_PLAYER_DESCRIPTION, - KnownTranslationKeys::COMMANDS_BAN_USAGE + KnownTranslationFactory::pocketmine_command_ban_player_description(), + KnownTranslationFactory::commands_ban_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_PLAYER); } diff --git a/src/command/defaults/BanIpCommand.php b/src/command/defaults/BanIpCommand.php index 13305b784..fca99eff6 100644 --- a/src/command/defaults/BanIpCommand.php +++ b/src/command/defaults/BanIpCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function array_shift; @@ -40,8 +39,8 @@ class BanIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_BAN_IP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_BANIP_USAGE + KnownTranslationFactory::pocketmine_command_ban_ip_description(), + KnownTranslationFactory::commands_banip_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_IP); } diff --git a/src/command/defaults/BanListCommand.php b/src/command/defaults/BanListCommand.php index 3cf92076c..f3bd20baa 100644 --- a/src/command/defaults/BanListCommand.php +++ b/src/command/defaults/BanListCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\BanEntry; use pocketmine\permission\DefaultPermissionNames; use function array_map; @@ -41,8 +40,8 @@ class BanListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_BANLIST_DESCRIPTION, - KnownTranslationKeys::COMMANDS_BANLIST_USAGE + KnownTranslationFactory::pocketmine_command_banlist_description(), + KnownTranslationFactory::commands_banlist_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_LIST); } diff --git a/src/command/defaults/ClearCommand.php b/src/command/defaults/ClearCommand.php index 265549a9a..59bee1e5b 100644 --- a/src/command/defaults/ClearCommand.php +++ b/src/command/defaults/ClearCommand.php @@ -30,7 +30,6 @@ use pocketmine\item\LegacyStringToItemParser; use pocketmine\item\LegacyStringToItemParserException; use pocketmine\item\StringToItemParser; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -43,8 +42,8 @@ class ClearCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_USAGE + KnownTranslationFactory::pocketmine_command_clear_description(), + KnownTranslationFactory::pocketmine_command_clear_usage() ); $this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER])); } diff --git a/src/command/defaults/DefaultGamemodeCommand.php b/src/command/defaults/DefaultGamemodeCommand.php index 501ef98fa..f7752319e 100644 --- a/src/command/defaults/DefaultGamemodeCommand.php +++ b/src/command/defaults/DefaultGamemodeCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\data\java\GameModeIdMap; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\GameMode; use function count; @@ -37,8 +36,8 @@ class DefaultGamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_DEFAULTGAMEMODE_DESCRIPTION, - KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE + KnownTranslationFactory::pocketmine_command_defaultgamemode_description(), + KnownTranslationFactory::commands_defaultgamemode_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_DEFAULTGAMEMODE); } diff --git a/src/command/defaults/DeopCommand.php b/src/command/defaults/DeopCommand.php index 7d94c5633..9dbd0757c 100644 --- a/src/command/defaults/DeopCommand.php +++ b/src/command/defaults/DeopCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -39,8 +38,8 @@ class DeopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_DEOP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_DEOP_USAGE + KnownTranslationFactory::pocketmine_command_deop_description(), + KnownTranslationFactory::commands_deop_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_TAKE); } diff --git a/src/command/defaults/DifficultyCommand.php b/src/command/defaults/DifficultyCommand.php index c61fc2516..7ccde43f0 100644 --- a/src/command/defaults/DifficultyCommand.php +++ b/src/command/defaults/DifficultyCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\world\World; use function count; @@ -37,8 +36,8 @@ class DifficultyCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_DIFFICULTY_DESCRIPTION, - KnownTranslationKeys::COMMANDS_DIFFICULTY_USAGE + KnownTranslationFactory::pocketmine_command_difficulty_description(), + KnownTranslationFactory::commands_difficulty_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_DIFFICULTY); } diff --git a/src/command/defaults/EffectCommand.php b/src/command/defaults/EffectCommand.php index ac5828d65..84fa8585e 100644 --- a/src/command/defaults/EffectCommand.php +++ b/src/command/defaults/EffectCommand.php @@ -28,7 +28,6 @@ use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\entity\effect\EffectInstance; use pocketmine\entity\effect\VanillaEffects; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\Limits; use pocketmine\utils\TextFormat; @@ -40,8 +39,8 @@ class EffectCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_EFFECT_DESCRIPTION, - KnownTranslationKeys::COMMANDS_EFFECT_USAGE + KnownTranslationFactory::pocketmine_command_effect_description(), + KnownTranslationFactory::commands_effect_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_EFFECT); } diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php index 10d2c3f16..08e959a4f 100644 --- a/src/command/defaults/EnchantCommand.php +++ b/src/command/defaults/EnchantCommand.php @@ -28,7 +28,6 @@ use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\enchantment\EnchantmentInstance; use pocketmine\item\enchantment\VanillaEnchantments; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; use function count; @@ -38,8 +37,8 @@ class EnchantCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_ENCHANT_DESCRIPTION, - KnownTranslationKeys::COMMANDS_ENCHANT_USAGE + KnownTranslationFactory::pocketmine_command_enchant_description(), + KnownTranslationFactory::commands_enchant_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_ENCHANT); } diff --git a/src/command/defaults/GamemodeCommand.php b/src/command/defaults/GamemodeCommand.php index 90c6627ae..e01150875 100644 --- a/src/command/defaults/GamemodeCommand.php +++ b/src/command/defaults/GamemodeCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\GameMode; use pocketmine\player\Player; @@ -39,8 +38,8 @@ class GamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION, - KnownTranslationKeys::COMMANDS_GAMEMODE_USAGE + KnownTranslationFactory::pocketmine_command_gamemode_description(), + KnownTranslationFactory::commands_gamemode_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_GAMEMODE); } diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php index 1614739cd..2a2ccf49c 100644 --- a/src/command/defaults/GarbageCollectorCommand.php +++ b/src/command/defaults/GarbageCollectorCommand.php @@ -25,7 +25,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; use function count; @@ -38,8 +37,8 @@ class GarbageCollectorCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_GC_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE + KnownTranslationFactory::pocketmine_command_gc_description(), + KnownTranslationFactory::pocketmine_command_gc_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_GC); } diff --git a/src/command/defaults/GiveCommand.php b/src/command/defaults/GiveCommand.php index 7a5de2570..34814f207 100644 --- a/src/command/defaults/GiveCommand.php +++ b/src/command/defaults/GiveCommand.php @@ -30,7 +30,6 @@ use pocketmine\item\LegacyStringToItemParser; use pocketmine\item\LegacyStringToItemParserException; use pocketmine\item\StringToItemParser; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\nbt\JsonNbtParser; use pocketmine\nbt\NbtDataException; use pocketmine\permission\DefaultPermissionNames; @@ -44,8 +43,8 @@ class GiveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_USAGE + KnownTranslationFactory::pocketmine_command_give_description(), + KnownTranslationFactory::pocketmine_command_give_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_GIVE); } diff --git a/src/command/defaults/HelpCommand.php b/src/command/defaults/HelpCommand.php index be1beab25..77bc98d0e 100644 --- a/src/command/defaults/HelpCommand.php +++ b/src/command/defaults/HelpCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; +use pocketmine\lang\Translatable; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; use function array_chunk; @@ -46,8 +46,8 @@ class HelpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_HELP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_HELP_USAGE, + KnownTranslationFactory::pocketmine_command_help_description(), + KnownTranslationFactory::commands_help_usage(), ["?"] ); $this->setPermission(DefaultPermissionNames::COMMAND_HELP); @@ -92,7 +92,9 @@ class HelpCommand extends VanillaCommand{ $lang = $sender->getLanguage(); if(isset($commands[$pageNumber - 1])){ foreach($commands[$pageNumber - 1] as $command){ - $sender->sendMessage(TextFormat::DARK_GREEN . "/" . $command->getName() . ": " . TextFormat::WHITE . $lang->translateString($command->getDescription())); + $description = $command->getDescription(); + $descriptionString = $description instanceof Translatable ? $lang->translate($description) : $description; + $sender->sendMessage(TextFormat::DARK_GREEN . "/" . $command->getName() . ": " . TextFormat::WHITE . $descriptionString); } } @@ -100,9 +102,14 @@ class HelpCommand extends VanillaCommand{ }else{ if(($cmd = $sender->getServer()->getCommandMap()->getCommand(strtolower($commandName))) instanceof Command){ if($cmd->testPermissionSilent($sender)){ + $lang = $sender->getLanguage(); + $description = $cmd->getDescription(); + $descriptionString = $description instanceof Translatable ? $lang->translate($description) : $description; $message = TextFormat::YELLOW . "--------- " . TextFormat::WHITE . " Help: /" . $cmd->getName() . TextFormat::YELLOW . " ---------\n"; - $message .= TextFormat::GOLD . "Description: " . TextFormat::WHITE . $sender->getLanguage()->translateString($cmd->getDescription()) . "\n"; - $message .= TextFormat::GOLD . "Usage: " . TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $sender->getLanguage()->translateString($cmd->getUsage()))) . "\n"; + $message .= TextFormat::GOLD . "Description: " . TextFormat::WHITE . $descriptionString . "\n"; + $usage = $cmd->getUsage(); + $usageString = $usage instanceof Translatable ? $lang->translate($usage) : $usage; + $message .= TextFormat::GOLD . "Usage: " . TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $usageString)) . "\n"; $sender->sendMessage($message); return true; diff --git a/src/command/defaults/KickCommand.php b/src/command/defaults/KickCommand.php index 50a37f6a8..a341ca64b 100644 --- a/src/command/defaults/KickCommand.php +++ b/src/command/defaults/KickCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -41,8 +40,8 @@ class KickCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_KICK_DESCRIPTION, - KnownTranslationKeys::COMMANDS_KICK_USAGE + KnownTranslationFactory::pocketmine_command_kick_description(), + KnownTranslationFactory::commands_kick_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_KICK); } diff --git a/src/command/defaults/KillCommand.php b/src/command/defaults/KillCommand.php index ff96a387f..f425060e3 100644 --- a/src/command/defaults/KillCommand.php +++ b/src/command/defaults/KillCommand.php @@ -28,7 +28,6 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -40,8 +39,8 @@ class KillCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_KILL_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_KILL_USAGE, + KnownTranslationFactory::pocketmine_command_kill_description(), + KnownTranslationFactory::pocketmine_command_kill_usage(), ["suicide"] ); $this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_KILL_SELF, DefaultPermissionNames::COMMAND_KILL_OTHER])); diff --git a/src/command/defaults/ListCommand.php b/src/command/defaults/ListCommand.php index 556ff24f8..5de2e6697 100644 --- a/src/command/defaults/ListCommand.php +++ b/src/command/defaults/ListCommand.php @@ -25,7 +25,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function array_filter; @@ -40,8 +39,8 @@ class ListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_LIST_DESCRIPTION, - KnownTranslationKeys::COMMANDS_PLAYERS_USAGE + KnownTranslationFactory::pocketmine_command_list_description(), + KnownTranslationFactory::commands_players_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_LIST); } diff --git a/src/command/defaults/MeCommand.php b/src/command/defaults/MeCommand.php index d1d832949..904b39fe4 100644 --- a/src/command/defaults/MeCommand.php +++ b/src/command/defaults/MeCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -38,8 +37,8 @@ class MeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_ME_DESCRIPTION, - KnownTranslationKeys::COMMANDS_ME_USAGE + KnownTranslationFactory::pocketmine_command_me_description(), + KnownTranslationFactory::commands_me_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_ME); } diff --git a/src/command/defaults/OpCommand.php b/src/command/defaults/OpCommand.php index 88348c7ac..4067eb3e7 100644 --- a/src/command/defaults/OpCommand.php +++ b/src/command/defaults/OpCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -39,8 +38,8 @@ class OpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_OP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_OP_USAGE + KnownTranslationFactory::pocketmine_command_op_description(), + KnownTranslationFactory::commands_op_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_GIVE); } diff --git a/src/command/defaults/PardonCommand.php b/src/command/defaults/PardonCommand.php index 27b40069f..842cbe3ae 100644 --- a/src/command/defaults/PardonCommand.php +++ b/src/command/defaults/PardonCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use function count; @@ -36,8 +35,8 @@ class PardonCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_PLAYER_DESCRIPTION, - KnownTranslationKeys::COMMANDS_UNBAN_USAGE, + KnownTranslationFactory::pocketmine_command_unban_player_description(), + KnownTranslationFactory::commands_unban_usage(), ["unban"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_PLAYER); diff --git a/src/command/defaults/PardonIpCommand.php b/src/command/defaults/PardonIpCommand.php index 9b2278706..395ba1d93 100644 --- a/src/command/defaults/PardonIpCommand.php +++ b/src/command/defaults/PardonIpCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use function count; use function preg_match; @@ -37,8 +36,8 @@ class PardonIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_IP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_UNBANIP_USAGE, + KnownTranslationFactory::pocketmine_command_unban_ip_description(), + KnownTranslationFactory::commands_unbanip_usage(), ["unban-ip"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_IP); diff --git a/src/command/defaults/ParticleCommand.php b/src/command/defaults/ParticleCommand.php index 00e052bb7..ee7af129a 100644 --- a/src/command/defaults/ParticleCommand.php +++ b/src/command/defaults/ParticleCommand.php @@ -30,7 +30,6 @@ use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\ItemFactory; use pocketmine\item\VanillaItems; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\math\Vector3; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -79,8 +78,8 @@ class ParticleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_USAGE + KnownTranslationFactory::pocketmine_command_particle_description(), + KnownTranslationFactory::pocketmine_command_particle_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_PARTICLE); } diff --git a/src/command/defaults/PluginsCommand.php b/src/command/defaults/PluginsCommand.php index c0339f52d..3ae8d19a2 100644 --- a/src/command/defaults/PluginsCommand.php +++ b/src/command/defaults/PluginsCommand.php @@ -25,7 +25,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\plugin\Plugin; use pocketmine\utils\TextFormat; @@ -40,8 +39,8 @@ class PluginsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE, + KnownTranslationFactory::pocketmine_command_plugins_description(), + KnownTranslationFactory::pocketmine_command_plugins_usage(), ["pl"] ); $this->setPermission(DefaultPermissionNames::COMMAND_PLUGINS); diff --git a/src/command/defaults/SaveCommand.php b/src/command/defaults/SaveCommand.php index 71a3c33f8..9fe3cf197 100644 --- a/src/command/defaults/SaveCommand.php +++ b/src/command/defaults/SaveCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use function microtime; use function round; @@ -36,8 +35,8 @@ class SaveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SAVE_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SAVE_USAGE + KnownTranslationFactory::pocketmine_command_save_description(), + KnownTranslationFactory::commands_save_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM); } diff --git a/src/command/defaults/SaveOffCommand.php b/src/command/defaults/SaveOffCommand.php index 6d8f8a7e9..5dd39f6f3 100644 --- a/src/command/defaults/SaveOffCommand.php +++ b/src/command/defaults/SaveOffCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; class SaveOffCommand extends VanillaCommand{ @@ -34,8 +33,8 @@ class SaveOffCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SAVEOFF_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE + KnownTranslationFactory::pocketmine_command_saveoff_description(), + KnownTranslationFactory::commands_save_off_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE); } diff --git a/src/command/defaults/SaveOnCommand.php b/src/command/defaults/SaveOnCommand.php index f57fa5593..1bbdd5a0b 100644 --- a/src/command/defaults/SaveOnCommand.php +++ b/src/command/defaults/SaveOnCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; class SaveOnCommand extends VanillaCommand{ @@ -34,8 +33,8 @@ class SaveOnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SAVEON_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE + KnownTranslationFactory::pocketmine_command_saveon_description(), + KnownTranslationFactory::commands_save_on_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE); } diff --git a/src/command/defaults/SayCommand.php b/src/command/defaults/SayCommand.php index a4fd0e066..29513280e 100644 --- a/src/command/defaults/SayCommand.php +++ b/src/command/defaults/SayCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\console\ConsoleCommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -39,8 +38,8 @@ class SayCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SAY_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SAY_USAGE + KnownTranslationFactory::pocketmine_command_say_description(), + KnownTranslationFactory::commands_say_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAY); } diff --git a/src/command/defaults/SeedCommand.php b/src/command/defaults/SeedCommand.php index 53f19a19a..364c9d003 100644 --- a/src/command/defaults/SeedCommand.php +++ b/src/command/defaults/SeedCommand.php @@ -25,7 +25,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -34,8 +33,8 @@ class SeedCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SEED_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SEED_USAGE + KnownTranslationFactory::pocketmine_command_seed_description(), + KnownTranslationFactory::commands_seed_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SEED); } diff --git a/src/command/defaults/SetWorldSpawnCommand.php b/src/command/defaults/SetWorldSpawnCommand.php index 9b67fa076..9bd37db98 100644 --- a/src/command/defaults/SetWorldSpawnCommand.php +++ b/src/command/defaults/SetWorldSpawnCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\math\Vector3; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -40,8 +39,8 @@ class SetWorldSpawnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SETWORLDSPAWN_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_USAGE + KnownTranslationFactory::pocketmine_command_setworldspawn_description(), + KnownTranslationFactory::commands_setworldspawn_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SETWORLDSPAWN); } diff --git a/src/command/defaults/SpawnpointCommand.php b/src/command/defaults/SpawnpointCommand.php index 6bfea948a..a99d4a49e 100644 --- a/src/command/defaults/SpawnpointCommand.php +++ b/src/command/defaults/SpawnpointCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -41,8 +40,8 @@ class SpawnpointCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_SPAWNPOINT_DESCRIPTION, - KnownTranslationKeys::COMMANDS_SPAWNPOINT_USAGE + KnownTranslationFactory::pocketmine_command_spawnpoint_description(), + KnownTranslationFactory::commands_spawnpoint_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_SPAWNPOINT); } diff --git a/src/command/defaults/StatusCommand.php b/src/command/defaults/StatusCommand.php index 7a4a98558..7ccbbb313 100644 --- a/src/command/defaults/StatusCommand.php +++ b/src/command/defaults/StatusCommand.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\lang\KnownTranslationKeys; +use pocketmine\lang\KnownTranslationFactory; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\Process; use pocketmine\utils\TextFormat; @@ -39,8 +39,8 @@ class StatusCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_USAGE + KnownTranslationFactory::pocketmine_command_status_description(), + KnownTranslationFactory::pocketmine_command_status_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_STATUS); } diff --git a/src/command/defaults/StopCommand.php b/src/command/defaults/StopCommand.php index 23a624dd5..3292cd7c6 100644 --- a/src/command/defaults/StopCommand.php +++ b/src/command/defaults/StopCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; class StopCommand extends VanillaCommand{ @@ -34,8 +33,8 @@ class StopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_STOP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_STOP_USAGE + KnownTranslationFactory::pocketmine_command_stop_description(), + KnownTranslationFactory::commands_stop_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_STOP); } diff --git a/src/command/defaults/TeleportCommand.php b/src/command/defaults/TeleportCommand.php index 17979fec6..1ece20f30 100644 --- a/src/command/defaults/TeleportCommand.php +++ b/src/command/defaults/TeleportCommand.php @@ -28,7 +28,6 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\entity\Location; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\AssumptionFailedError; @@ -42,8 +41,8 @@ class TeleportCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TP_DESCRIPTION, - KnownTranslationKeys::COMMANDS_TP_USAGE, + KnownTranslationFactory::pocketmine_command_tp_description(), + KnownTranslationFactory::commands_tp_usage(), ["teleport"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELEPORT); diff --git a/src/command/defaults/TellCommand.php b/src/command/defaults/TellCommand.php index c7feb644c..4e294af5b 100644 --- a/src/command/defaults/TellCommand.php +++ b/src/command/defaults/TellCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\utils\TextFormat; @@ -40,8 +39,8 @@ class TellCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TELL_DESCRIPTION, - KnownTranslationKeys::COMMANDS_MESSAGE_USAGE, + KnownTranslationFactory::pocketmine_command_tell_description(), + KnownTranslationFactory::commands_message_usage(), ["w", "msg"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELL); diff --git a/src/command/defaults/TimeCommand.php b/src/command/defaults/TimeCommand.php index b3b1f397d..fcdd89dee 100644 --- a/src/command/defaults/TimeCommand.php +++ b/src/command/defaults/TimeCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\world\World; @@ -39,8 +38,8 @@ class TimeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TIME_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_TIME_USAGE + KnownTranslationFactory::pocketmine_command_time_description(), + KnownTranslationFactory::pocketmine_command_time_usage() ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_TIME_ADD, diff --git a/src/command/defaults/TimingsCommand.php b/src/command/defaults/TimingsCommand.php index cff3f4dd0..26839b312 100644 --- a/src/command/defaults/TimingsCommand.php +++ b/src/command/defaults/TimingsCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use pocketmine\scheduler\BulkCurlTask; @@ -60,8 +59,8 @@ class TimingsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_USAGE + KnownTranslationFactory::pocketmine_command_timings_description(), + KnownTranslationFactory::pocketmine_command_timings_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_TIMINGS); } diff --git a/src/command/defaults/TitleCommand.php b/src/command/defaults/TitleCommand.php index 084949cd3..76e6f3b6e 100644 --- a/src/command/defaults/TitleCommand.php +++ b/src/command/defaults/TitleCommand.php @@ -26,7 +26,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; use function array_slice; @@ -38,8 +37,8 @@ class TitleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TITLE_DESCRIPTION, - KnownTranslationKeys::COMMANDS_TITLE_USAGE + KnownTranslationFactory::pocketmine_command_title_description(), + KnownTranslationFactory::commands_title_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_TITLE); } diff --git a/src/command/defaults/TransferServerCommand.php b/src/command/defaults/TransferServerCommand.php index 0190e48ee..4159a5b25 100644 --- a/src/command/defaults/TransferServerCommand.php +++ b/src/command/defaults/TransferServerCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\lang\KnownTranslationKeys; +use pocketmine\lang\KnownTranslationFactory; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function count; @@ -35,8 +35,8 @@ class TransferServerCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_USAGE + KnownTranslationFactory::pocketmine_command_transferserver_description(), + KnownTranslationFactory::pocketmine_command_transferserver_usage() ); $this->setPermission(DefaultPermissionNames::COMMAND_TRANSFERSERVER); } diff --git a/src/command/defaults/VersionCommand.php b/src/command/defaults/VersionCommand.php index 17e4c858c..c5a09b98f 100644 --- a/src/command/defaults/VersionCommand.php +++ b/src/command/defaults/VersionCommand.php @@ -25,7 +25,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\permission\DefaultPermissionNames; use pocketmine\plugin\Plugin; @@ -46,8 +45,8 @@ class VersionCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, - KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_USAGE, + KnownTranslationFactory::pocketmine_command_version_description(), + KnownTranslationFactory::pocketmine_command_version_usage(), ["ver", "about"] ); $this->setPermission(DefaultPermissionNames::COMMAND_VERSION); diff --git a/src/command/defaults/WhitelistCommand.php b/src/command/defaults/WhitelistCommand.php index 458d819e0..2fdf5a1fa 100644 --- a/src/command/defaults/WhitelistCommand.php +++ b/src/command/defaults/WhitelistCommand.php @@ -27,7 +27,6 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\lang\KnownTranslationFactory; -use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function count; @@ -41,8 +40,8 @@ class WhitelistCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationKeys::POCKETMINE_COMMAND_WHITELIST_DESCRIPTION, - KnownTranslationKeys::COMMANDS_WHITELIST_USAGE + KnownTranslationFactory::pocketmine_command_whitelist_description(), + KnownTranslationFactory::commands_whitelist_usage() ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_WHITELIST_RELOAD, diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index 4683c2c72..45d6daaa6 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -35,6 +35,7 @@ use pocketmine\event\server\DataPacketSendEvent; use pocketmine\form\Form; use pocketmine\lang\KnownTranslationFactory; use pocketmine\lang\KnownTranslationKeys; +use pocketmine\lang\Translatable; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\StringTag; @@ -832,9 +833,10 @@ class NetworkSession{ $aliasObj = new CommandEnum(ucfirst($command->getName()) . "Aliases", array_values($aliases)); } + $description = $command->getDescription(); $data = new CommandData( $lname, //TODO: commands containing uppercase letters in the name crash 1.9.0 client - $this->player->getLanguage()->translateString($command->getDescription()), + $description instanceof Translatable ? $this->player->getLanguage()->translate($description) : $description, 0, 0, $aliasObj, diff --git a/tests/phpstan/configs/check-explicit-mixed-baseline.neon b/tests/phpstan/configs/check-explicit-mixed-baseline.neon index 9d12ae3ad..e01b6b749 100644 --- a/tests/phpstan/configs/check-explicit-mixed-baseline.neon +++ b/tests/phpstan/configs/check-explicit-mixed-baseline.neon @@ -81,7 +81,7 @@ parameters: path: ../../../src/permission/PermissionParser.php - - message: "#^Parameter \\#1 \\$description of method pocketmine\\\\command\\\\Command\\:\\:setDescription\\(\\) expects string, mixed given\\.$#" + message: "#^Parameter \\#1 \\$description of method pocketmine\\\\command\\\\Command\\:\\:setDescription\\(\\) expects pocketmine\\\\lang\\\\Translatable\\|string, mixed given\\.$#" count: 1 path: ../../../src/plugin/PluginBase.php @@ -91,7 +91,7 @@ parameters: path: ../../../src/plugin/PluginBase.php - - message: "#^Parameter \\#1 \\$usage of method pocketmine\\\\command\\\\Command\\:\\:setUsage\\(\\) expects string, mixed given\\.$#" + message: "#^Parameter \\#1 \\$usage of method pocketmine\\\\command\\\\Command\\:\\:setUsage\\(\\) expects pocketmine\\\\lang\\\\Translatable\\|string, mixed given\\.$#" count: 1 path: ../../../src/plugin/PluginBase.php