Readme and permission and destination

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Kamesuta
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1 +1,23 @@
-ServerTeleport
+# ServerTeleport
+
+You can send players to another server.  
+
+## Usage
+
+Basic  
+`/stp <player> <server>`  
+
+Send Kamesuta to 'pvp' server  
+`/stp Kamesuta #pvp`  
+
+Send all players in network to the server which Notch is playing  
+`/stp @a minigame`  
+
+Send all players in 'resource' server to 'survival' server  
+`/stp #resource #survival`  
+
+## Permission
+
+Commands require 'servertp' permission  
+`/lpv user Kamesuta permission set servertp true`
+(LuckPerms for velocity command)

src/main/java/net/teamfruit/serverteleport/ServerTeleport.java

@@ -11,7 +11,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 

src/main/java/net/teamfruit/serverteleport/ServerTeleportCommand.java

@@ -5,12 +5,16 @@
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import net.kyori.text.ComponentBuilders;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -22,92 +26,128 @@ public class ServerTeleportCommand implements Command {
     private final String langPrefix;
     private final String langUsage;
     private final String langNoServer;
+    private final String langNoPermission;
     private final String langPlayerNum;
     private final String langPlayerName;
     private final String langSuccess;
 
     public ServerTeleportCommand(ProxyServer server, Toml toml) {
         this.server = server;
 
+        // Config
         this.servername = toml.getString("lobby-server");
 
+        // Localization
         Toml lang = toml.getTable("lang");
         this.langPrefix = lang.getString("prefix");
         this.langUsage = lang.getString("usage");
         this.langNoServer = lang.getString("noserver");
+        this.langNoPermission = lang.getString("nopermission");
         this.langPlayerNum = lang.getString("player-num");
         this.langPlayerName = lang.getString("player-name");
         this.langSuccess = lang.getString("success");
     }
 
     @Override
-    public void execute(@NonNull CommandSource source, String[] args) {
-        Player player = (Player) source;
-        if (args.length < 1 || args[0] == null) {
+    public void execute(@NonNull CommandSource player, String[] args) {
+        // Permission Validation
+        if (!player.hasPermission("servertp")) {
             player.sendMessage(ComponentBuilders.text()
                     .content(langPrefix)
-                    .append(langUsage)
+                    .append(langNoPermission)
                     .build()
             );
             return;
         }
-        String target = args[0];
-        String server = args.length < 2 ? servername : args[1];
-
-        Collection<Player> players = Optional.ofNullable(target.startsWith("#") ? target.substring(1) : null)
-                .flatMap(this.server::getServer)
-                .map(RegisteredServer::getPlayersConnected)
-                .orElse("@a".equals(target)
-                        ? this.server.getAllPlayers()
-                        : this.server.getPlayer(target).map(Arrays::asList).orElse(Collections.emptyList())
-                );
 
-        Optional<RegisteredServer> toConnect = this.server.getServer(server);
-        if (!toConnect.isPresent()) {
+        // Argument Validation
+        if (args.length < 1 || args[0] == null) {
             player.sendMessage(ComponentBuilders.text()
-                    .append(ComponentBuilders.text()
-                            .content(langPrefix))
-                    .append(ComponentBuilders.text()
-                            .append(langNoServer))
+                    .content(langPrefix)
+                    .append(langUsage)
                     .build()
             );
-        } else {
+            return;
+        }
+        String srcArg = args[0];
+        String dstArg = args.length < 2 ? "#" + servername : args[1];
+
+        // Destination Validation
+        Optional<RegisteredServer> dstOptional = dstArg.startsWith("#")
+                ? this.server.getServer(dstArg.substring(1))
+                : this.server.getPlayer(dstArg).flatMap(Player::getCurrentServer).map(ServerConnection::getServer);
+        if (!dstOptional.isPresent()) {
             player.sendMessage(ComponentBuilders.text()
                     .append(ComponentBuilders.text()
                             .content(langPrefix))
                     .append(ComponentBuilders.text()
-                            .append(
-                                    String.format(langSuccess,
-                                            server,
-                                            players.size() == 1
-                                                    ? String.format(langPlayerName, players.stream().findFirst().get().getUsername())
-                                                    : String.format(langPlayerNum, players.size())
-                                    )
-                            ))
+                            .append(langNoServer))
                     .build()
             );
-            players.forEach(p ->
-                    p.createConnectionRequest(toConnect.get()).fireAndForget());
+            return;
         }
+        RegisteredServer dst = dstOptional.get();
+
+        // Source Validation
+        List<Player> src = (
+                srcArg.startsWith("#")
+                        ? this.server.getServer(srcArg.substring(1)).map(RegisteredServer::getPlayersConnected).orElseGet(Collections::emptyList)
+                        : "@a".equals(srcArg)
+                        ? this.server.getAllPlayers()
+                        : this.server.getPlayer(srcArg).map(Arrays::asList).orElseGet(Collections::emptyList)
+        )
+                .stream()
+                .filter(p -> !dstOptional.equals(p.getCurrentServer().map(ServerConnection::getServer)))
+                .collect(Collectors.toList());
+
+        // Send Message
+        player.sendMessage(ComponentBuilders.text()
+                .append(ComponentBuilders.text()
+                        .content(langPrefix))
+                .append(ComponentBuilders.text()
+                        .append(
+                                String.format(langSuccess,
+                                        dstArg,
+                                        src.size() == 1
+                                                ? String.format(langPlayerName, src.get(0).getUsername())
+                                                : String.format(langPlayerNum, src.size())
+                                )
+                        ))
+                .build()
+        );
+
+        // Run Redirect
+        src.forEach(p ->
+                p.createConnectionRequest(dst).fireAndForget());
     }
 
     @Override
-    public List<String> suggest(CommandSource source, @NonNull String[] args) {
+    public List<String> suggest(CommandSource player, @NonNull String[] args) {
+        // Permission Validation
+        if (!player.hasPermission("servertp"))
+            return Collections.emptyList();
+
+        // Source Suggestion
         if (args.length == 1)
-            return Arrays.asList(
+            return Stream.of(
                     Stream.of("@a"),
                     this.server.getAllServers().stream().map(RegisteredServer::getServerInfo)
                             .map(ServerInfo::getName).map(e -> "#" + e),
                     this.server.getAllPlayers().stream().map(Player::getUsername)
             )
-                    .stream()
                     .flatMap(Function.identity())
                     .collect(Collectors.toList());
+
+        // Destination Suggestion
         if (args.length == 2)
-            return this.server.getAllServers()
-                    .stream()
-                    .map(e -> e.getServerInfo().getName())
+            return Stream.of(
+                    this.server.getAllServers().stream().map(RegisteredServer::getServerInfo)
+                            .map(ServerInfo::getName).map(e -> "#" + e),
+                    this.server.getAllPlayers().stream().map(Player::getUsername)
+            )
+                    .flatMap(Function.identity())
                     .collect(Collectors.toList());
+
         return Collections.emptyList();
     }
 }

src/main/resources/config.toml

@@ -1,9 +1,10 @@
 lobby-server = "hub"
 
-[[lang]]
+[lang]
 prefix = "§d[ServerTP] "
 usage = "§a/stp <player> <server>"
 noserver = "§aNo server to teleport"
+nopermission = "§cNo permission"
 player-num = "§a%d players"
 player-name = "§a%s"
 success = "§aTeleporting %s to %s..."