mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

fix last remaining non-usages of KnownTranslationFactory

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-08-15 16:35:51 +01:00
parent 789a669395
commit 715fbc9ee5
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/locale

@ -1 +1 @@
Subproject commit b41efc9044e1f6ab2d5c44ced3203ea18cba0165
Subproject commit f07494a0245dc52fa6cbcc4d0e45703d1fc22ee8

3
src/command/defaults/EnchantCommand.php
View File

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

3
src/command/defaults/GamemodeCommand.php
View File

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

7
src/command/defaults/VanillaCommand.php
View File

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

12
src/lang/KnownTranslationFactory.php
View File

@ -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{