diff --git a/src/command/defaults/BanCommand.php b/src/command/defaults/BanCommand.php index d571a9aa04..3e264abf83 100644 --- a/src/command/defaults/BanCommand.php +++ b/src/command/defaults/BanCommand.php @@ -39,8 +39,8 @@ class BanCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BAN_PLAYER_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_BAN_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_BAN_PLAYER_DESCRIPTION, + KnownTranslationKeys::COMMANDS_BAN_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_PLAYER); } diff --git a/src/command/defaults/BanIpCommand.php b/src/command/defaults/BanIpCommand.php index 3356e5ece1..13305b7844 100644 --- a/src/command/defaults/BanIpCommand.php +++ b/src/command/defaults/BanIpCommand.php @@ -40,8 +40,8 @@ class BanIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BAN_IP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_BANIP_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_BAN_IP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_BANIP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_IP); } diff --git a/src/command/defaults/BanListCommand.php b/src/command/defaults/BanListCommand.php index 86d140cb10..3cf92076ce 100644 --- a/src/command/defaults/BanListCommand.php +++ b/src/command/defaults/BanListCommand.php @@ -41,8 +41,8 @@ class BanListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_BANLIST_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_BANLIST_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_BANLIST_DESCRIPTION, + KnownTranslationKeys::COMMANDS_BANLIST_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_BAN_LIST); } diff --git a/src/command/defaults/ClearCommand.php b/src/command/defaults/ClearCommand.php index 08f160caa2..b2dbcc97b2 100644 --- a/src/command/defaults/ClearCommand.php +++ b/src/command/defaults/ClearCommand.php @@ -42,8 +42,8 @@ class ClearCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_CLEAR_USAGE ); $this->setPermission(implode(";", [DefaultPermissionNames::COMMAND_CLEAR_SELF, DefaultPermissionNames::COMMAND_CLEAR_OTHER])); } diff --git a/src/command/defaults/DefaultGamemodeCommand.php b/src/command/defaults/DefaultGamemodeCommand.php index bbfa5eb357..501ef98fab 100644 --- a/src/command/defaults/DefaultGamemodeCommand.php +++ b/src/command/defaults/DefaultGamemodeCommand.php @@ -37,8 +37,8 @@ class DefaultGamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DEFAULTGAMEMODE_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_DEFAULTGAMEMODE_DESCRIPTION, + KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_DEFAULTGAMEMODE); } diff --git a/src/command/defaults/DeopCommand.php b/src/command/defaults/DeopCommand.php index 900aa0381a..615eb9b498 100644 --- a/src/command/defaults/DeopCommand.php +++ b/src/command/defaults/DeopCommand.php @@ -39,8 +39,8 @@ class DeopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DEOP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_DEOP_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_DEOP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_DEOP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_TAKE); } diff --git a/src/command/defaults/DifficultyCommand.php b/src/command/defaults/DifficultyCommand.php index ce5b42ce73..c61fc2516e 100644 --- a/src/command/defaults/DifficultyCommand.php +++ b/src/command/defaults/DifficultyCommand.php @@ -37,8 +37,8 @@ class DifficultyCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_DIFFICULTY_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_DIFFICULTY_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_DIFFICULTY_DESCRIPTION, + KnownTranslationKeys::COMMANDS_DIFFICULTY_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_DIFFICULTY); } diff --git a/src/command/defaults/EffectCommand.php b/src/command/defaults/EffectCommand.php index 5923010036..ac5828d656 100644 --- a/src/command/defaults/EffectCommand.php +++ b/src/command/defaults/EffectCommand.php @@ -40,8 +40,8 @@ class EffectCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_EFFECT_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_EFFECT_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_EFFECT_DESCRIPTION, + KnownTranslationKeys::COMMANDS_EFFECT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_EFFECT); } diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php index 205cb8b7a7..10d2c3f167 100644 --- a/src/command/defaults/EnchantCommand.php +++ b/src/command/defaults/EnchantCommand.php @@ -38,8 +38,8 @@ class EnchantCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_ENCHANT_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_ENCHANT_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_ENCHANT_DESCRIPTION, + KnownTranslationKeys::COMMANDS_ENCHANT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_ENCHANT); } diff --git a/src/command/defaults/GamemodeCommand.php b/src/command/defaults/GamemodeCommand.php index e8a51bec62..90c6627aeb 100644 --- a/src/command/defaults/GamemodeCommand.php +++ b/src/command/defaults/GamemodeCommand.php @@ -39,8 +39,8 @@ class GamemodeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_GAMEMODE_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION, + KnownTranslationKeys::COMMANDS_GAMEMODE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_GAMEMODE); } diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php index 8e11fb515b..e9ce55f317 100644 --- a/src/command/defaults/GarbageCollectorCommand.php +++ b/src/command/defaults/GarbageCollectorCommand.php @@ -37,8 +37,8 @@ class GarbageCollectorCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GC_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE + 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 975d63d888..6d3df6ab1b 100644 --- a/src/command/defaults/GiveCommand.php +++ b/src/command/defaults/GiveCommand.php @@ -43,8 +43,8 @@ class GiveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_USAGE + 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 27f9c767e7..be1beab252 100644 --- a/src/command/defaults/HelpCommand.php +++ b/src/command/defaults/HelpCommand.php @@ -46,8 +46,8 @@ class HelpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_HELP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_HELP_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_HELP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_HELP_USAGE, ["?"] ); $this->setPermission(DefaultPermissionNames::COMMAND_HELP); diff --git a/src/command/defaults/KickCommand.php b/src/command/defaults/KickCommand.php index d654be2da4..50a37f6a80 100644 --- a/src/command/defaults/KickCommand.php +++ b/src/command/defaults/KickCommand.php @@ -41,8 +41,8 @@ class KickCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_KICK_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_KICK_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_KICK_DESCRIPTION, + KnownTranslationKeys::COMMANDS_KICK_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_KICK); } diff --git a/src/command/defaults/KillCommand.php b/src/command/defaults/KillCommand.php index 2e1bb0b9f2..ff96a387f0 100644 --- a/src/command/defaults/KillCommand.php +++ b/src/command/defaults/KillCommand.php @@ -40,8 +40,8 @@ class KillCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_KILL_DESCRIPTION, - "%" . KnownTranslationKeys::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])); diff --git a/src/command/defaults/ListCommand.php b/src/command/defaults/ListCommand.php index db8e66c8e4..556ff24f88 100644 --- a/src/command/defaults/ListCommand.php +++ b/src/command/defaults/ListCommand.php @@ -40,8 +40,8 @@ class ListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_LIST_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_PLAYERS_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_LIST_DESCRIPTION, + KnownTranslationKeys::COMMANDS_PLAYERS_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_LIST); } diff --git a/src/command/defaults/MeCommand.php b/src/command/defaults/MeCommand.php index f0df8bf336..d1d8329491 100644 --- a/src/command/defaults/MeCommand.php +++ b/src/command/defaults/MeCommand.php @@ -38,8 +38,8 @@ class MeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_ME_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_ME_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_ME_DESCRIPTION, + KnownTranslationKeys::COMMANDS_ME_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_ME); } diff --git a/src/command/defaults/OpCommand.php b/src/command/defaults/OpCommand.php index 721dda447e..3e172b3daf 100644 --- a/src/command/defaults/OpCommand.php +++ b/src/command/defaults/OpCommand.php @@ -39,8 +39,8 @@ class OpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_OP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_OP_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_OP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_OP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_OP_GIVE); } diff --git a/src/command/defaults/PardonCommand.php b/src/command/defaults/PardonCommand.php index f35839b00b..27b40069f0 100644 --- a/src/command/defaults/PardonCommand.php +++ b/src/command/defaults/PardonCommand.php @@ -36,8 +36,8 @@ class PardonCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_PLAYER_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_UNBAN_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_PLAYER_DESCRIPTION, + KnownTranslationKeys::COMMANDS_UNBAN_USAGE, ["unban"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_PLAYER); diff --git a/src/command/defaults/PardonIpCommand.php b/src/command/defaults/PardonIpCommand.php index 191dc036cb..9b2278706b 100644 --- a/src/command/defaults/PardonIpCommand.php +++ b/src/command/defaults/PardonIpCommand.php @@ -37,8 +37,8 @@ class PardonIpCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_IP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_UNBANIP_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_UNBAN_IP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_UNBANIP_USAGE, ["unban-ip"] ); $this->setPermission(DefaultPermissionNames::COMMAND_UNBAN_IP); diff --git a/src/command/defaults/ParticleCommand.php b/src/command/defaults/ParticleCommand.php index 7bb6e098b6..00e052bb7f 100644 --- a/src/command/defaults/ParticleCommand.php +++ b/src/command/defaults/ParticleCommand.php @@ -79,8 +79,8 @@ class ParticleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_PARTICLE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_PARTICLE); } diff --git a/src/command/defaults/PluginsCommand.php b/src/command/defaults/PluginsCommand.php index 3666c45435..c0339f52d3 100644 --- a/src/command/defaults/PluginsCommand.php +++ b/src/command/defaults/PluginsCommand.php @@ -40,8 +40,8 @@ class PluginsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE, ["pl"] ); $this->setPermission(DefaultPermissionNames::COMMAND_PLUGINS); diff --git a/src/command/defaults/SaveCommand.php b/src/command/defaults/SaveCommand.php index fe07c53a8e..71a3c33f87 100644 --- a/src/command/defaults/SaveCommand.php +++ b/src/command/defaults/SaveCommand.php @@ -36,8 +36,8 @@ class SaveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVE_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SAVE_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SAVE_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SAVE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM); } diff --git a/src/command/defaults/SaveOffCommand.php b/src/command/defaults/SaveOffCommand.php index 6d85082496..6d8f8a7e9b 100644 --- a/src/command/defaults/SaveOffCommand.php +++ b/src/command/defaults/SaveOffCommand.php @@ -34,8 +34,8 @@ class SaveOffCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVEOFF_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SAVEOFF_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE); } diff --git a/src/command/defaults/SaveOnCommand.php b/src/command/defaults/SaveOnCommand.php index b0d5ebf05c..f57fa55936 100644 --- a/src/command/defaults/SaveOnCommand.php +++ b/src/command/defaults/SaveOnCommand.php @@ -34,8 +34,8 @@ class SaveOnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAVEON_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SAVEON_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE); } diff --git a/src/command/defaults/SayCommand.php b/src/command/defaults/SayCommand.php index 62d9fd2142..a4fd0e0669 100644 --- a/src/command/defaults/SayCommand.php +++ b/src/command/defaults/SayCommand.php @@ -39,8 +39,8 @@ class SayCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SAY_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SAY_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SAY_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SAY_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SAY); } diff --git a/src/command/defaults/SeedCommand.php b/src/command/defaults/SeedCommand.php index d154ff8916..53f19a19a3 100644 --- a/src/command/defaults/SeedCommand.php +++ b/src/command/defaults/SeedCommand.php @@ -34,8 +34,8 @@ class SeedCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SEED_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SEED_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SEED_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SEED_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SEED); } diff --git a/src/command/defaults/SetWorldSpawnCommand.php b/src/command/defaults/SetWorldSpawnCommand.php index 2c6f145b14..9b67fa0765 100644 --- a/src/command/defaults/SetWorldSpawnCommand.php +++ b/src/command/defaults/SetWorldSpawnCommand.php @@ -40,8 +40,8 @@ class SetWorldSpawnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SETWORLDSPAWN_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SETWORLDSPAWN_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SETWORLDSPAWN); } diff --git a/src/command/defaults/SpawnpointCommand.php b/src/command/defaults/SpawnpointCommand.php index 031c64ae4a..6bfea948a0 100644 --- a/src/command/defaults/SpawnpointCommand.php +++ b/src/command/defaults/SpawnpointCommand.php @@ -41,8 +41,8 @@ class SpawnpointCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_SPAWNPOINT_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_SPAWNPOINT_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_SPAWNPOINT_DESCRIPTION, + KnownTranslationKeys::COMMANDS_SPAWNPOINT_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_SPAWNPOINT); } diff --git a/src/command/defaults/StatusCommand.php b/src/command/defaults/StatusCommand.php index 6f5e0133be..7086934237 100644 --- a/src/command/defaults/StatusCommand.php +++ b/src/command/defaults/StatusCommand.php @@ -39,8 +39,8 @@ class StatusCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_USAGE + 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 edf2eb7e3c..23a624dd5a 100644 --- a/src/command/defaults/StopCommand.php +++ b/src/command/defaults/StopCommand.php @@ -34,8 +34,8 @@ class StopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_STOP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_STOP_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_STOP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_STOP_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_STOP); } diff --git a/src/command/defaults/TeleportCommand.php b/src/command/defaults/TeleportCommand.php index 945036ebf9..17979fec61 100644 --- a/src/command/defaults/TeleportCommand.php +++ b/src/command/defaults/TeleportCommand.php @@ -42,8 +42,8 @@ class TeleportCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TP_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_TP_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_TP_DESCRIPTION, + KnownTranslationKeys::COMMANDS_TP_USAGE, ["teleport"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELEPORT); diff --git a/src/command/defaults/TellCommand.php b/src/command/defaults/TellCommand.php index 693fae68b6..c7feb644ca 100644 --- a/src/command/defaults/TellCommand.php +++ b/src/command/defaults/TellCommand.php @@ -40,8 +40,8 @@ class TellCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TELL_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_MESSAGE_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_TELL_DESCRIPTION, + KnownTranslationKeys::COMMANDS_MESSAGE_USAGE, ["w", "msg"] ); $this->setPermission(DefaultPermissionNames::COMMAND_TELL); diff --git a/src/command/defaults/TimeCommand.php b/src/command/defaults/TimeCommand.php index 5978b7ec2c..b3b1f397df 100644 --- a/src/command/defaults/TimeCommand.php +++ b/src/command/defaults/TimeCommand.php @@ -39,8 +39,8 @@ class TimeCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIME_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIME_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_TIME_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_TIME_USAGE ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_TIME_ADD, diff --git a/src/command/defaults/TimingsCommand.php b/src/command/defaults/TimingsCommand.php index 68350b56a0..cff3f4dd0b 100644 --- a/src/command/defaults/TimingsCommand.php +++ b/src/command/defaults/TimingsCommand.php @@ -60,8 +60,8 @@ class TimingsCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_TIMINGS_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_TIMINGS); } diff --git a/src/command/defaults/TitleCommand.php b/src/command/defaults/TitleCommand.php index 6a96293aea..084949cd37 100644 --- a/src/command/defaults/TitleCommand.php +++ b/src/command/defaults/TitleCommand.php @@ -38,8 +38,8 @@ class TitleCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TITLE_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_TITLE_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_TITLE_DESCRIPTION, + KnownTranslationKeys::COMMANDS_TITLE_USAGE ); $this->setPermission(DefaultPermissionNames::COMMAND_TITLE); } diff --git a/src/command/defaults/TransferServerCommand.php b/src/command/defaults/TransferServerCommand.php index 0a64ccfcf3..0190e48ee2 100644 --- a/src/command/defaults/TransferServerCommand.php +++ b/src/command/defaults/TransferServerCommand.php @@ -35,8 +35,8 @@ class TransferServerCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_TRANSFERSERVER_USAGE + 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 ff69f76273..daecc625f0 100644 --- a/src/command/defaults/VersionCommand.php +++ b/src/command/defaults/VersionCommand.php @@ -46,8 +46,8 @@ class VersionCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_USAGE, + KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, + KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_USAGE, ["ver", "about"] ); $this->setPermission(DefaultPermissionNames::COMMAND_VERSION); diff --git a/src/command/defaults/WhitelistCommand.php b/src/command/defaults/WhitelistCommand.php index abe67064f8..458d819e00 100644 --- a/src/command/defaults/WhitelistCommand.php +++ b/src/command/defaults/WhitelistCommand.php @@ -41,8 +41,8 @@ class WhitelistCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - "%" . KnownTranslationKeys::POCKETMINE_COMMAND_WHITELIST_DESCRIPTION, - "%" . KnownTranslationKeys::COMMANDS_WHITELIST_USAGE + KnownTranslationKeys::POCKETMINE_COMMAND_WHITELIST_DESCRIPTION, + KnownTranslationKeys::COMMANDS_WHITELIST_USAGE ); $this->setPermission(implode(";", [ DefaultPermissionNames::COMMAND_WHITELIST_RELOAD, diff --git a/src/network/mcpe/auth/ProcessLoginTask.php b/src/network/mcpe/auth/ProcessLoginTask.php index 0674ba0339..c0e537c646 100644 --- a/src/network/mcpe/auth/ProcessLoginTask.php +++ b/src/network/mcpe/auth/ProcessLoginTask.php @@ -138,11 +138,11 @@ class ProcessLoginTask extends AsyncTask{ if($currentPublicKey === null){ if(!$first){ - throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_MISSINGKEY); + throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_MISSINGKEY); } }elseif($headerDerKey !== $currentPublicKey){ //Fast path: if the header key doesn't match what we expected, the signature isn't going to validate anyway - throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); + throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); } try{ @@ -152,7 +152,7 @@ class ProcessLoginTask extends AsyncTask{ } try{ if(!JwtUtils::verify($jwt, $signingKeyOpenSSL)){ - throw new VerifyLoginException("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); + throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE); } }catch(JwtException $e){ throw new VerifyLoginException($e->getMessage(), 0, $e); @@ -178,11 +178,11 @@ class ProcessLoginTask extends AsyncTask{ $time = time(); if(isset($claims->nbf) and $claims->nbf > $time + self::CLOCK_DRIFT_MAX){ - throw new VerifyLoginException("%" . KnownTranslationKeys::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("%" . KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOLATE); + throw new VerifyLoginException(KnownTranslationKeys::POCKETMINE_DISCONNECT_INVALIDSESSION_TOOLATE); } if(isset($claims->identityPublicKey)){