mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-10 13:35:29 +00:00
Remove % translation prefixes dotted around all over the place
This commit is contained in:
parent
39cdf23bd5
commit
039c59856d
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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]));
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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]));
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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)){
|
||||
|
Loading…
x
Reference in New Issue
Block a user