From 94e16f416de31b79c93bdc2c6cf84b22d25ba63f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 29 Jun 2021 22:46:04 +0100 Subject: [PATCH] Added KnownTranslationKeys (generated) and start using it --- build/generate-known-translation-keys.php | 93 +++++ phpstan.neon.dist | 1 + src/Server.php | 61 +-- src/block/Bed.php | 7 +- src/command/Command.php | 7 +- src/command/SimpleCommandMap.php | 9 +- src/command/defaults/BanCommand.php | 7 +- src/command/defaults/BanIpCommand.php | 11 +- src/command/defaults/BanListCommand.php | 9 +- src/command/defaults/ClearCommand.php | 21 +- .../defaults/DefaultGamemodeCommand.php | 7 +- src/command/defaults/DeopCommand.php | 7 +- src/command/defaults/DifficultyCommand.php | 7 +- src/command/defaults/EffectCommand.php | 19 +- src/command/defaults/EnchantCommand.php | 13 +- src/command/defaults/GamemodeCommand.php | 13 +- .../defaults/GarbageCollectorCommand.php | 5 +- src/command/defaults/GiveCommand.php | 5 +- src/command/defaults/HelpCommand.php | 7 +- src/command/defaults/KickCommand.php | 11 +- src/command/defaults/KillCommand.php | 15 +- src/command/defaults/ListCommand.php | 7 +- src/command/defaults/MeCommand.php | 7 +- src/command/defaults/OpCommand.php | 7 +- src/command/defaults/PardonCommand.php | 7 +- src/command/defaults/PardonIpCommand.php | 9 +- src/command/defaults/ParticleCommand.php | 9 +- src/command/defaults/PluginsCommand.php | 7 +- src/command/defaults/SaveCommand.php | 9 +- src/command/defaults/SaveOffCommand.php | 7 +- src/command/defaults/SaveOnCommand.php | 7 +- src/command/defaults/SayCommand.php | 7 +- src/command/defaults/SeedCommand.php | 7 +- src/command/defaults/SetWorldSpawnCommand.php | 7 +- src/command/defaults/SpawnpointCommand.php | 11 +- src/command/defaults/StatusCommand.php | 5 +- src/command/defaults/StopCommand.php | 7 +- src/command/defaults/TeleportCommand.php | 9 +- src/command/defaults/TellCommand.php | 15 +- src/command/defaults/TimeCommand.php | 21 +- src/command/defaults/TimingsCommand.php | 21 +- src/command/defaults/TitleCommand.php | 9 +- .../defaults/TransferServerCommand.php | 5 +- src/command/defaults/VersionCommand.php | 9 +- src/command/defaults/WhitelistCommand.php | 23 +- src/lang/KnownTranslationKeys.php | 369 ++++++++++++++++++ src/lang/Language.php | 2 +- src/network/mcpe/NetworkSession.php | 3 +- src/network/mcpe/auth/ProcessLoginTask.php | 11 +- .../mcpe/handler/LoginPacketHandler.php | 3 +- src/network/query/QueryHandler.php | 3 +- src/player/Player.php | 3 +- src/plugin/PluginBase.php | 5 +- src/plugin/PluginManager.php | 41 +- src/wizard/SetupWizard.php | 61 +-- src/world/World.php | 3 +- src/world/WorldManager.php | 17 +- 57 files changed, 802 insertions(+), 286 deletions(-) create mode 100644 build/generate-known-translation-keys.php create mode 100644 src/lang/KnownTranslationKeys.php diff --git a/build/generate-known-translation-keys.php b/build/generate-known-translation-keys.php new file mode 100644 index 000000000..2018db3ff --- /dev/null +++ b/build/generate-known-translation-keys.php @@ -0,0 +1,93 @@ + $v){ + $perms[] = $k; +} + +sort($perms, SORT_STRING); +foreach($perms as $perm){ + echo "\tpublic const "; + echo constantify($perm); + echo " = \"" . $perm . "\";\n"; +} + +echo "}\n"; + +file_put_contents(dirname(__DIR__) . '/src/lang/KnownTranslationKeys.php', ob_get_clean()); + +echo "Done.\n"; diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 06f5907b9..4e1631d93 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -31,6 +31,7 @@ parameters: - src/PocketMine.php - build/make-release.php - build/server-phar.php + - build/generate-known-translation-keys.php paths: - src - tests/phpstan/rules diff --git a/src/Server.php b/src/Server.php index 5b355f8b4..8d2e83c18 100644 --- a/src/Server.php +++ b/src/Server.php @@ -43,6 +43,7 @@ use pocketmine\event\player\PlayerDataSaveEvent; use pocketmine\event\server\CommandEvent; use pocketmine\event\server\DataPacketSendEvent; use pocketmine\event\server\QueryRegenerateEvent; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\Language; use pocketmine\lang\LanguageNotFoundException; use pocketmine\lang\TranslationContainer; @@ -529,7 +530,7 @@ class Server{ private function handleCorruptedPlayerData(string $name) : void{ $path = $this->getPlayerDataPath($name); rename($path, $path . '.bak'); - $this->logger->error($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name])); + $this->logger->error($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_DATA_PLAYERCORRUPTED, [$name])); } public function getOfflinePlayerData(string $name) : ?CompoundTag{ @@ -575,7 +576,7 @@ class Server{ try{ file_put_contents($this->getPlayerDataPath($name), zlib_encode($nbt->write(new TreeRoot($ev->getSaveData())), ZLIB_ENCODING_GZIP)); }catch(\ErrorException $e){ - $this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()])); + $this->logger->critical($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_DATA_SAVEERROR, [$name, $e->getMessage()])); $this->logger->logException($e); } }); @@ -879,30 +880,30 @@ class Server{ } } - $this->logger->info($this->getLanguage()->translateString("language.selected", [$this->getLanguage()->getName(), $this->getLanguage()->getLang()])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::LANGUAGE_SELECTED, [$this->getLanguage()->getName(), $this->getLanguage()->getLang()])); if(VersionInfo::IS_DEVELOPMENT_BUILD){ if(!$this->configGroup->getPropertyBool("settings.enable-dev-builds", false)){ - $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error1", [VersionInfo::NAME])); - $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error2")); - $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error3")); - $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"])); - $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error5", ["https://github.com/pmmp/PocketMine-MP/releases"])); + $this->logger->emergency($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_ERROR1, [VersionInfo::NAME])); + $this->logger->emergency($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_ERROR2)); + $this->logger->emergency($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_ERROR3)); + $this->logger->emergency($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_ERROR4, ["settings.enable-dev-builds"])); + $this->logger->emergency($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_ERROR5, ["https://github.com/pmmp/PocketMine-MP/releases"])); $this->forceShutdown(); return; } $this->logger->warning(str_repeat("-", 40)); - $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning1", [VersionInfo::NAME])); - $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning2")); - $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning3")); + $this->logger->warning($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_WARNING1, [VersionInfo::NAME])); + $this->logger->warning($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_WARNING2)); + $this->logger->warning($this->language->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEVBUILD_WARNING3)); $this->logger->warning(str_repeat("-", 40)); } $this->memoryManager = new MemoryManager($this); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.start", [TextFormat::AQUA . $this->getVersion() . TextFormat::RESET])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_START, [TextFormat::AQUA . $this->getVersion() . TextFormat::RESET])); if(($poolSize = $this->configGroup->getPropertyString("settings.async-workers", "auto")) === "auto"){ $poolSize = 2; @@ -955,11 +956,11 @@ class Server{ $this->onlineMode = $this->configGroup->getConfigBool("xbox-auth", true); if($this->onlineMode){ - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.auth.enabled")); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_AUTH_ENABLED)); }else{ - $this->logger->warning($this->getLanguage()->translateString("pocketmine.server.auth.disabled")); - $this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authWarning")); - $this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authProperty.disabled")); + $this->logger->warning($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_AUTH_DISABLED)); + $this->logger->warning($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_AUTHWARNING)); + $this->logger->warning($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_AUTHPROPERTY_DISABLED)); } if($this->configGroup->getConfigBool("hardcore", false) and $this->getDifficulty() < World::DIFFICULTY_HARD){ @@ -976,11 +977,11 @@ class Server{ $this->network = new Network($this->logger); $this->network->setName($this->getMotd()); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.info", [ + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_INFO, [ $this->getName(), (VersionInfo::IS_DEVELOPMENT_BUILD ? TextFormat::YELLOW : "") . $this->getPocketMineVersion() . TextFormat::RESET ])); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.license", [$this->getName()])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_LICENSE, [$this->getName()])); Timings::init(); TimingsHandler::setEnabled($this->configGroup->getPropertyBool("settings.enable-profiling", false)); @@ -1017,7 +1018,7 @@ class Server{ ){ $providerManager->setDefault($format); }elseif($formatName !== ""){ - $this->logger->warning($this->language->translateString("pocketmine.level.badDefaultFormat", [$formatName])); + $this->logger->warning($this->language->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_BADDEFAULTFORMAT, [$formatName])); } $this->worldManager = new WorldManager($this, Path::join($this->dataPath, "worlds"), $providerManager); @@ -1087,7 +1088,7 @@ class Server{ $world = $this->worldManager->getWorldByName($default); if($world === null){ - $this->getLogger()->emergency($this->getLanguage()->translateString("pocketmine.level.defaultError")); + $this->getLogger()->emergency($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_DEFAULTERROR)); $this->forceShutdown(); return; @@ -1103,7 +1104,7 @@ class Server{ //if it's not registered we need to make sure Query still works $this->network->registerInterface(new DedicatedQueryNetworkInterface($this->getIp(), $this->getPort(), new \PrefixedLogger($this->logger, "Dedicated Query Interface"))); } - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp(), $this->getPort()])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_NETWORKSTART, [$this->getIp(), $this->getPort()])); if($useQuery){ $this->network->registerRawPacketHandler(new QueryHandler($this)); @@ -1124,9 +1125,9 @@ class Server{ $this->configGroup->save(); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.defaultGameMode", [$this->getGamemode()->getTranslationKey()])); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.donate", [TextFormat::AQUA . "https://patreon.com/pocketminemp" . TextFormat::RESET])); - $this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - $this->startTime, 3)])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DEFAULTGAMEMODE, [$this->getGamemode()->getTranslationKey()])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_DONATE, [TextFormat::AQUA . "https://patreon.com/pocketminemp" . TextFormat::RESET])); + $this->logger->info($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_STARTFINISHED, [round(microtime(true) - $this->startTime, 3)])); //TODO: move console parts to a separate component $consoleSender = new ConsoleCommandSender($this, $this->language); @@ -1365,7 +1366,7 @@ class Server{ return true; } - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.notFound")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NOTFOUND)); return false; } @@ -1501,10 +1502,10 @@ class Server{ ini_set("error_reporting", '0'); ini_set("memory_limit", '-1'); //Fix error dump not dumped on memory problems try{ - $this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.create")); + $this->logger->emergency($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_CRASH_CREATE)); $dump = new CrashDump($this); - $this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.submit", [$dump->getPath()])); + $this->logger->emergency($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_CRASH_SUBMIT, [$dump->getPath()])); if($this->configGroup->getPropertyBool("auto-report.enabled", true)){ $report = true; @@ -1548,7 +1549,7 @@ class Server{ if(isset($data->crashId) and isset($data->crashUrl)){ $reportId = $data->crashId; $reportUrl = $data->crashUrl; - $this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.archive", [$reportUrl, $reportId])); + $this->logger->emergency($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_CRASH_ARCHIVE, [$reportUrl, $reportId])); }elseif(isset($data->error)){ $this->logger->emergency("Automatic crash report submission failed: $data->error"); } @@ -1560,7 +1561,7 @@ class Server{ }catch(\Throwable $e){ $this->logger->logException($e); try{ - $this->logger->critical($this->getLanguage()->translateString("pocketmine.crash.error", [$e->getMessage()])); + $this->logger->critical($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_CRASH_ERROR, [$e->getMessage()])); }catch(\Throwable $e){} } @@ -1729,7 +1730,7 @@ class Server{ } if($this->getTicksPerSecondAverage() < 12){ - $this->logger->warning($this->getLanguage()->translateString("pocketmine.server.tickOverload")); + $this->logger->warning($this->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_TICKOVERLOAD)); } } diff --git a/src/block/Bed.php b/src/block/Bed.php index 1a7482990..c8c40a831 100644 --- a/src/block/Bed.php +++ b/src/block/Bed.php @@ -31,6 +31,7 @@ use pocketmine\data\bedrock\DyeColorIdMap; use pocketmine\item\Bed as ItemBed; use pocketmine\item\Item; use pocketmine\item\ItemFactory; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; @@ -135,7 +136,7 @@ class Bed extends Transparent{ return true; }elseif($playerPos->distanceSquared($this->pos) > 4 and $playerPos->distanceSquared($other->pos) > 4){ - $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.tooFar")); + $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%" . KnownTranslationKeys::TILE_BED_TOOFAR)); return true; } @@ -144,7 +145,7 @@ class Bed extends Transparent{ $isNight = ($time >= World::TIME_NIGHT and $time < World::TIME_SUNRISE); if(!$isNight){ - $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.noSleep")); + $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%" . KnownTranslationKeys::TILE_BED_NOSLEEP)); return true; } @@ -152,7 +153,7 @@ class Bed extends Transparent{ $b = ($this->isHeadPart() ? $this : $other); if($b->isOccupied()){ - $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.occupied")); + $player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%" . KnownTranslationKeys::TILE_BED_OCCUPIED)); return true; } diff --git a/src/command/Command.php b/src/command/Command.php index d77972101..341883fdd 100644 --- a/src/command/Command.php +++ b/src/command/Command.php @@ -28,6 +28,7 @@ namespace pocketmine\command; use pocketmine\command\utils\CommandException; use pocketmine\console\ConsoleCommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\PermissionManager; use pocketmine\Server; @@ -116,7 +117,7 @@ abstract class Command{ } if($this->permissionMessage === null){ - $target->sendMessage($target->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $target->sendMessage($target->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); }elseif($this->permissionMessage !== ""){ $target->sendMessage(str_replace("", $this->permission, $this->permissionMessage)); } @@ -239,8 +240,8 @@ abstract class Command{ $result = new TranslationContainer($formatted, $message->getParameters()); $colored = new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . $formatted, $message->getParameters()); }else{ - $result = new TranslationContainer("chat.type.admin", [$source->getName(), $message]); - $colored = new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%chat.type.admin", [$source->getName(), $message]); + $result = new TranslationContainer(KnownTranslationKeys::CHAT_TYPE_ADMIN, [$source->getName(), $message]); + $colored = new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%" . KnownTranslationKeys::CHAT_TYPE_ADMIN, [$source->getName(), $message]); } if($sendToSource and !($source instanceof ConsoleCommandSender)){ diff --git a/src/command/SimpleCommandMap.php b/src/command/SimpleCommandMap.php index 8d124d748..2feb20a5b 100644 --- a/src/command/SimpleCommandMap.php +++ b/src/command/SimpleCommandMap.php @@ -65,6 +65,7 @@ use pocketmine\command\defaults\VanillaCommand; use pocketmine\command\defaults\VersionCommand; use pocketmine\command\defaults\WhitelistCommand; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\Server; use function array_shift; use function count; @@ -245,7 +246,7 @@ class SimpleCommandMap implements CommandMap{ try{ $target->execute($sender, $sentCommandLabel, $args); }catch(InvalidCommandSyntaxException $e){ - $sender->sendMessage($sender->getLanguage()->translateString("commands.generic.usage", [$target->getUsage()])); + $sender->sendMessage($sender->getLanguage()->translateString(KnownTranslationKeys::COMMANDS_GENERIC_USAGE, [$target->getUsage()])); }finally{ $target->timings->stopTiming(); } @@ -277,7 +278,7 @@ class SimpleCommandMap implements CommandMap{ foreach($values as $alias => $commandStrings){ if(strpos($alias, ":") !== false){ - $this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.illegal", [$alias])); + $this->server->getLogger()->warning($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_COMMAND_ALIAS_ILLEGAL, [$alias])); continue; } @@ -300,12 +301,12 @@ class SimpleCommandMap implements CommandMap{ } if(count($recursive) > 0){ - $this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.recursive", [$alias, implode(", ", $recursive)])); + $this->server->getLogger()->warning($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_COMMAND_ALIAS_RECURSIVE, [$alias, implode(", ", $recursive)])); continue; } if(count($bad) > 0){ - $this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.notFound", [$alias, implode(", ", $bad)])); + $this->server->getLogger()->warning($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_COMMAND_ALIAS_NOTFOUND, [$alias, implode(", ", $bad)])); continue; } diff --git a/src/command/defaults/BanCommand.php b/src/command/defaults/BanCommand.php index 98616f9ea..14f341620 100644 --- a/src/command/defaults/BanCommand.php +++ b/src/command/defaults/BanCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -38,8 +39,8 @@ class BanCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.ban.player.description", - "%commands.ban.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BAN_PLAYER_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_BAN_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_PLAYER); } @@ -62,7 +63,7 @@ class BanCommand extends VanillaCommand{ $player->kick($reason !== "" ? "Banned by admin. Reason: " . $reason : "Banned by admin."); } - Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.ban.success", [$player !== null ? $player->getName() : $name])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_BAN_SUCCESS, [$player !== null ? $player->getName() : $name])); return true; } diff --git a/src/command/defaults/BanIpCommand.php b/src/command/defaults/BanIpCommand.php index f263d4745..89d10e7f4 100644 --- a/src/command/defaults/BanIpCommand.php +++ b/src/command/defaults/BanIpCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -39,8 +40,8 @@ class BanIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.ban.ip.description", - "%commands.banip.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BAN_IP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_BANIP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_IP); } @@ -60,15 +61,15 @@ class BanIpCommand extends VanillaCommand{ if(preg_match("/^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$/", $value)){ $this->processIPBan($value, $sender, $reason); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.banip.success", [$value])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_BANIP_SUCCESS, [$value])); }else{ if(($player = $sender->getServer()->getPlayerByPrefix($value)) instanceof Player){ $ip = $player->getNetworkSession()->getIp(); $this->processIPBan($ip, $sender, $reason); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.banip.success.players", [$ip, $player->getName()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_BANIP_SUCCESS_PLAYERS, [$ip, $player->getName()])); }else{ - $sender->sendMessage(new TranslationContainer("commands.banip.invalid")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_BANIP_INVALID)); return false; } diff --git a/src/command/defaults/BanListCommand.php b/src/command/defaults/BanListCommand.php index ab33bf8ae..366a479ae 100644 --- a/src/command/defaults/BanListCommand.php +++ b/src/command/defaults/BanListCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\BanEntry; use pocketmine\permission\DefaultPermissionNames; @@ -40,8 +41,8 @@ class BanListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.banlist.description", - "%commands.banlist.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BANLIST_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_BANLIST_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_LIST); } @@ -72,9 +73,9 @@ class BanListCommand extends VanillaCommand{ $message = implode(", ", $list); if($args[0] === "ips"){ - $sender->sendMessage(new TranslationContainer("commands.banlist.ips", [count($list)])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_BANLIST_IPS, [count($list)])); }else{ - $sender->sendMessage(new TranslationContainer("commands.banlist.players", [count($list)])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_BANLIST_PLAYERS, [count($list)])); } $sender->sendMessage($message); diff --git a/src/command/defaults/ClearCommand.php b/src/command/defaults/ClearCommand.php index 03c53c4e6..eded7e8fa 100644 --- a/src/command/defaults/ClearCommand.php +++ b/src/command/defaults/ClearCommand.php @@ -28,6 +28,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\LegacyStringToItemParser; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -41,8 +42,8 @@ class ClearCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.clear.description", - "%pocketmine.command.clear.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_USAGE ); $this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER])); } @@ -60,16 +61,16 @@ class ClearCommand extends VanillaCommand{ if(isset($args[0])){ $target = $sender->getServer()->getPlayerByPrefix($args[0]); if($target === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } if($target !== $sender && !$sender->hasPermission(DefaultPermissionNames::COMMAND_CLEAR_OTHER)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } }elseif($sender instanceof Player){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_CLEAR_SELF)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -89,7 +90,7 @@ class ClearCommand extends VanillaCommand{ } }catch(InvalidArgumentException $e){ //vanilla checks this at argument parsing layer, can't come up with a better alternative - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.give.item.notFound", [$args[1]])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GIVE_ITEM_NOTFOUND, [$args[1]])); return true; } } @@ -103,9 +104,9 @@ class ClearCommand extends VanillaCommand{ } if($count > 0){ - $sender->sendMessage(new TranslationContainer("%commands.clear.testing", [$target->getName(), $count])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_CLEAR_TESTING, [$target->getName(), $count])); }else{ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.clear.failure.no.items", [$target->getName()])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_CLEAR_FAILURE_NO_ITEMS, [$target->getName()])); } return true; @@ -165,9 +166,9 @@ class ClearCommand extends VanillaCommand{ } if($cleared > 0){ - Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.clear.success", [$target->getName(), $cleared])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_CLEAR_SUCCESS, [$target->getName(), $cleared])); }else{ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.clear.failure.no.items", [$target->getName()])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_CLEAR_FAILURE_NO_ITEMS, [$target->getName()])); } return true; diff --git a/src/command/defaults/DefaultGamemodeCommand.php b/src/command/defaults/DefaultGamemodeCommand.php index 7fc965171..88648edd0 100644 --- a/src/command/defaults/DefaultGamemodeCommand.php +++ b/src/command/defaults/DefaultGamemodeCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\data\java\GameModeIdMap; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\GameMode; @@ -36,8 +37,8 @@ class DefaultGamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.defaultgamemode.description", - "%commands.defaultgamemode.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DEFAULTGAMEMODE_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_DEFAULTGAMEMODE); } @@ -58,7 +59,7 @@ class DefaultGamemodeCommand extends VanillaCommand{ } $sender->getServer()->getConfigGroup()->setConfigInt("gamemode", GameModeIdMap::getInstance()->toId($gameMode)); - $sender->sendMessage(new TranslationContainer("commands.defaultgamemode.success", [$gameMode->getTranslationKey()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_SUCCESS, [$gameMode->getTranslationKey()])); return true; } } diff --git a/src/command/defaults/DeopCommand.php b/src/command/defaults/DeopCommand.php index 5a4a488cf..6df6520cd 100644 --- a/src/command/defaults/DeopCommand.php +++ b/src/command/defaults/DeopCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -38,8 +39,8 @@ class DeopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.deop.description", - "%commands.deop.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DEOP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_DEOP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_TAKE); } @@ -62,7 +63,7 @@ class DeopCommand extends VanillaCommand{ if(($player = $sender->getServer()->getPlayerExact($name)) !== null){ $player->sendMessage(TextFormat::GRAY . "You are no longer op!"); } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.deop.success", [$name])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_DEOP_SUCCESS, [$name])); return true; } diff --git a/src/command/defaults/DifficultyCommand.php b/src/command/defaults/DifficultyCommand.php index 56951b02e..bd2011359 100644 --- a/src/command/defaults/DifficultyCommand.php +++ b/src/command/defaults/DifficultyCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\world\World; @@ -36,8 +37,8 @@ class DifficultyCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.difficulty.description", - "%commands.difficulty.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DIFFICULTY_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_DIFFICULTY_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_DIFFICULTY); } @@ -65,7 +66,7 @@ class DifficultyCommand extends VanillaCommand{ $world->setDifficulty($difficulty); } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.difficulty.success", [$difficulty])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_DIFFICULTY_SUCCESS, [$difficulty])); }else{ throw new InvalidCommandSyntaxException(); } diff --git a/src/command/defaults/EffectCommand.php b/src/command/defaults/EffectCommand.php index d035aba7d..db37acbe8 100644 --- a/src/command/defaults/EffectCommand.php +++ b/src/command/defaults/EffectCommand.php @@ -27,6 +27,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\entity\effect\EffectInstance; use pocketmine\entity\effect\VanillaEffects; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\Limits; @@ -39,8 +40,8 @@ class EffectCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.effect.description", - "%commands.effect.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_EFFECT_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_EFFECT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_EFFECT); } @@ -57,7 +58,7 @@ class EffectCommand extends VanillaCommand{ $player = $sender->getServer()->getPlayerByPrefix($args[0]); if($player === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } $effectManager = $player->getEffects(); @@ -65,14 +66,14 @@ class EffectCommand extends VanillaCommand{ if(strtolower($args[1]) === "clear"){ $effectManager->clear(); - $sender->sendMessage(new TranslationContainer("commands.effect.success.removed.all", [$player->getDisplayName()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_EFFECT_SUCCESS_REMOVED_ALL, [$player->getDisplayName()])); return true; } try{ $effect = VanillaEffects::fromString($args[1]); }catch(\InvalidArgumentException $e){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.effect.notFound", [$args[1]])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_EFFECT_NOTFOUND, [$args[1]])); return true; } @@ -105,19 +106,19 @@ class EffectCommand extends VanillaCommand{ if($duration === 0){ if(!$effectManager->has($effect)){ if(count($effectManager->all()) === 0){ - $sender->sendMessage(new TranslationContainer("commands.effect.failure.notActive.all", [$player->getDisplayName()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_EFFECT_FAILURE_NOTACTIVE_ALL, [$player->getDisplayName()])); }else{ - $sender->sendMessage(new TranslationContainer("commands.effect.failure.notActive", [$effect->getName(), $player->getDisplayName()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_EFFECT_FAILURE_NOTACTIVE, [$effect->getName(), $player->getDisplayName()])); } return true; } $effectManager->remove($effect); - $sender->sendMessage(new TranslationContainer("commands.effect.success.removed", [$effect->getName(), $player->getDisplayName()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_EFFECT_SUCCESS_REMOVED, [$effect->getName(), $player->getDisplayName()])); }else{ $instance = new EffectInstance($effect, $duration, $amplification, $visible); $effectManager->add($instance); - self::broadcastCommandMessage($sender, new TranslationContainer("%commands.effect.success", [$effect->getName(), $instance->getAmplifier(), $player->getDisplayName(), $instance->getDuration() / 20])); + self::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_EFFECT_SUCCESS, [$effect->getName(), $instance->getAmplifier(), $player->getDisplayName(), $instance->getDuration() / 20])); } return true; diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php index 226c7729b..a05b48d7f 100644 --- a/src/command/defaults/EnchantCommand.php +++ b/src/command/defaults/EnchantCommand.php @@ -27,6 +27,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\enchantment\EnchantmentInstance; use pocketmine\item\enchantment\VanillaEnchantments; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; @@ -37,8 +38,8 @@ class EnchantCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.enchant.description", - "%commands.enchant.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_ENCHANT_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_ENCHANT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_ENCHANT); } @@ -55,21 +56,21 @@ class EnchantCommand extends VanillaCommand{ $player = $sender->getServer()->getPlayerByPrefix($args[0]); if($player === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } $item = $player->getInventory()->getItemInHand(); if($item->isNull()){ - $sender->sendMessage(new TranslationContainer("commands.enchant.noItem")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_ENCHANT_NOITEM)); return true; } try{ $enchantment = VanillaEnchantments::fromString($args[1]); }catch(\InvalidArgumentException $e){ - $sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$args[1]])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_ENCHANT_NOTFOUND, [$args[1]])); return true; } @@ -84,7 +85,7 @@ class EnchantCommand extends VanillaCommand{ $item->addEnchantment(new EnchantmentInstance($enchantment, $level)); $player->getInventory()->setItemInHand($item); - self::broadcastCommandMessage($sender, new TranslationContainer("%commands.enchant.success", [$player->getName()])); + self::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_ENCHANT_SUCCESS, [$player->getName()])); return true; } } diff --git a/src/command/defaults/GamemodeCommand.php b/src/command/defaults/GamemodeCommand.php index 8e71fe23b..3b99fe22b 100644 --- a/src/command/defaults/GamemodeCommand.php +++ b/src/command/defaults/GamemodeCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\GameMode; @@ -38,8 +39,8 @@ class GamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.gamemode.description", - "%commands.gamemode.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_GAMEMODE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_GAMEMODE); } @@ -62,7 +63,7 @@ class GamemodeCommand extends VanillaCommand{ if(isset($args[1])){ $target = $sender->getServer()->getPlayerByPrefix($args[1]); if($target === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } @@ -77,10 +78,10 @@ class GamemodeCommand extends VanillaCommand{ $sender->sendMessage("Game mode change for " . $target->getName() . " failed!"); }else{ if($target === $sender){ - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.gamemode.success.self", [$gameMode->getTranslationKey()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_GAMEMODE_SUCCESS_SELF, [$gameMode->getTranslationKey()])); }else{ - $target->sendMessage(new TranslationContainer("gameMode.changed", [$gameMode->getTranslationKey()])); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.gamemode.success.other", [$gameMode->getTranslationKey(), $target->getName()])); + $target->sendMessage(new TranslationContainer(KnownTranslationKeys::GAMEMODE_CHANGED, [$gameMode->getTranslationKey()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_GAMEMODE_SUCCESS_OTHER, [$gameMode->getTranslationKey(), $target->getName()])); } } diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php index 1614e9e90..8e11fb515 100644 --- a/src/command/defaults/GarbageCollectorCommand.php +++ b/src/command/defaults/GarbageCollectorCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; use function count; @@ -36,8 +37,8 @@ class GarbageCollectorCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.gc.description", - "%pocketmine.command.gc.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GC_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_GC); } diff --git a/src/command/defaults/GiveCommand.php b/src/command/defaults/GiveCommand.php index 3fd2085bd..aa23475f9 100644 --- a/src/command/defaults/GiveCommand.php +++ b/src/command/defaults/GiveCommand.php @@ -27,6 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\LegacyStringToItemParser; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\nbt\JsonNbtParser; use pocketmine\nbt\NbtDataException; @@ -41,8 +42,8 @@ class GiveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.give.description", - "%pocketmine.command.give.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_GIVE); } diff --git a/src/command/defaults/HelpCommand.php b/src/command/defaults/HelpCommand.php index ba7dda68e..09c29c3c8 100644 --- a/src/command/defaults/HelpCommand.php +++ b/src/command/defaults/HelpCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; @@ -45,8 +46,8 @@ class HelpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.help.description", - "%commands.help.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_HELP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_HELP_USAGE, ["?"] ); $this->setPermission(DefaultPermissionNames::COMMAND_HELP); @@ -87,7 +88,7 @@ class HelpCommand extends VanillaCommand{ if($pageNumber < 1){ $pageNumber = 1; } - $sender->sendMessage(new TranslationContainer("commands.help.header", [$pageNumber, count($commands)])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_HELP_HEADER, [$pageNumber, count($commands)])); if(isset($commands[$pageNumber - 1])){ foreach($commands[$pageNumber - 1] as $command){ $sender->sendMessage(TextFormat::DARK_GREEN . "/" . $command->getName() . ": " . TextFormat::WHITE . $command->getDescription()); diff --git a/src/command/defaults/KickCommand.php b/src/command/defaults/KickCommand.php index 67bbcf9d1..f30761fea 100644 --- a/src/command/defaults/KickCommand.php +++ b/src/command/defaults/KickCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -40,8 +41,8 @@ class KickCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.kick.description", - "%commands.kick.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_KICK_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_KICK_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_KICK); } @@ -61,12 +62,12 @@ class KickCommand extends VanillaCommand{ if(($player = $sender->getServer()->getPlayerByPrefix($name)) instanceof Player){ $player->kick("Kicked by admin." . ($reason !== "" ? "Reason: " . $reason : "")); if($reason !== ""){ - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kick.success.reason", [$player->getName(), $reason])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_KICK_SUCCESS_REASON, [$player->getName(), $reason])); }else{ - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kick.success", [$player->getName()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_KICK_SUCCESS, [$player->getName()])); } }else{ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); } return true; diff --git a/src/command/defaults/KillCommand.php b/src/command/defaults/KillCommand.php index b399f0591..d30ae3917 100644 --- a/src/command/defaults/KillCommand.php +++ b/src/command/defaults/KillCommand.php @@ -27,6 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\event\entity\EntityDamageEvent; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -39,8 +40,8 @@ class KillCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.kill.description", - "%pocketmine.command.kill.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_KILL_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_KILL_USAGE, ["suicide"] ); $this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_KILL_SELF, DefaultPermissionNames::COMMAND_KILL_OTHER])); @@ -57,7 +58,7 @@ class KillCommand extends VanillaCommand{ if(count($args) === 1){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_KILL_OTHER)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -66,9 +67,9 @@ class KillCommand extends VanillaCommand{ if($player instanceof Player){ $player->attack(new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000)); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kill.successful", [$player->getName()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_KILL_SUCCESSFUL, [$player->getName()])); }else{ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); } return true; @@ -76,13 +77,13 @@ class KillCommand extends VanillaCommand{ if($sender instanceof Player){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_KILL_SELF)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } $sender->attack(new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000)); - $sender->sendMessage(new TranslationContainer("commands.kill.successful", [$sender->getName()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_KILL_SUCCESSFUL, [$sender->getName()])); }else{ throw new InvalidCommandSyntaxException(); } diff --git a/src/command/defaults/ListCommand.php b/src/command/defaults/ListCommand.php index 70cbd9073..282a889ce 100644 --- a/src/command/defaults/ListCommand.php +++ b/src/command/defaults/ListCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -39,8 +40,8 @@ class ListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.list.description", - "%command.players.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_LIST_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_PLAYERS_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_LIST); } @@ -57,7 +58,7 @@ class ListCommand extends VanillaCommand{ })); sort($playerNames, SORT_STRING); - $sender->sendMessage(new TranslationContainer("commands.players.list", [count($playerNames), $sender->getServer()->getMaxPlayers()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_PLAYERS_LIST, [count($playerNames), $sender->getServer()->getMaxPlayers()])); $sender->sendMessage(implode(", ", $playerNames)); return true; diff --git a/src/command/defaults/MeCommand.php b/src/command/defaults/MeCommand.php index 1f643ac21..868571579 100644 --- a/src/command/defaults/MeCommand.php +++ b/src/command/defaults/MeCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -37,8 +38,8 @@ class MeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.me.description", - "%commands.me.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_ME_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_ME_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_ME); } @@ -52,7 +53,7 @@ class MeCommand extends VanillaCommand{ throw new InvalidCommandSyntaxException(); } - $sender->getServer()->broadcastMessage(new TranslationContainer("chat.type.emote", [$sender instanceof Player ? $sender->getDisplayName() : $sender->getName(), TextFormat::WHITE . implode(" ", $args)])); + $sender->getServer()->broadcastMessage(new TranslationContainer(KnownTranslationKeys::CHAT_TYPE_EMOTE, [$sender instanceof Player ? $sender->getDisplayName() : $sender->getName(), TextFormat::WHITE . implode(" ", $args)])); return true; } diff --git a/src/command/defaults/OpCommand.php b/src/command/defaults/OpCommand.php index a2aef219b..8d8c55f1a 100644 --- a/src/command/defaults/OpCommand.php +++ b/src/command/defaults/OpCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -38,8 +39,8 @@ class OpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.op.description", - "%commands.op.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_OP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_OP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_GIVE); } @@ -62,7 +63,7 @@ class OpCommand extends VanillaCommand{ if(($player = $sender->getServer()->getPlayerExact($name)) !== null){ $player->sendMessage(TextFormat::GRAY . "You are now op!"); } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.op.success", [$name])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_OP_SUCCESS, [$name])); return true; } } diff --git a/src/command/defaults/PardonCommand.php b/src/command/defaults/PardonCommand.php index c9b04e796..eaadf8705 100644 --- a/src/command/defaults/PardonCommand.php +++ b/src/command/defaults/PardonCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use function count; @@ -35,8 +36,8 @@ class PardonCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.unban.player.description", - "%commands.unban.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_PLAYER_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_UNBAN_USAGE, ["unban"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_PLAYER); @@ -53,7 +54,7 @@ class PardonCommand extends VanillaCommand{ $sender->getServer()->getNameBans()->remove($args[0]); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.unban.success", [$args[0]])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_UNBAN_SUCCESS, [$args[0]])); return true; } diff --git a/src/command/defaults/PardonIpCommand.php b/src/command/defaults/PardonIpCommand.php index df515d5ce..f728b2761 100644 --- a/src/command/defaults/PardonIpCommand.php +++ b/src/command/defaults/PardonIpCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use function count; @@ -36,8 +37,8 @@ class PardonIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.unban.ip.description", - "%commands.unbanip.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_IP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_UNBANIP_USAGE, ["unban-ip"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_IP); @@ -55,9 +56,9 @@ class PardonIpCommand extends VanillaCommand{ if(preg_match("/^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$/", $args[0])){ $sender->getServer()->getIPBans()->remove($args[0]); $sender->getServer()->getNetwork()->unblockAddress($args[0]); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.unbanip.success", [$args[0]])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_UNBANIP_SUCCESS, [$args[0]])); }else{ - $sender->sendMessage(new TranslationContainer("commands.unbanip.invalid")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_UNBANIP_INVALID)); } return true; diff --git a/src/command/defaults/ParticleCommand.php b/src/command/defaults/ParticleCommand.php index 560b3e426..569bd7195 100644 --- a/src/command/defaults/ParticleCommand.php +++ b/src/command/defaults/ParticleCommand.php @@ -29,6 +29,7 @@ use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\item\ItemFactory; use pocketmine\item\VanillaItems; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; use pocketmine\permission\DefaultPermissionNames; @@ -78,8 +79,8 @@ class ParticleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.particle.description", - "%pocketmine.command.particle.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_PARTICLE); } @@ -119,11 +120,11 @@ class ParticleCommand extends VanillaCommand{ $particle = $this->getParticle($name, $data); if($particle === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.particle.notFound", [$name])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_PARTICLE_NOTFOUND, [$name])); return true; } - $sender->sendMessage(new TranslationContainer("commands.particle.success", [$name, $count])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_PARTICLE_SUCCESS, [$name, $count])); $random = new Random((int) (microtime(true) * 1000) + mt_rand()); diff --git a/src/command/defaults/PluginsCommand.php b/src/command/defaults/PluginsCommand.php index ac3c9cd8a..791c34172 100644 --- a/src/command/defaults/PluginsCommand.php +++ b/src/command/defaults/PluginsCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\plugin\Plugin; @@ -39,8 +40,8 @@ class PluginsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.plugins.description", - "%pocketmine.command.plugins.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE, ["pl"] ); $this->setPermission(DefaultPermissionNames::COMMAND_PLUGINS); @@ -56,7 +57,7 @@ class PluginsCommand extends VanillaCommand{ }, $sender->getServer()->getPluginManager()->getPlugins()); sort($list, SORT_STRING); - $sender->sendMessage(new TranslationContainer("pocketmine.command.plugins.success", [count($list), implode(TextFormat::WHITE . ", ", $list)])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_SUCCESS, [count($list), implode(TextFormat::WHITE . ", ", $list)])); return true; } } diff --git a/src/command/defaults/SaveCommand.php b/src/command/defaults/SaveCommand.php index e701d3801..12b8b54d6 100644 --- a/src/command/defaults/SaveCommand.php +++ b/src/command/defaults/SaveCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use function microtime; @@ -35,8 +36,8 @@ class SaveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.save.description", - "%commands.save.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVE_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SAVE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM); } @@ -46,7 +47,7 @@ class SaveCommand extends VanillaCommand{ return true; } - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.save.start")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_SAVE_START)); $start = microtime(true); foreach($sender->getServer()->getOnlinePlayers() as $player){ @@ -57,7 +58,7 @@ class SaveCommand extends VanillaCommand{ $world->save(true); } - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.save.success", [round(microtime(true) - $start, 3)])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_SAVE_SUCCESS, [round(microtime(true) - $start, 3)])); return true; } diff --git a/src/command/defaults/SaveOffCommand.php b/src/command/defaults/SaveOffCommand.php index 9c08e2460..b64fec44e 100644 --- a/src/command/defaults/SaveOffCommand.php +++ b/src/command/defaults/SaveOffCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; @@ -33,8 +34,8 @@ class SaveOffCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.saveoff.description", - "%commands.save-off.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVEOFF_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE); } @@ -46,7 +47,7 @@ class SaveOffCommand extends VanillaCommand{ $sender->getServer()->getWorldManager()->setAutoSave(false); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.save.disabled")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_SAVE_DISABLED)); return true; } diff --git a/src/command/defaults/SaveOnCommand.php b/src/command/defaults/SaveOnCommand.php index 08a342de8..d19e3a3cc 100644 --- a/src/command/defaults/SaveOnCommand.php +++ b/src/command/defaults/SaveOnCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; @@ -33,8 +34,8 @@ class SaveOnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.saveon.description", - "%commands.save-on.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVEON_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE); } @@ -46,7 +47,7 @@ class SaveOnCommand extends VanillaCommand{ $sender->getServer()->getWorldManager()->setAutoSave(true); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.save.enabled")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_SAVE_ENABLED)); return true; } diff --git a/src/command/defaults/SayCommand.php b/src/command/defaults/SayCommand.php index ac3faa8e5..d337b6bc8 100644 --- a/src/command/defaults/SayCommand.php +++ b/src/command/defaults/SayCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\console\ConsoleCommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -38,8 +39,8 @@ class SayCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.say.description", - "%commands.say.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAY_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SAY_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAY); } @@ -53,7 +54,7 @@ class SayCommand extends VanillaCommand{ throw new InvalidCommandSyntaxException(); } - $sender->getServer()->broadcastMessage(new TranslationContainer(TextFormat::LIGHT_PURPLE . "%chat.type.announcement", [$sender instanceof Player ? $sender->getDisplayName() : ($sender instanceof ConsoleCommandSender ? "Server" : $sender->getName()), TextFormat::LIGHT_PURPLE . implode(" ", $args)])); + $sender->getServer()->broadcastMessage(new TranslationContainer(TextFormat::LIGHT_PURPLE . "%" . KnownTranslationKeys::CHAT_TYPE_ANNOUNCEMENT, [$sender instanceof Player ? $sender->getDisplayName() : ($sender instanceof ConsoleCommandSender ? "Server" : $sender->getName()), TextFormat::LIGHT_PURPLE . implode(" ", $args)])); return true; } } diff --git a/src/command/defaults/SeedCommand.php b/src/command/defaults/SeedCommand.php index d3015436a..078f5f2d5 100644 --- a/src/command/defaults/SeedCommand.php +++ b/src/command/defaults/SeedCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -33,8 +34,8 @@ class SeedCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.seed.description", - "%commands.seed.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SEED_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SEED_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SEED); } @@ -49,7 +50,7 @@ class SeedCommand extends VanillaCommand{ }else{ $seed = $sender->getServer()->getWorldManager()->getDefaultWorld()->getSeed(); } - $sender->sendMessage(new TranslationContainer("commands.seed.success", [$seed])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_SEED_SUCCESS, [$seed])); return true; } diff --git a/src/command/defaults/SetWorldSpawnCommand.php b/src/command/defaults/SetWorldSpawnCommand.php index 6ff10470d..055795dbb 100644 --- a/src/command/defaults/SetWorldSpawnCommand.php +++ b/src/command/defaults/SetWorldSpawnCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; use pocketmine\permission\DefaultPermissionNames; @@ -39,8 +40,8 @@ class SetWorldSpawnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.setworldspawn.description", - "%commands.setworldspawn.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SETWORLDSPAWN_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SETWORLDSPAWN); } @@ -69,7 +70,7 @@ class SetWorldSpawnCommand extends VanillaCommand{ $world->setSpawnLocation($pos); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.setworldspawn.success", [round($pos->x, 2), round($pos->y, 2), round($pos->z, 2)])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_SUCCESS, [round($pos->x, 2), round($pos->y, 2), round($pos->z, 2)])); return true; } diff --git a/src/command/defaults/SpawnpointCommand.php b/src/command/defaults/SpawnpointCommand.php index fcf86869d..bf5c91ec9 100644 --- a/src/command/defaults/SpawnpointCommand.php +++ b/src/command/defaults/SpawnpointCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -40,8 +41,8 @@ class SpawnpointCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.spawnpoint.description", - "%commands.spawnpoint.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SPAWNPOINT_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_SPAWNPOINT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SPAWNPOINT); } @@ -64,7 +65,7 @@ class SpawnpointCommand extends VanillaCommand{ }else{ $target = $sender->getServer()->getPlayerByPrefix($args[0]); if($target === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } @@ -78,7 +79,7 @@ class SpawnpointCommand extends VanillaCommand{ $z = $this->getRelativeDouble($pos->z, $sender, $args[3]); $target->setSpawn(new Position($x, $y, $z, $world)); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.spawnpoint.success", [$target->getName(), round($x, 2), round($y, 2), round($z, 2)])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_SPAWNPOINT_SUCCESS, [$target->getName(), round($x, 2), round($y, 2), round($z, 2)])); return true; }elseif(count($args) <= 1){ @@ -87,7 +88,7 @@ class SpawnpointCommand extends VanillaCommand{ $pos = Position::fromObject($cpos->floor(), $cpos->getWorld()); $target->setSpawn($pos); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.spawnpoint.success", [$target->getName(), round($pos->x, 2), round($pos->y, 2), round($pos->z, 2)])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_SPAWNPOINT_SUCCESS, [$target->getName(), round($pos->x, 2), round($pos->y, 2), round($pos->z, 2)])); return true; }else{ $sender->sendMessage(TextFormat::RED . "Please provide a player!"); diff --git a/src/command/defaults/StatusCommand.php b/src/command/defaults/StatusCommand.php index a64dc6dc9..6f5e0133b 100644 --- a/src/command/defaults/StatusCommand.php +++ b/src/command/defaults/StatusCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\Process; use pocketmine\utils\TextFormat; @@ -38,8 +39,8 @@ class StatusCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.status.description", - "%pocketmine.command.status.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_STATUS); } diff --git a/src/command/defaults/StopCommand.php b/src/command/defaults/StopCommand.php index 1b943d0d7..fe89c3af2 100644 --- a/src/command/defaults/StopCommand.php +++ b/src/command/defaults/StopCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; @@ -33,8 +34,8 @@ class StopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.stop.description", - "%commands.stop.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STOP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_STOP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_STOP); } @@ -44,7 +45,7 @@ class StopCommand extends VanillaCommand{ return true; } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.stop.start")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_STOP_START)); $sender->getServer()->shutdown(); diff --git a/src/command/defaults/TeleportCommand.php b/src/command/defaults/TeleportCommand.php index 77a664271..4f9998b3d 100644 --- a/src/command/defaults/TeleportCommand.php +++ b/src/command/defaults/TeleportCommand.php @@ -27,6 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\entity\Location; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -41,8 +42,8 @@ class TeleportCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.tp.description", - "%commands.tp.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TP_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_TP_USAGE, ["teleport"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELEPORT); @@ -96,7 +97,7 @@ class TeleportCommand extends VanillaCommand{ } $subject->teleport($targetPlayer->getLocation()); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success", [$subject->getName(), $targetPlayer->getName()])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_TP_SUCCESS, [$subject->getName(), $targetPlayer->getName()])); return true; case 3: @@ -116,7 +117,7 @@ class TeleportCommand extends VanillaCommand{ $targetLocation = new Location($x, $y, $z, $yaw, $pitch, $base->getWorld()); $subject->teleport($targetLocation); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success.coordinates", [ + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_TP_SUCCESS_COORDINATES, [ $subject->getName(), round($targetLocation->x, 2), round($targetLocation->y, 2), diff --git a/src/command/defaults/TellCommand.php b/src/command/defaults/TellCommand.php index f4e9c90f0..589df12f3 100644 --- a/src/command/defaults/TellCommand.php +++ b/src/command/defaults/TellCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -39,8 +40,8 @@ class TellCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.tell.description", - "%commands.message.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TELL_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_MESSAGE_USAGE, ["w", "msg"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELL); @@ -58,18 +59,18 @@ class TellCommand extends VanillaCommand{ $player = $sender->getServer()->getPlayerByPrefix(array_shift($args)); if($player === $sender){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.message.sameTarget")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_MESSAGE_SAMETARGET)); return true; } if($player instanceof Player){ $message = implode(" ", $args); - $sender->sendMessage(new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%commands.message.display.outgoing", [$player->getDisplayName(), $message])); + $sender->sendMessage(new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%" . KnownTranslationKeys::COMMANDS_MESSAGE_DISPLAY_OUTGOING, [$player->getDisplayName(), $message])); $name = $sender instanceof Player ? $sender->getDisplayName() : $sender->getName(); - $player->sendMessage(new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%commands.message.display.incoming", [$name, $message])); - Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.message.display.outgoing", [$player->getDisplayName(), $message]), false); + $player->sendMessage(new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%" . KnownTranslationKeys::COMMANDS_MESSAGE_DISPLAY_INCOMING, [$name, $message])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_MESSAGE_DISPLAY_OUTGOING, [$player->getDisplayName(), $message]), false); }else{ - $sender->sendMessage(new TranslationContainer("commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); } return true; diff --git a/src/command/defaults/TimeCommand.php b/src/command/defaults/TimeCommand.php index 23e1e1556..7d8ad4e30 100644 --- a/src/command/defaults/TimeCommand.php +++ b/src/command/defaults/TimeCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -39,8 +40,8 @@ class TimeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.time.description", - "%pocketmine.command.time.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIME_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIME_USAGE ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_TIME_ADD, @@ -61,7 +62,7 @@ class TimeCommand extends VanillaCommand{ if($args[0] === "start"){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_TIME_START)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -72,7 +73,7 @@ class TimeCommand extends VanillaCommand{ return true; }elseif($args[0] === "stop"){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_TIME_STOP)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -83,7 +84,7 @@ class TimeCommand extends VanillaCommand{ return true; }elseif($args[0] === "query"){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_TIME_QUERY)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -92,7 +93,7 @@ class TimeCommand extends VanillaCommand{ }else{ $world = $sender->getServer()->getWorldManager()->getDefaultWorld(); } - $sender->sendMessage($sender->getLanguage()->translateString("commands.time.query", [$world->getTime()])); + $sender->sendMessage($sender->getLanguage()->translateString(KnownTranslationKeys::COMMANDS_TIME_QUERY, [$world->getTime()])); return true; } @@ -102,7 +103,7 @@ class TimeCommand extends VanillaCommand{ if($args[0] === "set"){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_TIME_SET)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -134,10 +135,10 @@ class TimeCommand extends VanillaCommand{ foreach($sender->getServer()->getWorldManager()->getWorlds() as $world){ $world->setTime($value); } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.time.set", [$value])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_TIME_SET, [$value])); }elseif($args[0] === "add"){ if(!$sender->hasPermission(DefaultPermissionNames::COMMAND_TIME_ADD)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } @@ -146,7 +147,7 @@ class TimeCommand extends VanillaCommand{ foreach($sender->getServer()->getWorldManager()->getWorlds() as $world){ $world->setTime($world->getTime() + $value); } - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.time.added", [$value])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_TIME_ADDED, [$value])); }else{ throw new InvalidCommandSyntaxException(); } diff --git a/src/command/defaults/TimingsCommand.php b/src/command/defaults/TimingsCommand.php index 21018d50a..de501ad99 100644 --- a/src/command/defaults/TimingsCommand.php +++ b/src/command/defaults/TimingsCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -59,8 +60,8 @@ class TimingsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.timings.description", - "%pocketmine.command.timings.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_TIMINGS); } @@ -78,21 +79,21 @@ class TimingsCommand extends VanillaCommand{ if($mode === "on"){ if(TimingsHandler::isEnabled()){ - $sender->sendMessage(new TranslationContainer("pocketmine.command.timings.alreadyEnabled")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_ALREADYENABLED)); return true; } TimingsHandler::setEnabled(); - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.enable")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_ENABLE)); return true; }elseif($mode === "off"){ TimingsHandler::setEnabled(false); - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.disable")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_DISABLE)); return true; } if(!TimingsHandler::isEnabled()){ - $sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsDisabled")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_TIMINGSDISABLED)); return true; } @@ -101,7 +102,7 @@ class TimingsCommand extends VanillaCommand{ if($mode === "reset"){ TimingsHandler::reload(); - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.reset")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_RESET)); }elseif($mode === "merged" or $mode === "report" or $paste){ $timings = ""; if($paste){ @@ -163,16 +164,16 @@ class TimingsCommand extends VanillaCommand{ } $response = json_decode($result->getBody(), true); if(is_array($response) && isset($response["id"])){ - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.timingsRead", + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_TIMINGSREAD, ["https://" . $host . "/?id=" . $response["id"]])); }else{ - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.pasteError")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_PASTEERROR)); } } )); }else{ fclose($fileTimings); - Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.timingsWrite", [$timings])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_TIMINGSWRITE, [$timings])); } }else{ throw new InvalidCommandSyntaxException(); diff --git a/src/command/defaults/TitleCommand.php b/src/command/defaults/TitleCommand.php index ec846763b..86a5723c3 100644 --- a/src/command/defaults/TitleCommand.php +++ b/src/command/defaults/TitleCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use function array_slice; @@ -36,8 +37,8 @@ class TitleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.title.description", - "%commands.title.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TITLE_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_TITLE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_TITLE); } @@ -53,7 +54,7 @@ class TitleCommand extends VanillaCommand{ $player = $sender->getServer()->getPlayerByPrefix($args[0]); if($player === null){ - $sender->sendMessage(new TranslationContainer("commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } @@ -96,7 +97,7 @@ class TitleCommand extends VanillaCommand{ throw new InvalidCommandSyntaxException(); } - $sender->sendMessage(new TranslationContainer("commands.title.success")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_TITLE_SUCCESS)); return true; } diff --git a/src/command/defaults/TransferServerCommand.php b/src/command/defaults/TransferServerCommand.php index 1e783f9f9..0a64ccfcf 100644 --- a/src/command/defaults/TransferServerCommand.php +++ b/src/command/defaults/TransferServerCommand.php @@ -25,6 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; use function count; @@ -34,8 +35,8 @@ class TransferServerCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.transferserver.description", - "%pocketmine.command.transferserver.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_TRANSFERSERVER); } diff --git a/src/command/defaults/VersionCommand.php b/src/command/defaults/VersionCommand.php index 884e4c77f..b099ed8e4 100644 --- a/src/command/defaults/VersionCommand.php +++ b/src/command/defaults/VersionCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\permission\DefaultPermissionNames; @@ -39,8 +40,8 @@ class VersionCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.version.description", - "%pocketmine.command.version.usage", + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_USAGE, ["ver", "about"] ); $this->setPermission(DefaultPermissionNames::COMMAND_VERSION); @@ -52,7 +53,7 @@ class VersionCommand extends VanillaCommand{ } if(count($args) === 0){ - $sender->sendMessage(new TranslationContainer("pocketmine.server.info.extended", [ + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::POCKETMINE_SERVER_INFO_EXTENDED, [ $sender->getServer()->getName(), $sender->getServer()->getPocketMineVersion(), $sender->getServer()->getVersion(), @@ -78,7 +79,7 @@ class VersionCommand extends VanillaCommand{ } if(!$found){ - $sender->sendMessage(new TranslationContainer("pocketmine.command.version.noSuchPlugin")); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_NOSUCHPLUGIN)); } } diff --git a/src/command/defaults/WhitelistCommand.php b/src/command/defaults/WhitelistCommand.php index e0fd3ae10..0fddb59b3 100644 --- a/src/command/defaults/WhitelistCommand.php +++ b/src/command/defaults/WhitelistCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\permission\DefaultPermissionNames; use pocketmine\player\Player; @@ -42,8 +43,8 @@ class WhitelistCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%pocketmine.command.whitelist.description", - "%commands.whitelist.usage" + "%" . KnownTranslationKeys::POCKETMINE_COMMAND_WHITELIST_DESCRIPTION, + "%" . KnownTranslationKeys::COMMANDS_WHITELIST_USAGE ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_WHITELIST_RELOAD, @@ -67,17 +68,17 @@ class WhitelistCommand extends VanillaCommand{ switch(strtolower($args[0])){ case "reload": $sender->getServer()->getWhitelisted()->reload(); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.whitelist.reloaded")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_RELOADED)); return true; case "on": $sender->getServer()->getConfigGroup()->setConfigBool("white-list", true); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.whitelist.enabled")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_ENABLED)); return true; case "off": $sender->getServer()->getConfigGroup()->setConfigBool("white-list", false); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.whitelist.disabled")); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_DISABLED)); return true; case "list": @@ -86,17 +87,17 @@ class WhitelistCommand extends VanillaCommand{ $result = implode(", ", $entries); $count = count($entries); - $sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_LIST, [$count, $count])); $sender->sendMessage($result); return true; case "add": - $sender->sendMessage(new TranslationContainer("commands.generic.usage", ["%commands.whitelist.add.usage"])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GENERIC_USAGE, ["%" . KnownTranslationKeys::COMMANDS_WHITELIST_ADD_USAGE])); return true; case "remove": - $sender->sendMessage(new TranslationContainer("commands.generic.usage", ["%commands.whitelist.remove.usage"])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GENERIC_USAGE, ["%" . KnownTranslationKeys::COMMANDS_WHITELIST_REMOVE_USAGE])); return true; } }elseif(count($args) === 2){ @@ -109,12 +110,12 @@ class WhitelistCommand extends VanillaCommand{ switch(strtolower($args[0])){ case "add": $sender->getServer()->addWhitelist($args[1]); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.whitelist.add.success", [$args[1]])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_ADD_SUCCESS, [$args[1]])); return true; case "remove": $sender->getServer()->removeWhitelist($args[1]); - Command::broadcastCommandMessage($sender, new TranslationContainer("commands.whitelist.remove.success", [$args[1]])); + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_WHITELIST_REMOVE_SUCCESS, [$args[1]])); return true; } @@ -136,7 +137,7 @@ class WhitelistCommand extends VanillaCommand{ throw new AssumptionFailedError("Unknown subcommand $subcommand"); } if(!$sender->hasPermission($permission)){ - $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission")); + $sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION)); return true; } diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php new file mode 100644 index 000000000..6d5112688 --- /dev/null +++ b/src/lang/KnownTranslationKeys.php @@ -0,0 +1,369 @@ +get("language.name"); + return $this->get(KnownTranslationKeys::LANGUAGE_NAME); } public function getLang() : string{ diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index 45926887a..eab54915b 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -34,6 +34,7 @@ use pocketmine\event\player\PlayerDuplicateLoginEvent; use pocketmine\event\server\DataPacketReceiveEvent; use pocketmine\event\server\DataPacketSendEvent; use pocketmine\form\Form; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\StringTag; @@ -576,7 +577,7 @@ class NetworkSession{ } if($error !== null){ - $this->disconnect($this->server->getLanguage()->translateString("pocketmine.disconnect.invalidSession", [$error])); + $this->disconnect($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION, [$error])); return; } diff --git a/src/network/mcpe/auth/ProcessLoginTask.php b/src/network/mcpe/auth/ProcessLoginTask.php index fa8105235..103a39405 100644 --- a/src/network/mcpe/auth/ProcessLoginTask.php +++ b/src/network/mcpe/auth/ProcessLoginTask.php @@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe\auth; use FG\ASN1\Exception\ParserException; use Mdanter\Ecc\Crypto\Key\PublicKeyInterface; use Mdanter\Ecc\Serializer\PublicKey\DerPublicKeySerializer; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\JwtException; use pocketmine\network\mcpe\JwtUtils; use pocketmine\network\mcpe\protocol\types\login\JwtChainLinkBody; @@ -133,14 +134,14 @@ class ProcessLoginTask extends AsyncTask{ if($currentPublicKey === null){ if(!$first){ - throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.missingKey"); + throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_MISSINGKEY); } //First link, check that it is self-signed $currentPublicKey = $headers->x5u; }elseif($headers->x5u !== $currentPublicKey){ //Fast path: if the header key doesn't match what we expected, the signature isn't going to validate anyway - throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.badSignature"); + throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); } $derPublicKeySerializer = new DerPublicKeySerializer(); @@ -156,7 +157,7 @@ class ProcessLoginTask extends AsyncTask{ try{ if(!JwtUtils::verify($jwt, $signingKey)){ - throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.badSignature"); + throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); } }catch(JwtException $e){ throw new VerifyLoginException($e->getMessage(), 0, $e); @@ -180,11 +181,11 @@ class ProcessLoginTask extends AsyncTask{ $time = time(); if(isset($claims->nbf) and $claims->nbf > $time + self::CLOCK_DRIFT_MAX){ - throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.tooEarly"); + throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOEARLY); } if(isset($claims->exp) and $claims->exp < $time - self::CLOCK_DRIFT_MAX){ - throw new VerifyLoginException("%pocketmine.disconnect.invalidSession.tooLate"); + throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOLATE); } $currentPublicKey = $claims->identityPublicKey ?? null; //if there are further links, the next link should be signed with this diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index 222a67407..27911a3fa 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe\handler; use Mdanter\Ecc\Crypto\Key\PublicKeyInterface; use pocketmine\entity\InvalidSkinException; use pocketmine\event\player\PlayerPreLoginEvent; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\auth\ProcessLoginTask; use pocketmine\network\mcpe\convert\SkinAdapterSingleton; use pocketmine\network\mcpe\JwtException; @@ -87,7 +88,7 @@ class LoginPacketHandler extends PacketHandler{ //This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client) $this->session->disconnect( - $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$packet->protocol]), + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL, [$packet->protocol]), false ); diff --git a/src/network/query/QueryHandler.php b/src/network/query/QueryHandler.php index b88e47b73..101b47174 100644 --- a/src/network/query/QueryHandler.php +++ b/src/network/query/QueryHandler.php @@ -27,6 +27,7 @@ declare(strict_types=1); */ namespace pocketmine\network\query; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\AdvancedNetworkInterface; use pocketmine\network\RawPacketHandler; use pocketmine\Server; @@ -70,7 +71,7 @@ class QueryHandler implements RawPacketHandler{ $this->regenerateToken(); $this->lastToken = $this->token; - $this->logger->info($this->server->getLanguage()->translateString("pocketmine.server.query.running", [$addr, $port])); + $this->logger->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_SERVER_QUERY_RUNNING, [$addr, $port])); } public function getPattern() : string{ diff --git a/src/player/Player.php b/src/player/Player.php index 281405a56..3e626fed3 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -80,6 +80,7 @@ use pocketmine\item\enchantment\MeleeWeaponEnchantment; use pocketmine\item\Item; use pocketmine\item\ItemUseResult; use pocketmine\item\Releasable; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\Language; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; @@ -307,7 +308,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ return; } - $this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logIn", [ + $this->server->getLogger()->info($this->getServer()->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLAYER_LOGIN, [ TextFormat::AQUA . $this->username . TextFormat::WHITE, $session->getIp(), $session->getPort(), diff --git a/src/plugin/PluginBase.php b/src/plugin/PluginBase.php index eae2aeec3..e2beaeb0f 100644 --- a/src/plugin/PluginBase.php +++ b/src/plugin/PluginBase.php @@ -27,6 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandExecutor; use pocketmine\command\CommandSender; use pocketmine\command\PluginCommand; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\scheduler\TaskScheduler; use pocketmine\Server; use pocketmine\utils\AssumptionFailedError; @@ -167,7 +168,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{ foreach($this->getDescription()->getCommands() as $key => $data){ if(strpos($key, ":") !== false){ - $this->logger->error($this->server->getLanguage()->translateString("pocketmine.plugin.commandError", [$key, $this->getDescription()->getFullName()])); + $this->logger->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_COMMANDERROR, [$key, $this->getDescription()->getFullName()])); continue; } if(is_array($data)){ //TODO: error out if it isn't @@ -184,7 +185,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{ $aliasList = []; foreach($data["aliases"] as $alias){ if(strpos($alias, ":") !== false){ - $this->logger->error($this->server->getLanguage()->translateString("pocketmine.plugin.aliasError", [$alias, $this->getDescription()->getFullName()])); + $this->logger->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_ALIASERROR, [$alias, $this->getDescription()->getFullName()])); continue; } $aliasList[] = $alias; diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php index f42669b1d..08a01259b 100644 --- a/src/plugin/PluginManager.php +++ b/src/plugin/PluginManager.php @@ -31,6 +31,7 @@ use pocketmine\event\ListenerMethodTags; use pocketmine\event\plugin\PluginDisableEvent; use pocketmine\event\plugin\PluginEnableEvent; use pocketmine\event\RegisteredListener; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\permission\DefaultPermissions; use pocketmine\permission\PermissionManager; @@ -134,7 +135,7 @@ class PluginManager{ if($loader->canLoadPlugin($path)){ $description = $loader->getPluginDescription($path); if($description instanceof PluginDescription){ - $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.plugin.load", [$description->getFullName()])); + $this->server->getLogger()->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOAD, [$description->getFullName()])); try{ $description->checkRequiredExtensions(); }catch(PluginException $ex){ @@ -245,7 +246,7 @@ class PluginManager{ try{ $description = $loader->getPluginDescription($file); }catch(\RuntimeException $e){ //TODO: more specific exception handling - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.fileError", [$file, $directory, $e->getMessage()])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_FILEERROR, [$file, $directory, $e->getMessage()])); $this->server->getLogger()->logException($e); continue; } @@ -255,38 +256,38 @@ class PluginManager{ $name = $description->getName(); if(stripos($name, "pocketmine") !== false or stripos($name, "minecraft") !== false or stripos($name, "mojang") !== false){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.restrictedName"])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [$name, "%" . KnownTranslationKeys::POCKETMINE_PLUGIN_RESTRICTEDNAME])); continue; } if(strpos($name, " ") !== false){ - $this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.plugin.spacesDiscouraged", [$name])); + $this->server->getLogger()->warning($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_SPACESDISCOURAGED, [$name])); } if(isset($plugins[$name]) or $this->getPlugin($name) instanceof Plugin){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.duplicateError", [$name])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_DUPLICATEERROR, [$name])); continue; } if(!ApiVersion::isCompatible($this->server->getApiVersion(), $description->getCompatibleApis())){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, - $this->server->getLanguage()->translateString("%pocketmine.plugin.incompatibleAPI", [implode(", ", $description->getCompatibleApis())]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_INCOMPATIBLEAPI, [implode(", ", $description->getCompatibleApis())]) ])); continue; } $ambiguousVersions = ApiVersion::checkAmbiguousVersions($description->getCompatibleApis()); if(count($ambiguousVersions) > 0){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, - $this->server->getLanguage()->translateString("pocketmine.plugin.ambiguousMinAPI", [implode(", ", $ambiguousVersions)]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_AMBIGUOUSMINAPI, [implode(", ", $ambiguousVersions)]) ])); continue; } if(count($description->getCompatibleOperatingSystems()) > 0 and !in_array(Utils::getOS(), $description->getCompatibleOperatingSystems(), true)) { - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, - $this->server->getLanguage()->translateString("%pocketmine.plugin.incompatibleOS", [implode(", ", $description->getCompatibleOperatingSystems())]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_INCOMPATIBLEOS, [implode(", ", $description->getCompatibleOperatingSystems())]) ])); continue; } @@ -294,16 +295,16 @@ class PluginManager{ if(count($pluginMcpeProtocols = $description->getCompatibleMcpeProtocols()) > 0){ $serverMcpeProtocols = [ProtocolInfo::CURRENT_PROTOCOL]; if(count(array_intersect($pluginMcpeProtocols, $serverMcpeProtocols)) === 0){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, - $this->server->getLanguage()->translateString("%pocketmine.plugin.incompatibleProtocol", [implode(", ", $pluginMcpeProtocols)]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL, [implode(", ", $pluginMcpeProtocols)]) ])); continue; } } if($this->graylist !== null and !$this->graylist->isAllowed($name)){ - $this->server->getLogger()->notice($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->notice($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, "Disallowed by graylist" ])); @@ -332,9 +333,9 @@ class PluginManager{ if(isset($loadedPlugins[$dependency]) or $this->getPlugin($dependency) instanceof Plugin){ unset($dependencies[$name][$key]); }elseif(!isset($plugins[$dependency])){ - $this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [ + $this->server->getLogger()->critical($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [ $name, - $this->server->getLanguage()->translateString("%pocketmine.plugin.unknownDependency", [$dependency]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_UNKNOWNDEPENDENCY, [$dependency]) ])); unset($plugins[$name]); continue 2; @@ -371,7 +372,7 @@ class PluginManager{ if(($plugin = $this->loadPlugin($file, $loaders)) instanceof Plugin){ $loadedPlugins[$name] = $plugin; }else{ - $this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.genericLoadError", [$name])); + $this->server->getLogger()->critical($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_GENERICLOADERROR, [$name])); } } } @@ -379,7 +380,7 @@ class PluginManager{ if($loadedThisLoop === 0){ //No plugins loaded :( foreach($plugins as $name => $file){ - $this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.circularDependency"])); + $this->server->getLogger()->critical($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_LOADERROR, [$name, "%" . KnownTranslationKeys::POCKETMINE_PLUGIN_CIRCULARDEPENDENCY])); } $plugins = []; } @@ -394,7 +395,7 @@ class PluginManager{ public function enablePlugin(Plugin $plugin) : void{ if(!$plugin->isEnabled()){ - $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.plugin.enable", [$plugin->getDescription()->getFullName()])); + $this->server->getLogger()->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_ENABLE, [$plugin->getDescription()->getFullName()])); $plugin->getScheduler()->setEnabled(true); $plugin->onEnableStateChange(true); @@ -413,7 +414,7 @@ class PluginManager{ public function disablePlugin(Plugin $plugin) : void{ if($plugin->isEnabled()){ - $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.plugin.disable", [$plugin->getDescription()->getFullName()])); + $this->server->getLogger()->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_PLUGIN_DISABLE, [$plugin->getDescription()->getFullName()])); (new PluginDisableEvent($plugin))->call(); unset($this->enabledPlugins[$plugin->getDescription()->getName()]); diff --git a/src/wizard/SetupWizard.php b/src/wizard/SetupWizard.php index 31d71e551..62d7d391e 100644 --- a/src/wizard/SetupWizard.php +++ b/src/wizard/SetupWizard.php @@ -28,6 +28,7 @@ declare(strict_types=1); namespace pocketmine\wizard; use pocketmine\data\java\GameModeIdMap; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\Language; use pocketmine\lang\LanguageNotFoundException; use pocketmine\player\GameMode; @@ -82,7 +83,7 @@ class SetupWizard{ $this->lang = new Language($lang); - $this->message($this->lang->get("language_has_been_selected")); + $this->message($this->lang->get(KnownTranslationKeys::LANGUAGE_HAS_BEEN_SELECTED)); if(!$this->showLicense()){ return false; @@ -93,7 +94,7 @@ class SetupWizard{ $config->set("language", $lang); $config->save(); - if(strtolower($this->getInput($this->lang->get("skip_installer"), "n", "y/N")) === "y"){ + if(strtolower($this->getInput($this->lang->get(KnownTranslationKeys::SKIP_INSTALLER), "n", "y/N")) === "y"){ $this->printIpDetails(); return true; } @@ -112,7 +113,7 @@ class SetupWizard{ } private function showLicense() : bool{ - $this->message($this->lang->translateString("welcome_to_pocketmine", [VersionInfo::NAME])); + $this->message($this->lang->translateString(KnownTranslationKeys::WELCOME_TO_POCKETMINE, [VersionInfo::NAME])); echo <<writeLine(); - if(strtolower($this->getInput($this->lang->get("accept_license"), "n", "y/N")) !== "y"){ - $this->error($this->lang->translateString("you_have_to_accept_the_license", [VersionInfo::NAME])); + if(strtolower($this->getInput($this->lang->get(KnownTranslationKeys::ACCEPT_LICENSE), "n", "y/N")) !== "y"){ + $this->error($this->lang->translateString(KnownTranslationKeys::YOU_HAVE_TO_ACCEPT_THE_LICENSE, [VersionInfo::NAME])); sleep(5); return false; @@ -133,23 +134,23 @@ LICENSE; } private function welcome() : void{ - $this->message($this->lang->get("setting_up_server_now")); - $this->message($this->lang->get("default_values_info")); - $this->message($this->lang->get("server_properties")); + $this->message($this->lang->get(KnownTranslationKeys::SETTING_UP_SERVER_NOW)); + $this->message($this->lang->get(KnownTranslationKeys::DEFAULT_VALUES_INFO)); + $this->message($this->lang->get(KnownTranslationKeys::SERVER_PROPERTIES)); } private function generateBaseConfig() : void{ $config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES); - $config->set("motd", ($name = $this->getInput($this->lang->get("name_your_server"), self::DEFAULT_NAME))); + $config->set("motd", ($name = $this->getInput($this->lang->get(KnownTranslationKeys::NAME_YOUR_SERVER), self::DEFAULT_NAME))); $config->set("server-name", $name); - $this->message($this->lang->get("port_warning")); + $this->message($this->lang->get(KnownTranslationKeys::PORT_WARNING)); do{ - $port = (int) $this->getInput($this->lang->get("server_port"), (string) self::DEFAULT_PORT); + $port = (int) $this->getInput($this->lang->get(KnownTranslationKeys::SERVER_PORT), (string) self::DEFAULT_PORT); if($port <= 0 or $port > 65535){ - $this->error($this->lang->get("invalid_port")); + $this->error($this->lang->get(KnownTranslationKeys::INVALID_PORT)); continue; } @@ -157,35 +158,35 @@ LICENSE; }while(true); $config->set("server-port", $port); - $this->message($this->lang->get("gamemode_info")); + $this->message($this->lang->get(KnownTranslationKeys::GAMEMODE_INFO)); do{ - $gamemode = (int) $this->getInput($this->lang->get("default_gamemode"), (string) GameModeIdMap::getInstance()->toId(GameMode::SURVIVAL())); + $gamemode = (int) $this->getInput($this->lang->get(KnownTranslationKeys::DEFAULT_GAMEMODE), (string) GameModeIdMap::getInstance()->toId(GameMode::SURVIVAL())); }while($gamemode < 0 or $gamemode > 3); $config->set("gamemode", $gamemode); - $config->set("max-players", (int) $this->getInput($this->lang->get("max_players"), (string) self::DEFAULT_PLAYERS)); + $config->set("max-players", (int) $this->getInput($this->lang->get(KnownTranslationKeys::MAX_PLAYERS), (string) self::DEFAULT_PLAYERS)); $config->save(); } private function generateUserFiles() : void{ - $this->message($this->lang->get("op_info")); + $this->message($this->lang->get(KnownTranslationKeys::OP_INFO)); - $op = strtolower($this->getInput($this->lang->get("op_who"), "")); + $op = strtolower($this->getInput($this->lang->get(KnownTranslationKeys::OP_WHO), "")); if($op === ""){ - $this->error($this->lang->get("op_warning")); + $this->error($this->lang->get(KnownTranslationKeys::OP_WARNING)); }else{ $ops = new Config(Path::join($this->dataPath, "ops.txt"), Config::ENUM); $ops->set($op, true); $ops->save(); } - $this->message($this->lang->get("whitelist_info")); + $this->message($this->lang->get(KnownTranslationKeys::WHITELIST_INFO)); $config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES); - if(strtolower($this->getInput($this->lang->get("whitelist_enable"), "n", "y/N")) === "y"){ - $this->error($this->lang->get("whitelist_warning")); + if(strtolower($this->getInput($this->lang->get(KnownTranslationKeys::WHITELIST_ENABLE), "n", "y/N")) === "y"){ + $this->error($this->lang->get(KnownTranslationKeys::WHITELIST_WARNING)); $config->set("white-list", true); }else{ $config->set("white-list", false); @@ -195,9 +196,9 @@ LICENSE; private function networkFunctions() : void{ $config = new Config(Path::join($this->dataPath, "server.properties"), Config::PROPERTIES); - $this->error($this->lang->get("query_warning1")); - $this->error($this->lang->get("query_warning2")); - if(strtolower($this->getInput($this->lang->get("query_disable"), "n", "y/N")) === "y"){ + $this->error($this->lang->get(KnownTranslationKeys::QUERY_WARNING1)); + $this->error($this->lang->get(KnownTranslationKeys::QUERY_WARNING2)); + if(strtolower($this->getInput($this->lang->get(KnownTranslationKeys::QUERY_DISABLE), "n", "y/N")) === "y"){ $config->set("enable-query", false); }else{ $config->set("enable-query", true); @@ -207,7 +208,7 @@ LICENSE; } private function printIpDetails() : void{ - $this->message($this->lang->get("ip_get")); + $this->message($this->lang->get(KnownTranslationKeys::IP_GET)); $externalIP = Internet::getIP(); if($externalIP === false){ @@ -219,15 +220,15 @@ LICENSE; $internalIP = "unknown (" . $e->getMessage() . ")"; } - $this->error($this->lang->translateString("ip_warning", ["EXTERNAL_IP" => $externalIP, "INTERNAL_IP" => $internalIP])); - $this->error($this->lang->get("ip_confirm")); + $this->error($this->lang->translateString(KnownTranslationKeys::IP_WARNING, ["EXTERNAL_IP" => $externalIP, "INTERNAL_IP" => $internalIP])); + $this->error($this->lang->get(KnownTranslationKeys::IP_CONFIRM)); $this->readLine(); } private function endWizard() : void{ - $this->message($this->lang->get("you_have_finished")); - $this->message($this->lang->get("pocketmine_plugins")); - $this->message($this->lang->translateString("pocketmine_will_start", [VersionInfo::NAME])); + $this->message($this->lang->get(KnownTranslationKeys::YOU_HAVE_FINISHED)); + $this->message($this->lang->get(KnownTranslationKeys::POCKETMINE_PLUGINS)); + $this->message($this->lang->translateString(KnownTranslationKeys::POCKETMINE_WILL_START, [VersionInfo::NAME])); $this->writeLine(); $this->writeLine(); diff --git a/src/world/World.php b/src/world/World.php index 7c7a4c271..4bdcb7e40 100644 --- a/src/world/World.php +++ b/src/world/World.php @@ -54,6 +54,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\item\ItemUseResult; use pocketmine\item\LegacyStringToItemParser; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; use pocketmine\nbt\NbtDataException; @@ -400,7 +401,7 @@ class World implements ChunkManager{ $this->minY = $this->provider->getWorldMinY(); $this->maxY = $this->provider->getWorldMaxY(); - $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.preparing", [$this->displayName])); + $this->server->getLogger()->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_PREPARING, [$this->displayName])); $this->generator = GeneratorManager::getInstance()->getGenerator($this->provider->getWorldData()->getGenerator(), true); //TODO: validate generator options $this->chunkPopulationRequestQueue = new \SplQueue(); diff --git a/src/world/WorldManager.php b/src/world/WorldManager.php index 4fb3df5b2..99e07b566 100644 --- a/src/world/WorldManager.php +++ b/src/world/WorldManager.php @@ -27,6 +27,7 @@ use pocketmine\entity\Entity; use pocketmine\event\world\WorldInitEvent; use pocketmine\event\world\WorldLoadEvent; use pocketmine\event\world\WorldUnloadEvent; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\player\ChunkSelector; use pocketmine\Server; use pocketmine\timings\Timings; @@ -149,7 +150,7 @@ class WorldManager{ return false; } - $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.unloading", [$world->getDisplayName()])); + $this->server->getLogger()->info($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_UNLOADING, [$world->getDisplayName()])); try{ $safeSpawn = $this->defaultWorld !== null ? $this->defaultWorld->getSafeSpawn() : null; }catch(WorldException $e){ @@ -193,11 +194,11 @@ class WorldManager{ $providers = $this->providerManager->getMatchingProviders($path); if(count($providers) !== 1){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.level.loadError", [ + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_LOADERROR, [ $name, count($providers) === 0 ? - $this->server->getLanguage()->translateString("pocketmine.level.unknownFormat") : - $this->server->getLanguage()->translateString("pocketmine.level.ambiguousFormat", [implode(", ", array_keys($providers))]) + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_UNKNOWNFORMAT) : + $this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_AMBIGUOUSFORMAT, [implode(", ", array_keys($providers))]) ])); return false; } @@ -210,16 +211,16 @@ class WorldManager{ */ $provider = new $providerClass($path); }catch(CorruptedWorldException $e){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Corruption detected: " . $e->getMessage()])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_LOADERROR, [$name, "Corruption detected: " . $e->getMessage()])); return false; }catch(UnsupportedWorldFormatException $e){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Unsupported format: " . $e->getMessage()])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_LOADERROR, [$name, "Unsupported format: " . $e->getMessage()])); return false; } try{ GeneratorManager::getInstance()->getGenerator($provider->getWorldData()->getGenerator(), true); }catch(\InvalidArgumentException $e){ - $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Unknown generator \"" . $provider->getWorldData()->getGenerator() . "\""])); + $this->server->getLogger()->error($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_LOADERROR, [$name, "Unknown generator \"" . $provider->getWorldData()->getGenerator() . "\""])); return false; } if(!($provider instanceof WritableWorldProvider)){ @@ -271,7 +272,7 @@ class WorldManager{ (new WorldLoadEvent($world))->call(); if($backgroundGeneration){ - $this->server->getLogger()->notice($this->server->getLanguage()->translateString("pocketmine.level.backgroundGeneration", [$name])); + $this->server->getLogger()->notice($this->server->getLanguage()->translateString(KnownTranslationKeys::POCKETMINE_LEVEL_BACKGROUNDGENERATION, [$name])); $spawnLocation = $world->getSpawnLocation(); $centerX = $spawnLocation->getFloorX() >> 4;