Stop auto-translating string descriptions/usages for commands

Require usage of Translatable for translations.

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;
 	}
 

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();
 		}

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,
+			KnownTranslationFactory::pocketmine_command_ban_player_description(),
-			KnownTranslationKeys::COMMANDS_BAN_USAGE
+			KnownTranslationFactory::commands_ban_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_BAN_PLAYER);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_ban_ip_description(),
-			KnownTranslationKeys::COMMANDS_BANIP_USAGE
+			KnownTranslationFactory::commands_banip_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_BAN_IP);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_banlist_description(),
-			KnownTranslationKeys::COMMANDS_BANLIST_USAGE
+			KnownTranslationFactory::commands_banlist_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_BAN_LIST);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_clear_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_USAGE
+			KnownTranslationFactory::pocketmine_command_clear_usage()
 		);
 		$this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER]));
 	}

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,
+			KnownTranslationFactory::pocketmine_command_defaultgamemode_description(),
-			KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE
+			KnownTranslationFactory::commands_defaultgamemode_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_DEFAULTGAMEMODE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_deop_description(),
-			KnownTranslationKeys::COMMANDS_DEOP_USAGE
+			KnownTranslationFactory::commands_deop_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_OP_TAKE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_difficulty_description(),
-			KnownTranslationKeys::COMMANDS_DIFFICULTY_USAGE
+			KnownTranslationFactory::commands_difficulty_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_DIFFICULTY);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_effect_description(),
-			KnownTranslationKeys::COMMANDS_EFFECT_USAGE
+			KnownTranslationFactory::commands_effect_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_EFFECT);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_enchant_description(),
-			KnownTranslationKeys::COMMANDS_ENCHANT_USAGE
+			KnownTranslationFactory::commands_enchant_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_ENCHANT);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_gamemode_description(),
-			KnownTranslationKeys::COMMANDS_GAMEMODE_USAGE
+			KnownTranslationFactory::commands_gamemode_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_GAMEMODE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_gc_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE
+			KnownTranslationFactory::pocketmine_command_gc_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_GC);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_give_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_USAGE
+			KnownTranslationFactory::pocketmine_command_give_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_GIVE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_help_description(),
-			KnownTranslationKeys::COMMANDS_HELP_USAGE,
+			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 . "Description: " . TextFormat::WHITE . $descriptionString . "\n";
-					$message .= TextFormat::GOLD . "Usage: " . TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $sender->getLanguage()->translateString($cmd->getUsage()))) . "\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;

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,
+			KnownTranslationFactory::pocketmine_command_kick_description(),
-			KnownTranslationKeys::COMMANDS_KICK_USAGE
+			KnownTranslationFactory::commands_kick_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_KICK);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_kill_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_KILL_USAGE,
+			KnownTranslationFactory::pocketmine_command_kill_usage(),
 			["suicide"]
 		);
 		$this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_KILL_SELF, DefaultPermissionNames::COMMAND_KILL_OTHER]));

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,
+			KnownTranslationFactory::pocketmine_command_list_description(),
-			KnownTranslationKeys::COMMANDS_PLAYERS_USAGE
+			KnownTranslationFactory::commands_players_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_LIST);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_me_description(),
-			KnownTranslationKeys::COMMANDS_ME_USAGE
+			KnownTranslationFactory::commands_me_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_ME);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_op_description(),
-			KnownTranslationKeys::COMMANDS_OP_USAGE
+			KnownTranslationFactory::commands_op_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_OP_GIVE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_unban_player_description(),
-			KnownTranslationKeys::COMMANDS_UNBAN_USAGE,
+			KnownTranslationFactory::commands_unban_usage(),
 			["unban"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_PLAYER);

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,
+			KnownTranslationFactory::pocketmine_command_unban_ip_description(),
-			KnownTranslationKeys::COMMANDS_UNBANIP_USAGE,
+			KnownTranslationFactory::commands_unbanip_usage(),
 			["unban-ip"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_IP);

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,
+			KnownTranslationFactory::pocketmine_command_particle_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_USAGE
+			KnownTranslationFactory::pocketmine_command_particle_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_PARTICLE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_plugins_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE,
+			KnownTranslationFactory::pocketmine_command_plugins_usage(),
 			["pl"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_PLUGINS);

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,
+			KnownTranslationFactory::pocketmine_command_save_description(),
-			KnownTranslationKeys::COMMANDS_SAVE_USAGE
+			KnownTranslationFactory::commands_save_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_saveoff_description(),
-			KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE
+			KnownTranslationFactory::commands_save_off_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_saveon_description(),
-			KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE
+			KnownTranslationFactory::commands_save_on_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_say_description(),
-			KnownTranslationKeys::COMMANDS_SAY_USAGE
+			KnownTranslationFactory::commands_say_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SAY);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_seed_description(),
-			KnownTranslationKeys::COMMANDS_SEED_USAGE
+			KnownTranslationFactory::commands_seed_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SEED);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_setworldspawn_description(),
-			KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_USAGE
+			KnownTranslationFactory::commands_setworldspawn_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SETWORLDSPAWN);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_spawnpoint_description(),
-			KnownTranslationKeys::COMMANDS_SPAWNPOINT_USAGE
+			KnownTranslationFactory::commands_spawnpoint_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_SPAWNPOINT);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_status_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_USAGE
+			KnownTranslationFactory::pocketmine_command_status_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_STATUS);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_stop_description(),
-			KnownTranslationKeys::COMMANDS_STOP_USAGE
+			KnownTranslationFactory::commands_stop_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_STOP);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_tp_description(),
-			KnownTranslationKeys::COMMANDS_TP_USAGE,
+			KnownTranslationFactory::commands_tp_usage(),
 			["teleport"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_TELEPORT);

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,
+			KnownTranslationFactory::pocketmine_command_tell_description(),
-			KnownTranslationKeys::COMMANDS_MESSAGE_USAGE,
+			KnownTranslationFactory::commands_message_usage(),
 			["w", "msg"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_TELL);

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,
+			KnownTranslationFactory::pocketmine_command_time_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_TIME_USAGE
+			KnownTranslationFactory::pocketmine_command_time_usage()
 		);
 		$this->setPermission(implode(";", [
 			DefaultPermissionNames::COMMAND_TIME_ADD,

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,
+			KnownTranslationFactory::pocketmine_command_timings_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_USAGE
+			KnownTranslationFactory::pocketmine_command_timings_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_TIMINGS);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_title_description(),
-			KnownTranslationKeys::COMMANDS_TITLE_USAGE
+			KnownTranslationFactory::commands_title_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_TITLE);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_transferserver_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_USAGE
+			KnownTranslationFactory::pocketmine_command_transferserver_usage()
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_TRANSFERSERVER);
 	}

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,
+			KnownTranslationFactory::pocketmine_command_version_description(),
-			KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_USAGE,
+			KnownTranslationFactory::pocketmine_command_version_usage(),
 			["ver", "about"]
 		);
 		$this->setPermission(DefaultPermissionNames::COMMAND_VERSION);

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,
+			KnownTranslationFactory::pocketmine_command_whitelist_description(),
-			KnownTranslationKeys::COMMANDS_WHITELIST_USAGE
+			KnownTranslationFactory::commands_whitelist_usage()
 		);
 		$this->setPermission(implode(";", [
 			DefaultPermissionNames::COMMAND_WHITELIST_RELOAD,

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,

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