Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove throws of InvalidSubCommandException #21

Merged
merged 2 commits into from
Apr 19, 2022
Merged

remove throws of InvalidSubCommandException #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b30fe1d
refactor(BukkitCommandManager): replace error handle of InvalidSubCom…
OcZi Apr 19, 2022
3d44b6d
refactor: apply common handler of InvalidSubCommandException in all t…
OcZi Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,13 @@ public BukkitCommandManager(CommandManager delegate, String fallbackPrefix) {
return true;
});

this.getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, (namespace, ex) -> {
BukkitCommandWrapper.sendMessageToSender(ex, namespace);

String label = namespace.getObject(String.class, "label");

throw new org.bukkit.command.CommandException("An internal parse exception occurred while executing the command " + label, ex);
});

ErrorHandler.ErrorConsumer<ArgumentException> commonArgumentExceptionConsumer = (namespace, ex) -> {
BukkitCommandWrapper.sendMessageToSender(ex, namespace);

return false;
};

this.getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, commonArgumentExceptionConsumer);
this.getErrorHandler().addExceptionHandler(ArgumentParseException.class, commonArgumentExceptionConsumer);
this.getErrorHandler().addExceptionHandler(NoMoreArgumentsException.class, commonArgumentExceptionConsumer);
this.getErrorHandler().addExceptionHandler(NoPermissionsException.class, (namespace, throwable) -> {
Expand Down
7 changes: 1 addition & 6 deletions Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,14 @@ public BungeeCommandManager(CommandManager commandManager, Plugin plugin) {
return false;
});

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, (namespace, e) -> {
String label = namespace.getObject(String.class, "label");
BungeeCommandWrapper.sendMessageToSender(e, namespace);

throw new CommandException("An internal parse exception occurred while executing the command " + label, e);
});

ErrorHandler.ErrorConsumer<CommandException> commonHandler = (namespace, e) -> {
BungeeCommandWrapper.sendMessageToSender(e, namespace);

return true;
};

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, commonHandler);
getErrorHandler().addExceptionHandler(ArgumentParseException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoMoreArgumentsException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoPermissionsException.class, commonHandler);
Expand Down
6 changes: 1 addition & 5 deletions Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,14 @@ public DiscordCommandManager(CommandManager commandManager, JDA client, String c
return true;
});

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, (namespace, e) -> {
MessageListener.sendMessage(namespace, e);

throw new CommandException("An internal parse exception occurred while executing the command", e);
});

ErrorHandler.ErrorConsumer<CommandException> commonHandler = (namespace, e) -> {
MessageListener.sendMessage(namespace, e);

return true;
};

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, commonHandler);
getErrorHandler().addExceptionHandler(ArgumentParseException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoMoreArgumentsException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoPermissionsException.class, commonHandler);
Expand Down
6 changes: 1 addition & 5 deletions Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,14 @@ public VelocityCommandManager(ProxyServer proxyServer, CommandManager commandMan
return true;
});

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, (namespace, e) -> {
VelocityCommandWrapper.sendMessageToSender(e, namespace);

throw new CommandException("An internal parse exception occurred while executing the command", e);
});

ErrorHandler.ErrorConsumer<CommandException> commonHandler = (namespace, e) -> {
VelocityCommandWrapper.sendMessageToSender(e, namespace);

return true;
};

getErrorHandler().addExceptionHandler(InvalidSubCommandException.class, commonHandler);
getErrorHandler().addExceptionHandler(ArgumentParseException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoMoreArgumentsException.class, commonHandler);
getErrorHandler().addExceptionHandler(NoPermissionsException.class, commonHandler);
Expand Down