Remove deprecated Velocity 1.0.0 Command API.

This commit is contained in:
Andrew Steinborn
2020-10-22 00:13:20 -04:00
parent cceeeb3490
commit 2f0ee15051
6 changed files with 25 additions and 285 deletions

View File

@@ -49,33 +49,6 @@ public interface CommandNodeFactory<T extends Command> {
}
};
CommandNodeFactory<Command> FALLBACK = (alias, command) ->
BrigadierUtils.buildRawArgumentsLiteral(alias,
context -> {
CommandSource source = context.getSource();
String[] args = BrigadierUtils.getSplitArguments(context);
if (!command.hasPermission(source, args)) {
return BrigadierCommand.FORWARD;
}
command.execute(source, args);
return 1;
},
(context, builder) -> {
String[] args = BrigadierUtils.getSplitArguments(context);
if (!command.hasPermission(context.getSource(), args)) {
return builder.buildFuture();
}
return command.suggestAsync(context.getSource(), args).thenApply(values -> {
for (String value : values) {
builder.suggest(value);
}
return builder.build();
});
});
/**
* Returns a Brigadier node for the execution of the given command.
*

View File

@@ -36,14 +36,12 @@ import com.velocitypowered.api.event.command.CommandExecuteEvent;
import com.velocitypowered.api.event.command.CommandExecuteEvent.CommandResult;
import com.velocitypowered.proxy.plugin.VelocityEventManager;
import com.velocitypowered.proxy.util.BrigadierUtils;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor;
public class VelocityCommandManager implements CommandManager {
@@ -68,20 +66,6 @@ public class VelocityCommandManager implements CommandManager {
return new VelocityCommandMeta.Builder(command.getNode().getName());
}
@Override
public void register(final Command command, final String... aliases) {
Preconditions.checkArgument(aliases.length > 0, "no aliases provided");
register(aliases[0], command, Arrays.copyOfRange(aliases, 1, aliases.length));
}
@Override
public void register(final String alias, final Command command, final String... otherAliases) {
Preconditions.checkNotNull(alias, "alias");
Preconditions.checkNotNull(command, "command");
Preconditions.checkNotNull(otherAliases, "otherAliases");
register(metaBuilder(alias).aliases(otherAliases).build(), command);
}
@Override
public void register(final BrigadierCommand command) {
Preconditions.checkNotNull(command, "command");
@@ -102,20 +86,10 @@ public class VelocityCommandManager implements CommandManager {
} else if (command instanceof SimpleCommand) {
node = CommandNodeFactory.SIMPLE.create(primaryAlias, (SimpleCommand) command);
} else if (command instanceof RawCommand) {
// This ugly hack will be removed in Velocity 2.0. Most if not all plugins
// have side-effect free #suggest methods. We rely on the newer RawCommand
// throwing UOE.
RawCommand asRaw = (RawCommand) command;
try {
asRaw.suggest(null, new String[0]);
} catch (final UnsupportedOperationException e) {
node = CommandNodeFactory.RAW.create(primaryAlias, asRaw);
} catch (final Exception ignored) {
// The implementation probably relies on a non-null source
}
}
if (node == null) {
node = CommandNodeFactory.FALLBACK.create(primaryAlias, command);
node = CommandNodeFactory.RAW.create(primaryAlias, (RawCommand) command);
} else {
throw new IllegalArgumentException("Unknown command implementation for "
+ command.getClass().getName());
}
if (!(command instanceof BrigadierCommand)) {