diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java index 23c8cc29..3e0c727c 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java +++ b/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 diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java index fe81543d..b39613e2 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java +++ b/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 api; protected BungeeCommon(ReturnRunnable 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 getServersCopy(); + + /** + * Gets the ProxyServer Common Object + * + * @return ProxyServer Common + */ + public static BungeeCommon getInstance() { + return instance; + } } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java index b06f34fe..17b9d291 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java +++ b/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; diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java index df22e270..75b42d6a 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java +++ b/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; /** diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java index 23b450ac..be737901 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Logger.java +++ b/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 diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java index 76ac5a4f..3e1a2862 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java +++ b/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(); } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java index aef759b5..97e59784 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java +++ b/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; diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java index 0d397d6b..c0c72159 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java index 30a78e56..38ea1fc5 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java index cdb1008c..6afbdd5d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java index b09e7661..6b95a7f5 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java index c7903036..987ef272 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java index 3bdb8742..e35817a0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java index 04bce10f..fab294c3 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java index 1580feb2..120e6fcd 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java +++ b/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 */ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java index 87ef0250..8e058ee9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java index ad55ec82..2d35a83e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java index f4aba2b9..62fcdaf2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java index a69f3ae7..1c727ec4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java index 82fbde20..df44392d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java index d07fcb2b..4742925a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java index 6ecf38d1..3eb4f6b8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java index 4ec87cef..6ccd652e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java index bb7f43ae..48430a51 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java index 339f7d81..de4240fa 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java index 16169c20..a93e891d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java index 02129d4b..7fb179a7 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index 499602ea..fa57ef7e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java index 8f580003..e64c5cc8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java index a7940790..f63c5521 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java index f7dc15b5..18df92b4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java index 018e40c0..2a0169e4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 6dfbb47d..b20dc9f6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/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.*; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java index 049277f2..d4475766 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java index b05ddddc..94d82ca0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java index 2b635bfe..b3f47455 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java +++ b/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 */ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java index 1ba12f5f..e6bd83e2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java +++ b/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(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java index f93ffc68..5b411bd2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java index 0efe8bbd..e63ed94b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java +++ b/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 getWhitelist() { - return new ArrayList(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 getWhitelist() { + return new ArrayList(whitelist); + } + @Override public boolean isWhitelisted(UUID player) { return whitelist.contains(player); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java index 39ab6983..83f6b0ed 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java +++ b/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.*; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java index 12140d25..cd402a5f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java index 5cb9a9b7..57b30efe 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java index 56de7cce..dc221261 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java index 3dd82921..9e8be9d2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Plugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Plugin.java index c10013e2..d0ddf445 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Plugin.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java index 4036b083..36db6b9c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java index d4c198b3..1ca75566 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java index 39fc7a2d..664b0a95 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java index b192af82..d556a407 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java index 2286f513..c5869131 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java index 35597ee7..aae165a5 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java index 29b12664..a13b1e93 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java index 1d2b5f6a..5c00ad65 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadLang.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadLang.java index ad24bf84..1694921f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadLang.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlatformInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlatformInfo.java index a93b812e..927e86f0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlatformInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java index 03833f66..2ef0dd9f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java index 87dfc469..99ea942e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java index 75674da1..ebd82619 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java index 80520f43..e89419e9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java index 4e9d2ac5..c8899208 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java +++ b/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; /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java index 8994cd25..e673b5e2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java index 3cb68fdd..1391172c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java index ec8bc55d..bd782e8c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExEditServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExEditServer.java index 2645123f..accd0444 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExEditServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java index f9a0049c..35edc3d8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java index cf343e62..cb68b0d8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExLogMessage.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExLogMessage.java index da91ec66..8d0eb152 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExLogMessage.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExRequestQueue.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExRequestQueue.java index 2dca7e5b..cb70be5b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketInExRequestQueue.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java index 04f370ef..17b310d6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java index 2ea0f906..2003941a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java index 5adc69c4..e3ddaba8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReload.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReload.java index 60d44279..8c32186b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReload.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReset.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReset.java index 195930de..04a6bcf9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExReset.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java index b256b869..19f31f59 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExUpdateWhitelist.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExUpdateWhitelist.java index e1a10a7f..03c90154 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExUpdateWhitelist.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java index de55258e..e52c8ab3 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java index d6151a09..bb6c3a7d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java index b4c0d427..6d8ce8a0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java index dc2e6939..d307ed43 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java +++ b/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; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 4374a417..348988d7 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/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 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java index 1c2a6b7e..062261e6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java index 0c2f7d96..8829508e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java index 1d0310f0..845f4465 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java index 5a2e94a4..0492caad 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java index d53cd2a4..3b4e8ca4 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java index ea553ada..4c35eab1 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java index 599f7030..70b3f03e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java index 9f709ff4..d33b8f7a 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java index 7df6afb5..5c012694 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java index 97b740ab..ffa08377 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java index 18294b32..1b19a8b1 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java index 20f3b667..ba55e4dc 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java index bd8ce276..6ea10872 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java index 16cb8ea7..a675ba1b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java index c6731f14..fd8199a4 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java index 7c17cc6c..703f55c9 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java index e3822151..8cf36e57 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java index 1ad16569..09aa2d1b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java +++ b/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 diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java index 55193f17..961d0f0b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java +++ b/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 diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java index 30c651ae..3347cc0a 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java +++ b/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; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/BungeeChat.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/BungeeChat.java index a2f05d5b..914387d2 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/BungeeChat.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/BungeeChat.java @@ -1,7 +1,11 @@ package net.ME1312.SubServers.Client.Bukkit.Library.Compatibility; -import net.ME1312.SubServers.Client.Common.Network.API.*; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; +import net.ME1312.SubServers.Client.Common.Network.API.Host; +import net.ME1312.SubServers.Client.Common.Network.API.Proxy; +import net.ME1312.SubServers.Client.Common.Network.API.Server; +import net.ME1312.SubServers.Client.Common.Network.API.SubServer; + import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.HoverEvent; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java index ea838a47..f417711e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java @@ -1,15 +1,16 @@ package net.ME1312.SubServers.Client.Bukkit.Library.Compatibility; +import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Bukkit.Event.*; +import net.ME1312.SubServers.Client.Bukkit.SubAPI; +import net.ME1312.SubServers.Client.Bukkit.SubPlugin; +import net.ME1312.SubServers.Client.Common.Network.API.*; + import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.expansion.Cacheable; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.Taskable; -import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; -import net.ME1312.SubServers.Client.Common.Network.API.*; -import net.ME1312.SubServers.Client.Bukkit.Event.*; -import net.ME1312.SubServers.Client.Bukkit.SubAPI; -import net.ME1312.SubServers.Client.Bukkit.SubPlugin; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java index a14bc425..5ba2f8db 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Client.Bukkit.Library; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; + import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java index e51f1b3b..f810e1c7 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java @@ -5,6 +5,7 @@ import net.ME1312.SubServers.Client.Common.Network.API.Host; import net.ME1312.SubServers.Client.Common.Network.API.Proxy; import net.ME1312.SubServers.Client.Common.Network.API.Server; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; + import org.bukkit.permissions.Permissible; import java.util.List; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java index 28c443bb..5e3a5083 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java @@ -7,6 +7,7 @@ import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; + import org.bukkit.Bukkit; import java.util.UUID; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java index 9785edb3..6636eaef 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java @@ -2,12 +2,12 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; + import org.bukkit.Bukkit; import java.util.Calendar; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java index 1fb069c4..50bc656d 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java @@ -1,10 +1,10 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; + import org.bukkit.Bukkit; /** diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java index e5e04bd0..23006802 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java @@ -1,9 +1,9 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; + import org.bukkit.Bukkit; /** diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java index 1219105f..50daeebb 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java @@ -1,14 +1,14 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; +import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; +import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Client.Bukkit.Event.*; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; + import org.bukkit.Bukkit; import java.util.ArrayList; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java index b4938d56..4804017f 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java @@ -6,9 +6,9 @@ import net.ME1312.SubData.Client.Protocol.Initial.InitialPacket; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Client.Bukkit.Event.SubNetworkConnectEvent; import net.ME1312.SubServers.Client.Bukkit.SubAPI; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; + import org.bukkit.Bukkit; /** diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java index 63627ae8..4a5c40c9 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java @@ -13,6 +13,7 @@ import net.ME1312.SubServers.Client.Bukkit.Network.Packet.*; import net.ME1312.SubServers.Client.Bukkit.SubAPI; import net.ME1312.SubServers.Client.Bukkit.SubPlugin; import net.ME1312.SubServers.Client.Common.Network.Packet.*; + import org.bukkit.Bukkit; import java.io.IOException; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java index f143d2c7..49280bd4 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java @@ -1,12 +1,13 @@ package net.ME1312.SubServers.Client.Bukkit; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Bukkit.Graphic.UIHandler; -import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.ClientAPI; + import org.bukkit.Bukkit; import java.util.*; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java index 75f8ba4c..c03a41ea 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java @@ -1,21 +1,24 @@ package net.ME1312.SubServers.Client.Bukkit; -import net.ME1312.Galaxi.Library.*; -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.Map.ObjectMap; -import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubServers.Client.Bukkit.Graphic.UIRenderer; +import net.ME1312.Galaxi.Library.AsyncConsolidator; import net.ME1312.Galaxi.Library.Callback.Callback; 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.Pair; +import net.ME1312.Galaxi.Library.Container.Value; +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.Client.SubDataClient; +import net.ME1312.SubServers.Client.Bukkit.Graphic.UIRenderer; +import net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInExRunEvent; import net.ME1312.SubServers.Client.Common.Network.API.*; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketRestartServer; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; -import net.ME1312.SubServers.Client.Bukkit.Network.Packet.*; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -30,7 +33,7 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.*; -import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.*; +import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permits; public final class SubCommand extends BukkitCommand { private SubPlugin plugin; @@ -200,8 +203,8 @@ public final class SubCommand extends BukkitCommand { Runnable getPlayer = () -> plugin.api.getRemotePlayer(name, player -> { if (player != null) { sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info").replace("$str$", "player") + ChatColor.WHITE + player.getName()); - if (player.getProxy() != null) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Proxy") + ChatColor.WHITE + player.getProxy()); - if (player.getServer() != null) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Server") + ChatColor.WHITE + player.getServer()); + if (player.getProxyName() != null) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Proxy") + ChatColor.WHITE + player.getProxyName()); + if (player.getServerName() != null) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Server") + ChatColor.WHITE + player.getServerName()); if (player.getAddress() != null && plugin.config.get().getMap("Settings").getBoolean("Show-Addresses", false)) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Address") + ChatColor.WHITE + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort()); sender.sendMessage(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "UUID") + ChatColor.AQUA + player.getUniqueId()); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index f0d8a90b..10df2153 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -1,24 +1,25 @@ package net.ME1312.SubServers.Client.Bukkit; +import net.ME1312.Galaxi.Library.Config.YAMLConfig; +import net.ME1312.Galaxi.Library.Config.YAMLSection; +import net.ME1312.Galaxi.Library.Container.Pair; 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.Client.DataClient; import net.ME1312.SubData.Client.Encryption.AES; import net.ME1312.SubData.Client.Encryption.DHE; import net.ME1312.SubData.Client.Encryption.RSA; import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.Library.DisconnectReason; +import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Bukkit.Graphic.DefaultUIHandler; import net.ME1312.SubServers.Client.Bukkit.Graphic.UIHandler; -import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Library.Config.YAMLSection; -import net.ME1312.SubServers.Client.Bukkit.Library.Metrics; -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.Client.SubDataClient; import net.ME1312.SubServers.Client.Bukkit.Library.ConfigUpdater; +import net.ME1312.SubServers.Client.Bukkit.Library.Metrics; import net.ME1312.SubServers.Client.Bukkit.Network.SubProtocol; + import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.entity.Player; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java index 3d811b6a..58984c55 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java @@ -7,11 +7,15 @@ import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.API.*; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketAddServer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketRemoveServer; import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static net.ME1312.SubServers.Client.Common.Network.API.SimplifiedData.*; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java index faef2656..710088e9 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java @@ -11,8 +11,8 @@ import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.ForwardedDataSender; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; import net.ME1312.SubServers.Client.Common.ClientAPI; +import net.ME1312.SubServers.Client.Common.Network.Packet.*; import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java index 6b8ef94e..a1bcc744 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java @@ -11,9 +11,9 @@ import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.ForwardedDataSender; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; +import net.ME1312.SubServers.Client.Common.ClientAPI; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadPlayerInfo; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadProxyInfo; -import net.ME1312.SubServers.Client.Common.ClientAPI; import java.lang.reflect.InvocationTargetException; import java.util.*; @@ -113,7 +113,7 @@ public class Proxy { } /** - * Get the players on this proxy (via RedisBungee) + * Get the players on this proxy * * @return Remote Player Collection */ @@ -126,7 +126,7 @@ public class Proxy { } /** - * Get the players on this proxy (via RedisBungee) + * Get the players on this proxy * * @param callback Remote Player Collection */ diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java index cc827082..bc6b897d 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java @@ -5,8 +5,8 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadPlayerInfo; import net.ME1312.SubServers.Client.Common.ClientAPI; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadPlayerInfo; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; @@ -80,7 +80,7 @@ public class RemotePlayer { /** * Get the unique name of this player. * - * @return the players username + * @return the player's username */ public String getName() { return raw.getRawString("name"); @@ -100,7 +100,7 @@ public class RemotePlayer { * * @return the proxy this player is connected to */ - public String getProxy() { + public String getProxyName() { return raw.getRawString("proxy"); } @@ -137,7 +137,7 @@ public class RemotePlayer { * * @return the server this player is connected to */ - public String getServer() { + public String getServerName() { return raw.getRawString("server"); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java index 10173f4a..bcd60db6 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java @@ -10,9 +10,9 @@ import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.ForwardedDataSender; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; +import net.ME1312.SubServers.Client.Common.ClientAPI; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadPlayerInfo; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadServerInfo; -import net.ME1312.SubServers.Client.Common.ClientAPI; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java index f1053c13..2e748799 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java @@ -6,8 +6,8 @@ import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; import net.ME1312.SubServers.Client.Common.ClientAPI; +import net.ME1312.SubServers.Client.Common.Network.Packet.*; import java.lang.reflect.InvocationTargetException; import java.util.*; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java index 4a5a1353..0da72900 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java @@ -5,9 +5,9 @@ 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.Common.ClientAPI; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; -import net.ME1312.SubServers.Client.Common.ClientAPI; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java index a4e11904..72390de1 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java @@ -4,8 +4,8 @@ import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; import net.ME1312.SubServers.Client.Common.ClientAPI; +import net.ME1312.SubServers.Client.Common.Network.Packet.*; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java index e5310b94..a0160e9f 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java @@ -1,12 +1,12 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.SubData.Client.Protocol.PacketObjectIn; -import net.ME1312.SubData.Client.Protocol.PacketObjectOut; -import net.ME1312.SubData.Client.SubDataSender; 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.Protocol.PacketObjectIn; +import net.ME1312.SubData.Client.Protocol.PacketObjectOut; +import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java index 4d3ab0d3..f2018ceb 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java @@ -3,7 +3,6 @@ package net.ME1312.SubServers.Client.Common.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.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java index 5b331bee..391e303b 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java @@ -2,7 +2,6 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java index 89b2e476..372dbd72 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java @@ -3,7 +3,6 @@ package net.ME1312.SubServers.Client.Common.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.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java index af19e15f..c0a1df9f 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Client.Sponge.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java index 155242d1..418671bc 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java index 17db03ec..17ee4288 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java index 6159eab6..3e29edb6 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Client.Sponge.Event; import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.SubServers.Client.Sponge.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.Sponge.Library.SubEvent; import net.ME1312.SubServers.Client.Sponge.SubAPI; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java index d395e088..61ac4bbf 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Client.Sponge.Event; import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.SubServers.Client.Sponge.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.Sponge.Library.SubEvent; import net.ME1312.SubServers.Client.Sponge.SubAPI; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java index 07eda246..21cab81d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Client.Sponge.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.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java index 4b338eab..f8d560ca 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java @@ -1,8 +1,9 @@ package net.ME1312.SubServers.Client.Sponge.Event; +import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; -import net.ME1312.Galaxi.Library.Util; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java index 24890c34..33d24985 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/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.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java index aa40b706..30206cee 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java index dce72264..182f5174 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java index 97b2825e..399fe85c 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java index 7ce21aaf..55c79832 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java index 2a3f0d9c..58be0a9b 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java index ae2165b3..38963118 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Client.Sponge.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java index 0cafbaea..11db4982 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java index ada244ad..af450810 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Client.Sponge.Library.SubEvent; + import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java index 1b43e85f..7f7210f4 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java @@ -2,14 +2,15 @@ package net.ME1312.SubServers.Client.Sponge.Graphic; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; -import net.ME1312.SubServers.Client.Sponge.Library.Compatibility.ChatColor; -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.Common.Network.API.Host; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; +import net.ME1312.SubServers.Client.Sponge.Library.Compatibility.ChatColor; import net.ME1312.SubServers.Client.Sponge.SubPlugin; + import org.spongepowered.api.Sponge; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.ItemTypes; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java index c8cc2816..d4c55183 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java @@ -1,9 +1,10 @@ package net.ME1312.SubServers.Client.Sponge.Library; +import net.ME1312.SubServers.Client.Sponge.SubPlugin; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.inject.Inject; -import net.ME1312.SubServers.Client.Sponge.SubPlugin; import ninja.leaping.configurate.commented.CommentedConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import org.apache.commons.lang3.Validate; @@ -13,22 +14,11 @@ import org.spongepowered.api.scheduler.Scheduler; import org.spongepowered.api.scheduler.Task; 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; -import java.util.ArrayList; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; +import java.util.*; import java.util.zip.GZIPOutputStream; /** diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java index ccc18891..e86b35ad 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java @@ -5,6 +5,7 @@ import net.ME1312.SubServers.Client.Common.Network.API.Host; import net.ME1312.SubServers.Client.Common.Network.API.Proxy; import net.ME1312.SubServers.Client.Common.Network.API.Server; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; + import org.spongepowered.api.service.permission.Subject; import java.util.List; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java index 536067f2..facb76db 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java @@ -7,6 +7,7 @@ import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; + import org.spongepowered.api.Sponge; import java.util.UUID; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java index 7b2afc57..80f69980 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java @@ -2,7 +2,6 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java index 3f65d057..6619d56a 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java @@ -6,6 +6,7 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Client.Sponge.SubPlugin; + import org.spongepowered.api.Sponge; import java.util.logging.Logger; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java index c2a7632b..ffa887b1 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java @@ -5,6 +5,7 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; + import org.spongepowered.api.Sponge; import java.util.logging.Logger; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java index acfba00f..6ae3ad76 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java @@ -3,12 +3,12 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Client.Sponge.Event.*; import net.ME1312.SubServers.Client.Sponge.SubPlugin; + import org.spongepowered.api.Sponge; import java.util.ArrayList; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java index a71a1fe1..8109011d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java @@ -13,6 +13,7 @@ import net.ME1312.SubServers.Client.Sponge.Event.SubNetworkDisconnectEvent; import net.ME1312.SubServers.Client.Sponge.Network.Packet.*; import net.ME1312.SubServers.Client.Sponge.SubAPI; import net.ME1312.SubServers.Client.Sponge.SubPlugin; + import org.slf4j.LoggerFactory; import org.spongepowered.api.Sponge; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java index 9d2982cc..bcb8b4df 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java @@ -1,12 +1,13 @@ package net.ME1312.SubServers.Client.Sponge; +import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.ClientAPI; import net.ME1312.SubServers.Client.Sponge.Graphic.UIHandler; -import net.ME1312.Galaxi.Library.Util; -import net.ME1312.Galaxi.Library.Version.Version; + import org.spongepowered.api.Platform; import org.spongepowered.api.Sponge; import org.spongepowered.api.plugin.PluginContainer; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java index 7a082179..dd4badab 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java @@ -1,23 +1,26 @@ package net.ME1312.SubServers.Client.Sponge; -import com.google.gson.Gson; import net.ME1312.Galaxi.Library.AsyncConsolidator; +import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.Platform; -import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubServers.Client.Sponge.Graphic.UIRenderer; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.SubServers.Client.Sponge.Library.Compatibility.ChatColor; -import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Container.Value; +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.SubServers.Client.Sponge.Library.Compatibility.ListArgument; +import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.API.*; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; -import net.ME1312.SubServers.Client.Sponge.Network.Packet.*; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketRestartServer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; +import net.ME1312.SubServers.Client.Sponge.Graphic.UIRenderer; +import net.ME1312.SubServers.Client.Sponge.Library.Compatibility.ChatColor; +import net.ME1312.SubServers.Client.Sponge.Library.Compatibility.ListArgument; +import net.ME1312.SubServers.Client.Sponge.Network.Packet.PacketInExRunEvent; + +import com.google.gson.Gson; import org.spongepowered.api.Sponge; import org.spongepowered.api.command.CommandException; import org.spongepowered.api.command.CommandResult; @@ -43,7 +46,7 @@ import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.TimeUnit; -import static net.ME1312.SubServers.Client.Sponge.Library.ObjectPermission.*; +import static net.ME1312.SubServers.Client.Sponge.Library.ObjectPermission.permits; public final class SubCommand implements CommandExecutor { private SubPlugin plugin; @@ -491,8 +494,8 @@ public final class SubCommand implements CommandExecutor { Runnable getPlayer = () -> plugin.api.getRemotePlayer(name, player -> { if (player != null) { sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info").replace("$str$", "player")).toBuilder().append(Text.builder(player.getName()).color(TextColors.WHITE).build()).build()); - if (player.getProxy() != null) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Proxy")).toBuilder().append(Text.builder(player.getProxy()).color(TextColors.WHITE).build()).build()); - if (player.getServer() != null) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Server")).toBuilder().append(Text.builder(player.getServer()).color(TextColors.WHITE).build()).build()); + if (player.getProxyName() != null) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Proxy")).toBuilder().append(Text.builder(player.getProxyName()).color(TextColors.WHITE).build()).build()); + if (player.getServerName() != null) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Server")).toBuilder().append(Text.builder(player.getServerName()).color(TextColors.WHITE).build()).build()); if (player.getAddress() != null && plugin.config.get().getMap("Settings").getBoolean("Show-Addresses", false)) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "Address")).toBuilder().append(Text.builder(player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort()).color(TextColors.WHITE).build()).build()); sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Info.Format").replace("$str$", "UUID")).toBuilder().append(Text.builder(player.getUniqueId().toString()).color(TextColors.AQUA).build()).build()); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java index fc9e2de8..6797236d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java @@ -1,7 +1,11 @@ package net.ME1312.SubServers.Client.Sponge; -import com.google.gson.Gson; -import com.google.inject.Inject; +import net.ME1312.Galaxi.Library.Config.YAMLConfig; +import net.ME1312.Galaxi.Library.Container.Pair; +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.Client.DataClient; import net.ME1312.SubData.Client.Encryption.AES; import net.ME1312.SubData.Client.Encryption.DHE; @@ -10,15 +14,12 @@ import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Sponge.Graphic.UIHandler; -import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.SubServers.Client.Sponge.Library.Metrics; -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.Client.Sponge.Library.ConfigUpdater; +import net.ME1312.SubServers.Client.Sponge.Library.Metrics; import net.ME1312.SubServers.Client.Sponge.Network.SubProtocol; + +import com.google.gson.Gson; +import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongepowered.api.Game; diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java index 31bea768..ab6daef6 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java @@ -4,6 +4,7 @@ import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.SubServers.Bungee.Host.Host; import net.ME1312.SubServers.Bungee.Host.SubServer; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; + import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Command; diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java index 3e83ce35..2ebdc799 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java @@ -1,15 +1,16 @@ package net.ME1312.SubServers.Console; +import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.SubServers.Bungee.Event.SubCreateEvent; import net.ME1312.SubServers.Bungee.Event.SubSendCommandEvent; import net.ME1312.SubServers.Bungee.Event.SubStartEvent; 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.Config.YAMLConfig; import net.ME1312.SubServers.Bungee.SubAPI; import net.ME1312.SubServers.Bungee.SubProxy; import net.ME1312.SubServers.Console.Library.Metrics; + import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.event.EventHandler; diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java index d0b89003..38a34f59 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java @@ -2,11 +2,11 @@ package net.ME1312.SubServers.Console; import net.ME1312.Galaxi.Library.Callback.ExceptionReturnRunnable; import net.ME1312.Galaxi.Library.Callback.ExceptionRunnable; +import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.Host.SubCreator; import net.ME1312.SubServers.Bungee.Host.SubLogFilter; import net.ME1312.SubServers.Bungee.Host.SubLogger; import net.ME1312.SubServers.Bungee.Host.SubServer; -import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Console.Library.HTMLogger; import javax.imageio.ImageIO; @@ -22,8 +22,8 @@ import java.awt.*; import java.awt.event.*; import java.io.*; import java.text.SimpleDateFormat; -import java.util.*; import java.util.List; +import java.util.*; import java.util.logging.Level; public final class ConsoleWindow implements SubLogFilter { diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java index acaf2776..0e0bc168 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Console.Library; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Value; + import org.fusesource.jansi.AnsiOutputStream; import java.io.IOException; diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/Metrics.java b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/Metrics.java index 1a8299a7..a4b51ebf 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/Metrics.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/Metrics.java @@ -1,9 +1,10 @@ package net.ME1312.SubServers.Console.Library; +import net.ME1312.SubServers.Console.ConsolePlugin; +import net.ME1312.SubServers.Console.ConsoleWindow; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import net.ME1312.SubServers.Console.ConsolePlugin; -import net.ME1312.SubServers.Console.ConsoleWindow; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java index 2cff74bd..40b96fff 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java @@ -1,10 +1,10 @@ package net.ME1312.SubServers.Host.Event; import net.ME1312.Galaxi.Library.Container.ContainedPair; +import net.ME1312.Galaxi.Library.Container.Pair; +import net.ME1312.Galaxi.Library.Event.Event; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; -import net.ME1312.Galaxi.Library.Event.Event; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import java.util.UUID; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index 4b9c97cf..1acfeb10 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -1,13 +1,12 @@ package net.ME1312.SubServers.Host; -import com.dosse.upnp.UPnP; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Event.GalaxiReloadEvent; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; -import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Log.Logger; import net.ME1312.Galaxi.Library.Container.Pair; +import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; @@ -25,9 +24,11 @@ import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Host.Executable.SubCreatorImpl; import net.ME1312.SubServers.Host.Executable.SubLoggerImpl; import net.ME1312.SubServers.Host.Executable.SubServerImpl; -import net.ME1312.SubServers.Host.Library.*; import net.ME1312.SubServers.Host.Library.ConfigUpdater; +import net.ME1312.SubServers.Host.Library.Metrics; import net.ME1312.SubServers.Host.Network.SubProtocol; + +import com.dosse.upnp.UPnP; import org.json.JSONObject; import java.io.*; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java index 78ec9fae..8e1ef453 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java @@ -4,7 +4,6 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Host.Library.Compatibility.JNA; import java.io.File; -import java.lang.reflect.Field; /** * Executable Handler Class diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java index 831c770a..79bdee58 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java @@ -7,7 +7,6 @@ import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; @@ -23,6 +22,7 @@ import net.ME1312.SubServers.Host.Library.ReplacementScanner; import net.ME1312.SubServers.Host.Network.Packet.PacketExCreateServer; import net.ME1312.SubServers.Host.Network.Packet.PacketOutExLogMessage; import net.ME1312.SubServers.Host.SubAPI; + import org.json.JSONObject; import java.io.*; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index 99033f7c..6afcd5f1 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -1,10 +1,10 @@ package net.ME1312.SubServers.Host.Executable; import net.ME1312.Galaxi.Library.Callback.Callback; +import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Log.LogStream; import net.ME1312.Galaxi.Library.Log.Logger; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.Library.DisconnectReason; @@ -15,7 +15,9 @@ import net.ME1312.SubServers.Host.Network.Packet.PacketOutExLogMessage; import net.ME1312.SubServers.Host.SubAPI; import java.io.*; -import java.util.*; +import java.util.Timer; +import java.util.TimerTask; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java index 613f41d7..dbc9d733 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java @@ -11,7 +11,10 @@ import net.ME1312.SubServers.Host.Library.Exception.InvalidServerException; import net.ME1312.SubServers.Host.Network.Packet.PacketExEditServer; import net.ME1312.SubServers.Host.SubAPI; -import java.io.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.LinkedList; import java.util.UUID; import java.util.jar.JarFile; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java index ec872991..f96b1f0b 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java @@ -2,10 +2,11 @@ package net.ME1312.SubServers.Host.Library; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Log.Logger; +import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.SubAPI; + import org.json.JSONArray; import org.json.JSONObject; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java index a1cf676d..d3d8d9a0 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java @@ -2,7 +2,6 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java index 2b5eacea..95f4e6f0 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java @@ -1,14 +1,15 @@ package net.ME1312.SubServers.Host.Network.Packet; -import com.dosse.upnp.UPnP; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Host.Executable.SubServerImpl; import net.ME1312.SubServers.Host.ExHost; +import net.ME1312.SubServers.Host.Executable.SubServerImpl; + +import com.dosse.upnp.UPnP; import java.util.UUID; import java.util.logging.Logger; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java index b988af2c..b19930e3 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Host.Network.Packet; -import com.dosse.upnp.UPnP; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Map.ObjectMap; @@ -10,10 +9,12 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Host.Executable.SubServerImpl; import net.ME1312.SubServers.Host.ExHost; +import net.ME1312.SubServers.Host.Executable.SubServerImpl; import net.ME1312.SubServers.Host.SubAPI; +import com.dosse.upnp.UPnP; + import java.io.File; import java.io.FileWriter; import java.util.Map; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExEditServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExEditServer.java index cb38825e..8dc73f01 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExEditServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExEditServer.java @@ -5,9 +5,9 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; +import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.Executable.SubLoggerImpl; import net.ME1312.SubServers.Host.Executable.SubServerImpl; -import net.ME1312.SubServers.Host.ExHost; import java.util.Arrays; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java index 381931e8..bd3efe78 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java @@ -1,17 +1,17 @@ package net.ME1312.SubServers.Host.Network.Packet; -import com.dosse.upnp.UPnP; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.Executable.SubServerImpl; import net.ME1312.SubServers.Host.SubAPI; +import com.dosse.upnp.UPnP; + import java.util.UUID; import java.util.logging.Logger; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java index 3624f398..7facacce 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java @@ -4,7 +4,6 @@ import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Host.Event.*; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketOutExLogMessage.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketOutExLogMessage.java index fb7b6c96..4bca71cf 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketOutExLogMessage.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketOutExLogMessage.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index f0d53b59..fcb8f75c 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -7,8 +7,8 @@ import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Container.Value; +import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Plugin.Command.Command; @@ -16,13 +16,13 @@ import net.ME1312.Galaxi.Plugin.Command.CommandSender; import net.ME1312.Galaxi.Plugin.Command.CompletionHandler; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.API.*; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; import net.ME1312.SubServers.Host.Library.TextColor; -import net.ME1312.SubServers.Host.Network.Packet.*; +import net.ME1312.SubServers.Host.Network.Packet.PacketInExRunEvent; import java.lang.reflect.InvocationTargetException; import java.util.*; -import java.util.List; import java.util.concurrent.TimeUnit; /** @@ -190,8 +190,8 @@ public class SubCommand { Runnable getPlayer = () -> host.api.getRemotePlayer(name, player -> { if (player != null) { sender.sendMessage("Info on player: " + TextColor.WHITE + player.getName()); - if (player.getProxy() != null) sender.sendMessage(" -> Proxy: " + TextColor.WHITE + player.getProxy()); - if (player.getServer() != null) sender.sendMessage(" -> Server: " + TextColor.WHITE + player.getServer()); + if (player.getProxyName() != null) sender.sendMessage(" -> Proxy: " + TextColor.WHITE + player.getProxyName()); + if (player.getServerName() != null) sender.sendMessage(" -> Server: " + TextColor.WHITE + player.getServerName()); if (player.getAddress() != null) sender.sendMessage(" -> Address: " + TextColor.WHITE + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort()); sender.sendMessage(" -> UUID: " + TextColor.AQUA + player.getUniqueId()); } else { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java index 1c56c2b1..e631bb55 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java index a47921ce..bf8a515c 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java index 7724559f..dbc05be7 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java index 795b8d22..96e25411 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Sync.Event; import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.SubServers.Sync.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.Sync.Library.SubEvent; import net.ME1312.SubServers.Sync.SubAPI; + import net.md_5.bungee.api.plugin.Event; import java.lang.reflect.InvocationTargetException; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java index 2456762b..a578ea97 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java @@ -3,9 +3,10 @@ package net.ME1312.SubServers.Sync.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.Sync.Library.SubEvent; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; +import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.SubServers.Sync.SubAPI; + import net.md_5.bungee.api.plugin.Event; import java.lang.reflect.InvocationTargetException; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java index 482fed72..30e153af 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Sync.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.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java index ea8956d9..7fdb4686 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java @@ -1,8 +1,9 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.SubDataClient; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java index 3184597c..8720d47f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/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.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java index c3f59f12..39ea9e91 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java index 0b4d6880..d3cf546a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java index 04b31258..ca1c6787 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java index 7008dee2..a58aeb79 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java index 44a41d32..182ead37 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java index aec5e61c..ffdb7eb5 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Sync.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java index 88dab221..b25106fb 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java index 39dd8f3d..9be1aaf2 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java @@ -1,7 +1,8 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.SubServers.Sync.Library.SubEvent; import net.ME1312.Galaxi.Library.Util; +import net.ME1312.SubServers.Sync.Library.SubEvent; + import net.md_5.bungee.api.plugin.Event; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index 69f631c7..6e3c03fe 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -1,35 +1,36 @@ package net.ME1312.SubServers.Sync; -import com.dosse.upnp.UPnP; -import com.google.gson.Gson; +import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Container.Container; +import net.ME1312.Galaxi.Library.Container.Pair; +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.Client.DataClient; import net.ME1312.SubData.Client.Encryption.AES; import net.ME1312.SubData.Client.Encryption.DHE; import net.ME1312.SubData.Client.Encryption.RSA; import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.Library.DisconnectReason; +import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Bungee.BungeeCommon; import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback; import net.ME1312.SubServers.Sync.Event.*; -import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubServers.Sync.Library.Compatibility.Plugin; -import net.ME1312.SubServers.Sync.Library.Metrics; -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.Client.SubDataClient; import net.ME1312.SubServers.Sync.Library.ConfigUpdater; -import net.ME1312.SubServers.Sync.Server.CachedPlayer; +import net.ME1312.SubServers.Sync.Library.Metrics; import net.ME1312.SubServers.Sync.Network.Packet.PacketDisconnectPlayer; import net.ME1312.SubServers.Sync.Network.Packet.PacketExSyncPlayer; import net.ME1312.SubServers.Sync.Network.SubProtocol; +import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; import net.ME1312.SubServers.Sync.Server.SubServerImpl; + +import com.dosse.upnp.UPnP; +import com.google.gson.Gson; import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.UserConnection; import net.md_5.bungee.api.ChatColor; @@ -273,7 +274,7 @@ public final class ExProxy extends BungeeCommon implements Listener { for (ProxiedPlayer player : getPlayers()) { if (!rPlayers.containsKey(player.getUniqueId())) { // Add players that don't exist CachedPlayer p = new CachedPlayer(player); - rPlayerLinkP.put(player.getUniqueId(), p.getProxy().toLowerCase()); + rPlayerLinkP.put(player.getUniqueId(), p.getProxyName().toLowerCase()); rPlayers.put(player.getUniqueId(), p); if (player.getServer().getInfo() instanceof ServerImpl) rPlayerLinkS.put(player.getUniqueId(), (ServerImpl) player.getServer().getInfo()); add.add(p); @@ -454,7 +455,7 @@ public final class ExProxy extends BungeeCommon implements Listener { if (rPlayers.containsKey(e.getConnection().getUniqueId())) { Logger.get("SubServers").warning(e.getConnection().getName() + " connected, but already had a database entry"); CachedPlayer player = rPlayers.get(e.getConnection().getUniqueId()); - if (player.getProxy() != null && player.getProxy().equalsIgnoreCase(api.getName())) { + if (player.getProxyName() != null && player.getProxyName().equalsIgnoreCase(api.getName())) { ProxiedPlayer p = getPlayer(player.getUniqueId()); if (p != null) p.disconnect(new TextComponent(getTranslation("already_connected_proxy"))); } else { @@ -515,7 +516,7 @@ public final class ExProxy extends BungeeCommon implements Listener { ObjectMap raw = CachedPlayer.translate(e.getPlayer()); raw.set("server", e.getServer().getInfo().getName()); CachedPlayer player = new CachedPlayer(raw); - rPlayerLinkP.put(player.getUniqueId(), player.getProxy().toLowerCase()); + rPlayerLinkP.put(player.getUniqueId(), player.getProxyName().toLowerCase()); rPlayers.put(player.getUniqueId(), player); if (e.getServer().getInfo() instanceof ServerImpl) rPlayerLinkS.put(player.getUniqueId(), (ServerImpl) e.getServer().getInfo()); if (api.getSubDataNetwork()[0] != null) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Plugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Plugin.java index ec5a84ee..a896e56f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Plugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Plugin.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Sync.Library.Compatibility; import net.ME1312.Galaxi.Library.Util; + import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.PluginDescription; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java index 0734cdb9..900d71ee 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java @@ -1,8 +1,9 @@ package net.ME1312.SubServers.Sync.Library; +import net.ME1312.SubServers.Sync.ExProxy; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import net.ME1312.SubServers.Sync.ExProxy; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java index f63572dc..23271a89 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java @@ -7,6 +7,7 @@ import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; + import net.md_5.bungee.api.ProxyServer; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java index 26cafa38..99ee41b1 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java @@ -2,7 +2,6 @@ package net.ME1312.SubServers.Sync.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java index d978aea4..927c8351 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java @@ -5,6 +5,7 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Sync.ExProxy; + import net.md_5.bungee.api.connection.ProxiedPlayer; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java index 3ad8a6b1..e82ea4f8 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java @@ -5,11 +5,14 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; +import net.ME1312.SubServers.Sync.ExProxy; import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; -import net.ME1312.SubServers.Sync.ExProxy; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; /** * External Player Sync Packet diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java index 1d30d526..a93ff812 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java @@ -3,11 +3,11 @@ package net.ME1312.SubServers.Sync.Network.Packet; import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Sync.ExProxy; import net.ME1312.SubServers.Sync.Event.*; +import net.ME1312.SubServers.Sync.ExProxy; + import net.md_5.bungee.api.ProxyServer; import java.util.ArrayList; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java index 5a8e2e43..28234746 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Sync.Network; import net.ME1312.Galaxi.Library.Callback.Callback; -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.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -17,13 +17,17 @@ import net.ME1312.SubServers.Sync.Network.Packet.*; import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; import net.ME1312.SubServers.Sync.SubAPI; + import net.md_5.bungee.api.config.ListenerInfo; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.conf.Configuration; import java.io.IOException; import java.net.InetAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.UUID; import java.util.logging.Logger; /** @@ -184,10 +188,10 @@ public class SubProtocol extends SubDataProtocol { plugin.api.getRemotePlayers(players -> { for (RemotePlayer player : players.values()) { - plugin.rPlayerLinkP.put(player.getUniqueId(), player.getProxy().toLowerCase()); + plugin.rPlayerLinkP.put(player.getUniqueId(), player.getProxyName().toLowerCase()); plugin.rPlayers.put(player.getUniqueId(), new CachedPlayer(player)); - ServerInfo server = plugin.getServerInfo(player.getServer()); + ServerInfo server = plugin.getServerInfo(player.getServerName()); if (server instanceof ServerImpl) plugin.rPlayerLinkS.put(player.getUniqueId(), (ServerImpl) server); } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java index ac96afd1..c5146692 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java @@ -3,6 +3,9 @@ package net.ME1312.SubServers.Sync.Server; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubServers.Client.Common.Network.API.RemotePlayer; import net.ME1312.SubServers.Sync.SubAPI; + +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; /** @@ -54,14 +57,9 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. super(raw); } - @Override - public String getProxyName() { - return getProxy(); - } - - @Override - public String getServerName() { - return getServer(); + public ServerInfo getServer() { + String name = getServerName(); + return (name == null)? null : ProxyServer.getInstance().getServerInfo(name); } } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java index 0378453c..5f2e0230 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java @@ -5,8 +5,8 @@ import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.ForwardedDataSender; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.SubServers.Sync.ExProxy; import net.ME1312.SubServers.Sync.SubAPI; + import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java index 2db93202..0e64b31a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java @@ -1,21 +1,19 @@ package net.ME1312.SubServers.Sync; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; -import net.ME1312.SubData.Client.DataClient; import net.ME1312.Galaxi.Library.Version.Version; +import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; +import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Bungee.BungeeAPI; import net.ME1312.SubServers.Client.Common.ClientAPI; -import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; + import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.protocol.ProtocolConstants; -import java.lang.reflect.InvocationTargetException; -import java.net.InetAddress; import java.util.*; /** diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index be25a125..2464c800 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -1,27 +1,30 @@ package net.ME1312.SubServers.Sync; -import com.google.gson.Gson; import net.ME1312.Galaxi.Library.AsyncConsolidator; 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.Container.Container; -import net.ME1312.Galaxi.Library.Platform; -import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubData.Client.SubDataSender; -import net.ME1312.Galaxi.Library.Map.ObjectMap; -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.Platform; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; +import net.ME1312.SubData.Client.SubDataClient; +import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Bungee.Library.Compatibility.CommandX; import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiInfo; import net.ME1312.SubServers.Client.Common.Network.API.*; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; -import net.ME1312.SubServers.Sync.Network.Packet.*; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; +import net.ME1312.SubServers.Sync.Network.Packet.PacketCheckPermission; +import net.ME1312.SubServers.Sync.Network.Packet.PacketInExRunEvent; import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; import net.ME1312.SubServers.Sync.Server.SubServerImpl; + +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; @@ -41,7 +44,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; @SuppressWarnings("deprecation") public final class SubCommand extends CommandX { @@ -225,8 +229,8 @@ public final class SubCommand extends CommandX { Runnable getPlayer = () -> plugin.api.getRemotePlayer(name, player -> { if (player != null) { sender.sendMessage("SubServers > Info on player: " + ChatColor.WHITE + player.getName()); - if (player.getProxy() != null) sender.sendMessage(" -> Proxy: " + ChatColor.WHITE + player.getProxy()); - if (player.getServer() != null) sender.sendMessage(" -> Server: " + ChatColor.WHITE + player.getServer()); + if (player.getProxyName() != null) sender.sendMessage(" -> Proxy: " + ChatColor.WHITE + player.getProxyName()); + if (player.getServerName() != null) sender.sendMessage(" -> Server: " + ChatColor.WHITE + player.getServerName()); if (player.getAddress() != null) sender.sendMessage(" -> Address: " + ChatColor.WHITE + player.getAddress().getAddress().getHostAddress() + ':' + player.getAddress().getPort()); sender.sendMessage(" -> UUID: " + ChatColor.AQUA + player.getUniqueId()); } else {