Skip to content

Commit b2b1e58

Browse files
committed
Support plugin namespaces in Brigadier
1 parent 66b7919 commit b2b1e58

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

bukkit/src/main/java/revxrsal/commands/bukkit/core/Brigadier.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.bukkit.command.CommandSender;
4040
import org.bukkit.entity.Entity;
4141
import org.bukkit.entity.Player;
42+
import org.bukkit.plugin.Plugin;
4243
import org.jetbrains.annotations.NotNull;
4344
import org.jetbrains.annotations.Nullable;
4445
import revxrsal.commands.CommandHandler;
@@ -117,15 +118,17 @@ public EntitySelectorImpl(List<Entity> entities) {
117118
}
118119
}
119120

120-
public void parse(@NotNull CommandHandler handler) {
121+
public void parse(Plugin plugin, @NotNull CommandHandler handler) {
121122
List<LiteralArgumentBuilder<?>> nodes = new ArrayList<>();
122123
List<CommandCategory> roots = handler.getCategories().values().stream().filter(c -> c.getPath().size() == 1).collect(Collectors.toList());
123124
List<ExecutableCommand> rootCommands = handler.getCommands().values().stream().filter(c -> c.getPath().size() == 1).collect(Collectors.toList());
124125
for (CommandCategory root : roots) {
125126
nodes.add(parse(literal(root.getName()), root));
127+
nodes.add(parse(literal(plugin.getName().toLowerCase() + ":" + root.getName()), root));
126128
}
127129
for (ExecutableCommand root : rootCommands) {
128130
nodes.add(parse(literal(root.getName()), root));
131+
nodes.add(parse(literal(plugin.getName().toLowerCase() + ":" + root.getName()), root));
129132
}
130133
nodes.forEach(commodore::register);
131134
}

bukkit/src/main/java/revxrsal/commands/bukkit/core/BukkitHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public BukkitHandler(@NotNull Plugin plugin) {
120120
}
121121

122122
@Override public BukkitCommandHandler registerBrigadier() {
123-
brigadier.get().ifPresent(brigadier -> brigadier.parse(this));
123+
brigadier.get().ifPresent(brigadier -> brigadier.parse(plugin, this));
124124
return this;
125125
}
126126

0 commit comments

Comments
 (0)