Optimize imports

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java

@@ -4,10 +4,13 @@ import net.ME1312.Galaxi.Library.UniversalFile;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer;
+
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * SubAPI BungeeCord Common Class

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee;
 
 import net.ME1312.Galaxi.Library.Callback.ReturnRunnable;
+
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.config.ServerInfo;
 
@@ -11,10 +12,12 @@ import java.util.Map;
  * BungeeCord Common Layout Class
  */
 public abstract class BungeeCommon extends BungeeCord {
+    private static BungeeCommon instance;
     final ReturnRunnable<BungeeAPI> api;
 
     protected BungeeCommon(ReturnRunnable<BungeeAPI> api) throws IOException {
         this.api = api;
+        instance = this;
     }
 
     /**
@@ -30,4 +33,13 @@ public abstract class BungeeCommon extends BungeeCord {
      * @return Server Map Copy
      */
     public abstract Map<String, ServerInfo> getServersCopy();
+
+    /**
+     * Gets the ProxyServer Common Object
+     *
+     * @return ProxyServer Common
+     */
+    public static BungeeCommon getInstance() {
+        return instance;
+    }
 }

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
 import net.ME1312.Galaxi.Library.Container.Pair;
+
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Command;
 
 /**

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java

@@ -1,7 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
 import net.ME1312.Galaxi.Library.Util;
-import net.md_5.bungee.api.ProxyServer;
+import net.ME1312.SubServers.Bungee.BungeeCommon;
 
 import java.util.HashMap;
 import java.util.logging.Handler;
@@ -34,7 +34,7 @@ public class Logger {
                     @Override
                     public void publish(LogRecord record) {
                         if (open)
-                            ProxyServer.getInstance().getLogger().log(record.getLevel(), prefix + " > " + record.getMessage(), record.getParameters());
+                            BungeeCommon.getInstance().getLogger().log(record.getLevel(), prefix + " > " + record.getMessage(), record.getParameters());
                     }
 
                     @Override

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java

@@ -1,5 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
+import net.md_5.bungee.api.config.ServerInfo;
+
 import java.net.InetSocketAddress;
 import java.util.UUID;
 
@@ -18,7 +20,7 @@ public interface RemotePlayer {
     /**
      * Get the unique name of this player.
      *
-     * @return the players username
+     * @return the player's username
      */
     String getName();
 
@@ -42,4 +44,11 @@ public interface RemotePlayer {
      * @return the name of the server this player is connected to
      */
     String getServerName();
+
+    /**
+     * Gets the server this player is connected to.
+     *
+     * @return the server this player is connected to
+     */
+    ServerInfo getServer();
 }

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java

@@ -2,6 +2,7 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility.mc1_13;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Pair;
+
 import net.md_5.bungee.api.CommandSender;
 
 import java.util.LinkedList;

SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java

@@ -3,6 +3,7 @@ package net.ME1312.SubServers.Bungee.Library.Fallback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.BungeeCommon;
+
 import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.AbstractReconnectHandler;
 import net.md_5.bungee.api.ProxyServer;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Event;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java

@@ -1,9 +1,10 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java

@@ -1,11 +1,12 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.Galaxi.Library.Version.Version;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java

@@ -6,6 +6,7 @@ import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
+
 import net.md_5.bungee.api.plugin.Event;
 
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java

@@ -1,12 +1,13 @@
 package net.ME1312.SubServers.Bungee.Event;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
-import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.SubServers.Bungee.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.SubServers.Bungee.Library.SubEvent;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java

@@ -1,16 +1,13 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.DataServer;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataServer;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 
-import java.net.InetAddress;
-
 /**
  * SubData Network Connect Event
  */

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java

@@ -1,12 +1,11 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.DataServer;
 import net.ME1312.SubData.Server.Library.DisconnectReason;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataServer;
+
 import net.md_5.bungee.api.plugin.Event;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java

@@ -4,7 +4,7 @@ import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.DataServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.md_5.bungee.api.plugin.Cancellable;
+
 import net.md_5.bungee.api.plugin.Event;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Event;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java

@@ -1,9 +1,10 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java

@@ -3,10 +3,8 @@ package net.ME1312.SubServers.Bungee.Event;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.md_5.bungee.api.plugin.Cancellable;
-import net.md_5.bungee.api.plugin.Event;
 
-import java.util.UUID;
+import net.md_5.bungee.api.plugin.Event;
 
 /**
  * Server Started Event

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Cancellable;
 import net.md_5.bungee.api.plugin.Event;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Bungee.Event;
 
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.Library.SubEvent;
-import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.plugin.Event;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java

@@ -1,7 +1,7 @@
 package net.ME1312.SubServers.Bungee.Host;
 
-import net.ME1312.SubServers.Bungee.Library.Compatibility.JNA;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.JNA;
 
 import java.io.File;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee.Host.External;
 
-import com.google.common.collect.Range;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.ClientHandler;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.Protocol.PacketOut;
@@ -10,15 +11,15 @@ import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExAddServer;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExDeleteServer;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExRemoveServer;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExReset;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
+import com.google.common.collect.Range;
 import net.md_5.bungee.BungeeCord;
 
 import java.net.InetAddress;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java

@@ -1,19 +1,19 @@
 package net.ME1312.SubServers.Bungee.Host.External;
 
-import com.google.common.collect.Range;
-import net.ME1312.Galaxi.Library.*;
 import net.ME1312.Galaxi.Library.Callback.Callback;
+import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.UniversalFile;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Event.SubCreateEvent;
 import net.ME1312.SubServers.Bungee.Event.SubCreatedEvent;
 import net.ME1312.SubServers.Bungee.Host.*;
-import net.ME1312.Galaxi.Library.Config.YAMLConfig;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExConfigureHost;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExCreateServer;
@@ -21,6 +21,8 @@ import net.ME1312.SubServers.Bungee.Network.Packet.PacketExDownloadTemplates;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExUploadTemplates;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
+import com.google.common.collect.Range;
 import net.md_5.bungee.api.ChatColor;
 
 import java.io.File;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java

@@ -1,13 +1,12 @@
 package net.ME1312.SubServers.Bungee.Host.External;
 
-import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
-import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
+import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketInExLogMessage;
 import net.ME1312.SubServers.Bungee.SubAPI;
-import net.md_5.bungee.api.ProxyServer;
 
 import java.io.File;
 import java.io.FileNotFoundException;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java

@@ -3,16 +3,16 @@ package net.ME1312.SubServers.Bungee.Host.External;
 import net.ME1312.Galaxi.Library.Callback.ReturnRunnable;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.SubServers.Bungee.Event.*;
-import net.ME1312.SubServers.Bungee.Host.*;
+import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Event.*;
+import net.ME1312.SubServers.Bungee.Host.*;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExEditServer;
+
 import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.api.ChatColor;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java

@@ -1,14 +1,15 @@
 package net.ME1312.SubServers.Bungee.Host;
 
-import com.google.common.collect.Range;
+import net.ME1312.Galaxi.Library.ExtraDataHandler;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.ExtraDataHandler;
-import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
+import com.google.common.collect.Range;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.net.InetAddress;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java

@@ -1,20 +1,21 @@
 package net.ME1312.SubServers.Bungee.Host.Internal;
 
-import com.dosse.upnp.UPnP;
-import com.google.common.collect.Range;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.UniversalFile;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Event.SubAddServerEvent;
 import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
-import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
-import net.ME1312.Galaxi.Library.UniversalFile;
-import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
+import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
+import com.dosse.upnp.UPnP;
+import com.google.common.collect.Range;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.net.InetAddress;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java

@@ -1,27 +1,29 @@
 package net.ME1312.SubServers.Bungee.Host.Internal;
 
-import com.google.common.collect.Range;
-import com.google.gson.Gson;
-import net.ME1312.Galaxi.Library.*;
 import net.ME1312.Galaxi.Library.Callback.Callback;
+import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
+import net.ME1312.Galaxi.Library.UniversalFile;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Event.SubCreateEvent;
 import net.ME1312.SubServers.Bungee.Event.SubCreatedEvent;
 import net.ME1312.SubServers.Bungee.Host.*;
-import net.ME1312.Galaxi.Library.Config.YAMLConfig;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Bungee.Library.Exception.SubCreatorException;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Library.ReplacementScanner;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
+import com.google.common.collect.Range;
+import com.google.gson.Gson;
 import net.md_5.bungee.api.ChatColor;
 
 import java.io.*;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java

@@ -1,12 +1,11 @@
 package net.ME1312.SubServers.Bungee.Host.Internal;
 
-import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
-import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
+import net.ME1312.SubServers.Bungee.Host.SubLogger;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubAPI;
-import net.md_5.bungee.api.ProxyServer;
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java

@@ -2,22 +2,25 @@ package net.ME1312.SubServers.Bungee.Host.Internal;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.SubServers.Bungee.Event.*;
-import net.ME1312.SubServers.Bungee.Host.*;
+import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Value;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
-import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.UniversalFile;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubServers.Bungee.Event.*;
+import net.ME1312.SubServers.Bungee.Host.*;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
+import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.api.ChatColor;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.LinkedList;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java

@@ -1,19 +1,18 @@
 package net.ME1312.SubServers.Bungee.Host;
 
+import net.ME1312.Galaxi.Library.ExtraDataHandler;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Server.ClientHandler;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Event.SubRemoveProxyEvent;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.ExtraDataHandler;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.ClientHandler;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExSyncPlayer;
 import net.ME1312.SubServers.Bungee.SubAPI;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.util.*;
 
@@ -133,7 +132,7 @@ public class Proxy implements ClientHandler, ExtraDataHandler {
     }
 
     /**
-     * Get the players on this proxy (via RedisBungee)
+     * Get the players on this proxy
      *
      * @return Remote Player Collection
      */

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java

@@ -4,6 +4,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.SubDataSerializable;
 import net.ME1312.SubServers.Bungee.SubAPI;
+
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.net.InetSocketAddress;
@@ -58,34 +59,22 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat
         return local;
     }
 
-    /**
-     * Get the UUID of this player.
-     *
-     * @return the UUID
-     */
+    @Override
     public UUID getUniqueId() {
         if (local != null) {
             return local.getUniqueId();
         } else return id;
     }
 
-    /**
-     * Get the unique name of this player.
-     *
-     * @return the players username
-     */
+    @Override
     public String getName() {
         if (local != null) {
             return local.getName();
         } else return name;
     }
 
-    /**
-     * Gets the remote address of this connection.
-     *
-     * @return the remote address
-     */
     @SuppressWarnings("deprecation")
+    @Override
     public InetSocketAddress getAddress() {
         if (local != null) {
             return local.getAddress();
@@ -109,11 +98,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat
         return (proxy == null)? null : proxy.getName();
     }
 
-    /**
-     * Gets the server this player is connected to.
-     *
-     * @return the server this player is connected to
-     */
+    @Override
     public Server getServer() {
         if (local != null) {
             return (Server) local.getServer().getInfo();

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java

@@ -1,9 +1,9 @@
 package net.ME1312.SubServers.Bungee.Host;
 
 import net.ME1312.Galaxi.Library.ExtraDataHandler;
-import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.SubData.Server.ClientHandler;
 import net.ME1312.SubData.Server.DataClient;
+
 import net.md_5.bungee.api.config.ServerInfo;
 
 import java.util.Collection;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java

@@ -1,20 +1,19 @@
 package net.ME1312.SubServers.Bungee.Host;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.DataClient;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Event.SubEditServerEvent;
 import net.ME1312.SubServers.Bungee.Event.SubNetworkConnectEvent;
 import net.ME1312.SubServers.Bungee.Event.SubNetworkDisconnectEvent;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExRunEvent;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExUpdateWhitelist;
 import net.ME1312.SubServers.Bungee.SubAPI;
-import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -198,11 +197,6 @@ public class ServerImpl extends BungeeServerInfo implements Server {
         }
     }
 
-    @Override
-    public Collection<UUID> getWhitelist() {
-        return new ArrayList<UUID>(whitelist);
-    }
-
     /**
      * See if a player can access this server
      *
@@ -214,6 +208,11 @@ public class ServerImpl extends BungeeServerInfo implements Server {
         return (player instanceof ProxiedPlayer && whitelist.contains(((ProxiedPlayer) player).getUniqueId())) || super.canAccess(player);
     }
 
+    @Override
+    public Collection<UUID> getWhitelist() {
+        return new ArrayList<UUID>(whitelist);
+    }
+
     @Override
     public boolean isWhitelisted(UUID player) {
         return whitelist.contains(player);

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java

@@ -1,13 +1,14 @@
 package net.ME1312.SubServers.Bungee.Host;
 
-import com.google.common.collect.Range;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubServers.Bungee.Library.Exception.InvalidTemplateException;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubServers.Bungee.Library.Exception.InvalidTemplateException;
 import net.ME1312.SubServers.Bungee.SubAPI;
 
+import com.google.common.collect.Range;
+
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.util.*;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java

@@ -3,7 +3,8 @@ package net.ME1312.SubServers.Bungee.Host;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.UUID;
 
 /**
  * API-Safe SubServer Layout Class

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java

@@ -1,16 +1,18 @@
 package net.ME1312.SubServers.Bungee.Host;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.SubServers.Bungee.Event.SubEditServerEvent;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.SubServers.Bungee.SubAPI;
 
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * SubServer Layout Class

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java

@@ -1,9 +1,10 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
-import com.google.common.io.Resources;
 import net.ME1312.Galaxi.Library.UniversalFile;
 import net.ME1312.SubServers.Bungee.SubAPI;
 
+import com.google.common.io.Resources;
+
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.net.URL;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
 import net.ME1312.SubServers.Bungee.SubAPI;
+
 import net.md_5.bungee.api.config.ServerInfo;
 
 import java.util.Collection;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Plugin.java

@@ -1,6 +1,7 @@
 package net.ME1312.SubServers.Bungee.Library.Compatibility;
 
 import net.ME1312.Galaxi.Library.Util;
+
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.PluginDescription;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java

@@ -1,21 +1,15 @@
 package net.ME1312.SubServers.Bungee.Library;
 
+import net.ME1312.SubServers.Bungee.SubProxy;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import net.ME1312.SubServers.Bungee.SubProxy;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 
 import javax.net.ssl.HttpsURLConnection;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.nio.file.Path;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java

@@ -6,6 +6,7 @@ import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.ChatColor;
 
 import java.net.InetAddress;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java

@@ -6,6 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
+
 import net.md_5.bungee.api.ProxyServer;
 
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Map;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java

@@ -6,12 +6,10 @@ import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Host.RemotePlayer;
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
-import java.util.Map;
 import java.util.UUID;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Arrays;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Host;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Arrays;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadLang.java

@@ -1,9 +1,9 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.LinkedHashMap;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlatformInfo.java

@@ -1,11 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.config.ListenerInfo;
 
 import java.util.LinkedList;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java

@@ -1,14 +1,13 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Host.RemotePlayer;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Arrays;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Arrays;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Callback.Callback;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 
 import java.util.HashMap;
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.SubServers.Bungee.Host.External.ExternalSubCreator;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 /**

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java

@@ -1,13 +1,13 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 
 import java.util.HashMap;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java

@@ -3,9 +3,9 @@ package net.ME1312.SubServers.Bungee.Network.Packet;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 
 import java.util.HashMap;
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java

@@ -1,16 +1,16 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
 import net.ME1312.Galaxi.Library.UniversalFile;
-import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubData.Server.Protocol.PacketIn;
 import net.ME1312.SubData.Server.Protocol.PacketStreamOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.SubServers.Bungee.Host.External.ExternalSubCreator;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
-import java.io.*;
+import java.io.OutputStream;
 
 /**
  * External Host Template Download Packet

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExEditServer.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Arrays;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java

@@ -1,11 +1,11 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
 
 import java.util.HashMap;
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java

@@ -12,7 +12,10 @@ import net.ME1312.SubServers.Bungee.SubAPI;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * External Player Sync Packet

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExLogMessage.java

@@ -1,11 +1,10 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.External.ExternalSubLogger;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.External.ExternalSubLogger;
 
 import java.util.HashMap;
 import java.util.UUID;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExRequestQueue.java

@@ -1,9 +1,9 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketIn;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.lang.reflect.InvocationTargetException;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java

@@ -1,20 +1,20 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket;
+import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Host.External.ExternalHost;
 import net.ME1312.SubServers.Bungee.Host.Host;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.*;
 
-import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.req;
 import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.last;
+import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.req;
 
 /**
  * Link External Host Packet

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java

@@ -1,22 +1,20 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket;
-import net.ME1312.SubServers.Bungee.Event.SubAddProxyEvent;
-import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Event.SubAddProxyEvent;
+import net.ME1312.SubServers.Bungee.Host.Proxy;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
-import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.req;
 import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.last;
+import static net.ME1312.SubServers.Bungee.Network.Packet.PacketLinkServer.req;
 
 /**
  * Link Proxy Packet

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java

@@ -1,19 +1,20 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Library.DisconnectReason;
 import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket;
+import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubServers.Bungee.Event.SubStartedEvent;
 import net.ME1312.SubServers.Bungee.Host.Server;
 import net.ME1312.SubServers.Bungee.Host.ServerImpl;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubServers.Bungee.Host.SubServerImpl;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.ProxyServer;
 
 import java.net.InetSocketAddress;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReload.java

@@ -1,7 +1,6 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReset.java

@@ -1,7 +1,6 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java

@@ -1,12 +1,13 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Event.*;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubServers.Bungee.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Event.*;
+import net.ME1312.SubServers.Bungee.Library.SubEvent;
 import net.ME1312.SubServers.Bungee.SubProxy;
+
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExUpdateWhitelist.java

@@ -2,7 +2,6 @@ package net.ME1312.SubServers.Bungee.Network.Packet;
 
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Map;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Map;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java

@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.SubDataClient;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.Server;
+import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 import java.util.Map;

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java

@@ -1,7 +1,10 @@
 package net.ME1312.SubServers.Bungee;
 
-import com.google.common.collect.Range;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.UniversalFile;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.DataProtocol;
 import net.ME1312.SubData.Server.DataServer;
 import net.ME1312.SubServers.Bungee.Event.SubAddHostEvent;
@@ -10,11 +13,9 @@ import net.ME1312.SubServers.Bungee.Event.SubRemoveHostEvent;
 import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent;
 import net.ME1312.SubServers.Bungee.Host.*;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.Galaxi.Library.UniversalFile;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
+
+import com.google.common.collect.Range;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.protocol.ProtocolConstants;
 

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java

@@ -1,21 +1,22 @@
 package net.ME1312.SubServers.Bungee;
 
-import com.google.gson.Gson;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Callback.ReturnRunnable;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
-import net.ME1312.Galaxi.Library.Platform;
-import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.*;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.CommandX;
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Platform;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.ClientHandler;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubServers.Bungee.Host.*;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.CommandX;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiInfo;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission;
+
+import com.google.gson.Gson;
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
@@ -35,7 +36,8 @@ import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand.*;
+import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand.description;
+import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand.help;
 
 /**
  * Plugin Command Class

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java

@@ -1,37 +1,40 @@
 package net.ME1312.SubServers.Bungee;
 
-import com.dosse.upnp.UPnP;
-import com.google.common.collect.Range;
-import com.google.gson.Gson;
+import net.ME1312.Galaxi.Library.Config.YAMLConfig;
+import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.UniversalFile;
 import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Server.*;
+import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubData.Server.ClientHandler;
 import net.ME1312.SubData.Server.Encryption.AES;
 import net.ME1312.SubData.Server.Encryption.DHE;
 import net.ME1312.SubData.Server.Encryption.RSA;
 import net.ME1312.SubData.Server.Library.DataSize;
-import net.ME1312.SubServers.Bungee.Event.*;
+import net.ME1312.SubData.Server.SubDataClient;
+import net.ME1312.SubData.Server.SubDataServer;
+import net.ME1312.SubServers.Bungee.Event.SubRemoveProxyEvent;
+import net.ME1312.SubServers.Bungee.Event.SubStoppedEvent;
 import net.ME1312.SubServers.Bungee.Host.*;
-import net.ME1312.SubServers.Bungee.Library.*;
-import net.ME1312.Galaxi.Library.Config.YAMLConfig;
-import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiEventListener;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.LegacyServerMap;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Plugin;
-import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback;
 import net.ME1312.SubServers.Bungee.Library.ConfigUpdater;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException;
 import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Bungee.Network.Packet.PacketExSyncPlayer;
+import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback;
+import net.ME1312.SubServers.Bungee.Library.Metrics;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketExDisconnectPlayer;
+import net.ME1312.SubServers.Bungee.Network.Packet.PacketExSyncPlayer;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExReload;
 import net.ME1312.SubServers.Bungee.Network.SubProtocol;
-import net.md_5.bungee.BungeeCord;
+
+import com.dosse.upnp.UPnP;
+import com.google.common.collect.Range;
+import com.google.gson.Gson;
 import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.ChatColor;

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java

@@ -1,11 +1,12 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
 import net.ME1312.Galaxi.Library.Callback.Callback;
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.SubServers.Client.Bukkit.SubAPI;
+import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java

@@ -3,9 +3,10 @@ package net.ME1312.SubServers.Client.Bukkit.Event;
 import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
 import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.SubServers.Client.Bukkit.SubAPI;
+import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java

@@ -1,11 +1,12 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Pair;
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java

@@ -4,6 +4,7 @@ import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubData.Client.DataClient;
 import net.ME1312.SubData.Client.Library.DisconnectReason;
 import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java

@@ -2,6 +2,7 @@ package net.ME1312.SubServers.Client.Bukkit.Event;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java

@@ -1,8 +1,9 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java

@@ -1,7 +1,8 @@
 package net.ME1312.SubServers.Client.Bukkit.Event;
 
-import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
 import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
+
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java

@@ -1,19 +1,20 @@
 package net.ME1312.SubServers.Client.Bukkit.Graphic;
 
+import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Container.Value;
-import net.ME1312.Galaxi.Library.Callback.Callback;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Client.SubDataClient;
-import net.ME1312.SubServers.Client.Bukkit.Network.Packet.*;
+import net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInExRunEvent;
 import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
 import net.ME1312.SubServers.Client.Common.Network.API.Host;
 import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
 import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer;
 import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -29,7 +30,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.UUID;
 
-import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.*;
+import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permits;
 
 /**
  * Default GUI Listener

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java

@@ -2,14 +2,15 @@ package net.ME1312.SubServers.Client.Bukkit.Graphic;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
 import net.ME1312.SubServers.Client.Common.Network.API.Host;
 import net.ME1312.SubServers.Client.Common.Network.API.Server;
 import net.ME1312.SubServers.Client.Common.Network.API.SubCreator;
 import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
-import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -21,7 +22,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import java.text.DecimalFormat;
 import java.util.*;
 
-import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.*;
+import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permits;
 
 /**
  * Default GUI Renderer Class

SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java

@@ -2,13 +2,14 @@ package net.ME1312.SubServers.Client.Bukkit.Graphic;
 
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Container.Pair;
+import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
 import net.ME1312.SubServers.Client.Common.Network.API.Host;
 import net.ME1312.SubServers.Client.Common.Network.API.SubServer;
-import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;