8000 Add option to add custom error handling when Argument parse fails by willkroboth · Pull Request #366 · CommandAPI/CommandAPI · GitHub
[go: up one dir, main page]
Skip to content

Add option to add custom error handling when Argument parse fails #366

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

Merged
merged 1 commit into from
Nov 19, 2022
Merged

Add option to add custom error handling when Argument parse fails #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to 8000
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add option to add custom error handling when Argument parse fails
  • Loading branch information
@willkroboth
willkroboth committed Nov 19, 2022
commit db13e38a8d46df814e0852c4b82426937ad82d3a
2 changes: 1 addition & 1 deletion commandapi-core/src/main/java/dev/jorel/commandapi/CommandAPIHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Object[] argsToObjectArr(CommandContext<CommandSourceStack> cmdCtx, Argument<?>[
Object parseArgument(CommandContext<CommandSourceStack> cmdCtx, String key, Argument<?> value, Object[] previousArgs)
throws CommandSyntaxException {
if (value.isListed()) {
return value.parseArgument(NMS, cmdCtx, key, previousArgs);
return value.parseArgumentHandleError(NMS, cmdCtx, key, previousArgs);
} else {
return null;
}
Expand Down
34 changes: 32 additions & 2 deletions commandapi-core/src/main/java/dev/jorel/commandapi/arguments/Argument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.function.Predicate;

import dev.jorel.commandapi.ArgumentTree;
import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException;
import org.bukkit.command.CommandSender;

import com.mojang.brigadier.arguments.ArgumentType;
Expand Down Expand Up @@ -94,6 +95,21 @@ public final ArgumentType<?> getRawType() {
public final String getNodeName() {
return this.nodeName;
}

public final <CommandSourceStack> T parseArgumentHandleError(NMS<CommandSourceStack> nms,
CommandContext<CommandSourceStack> cmdCtx, String key, Object[] previousArgs) throws CommandSyntaxException {
try {
return parseArgument(nms, cmdCtx, key, previousArgs);
} catch (CommandSyntaxException original) {
try {
return exceptionHandler.handleException(new ArgumentParseExceptionContext(
new WrapperCommandSyntaxException(original)
));
} catch (WrapperCommandSyntaxException newException) {
throw newException.getException();
}
}
}

/**
* Parses an argument, returning the specific Bukkit object that the argument
Expand All @@ -109,7 +125,7 @@ public final String getNodeName() {
* @throws CommandSyntaxException if parsing fails
*/
public abstract <CommandSourceStack> T parseArgument(NMS<CommandSourceStack> nms,
CommandContext<CommandSourceStack> cmdCtx, String key, Object[] previousArgs) throws CommandSyntaxException;
CommandContext<CommandSourceStack> cmdCtx, String key, Object[] previousArgs) throws CommandSyntaxException;

/////////////////
// Suggestions //
Expand Down Expand Up @@ -304,6 +320,21 @@ public Argument<T> setListed(boolean listed) {
this.isListed = listed;
return this;
}

////////////////////////
// Exception Handling //
///////////////////////

private ArgumentParseExceptionHandler<T> exceptionHandler = context -> {throw context.exception();};

public final Argument<T> withExceptionHandler(ArgumentParseExceptionHandler<T> exceptionHandler) {
this.exceptionHandler = exceptionHandler;
return this;
}

public final ArgumentParseExceptionHandler<T> getExceptionHandler() {
return this.exceptionHandler;
}

///////////
// Other //
Expand All @@ -327,5 +358,4 @@ public List<String> getEntityNames(Object argument) {
public String toString() {
return this.getNodeName() + "<" + this.getClass().getSimpleName() + ">";
}

}
6 changes: 6 additions & 0 deletions ...dapi-core/src/main/java/dev/jorel/commandapi/arguments/ArgumentParseExceptionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dev.jorel.commandapi.arguments;

import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException;

public record ArgumentParseExceptionContext(WrapperCommandSyntaxException exception) {
}
8 changes: 8 additions & 0 deletions ...dapi-core/src/main/java/dev/jorel/commandapi/arguments/ArgumentParseExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package dev.jorel.commandapi.arguments;

import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException;

@FunctionalInterface
public interface ArgumentParseExceptionHandler<T> {
T handleException(ArgumentParseExceptionContext context) throws WrapperCommandSyntaxException;
}
2 changes: 1 addition & 1 deletion commandapi-core/src/main/java/dev/jorel/commandapi/arguments/CustomArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public <CommandListenerWrapper> T parseArgument(NMS<CommandListenerWrapper> nms,
throws CommandSyntaxException {
// Get the raw input and parsed input
final String customresult = CommandAPIHandler.getRawArgumentInput(cmdCtx, key);
final B parsedInput = base.parseArgument(nms, cmdCtx, key, previousArgs);
final B parsedInput = base.parseArgumentHandleError(nms, cmdCtx, key, previousArgs);

try {
return infoParser.apply(new CustomArgumentInfo<B>(nms.getCommandSenderFromCSS(cmdCtx.getSource()),
Expand Down
0