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

✨ Expose the Brigadier manager from Brigadier-enabled command managers

Browse source
This commit is contained in:
jmp 2020-10-24 18:40:05 -07:00 • committed by Alexander Söderberg
parent 81e53ed454
commit d0209dc762
5 changed files with 92 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
View file

@ -25,6 +25,8 @@ package cloud.commandframework.bukkit;
import cloud.commandframework.CommandManager;
import cloud.commandframework.CommandTree;
import cloud.commandframework.brigadier.BrigadierManagerHolder;
import cloud.commandframework.brigadier.CloudBrigadierManager;
import cloud.commandframework.bukkit.arguments.selector.MultipleEntitySelector;
import cloud.commandframework.bukkit.arguments.selector.MultiplePlayerSelector;
import cloud.commandframework.bukkit.arguments.selector.SingleEntitySelector;
@ -53,6 +55,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.EnumSet;
import java.util.Set;
@ -65,7 +68,8 @@ import java.util.regex.Pattern;
*
* @param <C> Command sender type
*/
public class BukkitCommandManager<C> extends CommandManager<C> {
@SuppressWarnings("unchecked")
public class BukkitCommandManager<C> extends CommandManager<C> implements BrigadierManagerHolder<C> {
private static final int VERSION_RADIX = 10;
private static final int BRIGADIER_MINIMUM_VERSION = 13;
@ -317,6 +321,17 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
}
}
/**
* {@inheritDoc}
*/
@Override
public @Nullable CloudBrigadierManager<C, ?> brigadierManager() {
if (this.getCommandRegistrationHandler() instanceof CloudCommodoreManager) {
return ((CloudCommodoreManager<C>) this.getCommandRegistrationHandler()).brigadierManager();
}
return null;
}
/**
* Strip the plugin namespace from a plugin namespaced command. This
* will also strip the leading '/' if it's present

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

@ -71,6 +71,10 @@ class CloudCommodoreManager<C> extends BukkitPluginRegistrationHandler<C> {
this.registerWithCommodore(String.format("%s:%s", bukkitCommand.getPlugin().getName(), label).toLowerCase(), command);
}
protected @NonNull CloudBrigadierManager brigadierManager() {
return this.brigadierManager;
}
private void registerWithCommodore(
final @NonNull String label,
final @NonNull Command<?> command