Use singular plurals, clean up some stuff.

proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java

@@ -6,7 +6,7 @@ import com.velocitypowered.natives.util.Natives;
 import com.velocitypowered.network.ConnectionManager;
 import com.velocitypowered.proxy.config.VelocityConfiguration;
 import com.velocitypowered.proxy.connection.http.NettyHttpClient;
-import com.velocitypowered.api.servers.ServerInfo;
+import com.velocitypowered.api.server.ServerInfo;
 import com.velocitypowered.proxy.util.AddressUtil;
 import com.velocitypowered.proxy.util.EncryptionUtils;
 import com.velocitypowered.proxy.util.ServerMap;

proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java

@@ -5,7 +5,6 @@ import com.velocitypowered.natives.compression.VelocityCompressor;
 import com.velocitypowered.natives.util.Natives;
 import com.velocitypowered.proxy.protocol.PacketWrapper;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.natives.compression.JavaVelocityCompressor;
 import com.velocitypowered.natives.encryption.JavaVelocityCipher;
 import com.velocitypowered.natives.encryption.VelocityCipher;
 import com.velocitypowered.proxy.protocol.netty.*;

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java

@@ -3,7 +3,7 @@ package com.velocitypowered.proxy.connection.backend;
 import com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
-import com.velocitypowered.proxy.protocol.packets.*;
+import com.velocitypowered.proxy.protocol.packet.*;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
 import io.netty.buffer.ByteBuf;

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java

@@ -8,7 +8,7 @@ import com.velocitypowered.proxy.data.GameProfile;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.proxy.protocol.packets.*;
+import com.velocitypowered.proxy.protocol.packet.*;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ServerConnection.java

@@ -7,11 +7,11 @@ import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftEncoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftVarintFrameDecoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftVarintLengthEncoder;
-import com.velocitypowered.proxy.protocol.packets.Handshake;
-import com.velocitypowered.proxy.protocol.packets.ServerLogin;
+import com.velocitypowered.proxy.protocol.packet.Handshake;
+import com.velocitypowered.proxy.protocol.packet.ServerLogin;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.api.servers.ServerInfo;
+import com.velocitypowered.api.server.ServerInfo;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import io.netty.channel.*;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java

@@ -2,14 +2,14 @@ package com.velocitypowered.proxy.connection.client;
 
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.backend.ServerConnection;
-import com.velocitypowered.api.servers.ServerInfo;
+import com.velocitypowered.api.server.ServerInfo;
 import com.velocitypowered.proxy.data.scoreboard.Objective;
 import com.velocitypowered.proxy.data.scoreboard.Score;
 import com.velocitypowered.proxy.data.scoreboard.Scoreboard;
 import com.velocitypowered.proxy.data.scoreboard.Team;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
-import com.velocitypowered.proxy.protocol.packets.*;
+import com.velocitypowered.proxy.protocol.packet.*;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.remap.EntityIdRemapper;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

@@ -4,13 +4,13 @@ import com.google.common.base.Preconditions;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.MinecraftConnectionAssociation;
 import com.velocitypowered.proxy.data.GameProfile;
-import com.velocitypowered.proxy.protocol.packets.Chat;
+import com.velocitypowered.proxy.protocol.packet.Chat;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.backend.ServerConnection;
-import com.velocitypowered.proxy.protocol.packets.ClientSettings;
+import com.velocitypowered.proxy.protocol.packet.ClientSettings;
 import com.velocitypowered.proxy.util.ThrowableUtils;
-import com.velocitypowered.api.servers.ServerInfo;
-import com.velocitypowered.proxy.protocol.packets.Disconnect;
+import com.velocitypowered.api.server.ServerInfo;
+import com.velocitypowered.proxy.protocol.packet.Disconnect;
 import net.kyori.text.Component;
 import net.kyori.text.TextComponent;
 import net.kyori.text.TranslatableComponent;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java

@@ -6,8 +6,8 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.proxy.protocol.packets.Disconnect;
-import com.velocitypowered.proxy.protocol.packets.Handshake;
+import com.velocitypowered.proxy.protocol.packet.Disconnect;
+import com.velocitypowered.proxy.protocol.packet.Handshake;
 import net.kyori.text.TranslatableComponent;
 
 public class HandshakeSessionHandler implements MinecraftSessionHandler {

proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java

@@ -6,11 +6,11 @@ import com.velocitypowered.proxy.data.GameProfile;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.proxy.protocol.packets.*;
+import com.velocitypowered.proxy.protocol.packet.*;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.VelocityServer;
-import com.velocitypowered.api.servers.ServerInfo;
+import com.velocitypowered.api.server.ServerInfo;
 import com.velocitypowered.proxy.util.EncryptionUtils;
 import io.netty.buffer.Unpooled;
 import net.kyori.text.TextComponent;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java

@@ -4,10 +4,9 @@ import com.google.common.base.Preconditions;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.config.VelocityConfiguration;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
-import com.velocitypowered.proxy.protocol.packets.KeepAlive;
-import com.velocitypowered.proxy.protocol.packets.StatusPing;
-import com.velocitypowered.proxy.protocol.packets.StatusRequest;
-import com.velocitypowered.proxy.protocol.packets.StatusResponse;
+import com.velocitypowered.proxy.protocol.packet.StatusPing;
+import com.velocitypowered.proxy.protocol.packet.StatusRequest;
+import com.velocitypowered.proxy.protocol.packet.StatusResponse;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.data.ServerPing;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;

proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java

@@ -1,6 +1,6 @@
 package com.velocitypowered.proxy.protocol;
 
-import com.velocitypowered.proxy.protocol.packets.*;
+import com.velocitypowered.proxy.protocol.packet.*;
 import io.netty.util.collection.IntObjectHashMap;
 import io.netty.util.collection.IntObjectMap;
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingDecoder.java

@@ -1,6 +1,6 @@
 package com.velocitypowered.proxy.protocol.netty;
 
-import com.velocitypowered.proxy.protocol.packets.LegacyPing;
+import com.velocitypowered.proxy.protocol.packet.LegacyPing;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java

@@ -2,9 +2,8 @@ package com.velocitypowered.proxy.protocol.netty;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.velocitypowered.proxy.protocol.packets.LegacyPingResponse;
+import com.velocitypowered.proxy.protocol.packet.LegacyPingResponse;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressEncoder.java

@@ -4,7 +4,6 @@ import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.natives.compression.VelocityCompressor;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.MessageToByteEncoder;
 
 public class MinecraftCompressEncoder extends MessageToByteEncoder<ByteBuf> {

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/BossBar.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Chat.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ClientSettings.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Disconnect.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/EncryptionRequest.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/EncryptionResponse.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Handshake.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/KeepAlive.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LegacyPing.java

@@ -0,0 +1,4 @@
+package com.velocitypowered.proxy.protocol.packet;
+
+public class LegacyPing {
+}

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LegacyPingResponse.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.data.ServerPing;
 import net.kyori.text.serializer.ComponentSerializers;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LoginPluginMessage.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LoginPluginResponse.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PluginMessage.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Respawn.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ScoreboardDisplay.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ScoreboardObjective.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.data.scoreboard.ObjectiveMode;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ScoreboardSetScore.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ScoreboardTeam.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLogin.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLoginSuccess.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/SetCompression.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/StatusPing.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolConstants;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/StatusRequest.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/StatusResponse.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.proxy.protocol.packets;
+package com.velocitypowered.proxy.protocol.packet;
 
 import com.velocitypowered.proxy.protocol.ProtocolConstants;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packets/LegacyPing.java

@@ -1,4 +0,0 @@
-package com.velocitypowered.proxy.protocol.packets;
-
-public class LegacyPing {
-}

proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java

@@ -3,7 +3,7 @@ package com.velocitypowered.proxy.protocol.util;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
-import com.velocitypowered.proxy.protocol.packets.PluginMessage;
+import com.velocitypowered.proxy.protocol.packet.PluginMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;

proxy/src/main/java/com/velocitypowered/proxy/util/ServerMap.java

@@ -2,7 +2,7 @@ package com.velocitypowered.proxy.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.velocitypowered.api.servers.ServerInfo;
+import com.velocitypowered.api.server.ServerInfo;
 
 import java.util.Collection;
 import java.util.HashMap;

proxy/src/test/java/com/velocitypowered/proxy/protocol/PacketRegistryTest.java

@@ -1,6 +1,6 @@
 package com.velocitypowered.proxy.protocol;
 
-import com.velocitypowered.proxy.protocol.packets.Handshake;
+import com.velocitypowered.proxy.protocol.packet.Handshake;
 import org.junit.jupiter.api.Test;
 
 import static com.velocitypowered.proxy.protocol.ProtocolConstants.MINECRAFT_1_12;