Shuffle some event classes around.

The new locations make better sense.

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.proxy;
+package com.velocitypowered.api.event.connection;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.InboundConnection;

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.connection;
+package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.Player;

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

@@ -6,7 +6,7 @@ import com.velocitypowered.api.util.GameProfile;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * This event is fired after the {@link com.velocitypowered.api.event.connection.PreLoginEvent} in
+ * This event is fired after the {@link PreLoginEvent} in
  * order to set up the game profile for the user. This can be used to configure a custom profile for
  * a user, i.e. skin replacement.
  */

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.connection;
+package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.connection;
+package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.Player;

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

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.connection;
+package com.velocitypowered.api.event.player;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;

api/src/main/java/com/velocitypowered/api/event/proxy/ProxyQueryEvent.java

@@ -1,4 +1,4 @@
-package com.velocitypowered.api.event.query;
+package com.velocitypowered.api.event.proxy;
 
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.server.QueryResponse;

api/src/main/java/com/velocitypowered/api/event/query/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Provides events for handling GS4 queries.
- */
-package com.velocitypowered.api.event.query;

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

@@ -6,8 +6,8 @@ import static java.util.concurrent.CompletableFuture.completedFuture;
 
 import com.google.common.base.Preconditions;
 import com.google.gson.JsonObject;
-import com.velocitypowered.api.event.connection.DisconnectEvent;
+import com.velocitypowered.api.event.player.DisconnectEvent;
-import com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus;
+import com.velocitypowered.api.event.player.DisconnectEvent.LoginStatus;
 import com.velocitypowered.api.event.player.KickedFromServerEvent;
 import com.velocitypowered.api.event.player.KickedFromServerEvent.DisconnectPlayer;
 import com.velocitypowered.api.event.player.KickedFromServerEvent.Notify;

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

@@ -8,12 +8,12 @@ import static com.velocitypowered.proxy.util.EncryptionUtils.decryptRsa;
 import static com.velocitypowered.proxy.util.EncryptionUtils.generateServerId;
 
 import com.google.common.base.Preconditions;
-import com.velocitypowered.api.event.connection.DisconnectEvent;
+import com.velocitypowered.api.event.player.DisconnectEvent;
-import com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus;
+import com.velocitypowered.api.event.player.DisconnectEvent.LoginStatus;
-import com.velocitypowered.api.event.connection.LoginEvent;
+import com.velocitypowered.api.event.player.LoginEvent;
-import com.velocitypowered.api.event.connection.PostLoginEvent;
+import com.velocitypowered.api.event.player.PostLoginEvent;
-import com.velocitypowered.api.event.connection.PreLoginEvent;
+import com.velocitypowered.api.event.player.PreLoginEvent;
-import com.velocitypowered.api.event.connection.PreLoginEvent.PreLoginComponentResult;
+import com.velocitypowered.api.event.player.PreLoginEvent.PreLoginComponentResult;
 import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
 import com.velocitypowered.api.event.player.GameProfileRequestEvent;
 import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent;

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

@@ -2,7 +2,7 @@ package com.velocitypowered.proxy.connection.client;
 
 import com.google.common.collect.ImmutableList;
 import com.spotify.futures.CompletableFutures;
-import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.event.connection.ProxyPingEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.InboundConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;

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

@@ -1,12 +1,12 @@
 package com.velocitypowered.proxy.protocol.netty;
 
-import static com.velocitypowered.api.event.query.ProxyQueryEvent.QueryType.BASIC;
+import static com.velocitypowered.api.event.proxy.ProxyQueryEvent.QueryType.BASIC;
-import static com.velocitypowered.api.event.query.ProxyQueryEvent.QueryType.FULL;
+import static com.velocitypowered.api.event.proxy.ProxyQueryEvent.QueryType.FULL;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
-import com.velocitypowered.api.event.query.ProxyQueryEvent;
+import com.velocitypowered.api.event.proxy.ProxyQueryEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginDescription;