From 6c44ccd5978c8381d67f1a7604389d4cb5f92a80 Mon Sep 17 00:00:00 2001 From: NayXegp Date: Sun, 23 Sep 2018 03:11:26 +0200 Subject: [PATCH] #2527: Minor cosmetic cleanups to imports etc Please see https://github.com/SpigotMC/BungeeCord/pull/2527 --- api/src/main/java/net/md_5/bungee/api/ServerPing.java | 1 - .../java/net/md_5/bungee/api/event/ProxyPingEvent.java | 1 - .../main/java/net/md_5/bungee/api/chat/ClickEvent.java | 1 - .../main/java/net/md_5/bungee/api/chat/TextComponent.java | 1 - proxy/src/main/java/net/md_5/bungee/BungeeCord.java | 1 - proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java | 4 ++-- proxy/src/main/java/net/md_5/bungee/ServerConnection.java | 1 - proxy/src/main/java/net/md_5/bungee/ServerConnector.java | 1 - proxy/src/main/java/net/md_5/bungee/UserConnection.java | 8 +++----- .../java/net/md_5/bungee/connection/InitialHandler.java | 6 ++---- proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java | 4 ++-- .../net/md_5/bungee/util/ChatComponentTransformer.java | 3 +-- 12 files changed, 10 insertions(+), 22 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java index 2f707ba6..88d36ad2 100644 --- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java +++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.UUID; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; import net.md_5.bungee.Util; diff --git a/api/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java b/api/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java index 05474d88..4baa06a9 100644 --- a/api/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java +++ b/api/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java @@ -6,7 +6,6 @@ import lombok.ToString; import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.api.connection.PendingConnection; -import net.md_5.bungee.api.plugin.Event; /** * Called when the proxy is pinged with packet 0xFE from the server list. diff --git a/chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java b/chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java index 1ced284f..1fb31112 100644 --- a/chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java +++ b/chat/src/main/java/net/md_5/bungee/api/chat/ClickEvent.java @@ -3,7 +3,6 @@ package net.md_5.bungee.api.chat; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; -import net.md_5.bungee.api.chat.ClickEvent.Action; @Getter @ToString diff --git a/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java b/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java index 2411793b..e3ef9b7e 100644 --- a/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java +++ b/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java @@ -2,7 +2,6 @@ package net.md_5.bungee.api.chat; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import net.md_5.bungee.api.ChatColor; diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index 26860887..20e14557 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -1,7 +1,6 @@ package net.md_5.bungee; import com.google.common.base.Charsets; -import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java index 89c8f48f..c0703afa 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java @@ -1,6 +1,5 @@ package net.md_5.bungee; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; @@ -12,6 +11,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; +import java.util.Objects; import java.util.Queue; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -79,7 +79,7 @@ public class BungeeServerInfo implements ServerInfo @Override public boolean equals(Object obj) { - return ( obj instanceof ServerInfo ) && Objects.equal( getAddress(), ( (ServerInfo) obj ).getAddress() ); + return ( obj instanceof ServerInfo ) && Objects.equals( getAddress(), ( (ServerInfo) obj ).getAddress() ); } @Override diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java index 285e5b8f..d11d601e 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java @@ -2,7 +2,6 @@ package net.md_5.bungee; import com.google.common.base.Preconditions; import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; 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 48153ce6..721444c5 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -7,7 +7,6 @@ import java.util.Locale; import java.util.Queue; import java.util.Set; import java.util.UUID; -import java.util.logging.Level; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.md_5.bungee.api.ChatColor; 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 63742805..3d4208a8 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -1,6 +1,5 @@ package net.md_5.bungee; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import io.netty.bootstrap.Bootstrap; @@ -17,6 +16,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Queue; import java.util.UUID; import java.util.logging.Level; @@ -51,13 +51,11 @@ 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.Respawn; import net.md_5.bungee.protocol.packet.SetCompression; import net.md_5.bungee.tab.ServerUnique; import net.md_5.bungee.tab.TabList; @@ -235,7 +233,7 @@ public final class UserConnection implements ProxiedPlayer while ( !serverJoinQueue.isEmpty() ) { ServerInfo candidate = ProxyServer.getInstance().getServerInfo( serverJoinQueue.remove() ); - if ( !Objects.equal( currentTarget, candidate ) ) + if ( !Objects.equals( currentTarget, candidate ) ) { next = candidate; break; @@ -294,7 +292,7 @@ public final class UserConnection implements ProxiedPlayer final BungeeServerInfo target = (BungeeServerInfo) event.getTarget(); // Update in case the event changed target - if ( getServer() != null && Objects.equal( getServer().getInfo(), target ) ) + if ( getServer() != null && Objects.equals( getServer().getInfo(), target ) ) { if ( callback != null ) { 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 d4fadcf6..34dd743c 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 @@ -4,7 +4,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.gson.Gson; import java.math.BigInteger; -import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.URLEncoder; import java.security.MessageDigest; @@ -29,7 +28,6 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.config.ListenerInfo; import net.md_5.bungee.api.config.ServerInfo; -import net.md_5.bungee.api.connection.Connection.Unsafe; import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.LoginEvent; @@ -274,7 +272,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection this.handshake = handshake; ch.setVersion( handshake.getProtocolVersion() ); - // Starting with FML 1.8, a "\0FML\0" token is appended to the handshake. This interferes + // Starting with FML 1.8, a "\0FML\0" token is appended to the handshake. This interferes // with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now. // We know FML appends \00FML\00. However, we need to also consider that other systems might // add their own data to the end of the string. So, we just take everything from the \0 character @@ -487,7 +485,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection } - offlineId = java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getName() ).getBytes( Charsets.UTF_8 ) ); + offlineId = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getName() ).getBytes( Charsets.UTF_8 ) ); if ( uniqueId == null ) { uniqueId = offlineId; diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java index 5437699f..cefa0206 100644 --- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java @@ -2,9 +2,9 @@ package net.md_5.bungee.forge; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.regex.Matcher; @@ -36,7 +36,7 @@ public class ForgeUtils */ public static Map readModList(PluginMessage pluginMessage) { - Map modTags = Maps.newHashMap(); + Map modTags = new HashMap<>(); ByteBuf payload = Unpooled.wrappedBuffer( pluginMessage.getData() ); byte discriminator = payload.readByte(); if ( discriminator == 2 ) // ModList diff --git a/proxy/src/main/java/net/md_5/bungee/util/ChatComponentTransformer.java b/proxy/src/main/java/net/md_5/bungee/util/ChatComponentTransformer.java index 3457aaa7..ad26893e 100644 --- a/proxy/src/main/java/net/md_5/bungee/util/ChatComponentTransformer.java +++ b/proxy/src/main/java/net/md_5/bungee/util/ChatComponentTransformer.java @@ -79,9 +79,8 @@ public final class ChatComponentTransformer * Transform a ScoreComponent by replacing the name and value with the * appropriate values. * - * @param component the component to transform - * @param scoreboard the scoreboard to retrieve scores from * @param player the player to use for the component's name + * @param component the component to transform */ private void transformScoreComponent(ProxiedPlayer player, ScoreComponent component) {