Merge pull request #1 from ForestTechMC/release/1.0.2

Release/1.0.2

Author: MrApik

README.md

@@ -6,7 +6,7 @@
 ![badge](https://img.shields.io/github/last-commit/ForestTechMC/ForestCommandAPI)
 ![badge](https://img.shields.io/github/actions/workflow/status/ForestTechMC/ForestCommandAPI/release.yml)
 ![badge](https://img.shields.io/codefactor/grade/github/foresttechmc/forestcommandapi)
-![badge](https://img.shields.io/badge/platform-PaperMC-lightgrey)
+![badge](https://img.shields.io/badge/platform-PaperMC%20%7C%20Velocity-lightgrey)
 [![badge](https://img.shields.io/discord/896466173166747650?label=discord)](https://discord.gg/2PpdrfxhD4)
 [![badge](https://img.shields.io/github/license/ForestTechMC/ForestRedisAPI)](https://github.com/ForestTechMC/ForestCommandAPI/blob/master/LICENSE.txt)
 
@@ -30,7 +30,7 @@ This API works as library - it does not require to install any file to the serve
 
 First, you need to setup the dependency on the ForestCommandAPI. 
 Replace **VERSION** with the version of the release.
-Replace **PLATFORM** with the name of the supported platforms (currently "paper", in the future "velocity", "spigot" and "bungeecord" will follow).
+Replace **PLATFORM** with the name of the supported platforms (currently "paper" and "velocity", in the future "spigot" and "bungeecord" will follow).
 
 <details>
     <summary>Maven</summary>

build.gradle

@@ -7,7 +7,7 @@ compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 
 allprojects {
-    version = '1.0.1'
+    version = '1.0.2-SNAPSHOT'
     group = 'cz.foresttech'
 
     repositories {

settings.gradle

@@ -1,6 +1,5 @@
 rootProject.name = 'ForestCommandAPI'
 include 'paper'
 include 'shared'
-include 'paper'
-include 'shared'
+include 'velocity'
 

velocity/build.gradle

@@ -0,0 +1,9 @@
+repositories {
+    maven {
+        url "https://repo.papermc.io/repository/maven-public/"
+    }
+}
+
+dependencies {
+    compileOnly "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT"
+}

velocity/src/main/java/cz/foresttech/commandapi/velocity/CommandAPI.java

@@ -0,0 +1,40 @@
+package cz.foresttech.commandapi.velocity;
+
+import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+import cz.foresttech.commandapi.shared.AbstractCommandAPI;
+import cz.foresttech.commandapi.velocity.argument.PlayerArgumentProcessor;
+
+public class CommandAPI extends AbstractCommandAPI<CommandSenderWrapper> {
+
+    private static ProxyServer proxyServer;
+    private final ProxyServerProvider proxyServerProvider;
+
+    public CommandAPI(ProxyServerProvider proxyServerProvider) {
+        this.proxyServerProvider = proxyServerProvider;
+        proxyServer = proxyServerProvider.getProxyServer();
+    }
+
+    @Override
+    protected void setup() {
+        registerArgumentTypeProcessor(Player.class, new PlayerArgumentProcessor());
+    }
+
+    @Override
+    protected boolean registerToPlatform(String cmdName) {
+        CommandManager commandManager = proxyServerProvider.getProxyServer().getCommandManager();
+        CommandMeta commandMeta = commandManager.metaBuilder(cmdName)
+                .plugin(this)
+                .build();
+
+        VelocityCommandHandler velocityCommandHandler = new VelocityCommandHandler(cmdName.toLowerCase(), this);
+        commandManager.register(commandMeta, velocityCommandHandler);
+        return true;
+    }
+
+    public static ProxyServer getProxyServer() {
+        return proxyServer;
+    }
+}

velocity/src/main/java/cz/foresttech/commandapi/velocity/CommandSenderWrapper.java

@@ -0,0 +1,21 @@
+package cz.foresttech.commandapi.velocity;
+
+import com.velocitypowered.api.command.CommandSource;
+import cz.foresttech.commandapi.shared.AbstractCommandSenderWrapper;
+
+public class CommandSenderWrapper extends AbstractCommandSenderWrapper<CommandSource> {
+
+    public CommandSenderWrapper(CommandSource sender) {
+        super(sender);
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        sender.sendRichMessage(message);
+    }
+
+    @Override
+    public void sendMessageColored(String message) {
+        sender.sendRichMessage(message);
+    }
+}

velocity/src/main/java/cz/foresttech/commandapi/velocity/ProxyServerProvider.java

@@ -0,0 +1,9 @@
+package cz.foresttech.commandapi.velocity;
+
+import com.velocitypowered.api.proxy.ProxyServer;
+
+public interface ProxyServerProvider {
+
+    ProxyServer getProxyServer();
+
+}

velocity/src/main/java/cz/foresttech/commandapi/velocity/VelocityCommandHandler.java

@@ -0,0 +1,31 @@
+package cz.foresttech.commandapi.velocity;
+
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.command.SimpleCommand;
+
+import java.util.List;
+
+public class VelocityCommandHandler implements SimpleCommand {
+
+    private final String commandName;
+    private final CommandAPI commandAPI;
+
+    public VelocityCommandHandler(String commandName, CommandAPI commandAPI) {
+        this.commandName = commandName;
+        this.commandAPI = commandAPI;
+    }
+
+    @Override
+    public void execute(Invocation invocation) {
+        CommandSource commandSender = invocation.source();
+        String[] args = invocation.arguments();
+        commandAPI.onCommand(new CommandSenderWrapper(commandSender), commandName, args);
+    }
+
+    @Override
+    public List<String> suggest(Invocation invocation) {
+        CommandSource commandSender = invocation.source();
+        String[] args = invocation.arguments();
+        return commandAPI.tabComplete(new CommandSenderWrapper(commandSender), commandName, args);
+    }
+}

velocity/src/main/java/cz/foresttech/commandapi/velocity/argument/PlayerArgumentProcessor.java

@@ -0,0 +1,36 @@
+package cz.foresttech.commandapi.velocity.argument;
+
+import com.velocitypowered.api.proxy.Player;
+import cz.foresttech.commandapi.shared.AbstractCommandSenderWrapper;
+import cz.foresttech.commandapi.shared.processor.ArgumentTypeProcessor;
+import cz.foresttech.commandapi.velocity.CommandAPI;
+
+import java.util.List;
+import java.util.UUID;
+
+public class PlayerArgumentProcessor implements ArgumentTypeProcessor<Player> {
+
+    @Override
+    public <S extends AbstractCommandSenderWrapper<?>> Player get(S commandSender, String argument) {
+        Player player = CommandAPI.getProxyServer().getPlayer(argument).orElse(null);
+        if (player == null) {
+            try {
+                UUID uuid = UUID.fromString(argument);
+                player = CommandAPI.getProxyServer().getPlayer(uuid).orElse(null);
+            } catch (IllegalArgumentException ignored) {
+            }
+        }
+        return player;
+    }
+
+    @Override
+    public <S extends AbstractCommandSenderWrapper<?>> List<String> tabComplete(S commandSender, String argument) {
+        String inLowerCase = argument.toLowerCase();
+        CommandAPI.getProxyServer().getAllPlayers();
+        return CommandAPI.getProxyServer().getAllPlayers().stream()
+                .map(Player::getUsername)
+                .filter(name -> name.toLowerCase().startsWith(inLowerCase))
+                .toList();
+    }
+
+}