SimplexDevelopment/SimplexCL
1
0
Fork 0
mirror of https://github.com/SimplexDevelopment/SimplexCL.git synced 2024-12-22 07:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor Changes

Browse Source 
Changed CommandBase#subCommand to return a boolean so you can check to see if it ran, to ensure that you only run the subcommand and not the subcommand AND the main command.
This commit is contained in:
Paldiu 2022-02-09 20:48:48 -06:00
parent 92990227b9
commit aa54dd5f10
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/simplex/cl/CommandBase.java
View File

@ -116,14 +116,14 @@ public abstract class CommandBase extends Permissible implements ICommand {
* @param command The SubCommand to run. * @param command The SubCommand to run.
* This is a functional interface to provide easy implementation of the command's details. * This is a functional interface to provide easy implementation of the command's details.
*/ */
public void subCommand(@NotNull String name, @NotNull CommandSender sender, @NotNull String permission, String @NotNull [] args, @NotNull SubCommand command) { public boolean subCommand(@NotNull String name, @NotNull CommandSender sender, @NotNull String permission, String @NotNull [] args, @NotNull SubCommand command) {
if (!sender.hasPermission(permission)) { if (!sender.hasPermission(permission)) {
sender.sendMessage(msg(getPermissionMessage())); sender.sendMessage(msg(getPermissionMessage()));
return; return true;
} }
if (args.length == 0) { if (args.length == 0) {
return; return false;
} }
String[] tieredCmd = name.split(" "); String[] tieredCmd = name.split(" ");
@ -131,13 +131,13 @@ public abstract class CommandBase extends Permissible implements ICommand {
if (args.length == 1 && tieredCmd.length == 1) { if (args.length == 1 && tieredCmd.length == 1) {
if (args[0].equalsIgnoreCase(name)) { if (args[0].equalsIgnoreCase(name)) {
command.execute(); command.execute();
return; return true;
} }
} }
if (args.length == 2 && tieredCmd.length == 2) { if (args.length == 2 && tieredCmd.length == 2) {
if (args[0].equalsIgnoreCase(tieredCmd[0]) && args[1].equalsIgnoreCase(tieredCmd[1])) { if (args[0].equalsIgnoreCase(tieredCmd[0]) && args[1].equalsIgnoreCase(tieredCmd[1])) {
command.execute(); command.execute();
return; return true;
} }
} }
if (args.length == 3 && tieredCmd.length == 3) { if (args.length == 3 && tieredCmd.length == 3) {
@ -145,7 +145,7 @@ public abstract class CommandBase extends Permissible implements ICommand {
&& args[1].equalsIgnoreCase(tieredCmd[1]) && args[1].equalsIgnoreCase(tieredCmd[1])
&& args[2].equalsIgnoreCase(tieredCmd[2])) { && args[2].equalsIgnoreCase(tieredCmd[2])) {
command.execute(); command.execute();
return; return true;
} }
} }
if (args.length == 4 && tieredCmd.length == 4) { if (args.length == 4 && tieredCmd.length == 4) {
@ -154,8 +154,10 @@ public abstract class CommandBase extends Permissible implements ICommand {
&& args[2].equalsIgnoreCase(tieredCmd[2]) && args[2].equalsIgnoreCase(tieredCmd[2])
&& args[3].equalsIgnoreCase(tieredCmd[3])) { && args[3].equalsIgnoreCase(tieredCmd[3])) {
command.execute(); command.execute();
return true;
} }
} }
return false;
} }
@Nullable @Nullable

12
src/main/java/io/github/simplex/cl/impl/ExampleCommand.java
View File

@ -16,13 +16,13 @@ public final class ExampleCommand extends CommandBase {
@Override @Override
public void execute(CommandSender sender, String[] args, boolean allowConsole) { public void execute(CommandSender sender, String[] args, boolean allowConsole) {
subCommand("info", sender, getPermission() + ".info", args, () -> { if (subCommand("info", sender, getPermission() + ".info", args, () -> sender.sendMessage(msg("SimplexCL was created by SimplexDevelopment!", BasicColors.GOLD)))) {
sender.sendMessage(msg("SimplexCL was created by SimplexDevelopment!", BasicColors.GOLD)); return;
}); }
subCommand("info more", sender, getPermission() + ".info.more", args, () -> { if (subCommand("info more", sender, getPermission() + ".info.more", args, () -> sender.sendMessage(msg("https://github.com/SimplexDevelopment", AdvancedColors.FUCHSIA)))) {
sender.sendMessage(msg("https://github.com/SimplexDevelopment", AdvancedColors.FUCHSIA)); return;
}); }
sender.sendMessage(msg("This is an example command.", BasicColors.BLUE)); sender.sendMessage(msg("This is an example command.", BasicColors.BLUE));
} }