Rearrange connection-related API classes.

This is the last rearrangement I plan to do.

api/src/main/java/com/velocitypowered/api/command/Command.java

@@ -1,10 +1,6 @@
 package com.velocitypowered.api.command;
 
-import com.google.common.collect.ImmutableList;
-import com.velocitypowered.api.proxy.Player;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * Represents a command that can be executed by a {@link CommandSource}

api/src/main/java/com/velocitypowered/api/command/ConsoleCommandSource.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.proxy;
+package com.velocitypowered.api.command;
 
 import com.velocitypowered.api.command.CommandSource;
 

api/src/main/java/com/velocitypowered/api/event/command/PlayerAvailableCommandsEvent.java

@@ -4,7 +4,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.Beta;
 import com.mojang.brigadier.tree.RootCommandNode;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * Allows plugins to modify the packet indicating commands available on the server to a

api/src/main/java/com/velocitypowered/api/event/connection/ConnectionHandshakeEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.connection;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 
 /**
  * This event is fired when a handshake is established between a client and the proxy.

api/src/main/java/com/velocitypowered/api/event/connection/PluginMessageEvent.java

@@ -4,8 +4,8 @@ import com.google.common.base.Preconditions;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.Player;
-import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.connection.Player;
+import com.velocitypowered.api.proxy.connection.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSource;

api/src/main/java/com/velocitypowered/api/event/connection/ProxyPingEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.connection;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import com.velocitypowered.api.proxy.server.ServerPing;
 
 /**

api/src/main/java/com/velocitypowered/api/event/player/DisconnectEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * This event is fired when a player disconnects from the proxy. Operations on the provided player,

api/src/main/java/com/velocitypowered/api/event/player/GameProfileRequestEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import com.velocitypowered.api.util.GameProfile;
 import org.checkerframework.checker.nullness.qual.Nullable;
 

api/src/main/java/com/velocitypowered/api/event/player/KickedFromServerEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.Optional;
 import net.kyori.adventure.text.Component;

api/src/main/java/com/velocitypowered/api/event/player/LoginEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * This event is fired once the player has been authenticated but before they connect to a server on

api/src/main/java/com/velocitypowered/api/event/player/PlayerChatEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import java.util.Optional;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

api/src/main/java/com/velocitypowered/api/event/player/PlayerChooseInitialServerEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.Optional;
 import org.checkerframework.checker.nullness.qual.Nullable;

api/src/main/java/com/velocitypowered/api/event/player/PlayerModInfoEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.util.ModInfo;
 
 /**

api/src/main/java/com/velocitypowered/api/event/player/PlayerResourcePackStatusEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * This event is fired when the status of a resource pack sent to the player by the server is

api/src/main/java/com/velocitypowered/api/event/player/PlayerSettingsChangedEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.player.PlayerSettings;
 
 public final class PlayerSettingsChangedEvent {

api/src/main/java/com/velocitypowered/api/event/player/PostLoginEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 
 /**
  * This event is fired once the player has been fully initialized and is about to connect to their

api/src/main/java/com/velocitypowered/api/event/player/PreLoginEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import java.util.Optional;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;

api/src/main/java/com/velocitypowered/api/event/player/ServerConnectedEvent.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.Optional;
 import org.checkerframework.checker.nullness.qual.Nullable;

api/src/main/java/com/velocitypowered/api/event/player/ServerPostConnectEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import org.checkerframework.checker.nullness.qual.Nullable;
 

api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java

@@ -2,9 +2,9 @@ package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder.Status;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder.Status;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.Optional;
 import org.checkerframework.checker.nullness.qual.Nullable;

api/src/main/java/com/velocitypowered/api/event/player/TabCompleteEvent.java

@@ -2,7 +2,7 @@ package com.velocitypowered.api.event.player;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import java.util.ArrayList;
 import java.util.List;
 

api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java

@@ -2,9 +2,11 @@ package com.velocitypowered.api.proxy;
 
 import com.velocitypowered.api.command.CommandManager;
 import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.command.ConsoleCommandSource;
 import com.velocitypowered.api.event.EventManager;
 import com.velocitypowered.api.plugin.PluginManager;
 import com.velocitypowered.api.proxy.config.ProxyConfig;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.messages.ChannelRegistrar;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;

api/src/main/java/com/velocitypowered/api/proxy/connection/InboundConnection.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.proxy;
+package com.velocitypowered.api.proxy.connection;
 
 import com.velocitypowered.api.network.ProtocolVersion;
 

api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java

@@ -1,9 +1,10 @@
-package com.velocitypowered.api.proxy;
+package com.velocitypowered.api.proxy.connection;
 
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.player.PlayerResourcePackStatusEvent;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
 import com.velocitypowered.api.proxy.player.PlayerSettings;
 import com.velocitypowered.api.proxy.player.TabList;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -78,15 +79,6 @@ public interface Player extends CommandSource, Identified, InboundConnection,
    */
   ConnectionRequestBuilder createConnectionRequest(RegisteredServer server);
 
-  /**
-   * Gets the player's profile properties.
-   *
-   * <p>The returned list may be unmodifiable.</p>
-   *
-   * @return the player's profile properties
-   */
-  List<GameProfile.Property> getGameProfileProperties();
-
   /**
    * Sets the player's profile properties.
    *

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.proxy;
+package com.velocitypowered.api.proxy.connection;
 
 import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSource;

api/src/main/java/com/velocitypowered/api/proxy/player/ConnectionRequestBuilder.java

@@ -1,5 +1,6 @@
-package com.velocitypowered.api.proxy;
+package com.velocitypowered.api.proxy.player;
 
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

api/src/main/java/com/velocitypowered/api/proxy/player/TabList.java

@@ -1,6 +1,6 @@
 package com.velocitypowered.api.proxy.player;
 
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.util.GameProfile;
 import java.util.Collection;
 import java.util.Optional;

api/src/main/java/com/velocitypowered/api/proxy/server/RegisteredServer.java

@@ -1,6 +1,6 @@
 package com.velocitypowered.api.proxy.server;
 
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;

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

@@ -11,8 +11,8 @@ import com.velocitypowered.api.event.lifecycle.ProxyReloadEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginManager;
-import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import com.velocitypowered.api.util.Favicon;

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/GlistCommand.java

@@ -12,8 +12,8 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.velocitypowered.api.command.BrigadierCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.permission.Tristate;
-import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import java.util.List;
 import java.util.Optional;

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/ServerCommand.java

@@ -6,9 +6,9 @@ import com.google.common.collect.ImmutableList;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
 import com.velocitypowered.api.permission.Tristate;
-import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
-import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.connection.Player;
+import com.velocitypowered.api.proxy.connection.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.velocitypowered.proxy.connection.backend;
 
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.proxy.server.RegisteredServer;

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

@@ -7,8 +7,9 @@ import static com.velocitypowered.proxy.network.Connections.HANDLER;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.connection.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import com.velocitypowered.api.util.GameProfile.Property;
 import com.velocitypowered.proxy.VelocityServer;
@@ -64,7 +65,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
 
   /**
    * Connects to the server.
-   * @return a {@link com.velocitypowered.api.proxy.ConnectionRequestBuilder.Result} representing
+   * @return a {@link ConnectionRequestBuilder.Result} representing
    *         whether or not the connect succeeded
    */
   public CompletableFuture<Impl> connect() {

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

@@ -1,6 +1,6 @@
 package com.velocitypowered.proxy.connection.client;
 
-import static com.velocitypowered.api.proxy.ConnectionRequestBuilder.Status.ALREADY_CONNECTED;
+import static com.velocitypowered.api.proxy.player.ConnectionRequestBuilder.Status.ALREADY_CONNECTED;
 import static com.velocitypowered.proxy.connection.util.ConnectionRequestResults.plainResult;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
@@ -20,10 +20,10 @@ import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.permission.PermissionFunction;
 import com.velocitypowered.api.permission.PermissionProvider;
 import com.velocitypowered.api.permission.Tristate;
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
-import com.velocitypowered.api.proxy.Player;
-import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.connection.Player;
+import com.velocitypowered.api.proxy.connection.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
 import com.velocitypowered.api.proxy.player.PlayerSettings;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.util.GameProfile;
@@ -322,14 +322,9 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
     return new ConnectionRequestBuilderImpl(server);
   }
 
-  @Override
-  public List<GameProfile.Property> getGameProfileProperties() {
-    return this.profile.getProperties();
-  }
-
   @Override
   public void setGameProfileProperties(List<GameProfile.Property> properties) {
-    this.profile = profile.withProperties(Preconditions.checkNotNull(properties));
+    this.profile = profile.withProperties(properties);
   }
 
   @Override

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

@@ -4,7 +4,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.connection.ConnectionHandshakeEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.config.PlayerInfoForwarding;
 import com.velocitypowered.proxy.connection.ConnectionType;
@@ -23,8 +23,6 @@ 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;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

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

@@ -1,7 +1,7 @@
 package com.velocitypowered.proxy.connection.client;
 
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.MinecraftConnectionAssociation;
 import com.velocitypowered.proxy.protocol.packet.Disconnect;

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

@@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableList;
 import com.spotify.futures.CompletableFutures;
 import com.velocitypowered.api.event.connection.ProxyPingEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.InboundConnection;
+import com.velocitypowered.api.proxy.connection.InboundConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.ModInfo;

proxy/src/main/java/com/velocitypowered/proxy/connection/util/ConnectionRequestResults.java

@@ -1,7 +1,7 @@
 package com.velocitypowered.proxy.connection.util;
 
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder.Status;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder;
+import com.velocitypowered.api.proxy.player.ConnectionRequestBuilder.Status;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.proxy.protocol.packet.Disconnect;
 import java.util.Optional;

proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java

@@ -2,10 +2,10 @@ package com.velocitypowered.proxy.console;
 
 import static com.velocitypowered.api.permission.PermissionFunction.ALWAYS_TRUE;
 
+import com.velocitypowered.api.command.ConsoleCommandSource;
 import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
 import com.velocitypowered.api.permission.PermissionFunction;
 import com.velocitypowered.api.permission.Tristate;
-import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.proxy.VelocityServer;
 import java.util.List;
 import net.kyori.adventure.identity.Identity;

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

@@ -10,7 +10,7 @@ import com.velocitypowered.api.event.connection.ProxyQueryEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginDescription;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.server.QueryResponse;
 import com.velocitypowered.proxy.VelocityServer;
 import io.netty.buffer.ByteBuf;

proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java

@@ -10,7 +10,7 @@ import static com.velocitypowered.proxy.network.Connections.READ_TIMEOUT;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.connection.Player;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;