From 715fbc9ee5ff3e710071fe34a6de2b1528dfb7b7 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sun, 15 Aug 2021 16:35:51 +0100
Subject: [PATCH] fix last remaining non-usages of KnownTranslationFactory

---
 resources/locale                         |  2 +-
 src/command/defaults/EnchantCommand.php  |  3 +--
 src/command/defaults/GamemodeCommand.php |  3 +--
 src/command/defaults/VanillaCommand.php  |  7 +++----
 src/lang/KnownTranslationFactory.php     | 12 ++++++++----
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/resources/locale b/resources/locale
index b41efc904..f07494a02 160000
--- a/resources/locale
+++ b/resources/locale
@@ -1 +1 @@
-Subproject commit b41efc9044e1f6ab2d5c44ced3203ea18cba0165
+Subproject commit f07494a0245dc52fa6cbcc4d0e45703d1fc22ee8
diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php
index 592c7c57f..205cb8b7a 100644
--- a/src/command/defaults/EnchantCommand.php
+++ b/src/command/defaults/EnchantCommand.php
@@ -29,7 +29,6 @@ use pocketmine\item\enchantment\EnchantmentInstance;
 use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\KnownTranslationKeys;
-use pocketmine\lang\Translatable;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\utils\TextFormat;
 use function count;
@@ -86,7 +85,7 @@ class EnchantCommand extends VanillaCommand{
 		$item->addEnchantment(new EnchantmentInstance($enchantment, $level));
 		$player->getInventory()->setItemInHand($item);
 
-		self::broadcastCommandMessage($sender, new Translatable(KnownTranslationKeys::COMMANDS_ENCHANT_SUCCESS, [$player->getName()]));
+		self::broadcastCommandMessage($sender, KnownTranslationFactory::commands_enchant_success($player->getName()));
 		return true;
 	}
 }
diff --git a/src/command/defaults/GamemodeCommand.php b/src/command/defaults/GamemodeCommand.php
index a63245869..a5210c438 100644
--- a/src/command/defaults/GamemodeCommand.php
+++ b/src/command/defaults/GamemodeCommand.php
@@ -28,7 +28,6 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\KnownTranslationKeys;
-use pocketmine\lang\Translatable;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\GameMode;
 use pocketmine\player\Player;
@@ -81,7 +80,7 @@ class GamemodeCommand extends VanillaCommand{
 			if($target === $sender){
 				Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_gamemode_success_self($gameMode->getTranslationKey()));
 			}else{
-				$target->sendMessage(new Translatable(KnownTranslationKeys::GAMEMODE_CHANGED, [$gameMode->getTranslationKey()]));
+				$target->sendMessage(KnownTranslationFactory::gameMode_changed($gameMode->getTranslationKey()));
 				Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_gamemode_success_other($gameMode->getTranslationKey(), $target->getName()));
 			}
 		}
diff --git a/src/command/defaults/VanillaCommand.php b/src/command/defaults/VanillaCommand.php
index 7aa1c757d..e4a32ee9c 100644
--- a/src/command/defaults/VanillaCommand.php
+++ b/src/command/defaults/VanillaCommand.php
@@ -26,8 +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\Translatable;
+use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\utils\TextFormat;
 use function is_numeric;
 use function substr;
@@ -83,11 +82,11 @@ abstract class VanillaCommand extends Command{
 
 		$v = (int) $input;
 		if($v > $max){
-			$sender->sendMessage(new Translatable(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOBIG, [$input, (string) $max]));
+			$sender->sendMessage(KnownTranslationFactory::commands_generic_num_tooBig($input, (string) $max)->prefix(TextFormat::RED));
 			return null;
 		}
 		if($v < $min){
-			$sender->sendMessage(new Translatable(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOSMALL, [$input, (string) $min]));
+			$sender->sendMessage(KnownTranslationFactory::commands_generic_num_tooSmall($input, (string) $min)->prefix(TextFormat::RED));
 			return null;
 		}
 
diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php
index d61ce8ff3..5d9536487 100644
--- a/src/lang/KnownTranslationFactory.php
+++ b/src/lang/KnownTranslationFactory.php
@@ -228,8 +228,10 @@ final class KnownTranslationFactory{
 		]);
 	}
 
-	public static function commands_enchant_success() : Translatable{
-		return new Translatable(KnownTranslationKeys::COMMANDS_ENCHANT_SUCCESS, []);
+	public static function commands_enchant_success(Translatable|string $param0) : Translatable{
+		return new Translatable(KnownTranslationKeys::COMMANDS_ENCHANT_SUCCESS, [
+			0 => $param0,
+		]);
 	}
 
 	public static function commands_enchant_usage() : Translatable{
@@ -753,8 +755,10 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::GAMEMODE_ADVENTURE, []);
 	}
 
-	public static function gameMode_changed() : Translatable{
-		return new Translatable(KnownTranslationKeys::GAMEMODE_CHANGED, []);
+	public static function gameMode_changed(Translatable|string $param0) : Translatable{
+		return new Translatable(KnownTranslationKeys::GAMEMODE_CHANGED, [
+			0 => $param0,
+		]);
 	}
 
 	public static function gameMode_creative() : Translatable{