From cbb190cfd3cdf46457d71eb0d45cdcaa10b6cdf1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 26 Sep 2014 10:11:16 +1000 Subject: [PATCH] Fix a few import ordering issues. --- .../bungee/api/connection/ProxiedPlayer.java | 8 ++++-- .../java/net/md_5/bungee/ServerConnector.java | 15 +++++----- .../java/net/md_5/bungee/UserConnection.java | 28 +++++++++---------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java index f3ef5f641..dc3255bfb 100644 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java @@ -1,12 +1,12 @@ package net.md_5.bungee.api.connection; import java.util.Locale; +import java.util.UUID; import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.Title; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.config.ServerInfo; -import java.util.UUID; /** * Represents a player who's connection is being connected to somewhere else, @@ -126,6 +126,7 @@ public interface ProxiedPlayer extends Connection, CommandSender /** * Set the header and footer displayed in the tab player list. + * * @param header The header for the tab player list, null to clear it. * @param footer The footer for the tab player list, null to clear it. */ @@ -133,6 +134,7 @@ public interface ProxiedPlayer extends Connection, CommandSender /** * Set the header and footer displayed in the tab player list. + * * @param header The header for the tab player list, null to clear it. * @param footer The footer for the tab player list, null to clear it. */ @@ -144,8 +146,8 @@ public interface ProxiedPlayer extends Connection, CommandSender void resetTabHeader(); /** - * Sends a {@link Title} to this player. - * This is the same as calling {@link Title#send(ProxiedPlayer)}. + * Sends a {@link Title} to this player. This is the same as calling + * {@link Title#send(ProxiedPlayer)}. * * @param title The title to send to the player. * @see Title diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index e53b1bcaf..1e43586a2 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -1,11 +1,10 @@ package net.md_5.bungee; import com.google.common.base.Preconditions; -import java.util.Objects; -import java.util.Queue; - import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; +import java.util.Objects; +import java.util.Queue; import lombok.RequiredArgsConstructor; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ProxyServer; @@ -20,21 +19,21 @@ import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.connection.CancelSendSignal; import net.md_5.bungee.connection.DownstreamBridge; import net.md_5.bungee.connection.LoginResult; -import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.ChannelWrapper; +import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.PacketHandler; -import net.md_5.bungee.protocol.MinecraftOutput; import net.md_5.bungee.protocol.DefinedPacket; +import net.md_5.bungee.protocol.MinecraftOutput; import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.ProtocolConstants; import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.packet.Handshake; +import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.Login; +import net.md_5.bungee.protocol.packet.LoginSuccess; +import net.md_5.bungee.protocol.packet.PluginMessage; import net.md_5.bungee.protocol.packet.Respawn; import net.md_5.bungee.protocol.packet.ScoreboardObjective; -import net.md_5.bungee.protocol.packet.PluginMessage; -import net.md_5.bungee.protocol.packet.Kick; -import net.md_5.bungee.protocol.packet.LoginSuccess; import net.md_5.bungee.protocol.packet.SetCompression; @RequiredArgsConstructor diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index 14b2452a2..b3e523499 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -36,21 +36,19 @@ import net.md_5.bungee.connection.InitialHandler; import net.md_5.bungee.entitymap.EntityMap; import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.HandlerBoss; -import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.netty.PipelineUtils; import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.MinecraftDecoder; import net.md_5.bungee.protocol.MinecraftEncoder; +import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.ProtocolConstants; import net.md_5.bungee.protocol.packet.Chat; import net.md_5.bungee.protocol.packet.ClientSettings; +import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter; import net.md_5.bungee.protocol.packet.PluginMessage; -import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.SetCompression; -import net.md_5.bungee.tab.Global; -import net.md_5.bungee.tab.GlobalPing; import net.md_5.bungee.tab.ServerUnique; import net.md_5.bungee.tab.TabList; import net.md_5.bungee.util.CaseInsensitiveSet; @@ -136,17 +134,17 @@ public final class UserConnection implements ProxiedPlayer // Blame Mojang for this one /*switch ( getPendingConnection().getListener().getTabListType() ) - { - case "GLOBAL": - tabListHandler = new Global( this ); - break; - case "SERVER": - tabListHandler = new ServerUnique( this ); - break; - default: - tabListHandler = new GlobalPing( this ); - break; - }*/ + { + case "GLOBAL": + tabListHandler = new Global( this ); + break; + case "SERVER": + tabListHandler = new ServerUnique( this ); + break; + default: + tabListHandler = new GlobalPing( this ); + break; + }*/ tabListHandler = new ServerUnique( this ); Collection g = bungee.getConfigurationAdapter().getGroups( name );