added screen command completer + updated and inlcude console command completer + update header

Author: Dytanic

cloudnet-cord/cloudnet-command/src/main/java/de/dytanic/cloudnet/command/CommandManager.java

@@ -5,12 +5,12 @@
 package de.dytanic.cloudnet.command;
 
 import de.dytanic.cloudnet.lib.NetworkUtils;
+import de.dytanic.cloudnet.lib.utility.Acceptable;
+import de.dytanic.cloudnet.lib.utility.CollectionWrapper;
 import jline.console.completer.Completer;
 import lombok.Getter;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Class that manages commands for the interfaces of CloudNet.
@@ -171,24 +171,34 @@ public int complete(String buffer, int cursor, List<CharSequence> candidates)
     {
         String[] input = buffer.split(" ");
 
-        if (input.length == 0) return cursor;
+        List<String> responses = new ArrayList<>();
 
-        Command command = getCommand(input[0]);
-        if (command instanceof TabCompletable)
+        if (buffer.isEmpty() || buffer.indexOf(' ') == -1)
+            responses.addAll(this.commands.keySet());
+        else
         {
-            List<String> tabCompletions = ((TabCompletable) command).onTab(input.length - 1, input[input.length - 1]);
+            Command command = getCommand(input[0]);
 
-            candidates.addAll(tabCompletions);
-
-            final int lastSpace = buffer.lastIndexOf(' ');
-            if (lastSpace == -1)
-            {
-                return cursor - buffer.length();
-            } else
+            if (command instanceof TabCompletable)
             {
-                return cursor - (buffer.length() - lastSpace - 1);
+                String[] args = buffer.split(" ");
+                String testString = args[args.length - 1];
+
+                responses.addAll(CollectionWrapper.filterMany(((TabCompletable) command).onTab(input.length - 1, input[input.length - 1]), new Acceptable<String>() {
+                    @Override
+                    public boolean isAccepted(String s)
+                    {
+                        return s != null && (testString.isEmpty() || s.toLowerCase().contains(testString.toLowerCase()));
+                    }
+                }));
             }
         }
-        return cursor;
+
+        Collections.sort(responses);
+
+        candidates.addAll(responses);
+        int lastSpace = buffer.lastIndexOf(' ');
+
+        return (lastSpace == -1) ? cursor - buffer.length() : cursor - (buffer.length() - lastSpace - 1);
     }
 }

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/CloudNet.java

@@ -102,15 +102,16 @@ public final class CloudNet implements Executable, Runnable, Reloadable {
 
     public CloudNet(CloudConfig config, CloudLogger cloudNetLogging, OptionSet optionSet, List<String> objective, List<String> args) throws Exception
     {
-        if (instance == null)
-            this.instance = this;
+        if (instance == null) instance = this;
 
         this.config = config;
         this.logger = cloudNetLogging;
         this.preConsoleOutput = objective;
         this.optionSet = optionSet;
         this.arguments = args;
         this.defaultModuleManager = new DefaultModuleManager();
+
+        this.logger.getReader().addCompleter(commandManager);
     }
 
     @Override

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/command/CommandScreen.java

@@ -6,14 +6,21 @@
 
 import de.dytanic.cloudnet.command.Command;
 import de.dytanic.cloudnet.command.CommandSender;
+import de.dytanic.cloudnet.command.TabCompletable;
 import de.dytanic.cloudnet.lib.NetworkUtils;
 import de.dytanic.cloudnet.lib.service.ServiceId;
+import de.dytanic.cloudnet.lib.utility.CollectionWrapper;
 import de.dytanic.cloudnetcore.CloudNet;
 import de.dytanic.cloudnetcore.network.components.MinecraftServer;
 import de.dytanic.cloudnetcore.network.components.ProxyServer;
 import de.dytanic.cloudnetcore.network.components.Wrapper;
 
-public final class CommandScreen extends Command {
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public final class CommandScreen extends Command implements TabCompletable {
 
     public CommandScreen()
     {
@@ -114,4 +121,15 @@ public void onExecuteCommand(CommandSender sender, String[] args)
                 break;
         }
     }
+
+    @Override
+    public List<String> onTab(long argsLength, String lastWord)
+    {
+        List<String> list = new ArrayList<>(CloudNet.getInstance().getServers().size() + CloudNet.getInstance().getProxys().size());
+
+        list.addAll(CloudNet.getInstance().getServers().keySet());
+        list.addAll(CloudNet.getInstance().getProxys().keySet());
+
+        return list;
+    }
 }

cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/NetworkUtils.java

@@ -272,16 +272,18 @@ public static void header()
         System.out.println("█      █      █    █ █   █ █   █ █  █  █ ████    █");
         System.out.println("█D     █Y     █T   █ █A  █ █N  █ █   █I█ █C      █");
         System.out.println("██████ ██████ ██████ █████ █████ █    ██ ████    █");
-        System.out.println();
-        System.out.println("«» The Cloud Network Environment Technology");
-        System.out.println("«» Support https://discord.gg/5NUhKuR      [" + NetworkUtils.class.getPackage().getSpecificationVersion() + "]");
-        System.out.println("«» Java " + System.getProperty("java.version") + " @" + System.getProperty("user.name") + NetworkUtils.SPACE_STRING + System.getProperty("os.name") + NetworkUtils.SPACE_STRING);
-        System.out.println(NetworkUtils.SPACE_STRING);
+        headerOut0();
     }
 
     public static void headerOut()
     {
-        System.out.println("«» The Cloud Network Environment Technology");
+        headerOut0();
+    }
+
+    private static void headerOut0()
+    {
+        System.out.println();
+        System.out.println("«» The Cloud Network Environment Technology 2");
         System.out.println("«» Support https://discord.gg/5NUhKuR      [" + NetworkUtils.class.getPackage().getSpecificationVersion() + "]");
         System.out.println("«» Java " + System.getProperty("java.version") + " @" + System.getProperty("user.name") + NetworkUtils.SPACE_STRING + System.getProperty("os.name") + NetworkUtils.SPACE_STRING);
         System.out.println(NetworkUtils.SPACE_STRING);