mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Changed usage message displaying to exceptions to reduce boilerplate code

Browse Source 
Someday this won't need to be done by commands themselves, it'll be done by the parser.
This commit is contained in:
Dylan K. Taylor
2017-07-04 13:44:47 +01:00
parent 409fc282d2
commit 97f6a32557
31 changed files with 128 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/command/defaults/BanCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
@@ -45,9 +46,7 @@ class BanCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$name = array_shift($args);

5
src/pocketmine/command/defaults/BanIpCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
@@ -45,9 +46,7 @@ class BanIpCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$value = array_shift($args);

5
src/pocketmine/command/defaults/BanListCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\permission\BanEntry;
@@ -50,9 +51,7 @@ class BanListCommand extends VanillaCommand{
}elseif($args[0] === "players"){
$list = $sender->getServer()->getNameBans();
}else{
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
}else{
$list = $sender->getServer()->getNameBans();

5
src/pocketmine/command/defaults/DefaultGamemodeCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Server;
@@ -44,9 +45,7 @@ class DefaultGamemodeCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$gameMode = Server::getGamemodeFromString($args[0]);

5
src/pocketmine/command/defaults/DeopCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -46,9 +47,7 @@ class DeopCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$name = array_shift($args);

9
src/pocketmine/command/defaults/DifficultyCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\Server;
@@ -46,9 +47,7 @@ class DifficultyCommand extends VanillaCommand{
}
if(count($args) !== 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$difficulty = Server::getDifficultyFromString($args[0]);
@@ -66,9 +65,7 @@ class DifficultyCommand extends VanillaCommand{
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.difficulty.success", [$difficulty]));
}else{
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
return true;

5
src/pocketmine/command/defaults/EffectCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\entity\Effect;
use pocketmine\event\TranslationContainer;
use pocketmine\utils\TextFormat;
@@ -45,9 +46,7 @@ class EffectCommand extends VanillaCommand{
}
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$player = $sender->getServer()->getPlayer($args[0]);

5
src/pocketmine/command/defaults/EnchantCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\item\enchantment\Enchantment;
use pocketmine\utils\TextFormat;
@@ -45,9 +46,7 @@ class EnchantCommand extends VanillaCommand{
}
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$player = $sender->getServer()->getPlayer($args[0]);

9
src/pocketmine/command/defaults/GamemodeCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\Server;
@@ -47,9 +48,7 @@ class GamemodeCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$gameMode = Server::getGamemodeFromString($args[0]);
@@ -69,9 +68,7 @@ class GamemodeCommand extends VanillaCommand{
return true;
}
}elseif(!($sender instanceof Player)){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$target->setGamemode($gameMode);

5
src/pocketmine/command/defaults/GiveCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\item\Item;
use pocketmine\nbt\JsonNBTParser;
@@ -49,9 +50,7 @@ class GiveCommand extends VanillaCommand{
}
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$player = $sender->getServer()->getPlayer($args[0]);

5
src/pocketmine/command/defaults/KickCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -46,9 +47,7 @@ class KickCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$name = array_shift($args);

9
src/pocketmine/command/defaults/KillCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
@@ -48,9 +49,7 @@ class KillCommand extends VanillaCommand{
}
if(count($args) >= 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
if(count($args) === 1){
@@ -97,9 +96,7 @@ class KillCommand extends VanillaCommand{
$sender->setHealth(0);
$sender->sendMessage(new TranslationContainer("commands.kill.successful", [$sender->getName()]));
}else{
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
return true;

5
src/pocketmine/command/defaults/MeCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -45,9 +46,7 @@ class MeCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$sender->getServer()->broadcastMessage(new TranslationContainer("chat.type.emote", [$sender instanceof Player ? $sender->getDisplayName() : $sender->getName(), TextFormat::WHITE . implode(" ", $args)]));

5
src/pocketmine/command/defaults/OpCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -46,9 +47,7 @@ class OpCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$name = array_shift($args);

5
src/pocketmine/command/defaults/PardonCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
class PardonCommand extends VanillaCommand{
@@ -44,9 +45,7 @@ class PardonCommand extends VanillaCommand{
}
if(count($args) !== 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$sender->getServer()->getNameBans()->remove($args[0]);

5
src/pocketmine/command/defaults/PardonIpCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
class PardonIpCommand extends VanillaCommand{
@@ -44,9 +45,7 @@ class PardonIpCommand extends VanillaCommand{
}
if(count($args) !== 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
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])){

5
src/pocketmine/command/defaults/ParticleCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\block\Block;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\item\Item;
use pocketmine\level\particle\AngryVillagerParticle;
@@ -77,9 +78,7 @@ class ParticleCommand extends VanillaCommand{
}
if(count($args) < 7){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
if($sender instanceof Player){

5
src/pocketmine/command/defaults/SayCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\ConsoleCommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -46,9 +47,7 @@ class SayCommand extends VanillaCommand{
}
if(count($args) === 0){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
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)]));

5
src/pocketmine/command/defaults/SetWorldSpawnCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\math\Vector3;
use pocketmine\Player;
@@ -59,9 +60,7 @@ class SetWorldSpawnCommand extends VanillaCommand{
$level = $sender->getServer()->getDefaultLevel();
$pos = new Vector3($this->getInteger($sender, $args[0]), $this->getInteger($sender, $args[1]), $this->getInteger($sender, $args[2]));
}else{
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$level->setSpawnLocation($pos);

5
src/pocketmine/command/defaults/SpawnpointCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\level\Level;
use pocketmine\level\Position;
@@ -94,8 +95,6 @@ class SpawnpointCommand extends VanillaCommand{
}
}
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
}

9
src/pocketmine/command/defaults/TeleportCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\math\Vector3;
use pocketmine\Player;
@@ -50,9 +51,7 @@ class TeleportCommand extends VanillaCommand{
return strlen($arg) > 0;
});
if(count($args) < 1 or count($args) > 6){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$target = null;
@@ -121,8 +120,6 @@ class TeleportCommand extends VanillaCommand{
return true;
}
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
}

5
src/pocketmine/command/defaults/TellCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
use pocketmine\utils\TextFormat;
@@ -46,9 +47,7 @@ class TellCommand extends VanillaCommand{
}
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$name = strtolower(array_shift($args));

11
src/pocketmine/command/defaults/TimeCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\level\Level;
use pocketmine\Player;
@@ -43,9 +44,7 @@ class TimeCommand extends VanillaCommand{
public function execute(CommandSender $sender, $currentAlias, array $args){
if(count($args) < 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
if($args[0] === "start"){
@@ -91,9 +90,7 @@ class TimeCommand extends VanillaCommand{
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
if($args[0] === "set"){
@@ -132,7 +129,7 @@ class TimeCommand extends VanillaCommand{
}
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.time.added", [$value]));
}else{
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
throw new InvalidCommandSyntaxException();
}
return true;

5
src/pocketmine/command/defaults/TimingsCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TimingsHandler;
use pocketmine\event\TranslationContainer;
use pocketmine\Player;
@@ -49,9 +50,7 @@ class TimingsCommand extends VanillaCommand{
}
if(count($args) !== 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$mode = strtolower($args[0]);

19
src/pocketmine/command/defaults/TitleCommand.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
class TitleCommand extends VanillaCommand{
@@ -43,8 +44,7 @@ class TitleCommand extends VanillaCommand{
}
if(count($args) < 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
$player = $sender->getServer()->getPlayer($args[0]);
@@ -62,39 +62,34 @@ class TitleCommand extends VanillaCommand{
break;
case "title":
if(count($args) < 3){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$player->addTitle(implode(" ", array_slice($args, 2)));
break;
case "subtitle":
if(count($args) < 3){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$player->addSubTitle(implode(" ", array_slice($args, 2)));
break;
case "actionbar":
if(count($args) < 3){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$player->addActionBarMessage(implode(" ", array_slice($args, 2)));
break;
case "times":
if(count($args) < 4){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$player->setTitleDuration($this->getInteger($sender, $args[2]), $this->getInteger($sender, $args[3]), $this->getInteger($sender, $args[4]));
break;
default:
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}
$sender->sendMessage(new TranslationContainer("commands.title.success"));

6
src/pocketmine/command/defaults/TransferServerCommand.php
View File

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\Player;
class TransferServerCommand extends VanillaCommand{
@@ -42,9 +42,7 @@ class TransferServerCommand extends VanillaCommand{
public function execute(CommandSender $sender, $commandLabel, array $args){
if(count($args) < 1){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return false;
throw new InvalidCommandSyntaxException();
}elseif(!($sender instanceof Player)){
$sender->sendMessage("This command must be executed as a player");

4
src/pocketmine/command/defaults/WhitelistCommand.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\event\TranslationContainer;
use pocketmine\utils\TextFormat;
@@ -45,8 +46,7 @@ class WhitelistCommand extends VanillaCommand{
}
if(count($args) === 0 or count($args) > 2){
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
throw new InvalidCommandSyntaxException();
}
if(count($args) === 1){