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

Compacted the code

Browse source
This commit is contained in:
M4ximumPizza 2023-05-08 16:48:18 -07:00
parent f20bede62a
commit 54b6e347c1
1 changed files with 17 additions and 53 deletions

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

@ -233,17 +233,13 @@ public class CommandDispatcher<S> {
if (child.hasNodes()) {
final RedirectModifier<S> modifier = context.getRedirectModifier();
if (modifier == null) {
if (next == null) {
next = new ArrayList<>(1);
}
if (next == null) next = new ArrayList<>(1);
next.add(child.copyFor(context.getSource()));
} else {
try {
final Collection<S> results = modifier.apply(context);
if (!results.isEmpty()) {
if (next == null) {
next = new ArrayList<>(results.size());
}
if (next == null) next = new ArrayList<>(results.size());
for (final S source : results) {
next.add(child.copyFor(source));
}
@ -252,9 +248,7 @@ public class CommandDispatcher<S> {
}
} catch (final CommandSyntaxException ex) {
consumer.onCommandComplete(context, false, 0);
if (!forked) {
throw ex;
}
if (!forked) throw ex;
}
}
}
@ -267,9 +261,7 @@ public class CommandDispatcher<S> {
successfulForks++;
} catch (final CommandSyntaxException ex) {
consumer.onCommandComplete(context, false, 0);
if (!forked) {
throw ex;
}
if (!forked) throw ex;
}
}
}
@ -373,9 +365,7 @@ public class CommandDispatcher<S> {
}
}
} catch (final CommandSyntaxException ex) {
if (errors == null) {
errors = new LinkedHashMap<>();
}
if (errors == null) errors = new LinkedHashMap<>();
errors.put(child, ex);
reader.setCursor(cursor);
continue;
@ -391,15 +381,11 @@ public class CommandDispatcher<S> {
return new ParseResults<>(context, parse.getReader(), parse.getExceptions());
} else {
final ParseResults<S> parse = parseNodes(child, reader, context);
if (potentials == null) {
potentials = new ArrayList<>(1);
}
if (potentials == null) potentials = new ArrayList<>(1);
potentials.add(parse);
}
} else {
if (potentials == null) {
potentials = new ArrayList<>(1);
}
if (potentials == null) potentials = new ArrayList<>(1);
potentials.add(new ParseResults<>(context, reader, Collections.emptyMap()));
}
}
@ -407,18 +393,10 @@ public class CommandDispatcher<S> {
if (potentials != null) {
if (potentials.size() > 1) {
potentials.sort((a, b) -> {
if (!a.getReader().canRead() && b.getReader().canRead()) {
return -1;
}
if (a.getReader().canRead() && !b.getReader().canRead()) {
return 1;
}
if (a.getExceptions().isEmpty() && !b.getExceptions().isEmpty()) {
return -1;
}
if (!a.getExceptions().isEmpty() && b.getExceptions().isEmpty()) {
return 1;
}
if (!a.getReader().canRead() && b.getReader().canRead()) return -1;
if (a.getReader().canRead() && !b.getReader().canRead()) return 1;
if (a.getExceptions().isEmpty() && !b.getExceptions().isEmpty()) return -1;
if (!a.getExceptions().isEmpty() && b.getExceptions().isEmpty()) return 1;
return 0;
});
}
@ -456,14 +434,8 @@ public class CommandDispatcher<S> {
}
private void getAllUsage(final CommandNode<S> node, final S source, final ArrayList<String> result, final String prefix, final boolean restricted) {
if (restricted && !node.canUse(source)) {
return;
}
if (node.getCommand() != null) {
result.add(prefix);
}
if (restricted && !node.canUse(source)) return;
if (node.getCommand() != null) result.add(prefix);
if (node.getRedirect() != null) {
final String redirect = node.getRedirect() == root ? "..." : "-> " + node.getRedirect().getUsageText();
result.add(prefix.isEmpty() ? node.getUsageText() + ARGUMENT_SEPARATOR + redirect : prefix + ARGUMENT_SEPARATOR + redirect);
@ -509,9 +481,7 @@ public class CommandDispatcher<S> {
}
private String getSmartUsage(final CommandNode<S> node, final S source, final boolean optional, final boolean deep) {
if (!node.canUse(source)) {
return null;
}
if (!node.canUse(source)) return null;
final String self = optional ? USAGE_OPTIONAL_OPEN + node.getUsageText() + USAGE_OPTIONAL_CLOSE : node.getUsageText();
final boolean childOptional = node.getCommand() != null;
@ -526,16 +496,12 @@ public class CommandDispatcher<S> {
final Collection<CommandNode<S>> children = node.getChildren().stream().filter(c -> c.canUse(source)).collect(Collectors.toList());
if (children.size() == 1) {
final String usage = getSmartUsage(children.iterator().next(), source, childOptional, childOptional);
if (usage != null) {
return self + ARGUMENT_SEPARATOR + usage;
}
if (usage != null) return self + ARGUMENT_SEPARATOR + usage;
} else if (children.size() > 1) {
final Set<String> childUsage = new LinkedHashSet<>();
for (final CommandNode<S> child : children) {
final String usage = getSmartUsage(child, source, childOptional, true);
if (usage != null) {
childUsage.add(usage);
}
if (usage != null) childUsage.add(usage);
}
if (childUsage.size() == 1) {
final String usage = childUsage.iterator().next();
@ -544,9 +510,7 @@ public class CommandDispatcher<S> {
final StringBuilder builder = new StringBuilder(open);
int count = 0;
for (final CommandNode<S> child : children) {
if (count > 0) {
builder.append(USAGE_OR);
}
if (count > 0) builder.append(USAGE_OR);
builder.append(child.getUsageText());
count++;
}