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

feat(brigadier): Duplicate literal nodes for each alias with Brigadier #91

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(brigadier): Duplicate literal nodes for each alias with Brigadier #91

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions ...brigadier/src/main/java/org/incendo/cloud/brigadier/node/LiteralBrigadierNodeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.leangen.geantyref.GenericTypeReflector;
import io.leangen.geantyref.TypeToken;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -102,7 +103,9 @@ public LiteralBrigadierNodeFactory(

final LiteralCommandNode<S> constructedRoot = literalArgumentBuilder.build();
for (final CommandNode<C> child : cloudCommand.children()) {
constructedRoot.addChild(this.constructCommandNode(child, permissionChecker, executor).build());
this.constructCommandNode(child, permissionChecker, executor).stream()
.map(ArgumentBuilder::build)
.forEach(constructedRoot::addChild);
}
return constructedRoot;
}
Expand Down Expand Up @@ -138,40 +141,46 @@ public LiteralBrigadierNodeFactory(
(sender, permission) -> this.commandManager.testPermission(sender, permission).allowed());
}

private @NonNull ArgumentBuilder<S, ?> constructCommandNode(
private @NonNull List<@NonNull ArgumentBuilder<S, ?>> constructCommandNode(
final @NonNull CommandNode<C> root,
final @NonNull BrigadierPermissionChecker<C> permissionChecker,
final com.mojang.brigadier.@NonNull Command<S> executor
) {
if (root.component().parser() instanceof AggregateParser) {
final AggregateParser<C, ?> aggregateParser = (AggregateParser<C, ?>) root.component().parser();
return this.constructAggregateNode(
return Arrays.asList(this.constructAggregateNode(
aggregateParser,
root,
permissionChecker,
executor
);
));
}

final ArgumentBuilder<S, ?> argumentBuilder;
final List<ArgumentBuilder<S, ?>> argumentBuilders;
if (root.component().type() == CommandComponent.ComponentType.LITERAL) {
argumentBuilder = this.createLiteralArgumentBuilder(root.component(), root, permissionChecker);
argumentBuilders = new ArrayList<>();
argumentBuilders.add(this.createLiteralArgumentBuilder(root.component().name(), root, permissionChecker));
for (final String alias : root.component().alternativeAliases()) {
argumentBuilders.add(this.createLiteralArgumentBuilder(alias, root, permissionChecker));
}
} else {
argumentBuilder = this.createVariableArgumentBuilder(root.component(), root, permissionChecker);
argumentBuilders = Arrays.asList(this.createVariableArgumentBuilder(root.component(), root, permissionChecker));
}
this.updateExecutes(argumentBuilder, root, executor);
argumentBuilders.forEach(argumentBuilder -> this.updateExecutes(argumentBuilder, root, executor));
for (final CommandNode<C> node : root.children()) {
argumentBuilder.then(this.constructCommandNode(node, permissionChecker, executor));
for (final ArgumentBuilder<S, ?> argumentBuilder : argumentBuilders) {
this.constructCommandNode(node, permissionChecker, executor).forEach(argumentBuilder::then);
}
}
return argumentBuilder;
return argumentBuilders;
}

private @NonNull ArgumentBuilder<S, ?> createLiteralArgumentBuilder(
final @NonNull CommandComponent<C> component,
final @NonNull String name,
final @NonNull CommandNode<C> root,
final @NonNull BrigadierPermissionChecker<C> permissionChecker
) {
return LiteralArgumentBuilder.<S>literal(component.name())
return LiteralArgumentBuilder.<S>literal(name)
.requires(this.requirement(root, permissionChecker));
}

Expand Down Expand Up @@ -221,7 +230,7 @@ public LiteralBrigadierNodeFactory(
// We now want to link up all subsequent components to the tail.
final ArgumentBuilder<S, ?> tail = argumentBuilders.get(argumentBuilders.size() - 1);
for (final CommandNode<C> node : root.children()) {
tail.then(this.constructCommandNode(node, permissionChecker, executor));
this.constructCommandNode(node, permissionChecker, executor).forEach(tail::then);
}

this.updateExecutes(tail, root, executor);
Expand Down