Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-17 01:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix commodore suggestions not working

Browse Source
This commit is contained in:
Vankka 2022-04-12 12:39:06 +03:00
parent f8c0900d17
commit e8ecea64bb
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/CommodoreHandler.java
View File

@ -21,38 +21,35 @@ package com.discordsrv.bukkit.command.game.handler;
import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.BukkitDiscordSRV;
import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.game.abstraction.GameCommand;
import com.discordsrv.common.command.game.handler.util.BrigadierUtil; import com.discordsrv.common.command.game.handler.util.BrigadierUtil;
import com.mojang.brigadier.tree.CommandNode; import com.discordsrv.common.command.game.sender.ICommandSender;
import com.mojang.brigadier.tree.LiteralCommandNode; import com.mojang.brigadier.tree.LiteralCommandNode;
import me.lucko.commodore.Commodore; import me.lucko.commodore.Commodore;
import me.lucko.commodore.CommodoreProvider; import me.lucko.commodore.CommodoreProvider;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.function.Function;
/** /**
* No avoiding basic handler on bukkit. Unfortunately it isn't possible to use brigadier for executing. * No avoiding basic handler on bukkit. Unfortunately it isn't possible to use brigadier for executing.
*/ */
public class CommodoreHandler extends AbstractBukkitCommandExecutor { public class CommodoreHandler extends AbstractBukkitCommandExecutor {
private final Commodore commodore; private final Commodore commodore;
private final Function<?, ICommandSender> senderFunction;
public CommodoreHandler(BukkitDiscordSRV discordSRV) { public CommodoreHandler(BukkitDiscordSRV discordSRV) {
super(discordSRV); super(discordSRV);
this.commodore = CommodoreProvider.getCommodore(discordSRV.plugin()); this.commodore = CommodoreProvider.getCommodore(discordSRV.plugin());
this.senderFunction = wrapper -> sender(commodore.getBukkitSender(wrapper));
} }
@Override @Override
public void registerCommand(GameCommand command) { public void registerCommand(GameCommand command) {
logger.debug("Registering command " + command.getLabel() + " with commodore"); logger.debug("Registering command " + command.getLabel() + " with commodore");
LiteralCommandNode<?> argumentBuilder = BrigadierUtil.convertToBrigadier(
command,
wrapper -> sender(commodore.getBukkitSender(wrapper))
);
CommandNode<?> redirection = argumentBuilder.getRedirect();
if (redirection != null) {
// Commodore handles the label being different fine
argumentBuilder = (LiteralCommandNode<?>) redirection;
}
PluginCommand pluginCommand = command(command); PluginCommand pluginCommand = command(command);
if (pluginCommand == null) { if (pluginCommand == null) {
logger.error("Failed to create command " + command.getLabel()); logger.error("Failed to create command " + command.getLabel());
@ -62,12 +59,37 @@ public class CommodoreHandler extends AbstractBukkitCommandExecutor {
handler.registerCommand(command); handler.registerCommand(command);
pluginCommand.setExecutor(this); pluginCommand.setExecutor(this);
String requiredPermission = command.getRequiredPermission(); List<LiteralCommandNode<?>> nodes = getAliases(command, pluginCommand);
LiteralCommandNode<?> finalArgumentBuilder = argumentBuilder; discordSRV.scheduler().runOnMainThread(() -> {
discordSRV.scheduler().runOnMainThread(() -> commodore.register( for (LiteralCommandNode<?> node : nodes) {
pluginCommand, commodore.register(node);
finalArgumentBuilder, }
player -> requiredPermission == null || player.hasPermission(requiredPermission) });
)); }
private List<LiteralCommandNode<?>> getAliases(GameCommand command, PluginCommand pluginCommand) {
String commandName = pluginCommand.getName();
String pluginName = pluginCommand.getPlugin().getName().toLowerCase(Locale.ROOT);
List<String> allAliases = new ArrayList<>();
allAliases.add(commandName);
allAliases.addAll(pluginCommand.getAliases());
List<LiteralCommandNode<?>> nodes = new ArrayList<>();
for (String alias : allAliases) {
if (alias.equals(commandName)) {
LiteralCommandNode<?> node = BrigadierUtil.convertToBrigadier(command, senderFunction);
if (node.getRedirect() != null) {
throw new IllegalStateException("Cannot register a redirected node!");
}
nodes.add(node);
} else {
nodes.add(BrigadierUtil.convertToBrigadier(GameCommand.literal(alias).redirect(command), senderFunction));
}
// plugin:command
nodes.add(BrigadierUtil.convertToBrigadier(GameCommand.literal(pluginName + ":" + alias).redirect(command), senderFunction));
}
return nodes;
} }
} }