zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🐛 Fix registration of command aliases on Bukkit when using Brigadier

Browse source
This commit is contained in:
jmp 2020-11-13 22:54:25 -08:00 • committed by Alexander Söderberg
parent fc1a613463
commit 2f0ded5be6
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Use the correct default range for Double and Float parsers in the StandardParserRegistry - Use the correct default range for Double and Float parsers in the StandardParserRegistry
- Fix Bukkit alias command suggestions without Brigadier - Fix Bukkit alias command suggestions without Brigadier
- Fix Bukkit command alias registration when using Brigadier
## [1.1.0] - 2020-10-24 ## [1.1.0] - 2020-10-24

38
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java
View file

@ -36,7 +36,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -77,52 +76,51 @@ public class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHa
return false; return false;
} }
final String label = commandArgument.getName(); final String label = commandArgument.getName();
final String namespacedLabel = this.getNamespacedLabel(label);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final List<String> aliases = new ArrayList<>(((StaticArgument<C>) commandArgument).getAlternativeAliases()); final List<String> aliases = new ArrayList<>(((StaticArgument<C>) commandArgument).getAlternativeAliases());
@SuppressWarnings("unchecked") final BukkitCommand<C> bukkitCommand = new BukkitCommand<>( @SuppressWarnings("unchecked") final BukkitCommand<C> bukkitCommand = new BukkitCommand<>(
label, label,
(this.bukkitCommandManager.getSplitAliases() ? Collections.emptyList() : aliases), aliases,
(Command<C>) command, (Command<C>) command,
(CommandArgument<C, ?>) commandArgument, (CommandArgument<C, ?>) commandArgument,
this.bukkitCommandManager this.bukkitCommandManager
); );
for (final String alias : aliases) { for (final String alias : aliases) {
this.recognizedAliases.add(getNamespacedLabel(alias)); final String namespacedAlias = this.getNamespacedLabel(alias);
this.recognizedAliases.add(namespacedAlias);
if (!this.bukkitCommands.containsKey(alias)) { if (!this.bukkitCommands.containsKey(alias)) {
this.recognizedAliases.add(alias); this.recognizedAliases.add(alias);
if (this.bukkitCommandManager.getSplitAliases()) { }
@SuppressWarnings("unchecked") final BukkitCommand<C> aliasCommand = new BukkitCommand<>(
alias, if (this.bukkitCommandManager.getSplitAliases()) {
Collections.emptyList(), if (this.bukkitCommands.containsKey(alias)) {
(Command<C>) command, this.registerExternal(namespacedAlias, command, bukkitCommand);
(CommandArgument<C, ?>) commandArgument, } else {
this.bukkitCommandManager this.registerExternal(namespacedAlias, command, bukkitCommand);
); this.registerExternal(alias, command, bukkitCommand);
this.commandMap.register(
alias,
this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(),
bukkitCommand
);
this.registerExternal(alias, command, aliasCommand);
} }
} }
} }
this.registeredCommands.put(commandArgument, bukkitCommand);
if (!this.bukkitCommands.containsKey(label)) { if (!this.bukkitCommands.containsKey(label)) {
this.recognizedAliases.add(label); this.recognizedAliases.add(label);
this.registerExternal(label, command, bukkitCommand);
} }
this.recognizedAliases.add(getNamespacedLabel(label)); this.recognizedAliases.add(this.getNamespacedLabel(label));
this.registerExternal(namespacedLabel, command, bukkitCommand);
this.commandMap.register( this.commandMap.register(
label, label,
this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(), this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(),
bukkitCommand bukkitCommand
); );
this.registerExternal(label, command, bukkitCommand);
this.registeredCommands.put(commandArgument, bukkitCommand);
return true; return true;
} }

1
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java
View file

@ -68,7 +68,6 @@ class CloudCommodoreManager<C> extends BukkitPluginRegistrationHandler<C> {
final @NonNull BukkitCommand<C> bukkitCommand final @NonNull BukkitCommand<C> bukkitCommand
) { ) {
this.registerWithCommodore(label, command); this.registerWithCommodore(label, command);
this.registerWithCommodore(String.format("%s:%s", bukkitCommand.getPlugin().getName(), label).toLowerCase(), command);
} }
protected @NonNull CloudBrigadierManager brigadierManager() { protected @NonNull CloudBrigadierManager brigadierManager() {