Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-12-23 23:00:35 +01:00
Introduce raw String-based command API
Dieser Commit ist enthalten in:
Ursprung
42df0fd2ad
Commit
04a23e3622
59
api/src/main/java/com/velocitypowered/api/command/RawCommand.java
Normale Datei
59
api/src/main/java/com/velocitypowered/api/command/RawCommand.java
Normale Datei
@ -0,0 +1,59 @@
|
||||
package com.velocitypowered.api.command;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import java.util.List;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
* A specialized sub-interface of {@code Command} which indicates that the proxy should pass a
|
||||
* raw command to the command. This is useful for bolting on external command frameworks to
|
||||
* Velocity.
|
||||
*/
|
||||
public interface RawCommand extends Command {
|
||||
/**
|
||||
* Executes the command for the specified {@link CommandSource}.
|
||||
*
|
||||
* @param source the source of this command
|
||||
* @param commandLine the full command line after the command name
|
||||
*/
|
||||
void execute(CommandSource source, String commandLine);
|
||||
|
||||
default void execute(CommandSource source, String @NonNull [] args) {
|
||||
execute(source, String.join(" ", args));
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides tab complete suggestions for a command for a specified {@link CommandSource}.
|
||||
*
|
||||
* @param source the source to run the command for
|
||||
* @param currentLine the current, partial command line for this command
|
||||
* @return tab complete suggestions
|
||||
*/
|
||||
default List<String> suggest(CommandSource source, String currentLine) {
|
||||
return ImmutableList.of();
|
||||
}
|
||||
|
||||
@Override
|
||||
default List<String> suggest(CommandSource source, String @NonNull [] currentArgs) {
|
||||
return suggest(source, String.join(" ", currentArgs));
|
||||
}
|
||||
|
||||
default boolean hasPermission(CommandSource source, String @NonNull [] args) {
|
||||
return hasPermission(source, String.join(" ", args));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests to check if the {@code source} has permission to use this command with the provided
|
||||
* {@code args}.
|
||||
*
|
||||
* <p>If this method returns false, the handling will be forwarded onto
|
||||
* the players current server.</p>
|
||||
*
|
||||
* @param source the source of the command
|
||||
* @param commandLine the arguments for this command
|
||||
* @return whether the source has permission
|
||||
*/
|
||||
default boolean hasPermission(CommandSource source, String commandLine) {
|
||||
return true;
|
||||
}
|
||||
}
|
@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableSet;
|
||||
import com.velocitypowered.api.command.Command;
|
||||
import com.velocitypowered.api.command.CommandManager;
|
||||
import com.velocitypowered.api.command.CommandSource;
|
||||
import com.velocitypowered.api.command.RawCommand;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
@ -55,11 +56,20 @@ public class VelocityCommandManager implements CommandManager {
|
||||
@SuppressWarnings("nullness")
|
||||
String[] actualArgs = Arrays.copyOfRange(split, 1, split.length);
|
||||
try {
|
||||
if (!command.hasPermission(source, actualArgs)) {
|
||||
return false;
|
||||
if (command instanceof RawCommand) {
|
||||
RawCommand rc = (RawCommand) command;
|
||||
int firstSpace = cmdLine.indexOf(' ');
|
||||
String line = firstSpace == -1 ? "" : cmdLine.substring(firstSpace + 1);
|
||||
if (!rc.hasPermission(source, line)) {
|
||||
return false;
|
||||
}
|
||||
rc.execute(source, line);
|
||||
} else {
|
||||
if (!command.hasPermission(source, actualArgs)) {
|
||||
return false;
|
||||
}
|
||||
command.execute(source, actualArgs);
|
||||
}
|
||||
|
||||
command.execute(source, actualArgs);
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Unable to invoke command " + cmdLine + " for " + source, e);
|
||||
@ -112,11 +122,20 @@ public class VelocityCommandManager implements CommandManager {
|
||||
@SuppressWarnings("nullness")
|
||||
String[] actualArgs = Arrays.copyOfRange(split, 1, split.length);
|
||||
try {
|
||||
if (!command.hasPermission(source, actualArgs)) {
|
||||
return ImmutableList.of();
|
||||
if (command instanceof RawCommand) {
|
||||
RawCommand rc = (RawCommand) command;
|
||||
int firstSpace = cmdLine.indexOf(' ');
|
||||
String line = firstSpace == -1 ? "" : cmdLine.substring(firstSpace + 1);
|
||||
if (!rc.hasPermission(source, line)) {
|
||||
return ImmutableList.of();
|
||||
}
|
||||
return ImmutableList.copyOf(rc.suggest(source, line));
|
||||
} else {
|
||||
if (!command.hasPermission(source, actualArgs)) {
|
||||
return ImmutableList.of();
|
||||
}
|
||||
return ImmutableList.copyOf(command.suggest(source, actualArgs));
|
||||
}
|
||||
|
||||
return ImmutableList.copyOf(command.suggest(source, actualArgs));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(
|
||||
"Unable to invoke suggestions for command " + alias + " for " + source, e);
|
||||
@ -149,7 +168,14 @@ public class VelocityCommandManager implements CommandManager {
|
||||
@SuppressWarnings("nullness")
|
||||
String[] actualArgs = Arrays.copyOfRange(split, 1, split.length);
|
||||
try {
|
||||
return command.hasPermission(source, actualArgs);
|
||||
if (command instanceof RawCommand) {
|
||||
RawCommand rc = (RawCommand) command;
|
||||
int firstSpace = cmdLine.indexOf(' ');
|
||||
String line = firstSpace == -1 ? "" : cmdLine.substring(firstSpace + 1);
|
||||
return rc.hasPermission(source, line);
|
||||
} else {
|
||||
return command.hasPermission(source, actualArgs);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(
|
||||
"Unable to invoke suggestions for command " + alias + " for " + source, e);
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren