ChomeNS/brigadier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow access to an unbuilt context, for caching parsed functions

Browse source
This commit is contained in:
Nathan Adams 2017-06-28 11:07:42 +02:00
parent bafe8e6b56
commit e6b78a5f2a
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/mojang/brigadier/CommandDispatcher.java
View file

@ -40,11 +40,15 @@ public class CommandDispatcher<S> {
}
public int execute(String command, S source) throws CommandException {
CommandContext<S> context = parseNodes(root, command, new CommandContextBuilder<>(source));
CommandContext<S> context = parse(command, source).build();
return context.getCommand().run(context);
}
private CommandContext<S> parseNodes(CommandNode<S> node, String command, CommandContextBuilder<S> contextBuilder) throws CommandException {
public CommandContextBuilder<S> parse(String command, S source) throws CommandException {
return parseNodes(root, command, new CommandContextBuilder<>(source));
}
private CommandContextBuilder<S> parseNodes(CommandNode<S> node, String command, CommandContextBuilder<S> contextBuilder) throws CommandException {
CommandException exception = null;
final S source = contextBuilder.getSource();
@ -60,7 +64,7 @@ public class CommandDispatcher<S> {
context.withCommand(child.getCommand());
}
if (remaining.isEmpty()) {
return context.build();
return context;
} else {
return parseNodes(child, remaining.substring(1), context);
}
@ -76,11 +80,11 @@ public class CommandDispatcher<S> {
throw ERROR_UNKNOWN_COMMAND.create();
}
return contextBuilder.build();
return contextBuilder;
}
public String getUsage(String command, S source) throws CommandException {
CommandContext<S> context = parseNodes(root, command, new CommandContextBuilder<>(source));
CommandContext<S> context = parseNodes(root, command, new CommandContextBuilder<>(source)).build();
CommandNode<S> base = Iterables.getLast(context.getNodes().keySet());
List<CommandNode<S>> children = base.getChildren().stream().filter(hasCommand).collect(Collectors.toList());
boolean optional = base.getCommand() != null;

2
src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java
View file

@ -42,7 +42,7 @@ public class CommandContextBuilder<S> {
public CommandContextBuilder<S> copy() {
CommandContextBuilder<S> copy = new CommandContextBuilder<>(source);
copy.command = this.command;
copy.arguments.putAll(this.arguments);
this.arguments.forEach((k, v) -> copy.arguments.put(k, v.copy()));
copy.nodes.putAll(this.nodes);
return copy;
}