From 5d287306c2458ccaad40621e3d7418215b764c62 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 1 Sep 2020 03:25:15 -0400 Subject: [PATCH] Small code cleanups --- .../velocitypowered/api/event/PostOrder.java | 2 +- .../api/event/connection/DisconnectEvent.java | 1 - .../api/proxy/ProxyServer.java | 2 +- .../api/util/FastUuidSansHyphens.java | 5 ++--- .../api/util/bossbar/BossBarColor.java | 2 +- .../encryption/JavaVelocityCipher.java | 2 -- .../natives/encryption/VelocityCipher.java | 2 -- .../natives/util/NativeConstraints.java | 21 +++++++------------ .../compression/VelocityCompressorTest.java | 2 +- .../com/velocitypowered/proxy/Metrics.java | 2 -- .../proxy/config/VelocityConfiguration.java | 14 ++++++++----- .../proxy/connection/MinecraftConnection.java | 1 - .../backend/BackendPlaySessionHandler.java | 1 + .../backend/BungeeCordMessageResponder.java | 5 +---- .../backend/TransitionSessionHandler.java | 2 +- .../client/HandshakeSessionHandler.java | 2 -- .../client/LoginSessionHandler.java | 1 - .../client/StatusSessionHandler.java | 7 +++---- .../plugin/loader/java/JavaPluginLoader.java | 1 - .../proxy/protocol/ProtocolUtils.java | 4 ++-- .../protocol/netty/AutoReadHolderHandler.java | 1 - .../protocol/packet/HeaderAndFooter.java | 4 ++-- .../proxy/protocol/packet/JoinGame.java | 3 +-- .../proxy/protocol/packet/PlayerListItem.java | 2 -- .../FloatArgumentPropertySerializer.java | 2 +- .../proxy/protocol/util/ByteBufDataInput.java | 1 - .../protocol/util/PluginMessageUtil.java | 1 - .../server/VelocityRegisteredServer.java | 19 +++++++---------- .../proxy/tablist/VelocityTabList.java | 3 --- .../proxy/util/BrigadierUtils.java | 19 ----------------- .../util/PluginDependencyUtilsTest.java | 1 - 31 files changed, 42 insertions(+), 93 deletions(-) diff --git a/api/src/main/java/com/velocitypowered/api/event/PostOrder.java b/api/src/main/java/com/velocitypowered/api/event/PostOrder.java index 7c31807f4..d8923d363 100644 --- a/api/src/main/java/com/velocitypowered/api/event/PostOrder.java +++ b/api/src/main/java/com/velocitypowered/api/event/PostOrder.java @@ -5,6 +5,6 @@ package com.velocitypowered.api.event; */ public enum PostOrder { - FIRST, EARLY, NORMAL, LATE, LAST; + FIRST, EARLY, NORMAL, LATE, LAST } diff --git a/api/src/main/java/com/velocitypowered/api/event/connection/DisconnectEvent.java b/api/src/main/java/com/velocitypowered/api/event/connection/DisconnectEvent.java index a509d700c..5dded1649 100644 --- a/api/src/main/java/com/velocitypowered/api/event/connection/DisconnectEvent.java +++ b/api/src/main/java/com/velocitypowered/api/event/connection/DisconnectEvent.java @@ -2,7 +2,6 @@ package com.velocitypowered.api.event.connection; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CANCELLED_BY_PROXY; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CONFLICTING_LOGIN; -import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.PRE_SERVER_JOIN; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.SUCCESSFUL_LOGIN; import com.google.common.base.Preconditions; diff --git a/api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java b/api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java index 874ee595c..d9ed1e4c8 100644 --- a/api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java +++ b/api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java @@ -58,7 +58,7 @@ public interface ProxyServer extends Audience { * Broadcasts a message to all players currently online. * * @param component the message to send - * @deprecated Use {@link #sendMessage(Component)} instead + * @deprecated Use {@link #sendMessage(net.kyori.adventure.text.Component)} instead */ @Deprecated void broadcast(net.kyori.text.Component component); diff --git a/api/src/main/java/com/velocitypowered/api/util/FastUuidSansHyphens.java b/api/src/main/java/com/velocitypowered/api/util/FastUuidSansHyphens.java index 3747d5034..158f7e07b 100644 --- a/api/src/main/java/com/velocitypowered/api/util/FastUuidSansHyphens.java +++ b/api/src/main/java/com/velocitypowered/api/util/FastUuidSansHyphens.java @@ -24,6 +24,7 @@ package com.velocitypowered.api.util; +import java.util.Arrays; import java.util.UUID; /** @@ -41,9 +42,7 @@ class FastUuidSansHyphens { private static final long[] HEX_VALUES = new long[128]; static { - for (int i = 0; i < HEX_VALUES.length; i++) { - HEX_VALUES[i] = -1; - } + Arrays.fill(HEX_VALUES, -1); HEX_VALUES['0'] = 0x0; HEX_VALUES['1'] = 0x1; diff --git a/api/src/main/java/com/velocitypowered/api/util/bossbar/BossBarColor.java b/api/src/main/java/com/velocitypowered/api/util/bossbar/BossBarColor.java index b5b38c8bb..5cb66dfc2 100644 --- a/api/src/main/java/com/velocitypowered/api/util/bossbar/BossBarColor.java +++ b/api/src/main/java/com/velocitypowered/api/util/bossbar/BossBarColor.java @@ -13,5 +13,5 @@ public enum BossBarColor { GREEN, YELLOW, PURPLE, - WHITE; + WHITE } diff --git a/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java b/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java index 3b9d6d12c..a1a65954a 100644 --- a/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java +++ b/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java @@ -3,8 +3,6 @@ package com.velocitypowered.natives.encryption; import com.google.common.base.Preconditions; import com.velocitypowered.natives.util.BufferPreference; import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; -import io.netty.channel.ChannelHandlerContext; import java.security.GeneralSecurityException; import javax.crypto.Cipher; import javax.crypto.SecretKey; diff --git a/native/src/main/java/com/velocitypowered/natives/encryption/VelocityCipher.java b/native/src/main/java/com/velocitypowered/natives/encryption/VelocityCipher.java index 3f17a6604..d5a161a99 100644 --- a/native/src/main/java/com/velocitypowered/natives/encryption/VelocityCipher.java +++ b/native/src/main/java/com/velocitypowered/natives/encryption/VelocityCipher.java @@ -3,8 +3,6 @@ package com.velocitypowered.natives.encryption; import com.velocitypowered.natives.Disposable; import com.velocitypowered.natives.Native; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import javax.crypto.ShortBufferException; public interface VelocityCipher extends Disposable, Native { void process(ByteBuf source); diff --git a/native/src/main/java/com/velocitypowered/natives/util/NativeConstraints.java b/native/src/main/java/com/velocitypowered/natives/util/NativeConstraints.java index 5a9dcb35d..4bc6d6715 100644 --- a/native/src/main/java/com/velocitypowered/natives/util/NativeConstraints.java +++ b/native/src/main/java/com/velocitypowered/natives/util/NativeConstraints.java @@ -27,19 +27,14 @@ public class NativeConstraints { static final BooleanSupplier NATIVE_BASE = () -> NATIVES_ENABLED && CAN_GET_MEMORYADDRESS; - static final BooleanSupplier LINUX_X86_64 = () -> { - return NATIVE_BASE.getAsBoolean() - && System.getProperty("os.name", "").equalsIgnoreCase("Linux") - && IS_AMD64; - }; + static final BooleanSupplier LINUX_X86_64 = () -> NATIVE_BASE.getAsBoolean() + && System.getProperty("os.name", "").equalsIgnoreCase("Linux") + && IS_AMD64; - static final BooleanSupplier LINUX_AARCH64 = () -> { - return NATIVE_BASE.getAsBoolean() - && System.getProperty("os.name", "").equalsIgnoreCase("Linux") - && IS_AARCH64; - }; + static final BooleanSupplier LINUX_AARCH64 = () -> NATIVE_BASE.getAsBoolean() + && System.getProperty("os.name", "").equalsIgnoreCase("Linux") + && IS_AARCH64; - static final BooleanSupplier JAVA_11 = () -> { - return Double.parseDouble(System.getProperty("java.specification.version")) >= 11; - }; + static final BooleanSupplier JAVA_11 = () -> Double.parseDouble( + System.getProperty("java.specification.version")) >= 11; } diff --git a/native/src/test/java/com/velocitypowered/natives/compression/VelocityCompressorTest.java b/native/src/test/java/com/velocitypowered/natives/compression/VelocityCompressorTest.java index 735d216ba..e8ff18f8a 100644 --- a/native/src/test/java/com/velocitypowered/natives/compression/VelocityCompressorTest.java +++ b/native/src/test/java/com/velocitypowered/natives/compression/VelocityCompressorTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.condition.JRE; class VelocityCompressorTest { - private static byte[] TEST_DATA = new byte[1 << 14]; + private static final byte[] TEST_DATA = new byte[1 << 14]; @BeforeAll static void checkNatives() throws IOException { diff --git a/proxy/src/main/java/com/velocitypowered/proxy/Metrics.java b/proxy/src/main/java/com/velocitypowered/proxy/Metrics.java index 16ce8cb15..182316d7d 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/Metrics.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/Metrics.java @@ -225,8 +225,6 @@ public class Metrics { ) ) { VelocityServer.GENERAL_GSON.toJson(object, writer); - } catch (IOException e) { - throw e; } return os.toByteArray(); } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java index 0f10f905b..a3f7537f2 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java @@ -22,11 +22,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import java.util.Arrays; +import java.security.SecureRandom; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Random; import java.util.UUID; @@ -73,13 +72,15 @@ public class VelocityConfiguration implements ProxyConfig { } private VelocityConfiguration(String bind, String motd, int showMaxPlayers, boolean onlineMode, - boolean announceForge, PlayerInfoForwarding playerInfoForwardingMode, byte[] forwardingSecret, + boolean preventClientProxyConnections, boolean announceForge, + PlayerInfoForwarding playerInfoForwardingMode, byte[] forwardingSecret, boolean onlineModeKickExistingPlayers, PingPassthroughMode pingPassthrough, Servers servers, ForcedHosts forcedHosts, Advanced advanced, Query query, Metrics metrics, Messages messages) { this.bind = bind; this.motd = motd; this.showMaxPlayers = showMaxPlayers; this.onlineMode = onlineMode; + this.preventClientProxyConnections = preventClientProxyConnections; this.announceForge = announceForge; this.playerInfoForwardingMode = playerInfoForwardingMode; this.forwardingSecret = forwardingSecret; @@ -460,6 +461,8 @@ public class VelocityConfiguration implements ProxyConfig { int maxPlayers = config.getIntOrElse("show-max-players", 500); Boolean onlineMode = config.getOrElse("online-mode", true); Boolean announceForge = config.getOrElse("announce-forge", true); + Boolean preventClientProxyConnections = config.getOrElse("prevent-client-proxy-connections", + true); Boolean kickExisting = config.getOrElse("kick-existing-players", false); return new VelocityConfiguration( @@ -468,6 +471,7 @@ public class VelocityConfiguration implements ProxyConfig { maxPlayers, onlineMode, announceForge, + preventClientProxyConnections, forwardingMode, forwardingSecret, kickExisting, @@ -484,7 +488,7 @@ public class VelocityConfiguration implements ProxyConfig { private static String generateRandomString(int length) { String chars = "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz1234567890"; StringBuilder builder = new StringBuilder(); - Random rnd = new Random(); + Random rnd = new SecureRandom(); for (int i = 0; i < length; i++) { builder.append(chars.charAt(rnd.nextInt(chars.length()))); } @@ -502,7 +506,7 @@ public class VelocityConfiguration implements ProxyConfig { "factions", "127.0.0.1:30067", "minigames", "127.0.0.1:30068" ); - private List attemptConnectionOrder = Arrays.asList("lobby"); + private List attemptConnectionOrder = ImmutableList.of("lobby"); private Servers() { } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java index 2361d6cb9..b2381f51f 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java @@ -27,7 +27,6 @@ import com.velocitypowered.proxy.protocol.netty.MinecraftCompressDecoder; import com.velocitypowered.proxy.protocol.netty.MinecraftCompressEncoder; import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder; import com.velocitypowered.proxy.protocol.netty.MinecraftEncoder; -import com.velocitypowered.proxy.protocol.packet.Handshake; import com.velocitypowered.proxy.util.except.QuietDecoderException; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java index eeeac5d96..bbba322d9 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java @@ -173,6 +173,7 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler { RootCommandNode dispatcherRootNode = (RootCommandNode) filterNode(server.getCommandManager().getDispatcher().getRoot()); + assert dispatcherRootNode != null : "Filtering root node returned null."; Collection> proxyNodes = dispatcherRootNode.getChildren(); for (CommandNode node : proxyNodes) { CommandNode existingServerChild = rootNode.getChild(node.getName()); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java index 071525007..9cfc0f371 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java @@ -19,7 +19,6 @@ import io.netty.buffer.Unpooled; import java.util.Optional; import java.util.StringJoiner; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.serializer.ComponentSerializer; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; @@ -158,9 +157,7 @@ class BungeeCordMessageResponder { if (target.equals("ALL")) { proxy.sendMessage(messageComponent); } else { - proxy.getPlayer(target).ifPresent(player -> { - player.sendMessage(messageComponent); - }); + proxy.getPlayer(target).ifPresent(player -> player.sendMessage(messageComponent)); } } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java index 9eb90094c..245f0c4f2 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java @@ -91,7 +91,7 @@ public class TransitionSessionHandler implements MinecraftSessionHandler { return; } - // Strap on the ClientPlaySessionHandler if required. + // Change the client to use the ClientPlaySessionHandler if required. ClientPlaySessionHandler playHandler; if (serverConn.getPlayer().getConnection().getSessionHandler() instanceof ClientPlaySessionHandler) { diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java index 87ea57a8c..83a25d4e8 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java @@ -14,7 +14,6 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler; import com.velocitypowered.proxy.connection.forge.legacy.LegacyForgeConstants; import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.StateRegistry; -import com.velocitypowered.proxy.protocol.packet.Disconnect; import com.velocitypowered.proxy.protocol.packet.Handshake; import com.velocitypowered.proxy.protocol.packet.LegacyDisconnect; import com.velocitypowered.proxy.protocol.packet.LegacyHandshake; @@ -23,7 +22,6 @@ import io.netty.buffer.ByteBuf; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.Optional; -import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java index ac3e9eec7..826baec66 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java @@ -42,7 +42,6 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; import net.kyori.adventure.text.Component; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java index ba9baaa2b..cffc71377 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java @@ -161,10 +161,9 @@ public class StatusSessionHandler implements MinecraftSessionHandler { this.pingReceived = true; getInitialPing() .thenCompose(ping -> server.getEventManager().fire(new ProxyPingEvent(inbound, ping))) - .thenAcceptAsync(event -> { - connection.closeWith(LegacyDisconnect.fromServerPing(event.getPing(), - packet.getVersion())); - }, connection.eventLoop()); + .thenAcceptAsync(event -> connection.closeWith( + LegacyDisconnect.fromServerPing(event.getPing(), packet.getVersion())), + connection.eventLoop()); return true; } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java b/proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java index f7de9970e..b1ac74d96 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java @@ -17,7 +17,6 @@ import com.velocitypowered.proxy.plugin.loader.VelocityPluginDescription; import java.io.BufferedInputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java index bc69fcd39..2fa1e759a 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java @@ -276,8 +276,8 @@ public enum ProtocolUtils { return; } writeVarInt(buf, stringArray.length); - for (int i = 0; i < stringArray.length; i++) { - writeString(buf, stringArray[i]); + for (String s : stringArray) { + writeString(buf, s); } } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/AutoReadHolderHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/AutoReadHolderHandler.java index 15700673e..037bf47f9 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/AutoReadHolderHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/AutoReadHolderHandler.java @@ -2,7 +2,6 @@ package com.velocitypowered.proxy.protocol.netty; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandler; import io.netty.util.ReferenceCountUtil; import java.util.ArrayDeque; import java.util.Queue; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/HeaderAndFooter.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/HeaderAndFooter.java index 863cddb50..93ceaed62 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/HeaderAndFooter.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/HeaderAndFooter.java @@ -15,8 +15,8 @@ public class HeaderAndFooter implements MinecraftPacket { private static final String EMPTY_COMPONENT = "{\"translate\":\"\"}"; private static final HeaderAndFooter RESET = new HeaderAndFooter(); - private String header; - private String footer; + private final String header; + private final String footer; public HeaderAndFooter() { this(EMPTY_COMPONENT, EMPTY_COMPONENT); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java index 1b8f3c175..76c384584 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java @@ -246,8 +246,7 @@ public class JoinGame implements MinecraftPacket { } if (version.compareTo(ProtocolVersion.MINECRAFT_1_16) >= 0) { buf.writeByte(previousGamemode); - ProtocolUtils.writeStringArray(buf, dimensionRegistry.getLevelNames().toArray( - new String[dimensionRegistry.getLevelNames().size()])); + ProtocolUtils.writeStringArray(buf, dimensionRegistry.getLevelNames().toArray(new String[0])); CompoundBinaryTag.Builder registryContainer = CompoundBinaryTag.builder(); ListBinaryTag encodedDimensionRegistry = dimensionRegistry.encodeRegistry(version); if (version.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) { diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java index c622f9fa0..056de8b4b 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableList; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.player.TabListEntry; import com.velocitypowered.api.util.GameProfile; -import com.velocitypowered.proxy.VelocityServer; import com.velocitypowered.proxy.connection.MinecraftSessionHandler; import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.ProtocolUtils; @@ -13,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/FloatArgumentPropertySerializer.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/FloatArgumentPropertySerializer.java index 9714691aa..1ccd7af23 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/FloatArgumentPropertySerializer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/FloatArgumentPropertySerializer.java @@ -9,7 +9,7 @@ import io.netty.buffer.ByteBuf; class FloatArgumentPropertySerializer implements ArgumentPropertySerializer { - static FloatArgumentPropertySerializer FLOAT = new FloatArgumentPropertySerializer(); + static final FloatArgumentPropertySerializer FLOAT = new FloatArgumentPropertySerializer(); private FloatArgumentPropertySerializer() { diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/ByteBufDataInput.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/ByteBufDataInput.java index 84866012a..587366adf 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/ByteBufDataInput.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/ByteBufDataInput.java @@ -2,7 +2,6 @@ package com.velocitypowered.proxy.protocol.util; import com.google.common.io.ByteArrayDataInput; import io.netty.buffer.ByteBuf; -import java.io.DataInput; import java.io.DataInputStream; import java.io.IOException; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java index db9964708..c91a1967b 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java @@ -3,7 +3,6 @@ package com.velocitypowered.proxy.protocol.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.util.ProxyVersion; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java b/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java index 0db5eea48..bec7dab41 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java @@ -27,7 +27,6 @@ import com.velocitypowered.proxy.protocol.netty.MinecraftVarintLengthEncoder; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelInitializer; import io.netty.channel.EventLoop; @@ -39,7 +38,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.ForwardingAudience; -import net.kyori.adventure.text.Component; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -100,16 +98,13 @@ public class VelocityRegisteredServer implements RegisteredServer, ForwardingAud } }) .connect(serverInfo.getAddress()) - .addListener(new ChannelFutureListener() { - @Override - public void operationComplete(ChannelFuture future) throws Exception { - if (future.isSuccess()) { - MinecraftConnection conn = future.channel().pipeline().get(MinecraftConnection.class); - conn.setSessionHandler(new PingSessionHandler( - pingFuture, VelocityRegisteredServer.this, conn, version)); - } else { - pingFuture.completeExceptionally(future.cause()); - } + .addListener((ChannelFutureListener) future -> { + if (future.isSuccess()) { + MinecraftConnection conn = future.channel().pipeline().get(MinecraftConnection.class); + conn.setSessionHandler(new PingSessionHandler( + pingFuture, VelocityRegisteredServer.this, conn, version)); + } else { + pingFuture.completeExceptionally(future.cause()); } }); return pingFuture; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java b/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java index a8d5e4fa2..5611a7761 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java @@ -1,9 +1,6 @@ package com.velocitypowered.proxy.tablist; -import static com.google.common.base.Verify.verify; - import com.google.common.base.Preconditions; -import com.google.common.base.Verify; import com.velocitypowered.api.proxy.player.TabList; import com.velocitypowered.api.proxy.player.TabListEntry; import com.velocitypowered.api.util.GameProfile; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java index 3bdca288a..5d753c155 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java @@ -127,25 +127,6 @@ public final class BrigadierUtils { return command.toLowerCase(Locale.ENGLISH); } - /** - * Prepares the given command node prior for hinting metadata to - * a {@link com.velocitypowered.api.command.Command}. - * - * @param node the command node to be wrapped - * @param command the command to execute - * @return the wrapped command node - */ - public static CommandNode wrapForHinting( - final CommandNode node, final @Nullable Command command) { - Preconditions.checkNotNull(node, "node"); - ArgumentBuilder builder = node.createBuilder(); - builder.executes(command); - for (CommandNode child : node.getChildren()) { - builder.then(wrapForHinting(child, command)); - } - return builder.build(); - } - private BrigadierUtils() { throw new AssertionError(); } diff --git a/proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java b/proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java index 29fc31e7e..0a2901360 100644 --- a/proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java +++ b/proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java @@ -8,7 +8,6 @@ import com.velocitypowered.api.plugin.PluginDescription; import com.velocitypowered.api.plugin.meta.PluginDependency; import com.velocitypowered.proxy.plugin.loader.VelocityPluginDescription; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import org.junit.jupiter.api.Test;