MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove remaining deprecated APIs

Browse Source
This commit is contained in:
Andrew Steinborn
2020-10-22 00:41:56 -04:00
parent 6816c15385
commit d6dcb115f1
7 changed files with 35 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
View File

@@ -130,13 +130,7 @@ public class VelocityCommandManager implements CommandManager {
return eventManager.fire(new CommandExecuteEvent(source, cmdLine));
}
@Override
public boolean execute(final CommandSource source, final String cmdLine) {
return executeAsync(source, cmdLine).join();
}
@Override
public boolean executeImmediately(final CommandSource source, final String cmdLine) {
private boolean executeImmediately0(final CommandSource source, final String cmdLine) {
Preconditions.checkNotNull(source, "source");
Preconditions.checkNotNull(cmdLine, "cmdLine");
@@ -160,27 +154,27 @@ public class VelocityCommandManager implements CommandManager {
}
@Override
public CompletableFuture<Boolean> executeAsync(final CommandSource source, final String cmdLine) {
public CompletableFuture<Boolean> execute(final CommandSource source, final String cmdLine) {
Preconditions.checkNotNull(source, "source");
Preconditions.checkNotNull(cmdLine, "cmdLine");
return callCommandEvent(source, cmdLine).thenApply(event -> {
return callCommandEvent(source, cmdLine).thenApplyAsync(event -> {
CommandResult commandResult = event.getResult();
if (commandResult.isForwardToServer() || !commandResult.isAllowed()) {
return false;
}
return executeImmediately(source, commandResult.getCommand().orElse(event.getCommand()));
});
return executeImmediately0(source, commandResult.getCommand().orElse(event.getCommand()));
}, eventManager.getService());
}
@Override
public CompletableFuture<Boolean> executeImmediatelyAsync(
public CompletableFuture<Boolean> executeImmediately(
final CommandSource source, final String cmdLine) {
Preconditions.checkNotNull(source, "source");
Preconditions.checkNotNull(cmdLine, "cmdLine");
return CompletableFuture.supplyAsync(
() -> executeImmediately(source, cmdLine), eventManager.getService());
() -> executeImmediately0(source, cmdLine), eventManager.getService());
}
/**

2
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -598,7 +598,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
return CompletableFuture.runAsync(() -> smc.write(Chat.createServerbound("/"
+ commandToRun)), smc.eventLoop());
} else {
return server.getCommandManager().executeImmediatelyAsync(player, commandToRun)
return server.getCommandManager().executeImmediately(player, commandToRun)
.thenAcceptAsync(hasRun -> {
if (!hasRun) {
smc.write(Chat.createServerbound("/" + commandToRun));

5
proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java
View File

@@ -27,6 +27,7 @@ import com.velocitypowered.proxy.VelocityServer;
import java.util.List;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.text.TextComponent;
import net.kyori.text.format.TextColor;
import net.minecrell.terminalconsole.SimpleTerminalConsole;
@@ -119,8 +120,8 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Cons
@Override
protected void runCommand(String command) {
try {
if (!this.server.getCommandManager().execute(this, command)) {
sendMessage(TextComponent.of("Command not found.", TextColor.RED));
if (!this.server.getCommandManager().execute(this, command).join()) {
sendMessage(Component.text("Command not found.", NamedTextColor.RED));
}
} catch (Exception e) {
logger.error("An error occurred while running this command.", e);

41
proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
View File

@@ -45,7 +45,6 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -72,8 +71,8 @@ public class CommandManagerTests {
VelocityCommandManager manager = createManager();
assertFalse(manager.hasCommand("foo"));
assertTrue(manager.getDispatcher().getRoot().getChildren().isEmpty());
assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo"));
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "bar"));
assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo").join());
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "bar").join());
assertTrue(manager.offerSuggestions(MockCommandSource.INSTANCE, "").join().isEmpty());
}
@@ -113,7 +112,7 @@ public class CommandManagerTests {
assertTrue(manager.hasCommand("foO"));
manager.unregister("fOo");
assertFalse(manager.hasCommand("foo"));
assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo"));
assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo").join());
manager.register("foo", command, "bAr", "BAZ");
assertTrue(manager.hasCommand("bar"));
@@ -170,14 +169,15 @@ public class CommandManagerTests {
node.addChild(quantityNode);
manager.register(new BrigadierCommand(node));
assertTrue(manager.executeAsync(MockCommandSource.INSTANCE, "buy ").join());
assertTrue(manager.execute(MockCommandSource.INSTANCE, "buy ").join());
assertTrue(executed.compareAndSet(true, false), "was executed");
assertTrue(manager.executeImmediatelyAsync(MockCommandSource.INSTANCE, "buy 14").join());
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "buy 14").join());
assertTrue(checkedRequires.compareAndSet(true, false));
assertTrue(executed.get());
assertTrue(manager.execute(MockCommandSource.INSTANCE, "buy 9"),
assertFalse(manager.execute(MockCommandSource.INSTANCE, "buy 9").join(),
"Invalid arg returns false");
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "buy 12 bananas"));
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "buy 12 bananas")
.join());
assertTrue(checkedRequires.get());
}
@@ -192,7 +192,7 @@ public class CommandManagerTests {
};
manager.register("foo", command);
assertTrue(manager.executeAsync(MockCommandSource.INSTANCE, "foo bar 254").join());
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo bar 254").join());
assertTrue(executed.get());
SimpleCommand noPermsCommand = new SimpleCommand() {
@@ -208,8 +208,9 @@ public class CommandManagerTests {
};
manager.register("dangerous", noPermsCommand, "veryDangerous");
assertFalse(manager.execute(MockCommandSource.INSTANCE, "dangerous"));
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "verydangerous 123"));
assertFalse(manager.execute(MockCommandSource.INSTANCE, "dangerous").join());
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "verydangerous 123")
.join());
}
@Test
@@ -226,7 +227,8 @@ public class CommandManagerTests {
};
manager.register("sendMe", command);
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "sendMe lobby 23"));
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "sendMe lobby 23")
.join());
assertTrue(executed.compareAndSet(true, false));
RawCommand noArgsCommand = new RawCommand() {
@@ -238,9 +240,9 @@ public class CommandManagerTests {
};
manager.register("noargs", noArgsCommand);
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "noargs"));
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "noargs").join());
assertTrue(executed.get());
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "noargs "));
assertTrue(manager.executeImmediately(MockCommandSource.INSTANCE, "noargs ").join());
RawCommand noPermsCommand = new RawCommand() {
@Override
@@ -255,7 +257,8 @@ public class CommandManagerTests {
};
manager.register("sendThem", noPermsCommand);
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "sendThem foo"));
assertFalse(manager.executeImmediately(MockCommandSource.INSTANCE, "sendThem foo")
.join());
}
@Test
@@ -420,16 +423,16 @@ public class CommandManagerTests {
manager.register(meta, command);
expectedArgs.set("notBarOrBaz");
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo notBarOrBaz"));
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo notBarOrBaz").join());
assertTrue(executed.compareAndSet(true, false));
expectedArgs.set("anotherArg 123");
assertTrue(manager.execute(MockCommandSource.INSTANCE, "Foo2 anotherArg 123"));
assertTrue(manager.execute(MockCommandSource.INSTANCE, "Foo2 anotherArg 123").join());
assertTrue(executed.compareAndSet(true, false));
expectedArgs.set("bar");
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo bar"));
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo bar").join());
assertTrue(executed.compareAndSet(true, false));
expectedArgs.set("bar 123");
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo2 bar 123"));
assertTrue(manager.execute(MockCommandSource.INSTANCE, "foo2 bar 123").join());
assertTrue(executed.compareAndSet(true, false));
assertEquals(ImmutableList.of("bar", "baz", "raw"),