Minor cleanup and add some missing Deprecated tags

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

@@ -33,6 +33,7 @@ public final class KickedFromServerEvent implements
    * @param duringServerConnect whether or not the player was kicked during the connection process
    * @param fancyReason a fancy reason for being disconnected, used for the initial result
    */
+  @Deprecated
   public KickedFromServerEvent(Player player, RegisteredServer server,
       @Nullable Component originalReason, boolean duringServerConnect, Component fancyReason) {
     this(player, server, originalReason, duringServerConnect, Notify.create(fancyReason));
@@ -46,10 +47,9 @@ public final class KickedFromServerEvent implements
    * @param duringServerConnect whether or not the player was kicked during the connection process
    * @param result the initial result
    */
-  public KickedFromServerEvent(Player player,
+  @Deprecated
-      RegisteredServer server,
+  public KickedFromServerEvent(Player player, RegisteredServer server,
-      @Nullable Component originalReason, boolean duringServerConnect,
+      @Nullable Component originalReason, boolean duringServerConnect, ServerKickResult result) {
-      ServerKickResult result) {
     this(player, server, AdventureCompat.asAdventureComponent(originalReason), duringServerConnect,
         result);
   }

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

@@ -34,8 +34,9 @@ public interface TabListEntry {
    *
    * @return {@link Optional} text {@link net.kyori.text.Component} of name displayed in the tab
    *         list
-   *
+   * @deprecated Use {@link #getDisplayNameComponent()} instead
    */
+  @Deprecated
   Optional<net.kyori.text.Component> getDisplayName();
 
   /**
@@ -56,6 +57,7 @@ public interface TabListEntry {
    * @return {@code this}, for chaining
    * @deprecated Use {@link #setDisplayName(Component)} instead
    */
+  @Deprecated
   TabListEntry setDisplayName(net.kyori.text.Component displayName);
 
   /**

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

@@ -293,6 +293,7 @@ public final class ServerPing {
       return samplePlayers;
     }
 
+    @Deprecated
     public Optional<net.kyori.text.Component> getDescription() {
       return Optional.ofNullable(description).map(AdventureCompat::asOriginalTextComponent);
     }

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

@@ -1,14 +1,12 @@
 package com.velocitypowered.proxy.connection.client;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gson.Gson;
 import com.spotify.futures.CompletableFutures;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.InboundConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
-import com.velocitypowered.api.util.Favicon;
 import com.velocitypowered.api.util.ModInfo;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.config.PingPassthroughMode;
@@ -20,7 +18,6 @@ import com.velocitypowered.proxy.protocol.packet.LegacyPing;
 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.protocol.util.FaviconSerializer;
 import com.velocitypowered.proxy.server.VelocityRegisteredServer;
 import io.netty.buffer.ByteBuf;
 import java.net.InetSocketAddress;
@@ -34,17 +31,6 @@ import org.apache.logging.log4j.Logger;
 
 public class StatusSessionHandler implements MinecraftSessionHandler {
 
-  private static final Gson PRE_1_16_PING_SERIALIZER = GsonComponentSerializer
-      .colorDownsamplingGson()
-      .serializer()
-      .newBuilder()
-      .registerTypeHierarchyAdapter(Favicon.class, new FaviconSerializer())
-      .create();
-  private static final Gson POST_1_16_PING_SERIALIZER = GsonComponentSerializer.gson()
-      .serializer()
-      .newBuilder()
-      .registerTypeHierarchyAdapter(Favicon.class, new FaviconSerializer())
-      .create();
   private static final Logger logger = LogManager.getLogger(StatusSessionHandler.class);
 
   private final VelocityServer server;