Merge pull request #48 from CloudNetService/development

Merge development into master

Author: byRoadrunner

Jenkinsfile

@@ -4,6 +4,9 @@ pipeline {
         maven 'Maven3'
         jdk 'Java8'
   }
+  options {
+    buildDiscarder logRotator(numToKeepStr: '10')
+  }
   stages {
     stage('Clean') {
       steps {
@@ -12,7 +15,7 @@ pipeline {
     }
     stage('Version') {
       steps {
-        sh 'mvn versions:set -DnewVersion=2.1.10'
+        sh 'mvn versions:set -DnewVersion=2.1.11'
       }
     }
     stage('Compile') {

README.md

@@ -11,19 +11,16 @@
 [![GitHub release](https://img.shields.io/github/release/CloudNetService/CloudNet.svg)](https://github.com/CloudNetService/CloudNet/releases)
 
 
-# CloudNet | The Cloud Network Environment Technology
+# CloudNet | The Cloud Network Environment Technology 2
 ![Image of CloudNet](https://cdn.discordapp.com/attachments/325383142464552972/354670548292206594/CloudNet.png)
 
 
-This is the CloudNet project, which has already taken a lot of time and effort for over 6 months. 
+This is the CloudNet project, which has already taken a lot of time and effort for over 1 year. 
 Here you can find the most recent commits to the project. 
-I am absolutely not satisfied by the code and find it horribly awful. 
-Therefore, soon there will be version 3.0 of CloudNet.
+I am absolutely not satisfied by the code and find it horribly awful.
 
 CloudNet is a cloud computing service for Minecraft networks. With a wide range of functionality, it offers both control over Minecraft Servers (Craftbukkit / Spigot / Glowstone) and BungeeCord Proxys.
 
-CloudNet is dynamic, which means that the software automates and "limits" many already clear functionalities based on the pre-configuration or the "CloudDynamicServices" (CDS 2.1)
-
 CloudNet manages server and helps networks to expand through new technologies to help the administration of a Minecraft Network. Another aspect of CloudNet are the unlimited development possibilities because you are able to build your own modules and extensive programming interfaces.
 CloudNet supports a wide range of needs and future opportunities, such as a Round Robin DNS management with the CloudFlare company service and the multi-proxy functionality for networks with more than 500 players, the project is important to enable high performance and stabilization for a Minecraft network.
 
@@ -33,16 +30,15 @@ For general information about CloudNet go to [spigotmc.org](https://www.spigotmc
 
  * Java 8
  * Linux/Windows server with a minimum of 2GB DDR3 Memory and 2 vCores
- * A FTP/SFTP client to manage your Linux or Windows Server
 
  **The use of Linux containers (LXC) or OpenVZ containers (OVZ) is discouraged. There are many issues with their stability.**  
 Use of KVM virtualization or dedicated servers is recommended.
 
  ### Support
 
-  * Spigot-Support » 1.7.x - 1.12.1 
+  * Spigot-Support » 1.7.10 - 1.13.1 
     * PaperSpigot, TacoSpigot, Hose, Torch
-  * BungeeCord-Support » 1.7.x - 1.12.1
+  * BungeeCord-Support » 1.7.10 - 1.13.1
     * Flexpipe, HexaCord, Waterfall, TraverTine
 
 ### Discord

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/proxied/CommandCloud.java

@@ -83,7 +83,7 @@ public void execute(CommandSender commandSender, String[] args)
                             "The information was sent to the cloud");
                     return;
                 }
-                if (args[0].equalsIgnoreCase("statistics") && commandSender.hasPermission("cloudnet.ommand.cloud.statistics"))
+                if (args[0].equalsIgnoreCase("statistics") && commandSender.hasPermission("cloudnet.command.cloud.statistics"))
                 {
                     Document document = CloudAPI.getInstance().getStatistics();
 
@@ -583,4 +583,4 @@ public Iterable<String> onTabComplete(CommandSender commandSender, String[] args
     {
         return new LinkedList<>(CloudProxy.getInstance().getCachedServers().keySet());
     }
-}
+}

cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/database/CloudFlareDatabase.java

@@ -13,7 +13,10 @@
 import de.dytanic.cloudnet.lib.utility.Return;
 import de.dytanic.cloudnet.lib.utility.document.Document;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Database to store information about the CloudFlare requests and cache.

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-cord/cloudnet-web/src/main/java/de/dytanic/cloudnet/web/client/WebClient.java

@@ -69,6 +69,7 @@ private <E> E handleRequest(String url, Type type)
         try
         {
             URLConnection urlConnection = new java.net.URL(url).openConnection();
+            urlConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
             urlConnection.setUseCaches(false);
             urlConnection.setConnectTimeout(1000);
             urlConnection.connect();
@@ -98,6 +99,7 @@ private String getString(String url, String key)
         try
         {
             URLConnection urlConnection = new java.net.URL(url).openConnection();
+            urlConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
             urlConnection.setUseCaches(false);
             urlConnection.setConnectTimeout(1000);
             urlConnection.connect();

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

@@ -157,9 +157,8 @@ private void defaultInitDoc(ConsoleReader consoleReader) throws Exception
                 break;
             }
         }
-        new Document("wrapper", Arrays.asList(new WrapperMeta("Wrapper-1", hostName, "admin")))
-                //.append("serverGroups", Arrays.asList(new LobbyGroup()))
-                .append("proxyGroups", Arrays.asList(new BungeeGroup()))
+        new Document("wrapper", Collections.singletonList(new WrapperMeta("Wrapper-1", hostName, "admin")))
+                .append("proxyGroups", Collections.singletonList(new BungeeGroup()))
                 .saveAsConfig(servicePath);
 
         new Document("group", new LobbyGroup()).saveAsConfig(Paths.get("groups/Lobby.json"));
@@ -169,10 +168,10 @@ private void defaultInitUsers(ConsoleReader consoleReader)
     {
         if (Files.exists(usersPath)) return;
 
-        String password = NetworkUtils.randomString(8);
+        String password = NetworkUtils.randomString(32);
         System.out.println("\"admin\" Password: " + password);
         System.out.println(NetworkUtils.SPACE_STRING);
-        new Document().append("users", Arrays.asList(new BasicUser("admin", password, Arrays.asList("*")))).saveAsConfig(usersPath);
+        new Document().append("users", Collections.singletonList(new BasicUser("admin", password, Arrays.asList("*")))).saveAsConfig(usersPath);
     }
 
     public CloudConfig load() throws Exception
@@ -273,20 +272,6 @@ public CloudConfig save(Collection<User> users)
 
     public void createGroup(@NonNull ServerGroup serverGroup)
     {
-        /*
-        Collection<ServerGroup> groups = this.serviceDocument.getObject("serverGroups", new TypeToken<Collection<ServerGroup>>() {
-        }.getType());
-        CollectionWrapper.checkAndRemove(groups, new Acceptable<ServerGroup>() {
-            @Override
-            public boolean isAccepted(ServerGroup value)
-            {
-                return value.getName().equals(serverGroup.getName());
-            }
-        });
-
-        groups.add(serverGroup);
-        this.serviceDocument.append("serverGroups", groups).saveAsConfig(servicePath);
-        */
 
         new Document("group", serverGroup).saveAsConfig(Paths.get("groups/" + serverGroup.getName() + ".json"));
 
@@ -310,20 +295,6 @@ public boolean isAccepted(ProxyGroup value)
 
     public void deleteGroup(ServerGroup serverGroup)
     {
-        /*
-        Collection<ServerGroup> groups = this.serviceDocument.getObject("serverGroups", new TypeToken<Collection<ServerGroup>>() {
-        }.getType());
-        CollectionWrapper.checkAndRemove(groups, new Acceptable<ServerGroup>() {
-            @Override
-            public boolean isAccepted(ServerGroup value)
-            {
-                return value.getName().equals(serverGroup.getName());
-            }
-        });
-
-        this.serviceDocument.append("serverGroups", groups).saveAsConfig(servicePath);
-        */
-
         new File("groups/" + serverGroup.getName() + ".json").delete();
     }
 
@@ -343,18 +314,6 @@ public boolean isAccepted(ProxyGroup value)
 
     public java.util.Map<String, ServerGroup> getServerGroups()
     {
-        /*
-        Collection<ServerGroup> collection = serviceDocument.getObject("serverGroups", new TypeToken<Collection<ServerGroup>>() {
-        }.getType());
-        return MapWrapper.collectionCatcherHashMap(collection, new Catcher<String, ServerGroup>() {
-            @Override
-            public String doCatch(ServerGroup key)
-            {
-                return key.getName();
-            }
-        });
-        */
-
         Map<String, ServerGroup> groups = NetworkUtils.newConcurrentHashMap();
 
         if (serviceDocument.contains("serverGroups"))
@@ -374,19 +333,24 @@ public String doCatch(ServerGroup key)
         Document entry;
 
         if (groupsDirectory.isDirectory())
-            for (File file : groupsDirectory.listFiles())
-            {
-                if (file.getName().endsWith(".json"))
-                    try
-                    {
-                        entry = Document.$loadDocument(file);
-                        ServerGroup serverGroup = entry.getObject("group", ServerGroup.TYPE);
-                        groups.put(serverGroup.getName(), serverGroup);
-                    } catch (Throwable ex)
-                    {
-                        System.out.println("Cannot load servergroup file [" + file.getName() + "]");
-                    }
-            }
+        {
+            File[] files = groupsDirectory.listFiles();
+
+            if (files != null)
+                for (File file : files)
+                {
+                    if (file.getName().endsWith(".json"))
+                        try
+                        {
+                            entry = Document.$loadDocument(file);
+                            ServerGroup serverGroup = entry.getObject("group", ServerGroup.TYPE);
+                            groups.put(serverGroup.getName(), serverGroup);
+                        } catch (Throwable ex)
+                        {
+                            System.out.println("Cannot load servergroup file [" + file.getName() + "]");
+                        }
+                }
+        }
 
         return groups;
     }
@@ -405,4 +369,4 @@ public String doCatch(ProxyGroup key)
         });
     }
 
-}
+}

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/CommandHelp.java

@@ -7,7 +7,6 @@
 import de.dytanic.cloudnet.command.Command;
 import de.dytanic.cloudnet.command.CommandSender;
 import de.dytanic.cloudnet.lib.NetworkUtils;
-import de.dytanic.cloudnet.lib.utility.CollectionWrapper;
 import de.dytanic.cloudnetcore.CloudNet;
 
 import java.lang.management.ManagementFactory;

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

@@ -6,14 +6,18 @@
 
 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.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.List;
+
+public final class CommandScreen extends Command implements TabCompletable {
 
     public CommandScreen()
     {
@@ -114,4 +118,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;
+    }
 }