From 5ed5c71aea0d55d46f0102d1094fcfff7282d550 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 16 Sep 2013 08:21:53 +1000 Subject: [PATCH] Move AbstractReconnectManager to the API and rename to AbstractReconnectHandler. --- .../java/net/md_5/bungee/api/AbstractReconnectHandler.java | 6 ++---- .../java/net/md_5/bungee/connection/InitialHandler.java | 6 +++--- .../net/md_5/bungee/reconnect/YamlReconnectHandler.java | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) rename proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java => api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java (87%) diff --git a/proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java similarity index 87% rename from proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java rename to api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java index 2cd0c280..2adcd573 100644 --- a/proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java +++ b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java @@ -1,13 +1,11 @@ -package net.md_5.bungee.reconnect; +package net.md_5.bungee.api; import com.google.common.base.Preconditions; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.ReconnectHandler; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.ProxiedPlayer; -public abstract class AbstractReconnectManager implements ReconnectHandler +public abstract class AbstractReconnectHandler implements ReconnectHandler { @Override diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index 9b10346a..8b18164b 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -51,7 +51,7 @@ import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse; import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest; import net.md_5.bungee.protocol.packet.PacketFEPing; import net.md_5.bungee.protocol.packet.PacketFFKick; -import net.md_5.bungee.reconnect.AbstractReconnectManager; +import net.md_5.bungee.api.AbstractReconnectHandler; @RequiredArgsConstructor public class InitialHandler extends PacketHandler implements PendingConnection @@ -133,7 +133,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection private void respondToPing() { - ServerInfo forced = AbstractReconnectManager.getForcedHost( this ); + ServerInfo forced = AbstractReconnectHandler.getForcedHost( this ); final String motd = ( forced != null ) ? forced.getMotd() : listener.getMotd(); Callback pingBack = new Callback() @@ -354,7 +354,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection server = bungee.getReconnectHandler().getServer( userCon ); } else { - server = AbstractReconnectManager.getForcedHost( this ); + server = AbstractReconnectHandler.getForcedHost( this ); } userCon.connect( server, true ); diff --git a/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java b/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java index 2c7a219b..6f036b73 100644 --- a/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java @@ -1,5 +1,6 @@ package net.md_5.bungee.reconnect; +import net.md_5.bungee.api.AbstractReconnectHandler; import java.io.File; import java.io.FileReader; import java.io.FileWriter; @@ -16,7 +17,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; -public class YamlReconnectHandler extends AbstractReconnectManager +public class YamlReconnectHandler extends AbstractReconnectHandler { private final Yaml yaml = new Yaml();