Skip to content

Commit

Permalink
Clean up $args["..."]
Browse files Browse the repository at this point in the history
  • Loading branch information
@inxomnyaa
inxomnyaa committed Dec 13, 2020
1 parent bac8a42 commit 26fe7f6
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 51 deletions.
4 changes: 1 addition & 3 deletions src/xenialdan/MagicWE2/commands/LanguageCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
}
if (isset($args["language"])) {
/** @var string $languageArgument */
$languageArgument = $args["language"];
$session->setLanguage($languageArgument);
$session->setLanguage((string)$args["language"]);
return;
}
$languages = Loader::getInstance()->getLanguageList();
Expand Down
2 changes: 1 addition & 1 deletion src/xenialdan/MagicWE2/commands/biome/SetBiomeCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SetBiomeCommand extends BaseCommand
*/
protected function prepare(): void
{
$this->registerArgument(0, new IntegerArgument("biome", false));
$this->registerArgument(0, new IntegerArgument("biome", false));//TODO add BiomeArgument
//TODO flags
$this->setPermission("we.command.biome.set");
}
Expand Down
7 changes: 2 additions & 5 deletions src/xenialdan/MagicWE2/commands/brush/BrushNameCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ protected function prepare(): void
* @param CommandSender $sender
* @param string $aliasUsed
* @param mixed[] $args
* @throws TypeError
* @throws TypeError
*/
public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
{
Expand All @@ -62,12 +60,11 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
$sender->sendMessage($brush->getName());
return;
}
$name = (string)$args["name"];
$brush->properties->setCustomName($name);
$brush->properties->setCustomName((string)$args["name"]);
$session->sendMessage(TF::GREEN . $lang->translateString('command.brushname.set', [$brush->getName()]));
$session->replaceBrush($brush);
}
} catch (Exception $error) {
} catch (Exception | TypeError $error) {
$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());
$sender->sendMessage($this->getUsageMessage());
Expand Down
2 changes: 1 addition & 1 deletion src/xenialdan/MagicWE2/commands/clipboard/CopyCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CopyCommand extends BaseCommand
*/
protected function prepare(): void
{
$this->registerArgument(0, new TextArgument("flags", true));
$this->registerArgument(0, new TextArgument("flags", true));//TODO add FlagArgument (parse returns array with flags)
$this->setPermission("we.command.clipboard.copy");
}

Expand Down
5 changes: 3 additions & 2 deletions src/xenialdan/MagicWE2/commands/clipboard/CutCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
}
$hasFlags = isset($args["flags"]);
//TODO Temp hack - add cutAsync - Update 9th Feb. 2020 LEAVE THAT ALONE! IT WORKS, DO NOT TOUCH IT!
API::copyAsync($selection, $session, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
API::fillAsync($selection, $session, [BlockFactory::getInstance()->get(BlockLegacyIds::AIR, 0)], $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
$flags = $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE;
API::copyAsync($selection, $session, $flags);
API::fillAsync($selection, $session, [BlockFactory::getInstance()->get(BlockLegacyIds::AIR, 0)], $flags);
} catch (Exception $error) {
$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());
Expand Down
16 changes: 8 additions & 8 deletions src/xenialdan/MagicWE2/commands/clipboard/FlipCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
}
/** @var Player $sender */
try {
$axis = (string)$args["axis"];
$axis = (string)$args["axis"];//TODO change to Axis[]
$sender->sendMessage(Loader::PREFIX . $lang->translateString('command.flip.try', [$axis]));
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
}
$clipboard = $session->getCurrentClipboard();
if (!$clipboard instanceof SingleClipboard) {
}
$clipboard = $session->getCurrentClipboard();
if (!$clipboard instanceof SingleClipboard) {
throw new SessionException($lang->translateString('error.noclipboard'));
}
$action = new FlipAction($axis);
}
$action = new FlipAction($axis);
#$offset = $selection->getShape()->getMinVec3()->subtract($session->getPlayer()->asVector3()->floor())->floor();
#$action->setClipboardVector($offset);
Server::getInstance()->getAsyncPool()->submitTask(
Expand Down
2 changes: 1 addition & 1 deletion src/xenialdan/MagicWE2/commands/generation/CylinderCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
try {
$messages = [];
$error = false;
$blocks = (string)$args["blocks"];
$blocks = (string)$args["blocks"];//TODO change to Palette
$diameter = (int)$args["diameter"];
$height = (int)($args["height"] ?? 1);
$newblocks = API::blockParser($blocks, $messages, $error);
Expand Down
24 changes: 12 additions & 12 deletions src/xenialdan/MagicWE2/commands/region/OverlayCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
}
/** @var Player $sender */
try {
$messages = [];
$error = false;
$blocks = API::blockParser((string)$args["blocks"], $messages, $error);
foreach ($messages as $message) {
$sender->sendMessage($message);
}
$return = !$error;
if ($return) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
$messages = [];
$error = false;
$blocks = API::blockParser((string)$args["blocks"], $messages, $error);//TODO change to Palette
foreach ($messages as $message) {
$sender->sendMessage($message);
}
$return = !$error;
if ($return) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
}
$selection = $session->getLatestSelection();
}
$selection = $session->getLatestSelection();
if (is_null($selection)) {
throw new SelectionException($lang->translateString('error.noselection'));
}
Expand Down
4 changes: 2 additions & 2 deletions src/xenialdan/MagicWE2/commands/region/ReplaceCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
try {
$messages = [];
$error = false;
$findBlocks = API::blockParser((string)$args["findblocks"], $messages, $error);
$replaceBlocks = API::blockParser((string)$args["replaceblocks"], $messages, $error);
$findBlocks = API::blockParser((string)$args["findblocks"], $messages, $error);//TODO change to Palette
$replaceBlocks = API::blockParser((string)$args["replaceblocks"], $messages, $error);//TODO change to Palette
foreach ($messages as $message) {
$sender->sendMessage($message);
}
Expand Down
20 changes: 10 additions & 10 deletions src/xenialdan/MagicWE2/commands/region/SetCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
}
/** @var Player $sender */
try {
$messages = [];
$error = false;
$replaceBlocks = API::blockParser((string)$args["blocks"], $messages, $error);
foreach ($messages as $message) {
$sender->sendMessage($message);
}
if (!$error) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
$messages = [];
$error = false;
$replaceBlocks = API::blockParser((string)$args["blocks"], $messages, $error);//TODO change to Palette
foreach ($messages as $message) {
$sender->sendMessage($message);
}
if (!$error) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
}
}
$selection = $session->getLatestSelection();
if (is_null($selection)) {
throw new SelectionException($lang->translateString('error.noselection'));
Expand Down
12 changes: 6 additions & 6 deletions src/xenialdan/MagicWE2/commands/selection/info/CountCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
try {
$error = false;
if (!empty($args["blocks"])) {
$messages = [];
API::blockParser(($filterBlocks = (string)$args["blocks"]), $messages, $error);
foreach ($messages as $message) {
$sender->sendMessage($message);
}
} else $filterBlocks = "";
$messages = [];
API::blockParser(($filterBlocks = (string)$args["blocks"]), $messages, $error);//TODO change to Palette
foreach ($messages as $message) {
$sender->sendMessage($message);
}
} else $filterBlocks = "";
if (!$error) {
$session = SessionHelper::getUserSession($sender);
if (is_null($session)) {
Expand Down

0 comments on commit 26fe7f6

Please sign in to comment.