Refactor Velocity networking to be closer to vanilla

proxy/src/main/java/com/velocitypowered/proxy/adventure/VelocityBossBarImplementation.java

@@ -69,7 +69,7 @@ public void createDirect(final ConnectedPlayer viewer) {
 
   public boolean viewerRemove(final ConnectedPlayer viewer) {
     if (this.viewers.remove(viewer)) {
-      viewer.getBossBarManager().remove(this, BossBarPacket.createRemovePacket(this.id, this.bar));
+      viewer.getBossBarManager().remove(this, BossBarPacket.createRemovePacket(this.id));
       return true;
     }
     return false;

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

@@ -208,19 +208,14 @@ public int run(final CommandContext<CommandSource> context) {
         return Command.SINGLE_SUCCESS;
       }
 
-      final TextComponent.Builder listBuilder = Component.text();
-      for (int i = 0; i < pluginCount; i++) {
-        final PluginContainer plugin = plugins.get(i);
-        listBuilder.append(componentForPlugin(plugin.getDescription()));
-        if (i + 1 < pluginCount) {
-          listBuilder.append(Component.text(", "));
-        }
-      }
+      final Component pluginListComponents = plugins.stream()
+          .map(container -> componentForPlugin(container.getDescription()))
+          .collect(Component.toComponent(Component.text(", ")));
 
       final TranslatableComponent output = Component.translatable()
           .key("velocity.command.plugins-list")
           .color(NamedTextColor.YELLOW)
-          .arguments(listBuilder.build())
+          .arguments(pluginListComponents)
           .build();
       source.sendMessage(output);
       return Command.SINGLE_SUCCESS;

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

@@ -158,7 +158,7 @@ public boolean handle(StartUpdatePacket packet) {
 
   @Override
   public boolean handle(KeepAlivePacket packet) {
-    serverConn.getPendingPings().put(packet.getRandomId(), System.nanoTime());
+    serverConn.getPendingPings().put(packet.randomId(), System.nanoTime());
     return false; // forwards on
   }
 
@@ -178,10 +178,10 @@ public boolean handle(DisconnectPacket packet) {
   @Override
   public boolean handle(BossBarPacket packet) {
     if (serverConn.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
-      if (packet.getAction() == BossBarPacket.ADD) {
-        playerSessionHandler.getServerBossBars().add(packet.getUuid());
-      } else if (packet.getAction() == BossBarPacket.REMOVE) {
-        playerSessionHandler.getServerBossBars().remove(packet.getUuid());
+      if (packet.action() == BossBarPacket.ADD) {
+        playerSessionHandler.getServerBossBars().add(packet.uuid());
+      } else if (packet.action() == BossBarPacket.REMOVE) {
+        playerSessionHandler.getServerBossBars().remove(packet.uuid());
       }
     }
     return false; // forward
@@ -190,13 +190,13 @@ public boolean handle(BossBarPacket packet) {
   @Override
   public boolean handle(final ResourcePackRequestPacket packet) {
     final ResourcePackInfo.Builder builder = new VelocityResourcePackInfo.BuilderImpl(
-        Preconditions.checkNotNull(packet.getUrl()))
-        .setId(packet.getId())
-        .setPrompt(packet.getPrompt() == null ? null : packet.getPrompt().getComponent())
+        Preconditions.checkNotNull(packet.url()))
+        .setId(packet.id())
+        .setPrompt(packet.prompt() == null ? null : packet.prompt().getComponent())
         .setShouldForce(packet.isRequired())
         .setOrigin(ResourcePackInfo.Origin.DOWNSTREAM_SERVER);
 
-    final String hash = packet.getHash();
+    final String hash = packet.hash();
     if (hash != null && !hash.isEmpty()) {
       if (PLAUSIBLE_SHA1_HASH.matcher(hash).matches()) {
         builder.setHash(ByteBufUtil.decodeHexDump(hash));
@@ -222,14 +222,14 @@ public boolean handle(final ResourcePackRequestPacket packet) {
           // Do not apply a resource pack that has already been applied
           if (serverConn.getConnection() != null) {
             serverConn.getConnection().write(new ResourcePackResponsePacket(
-                    packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
+                    packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
             if (serverConn.getConnection().getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20_3)) {
               serverConn.getConnection().write(new ResourcePackResponsePacket(
-                  packet.getId(), packet.getHash(),
+                  packet.id(), packet.hash(),
                   PlayerResourcePackStatusEvent.Status.DOWNLOADED));
             }
             serverConn.getConnection().write(new ResourcePackResponsePacket(
-                packet.getId(), packet.getHash(),
+                packet.id(), packet.hash(),
                 PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
           }
           if (modifiedPack) {
@@ -241,16 +241,16 @@ public boolean handle(final ResourcePackRequestPacket packet) {
         }
       } else if (serverConn.getConnection() != null) {
         serverConn.getConnection().write(new ResourcePackResponsePacket(
-            packet.getId(),
-            packet.getHash(),
+            packet.id(),
+            packet.hash(),
             PlayerResourcePackStatusEvent.Status.DECLINED
         ));
       }
     }, playerConnection.eventLoop()).exceptionally((ex) -> {
       if (serverConn.getConnection() != null) {
         serverConn.getConnection().write(new ResourcePackResponsePacket(
-            packet.getId(),
-            packet.getHash(),
+            packet.id(),
+            packet.hash(),
             PlayerResourcePackStatusEvent.Status.DECLINED
         ));
       }
@@ -420,7 +420,7 @@ public boolean handle(TransferPacket packet) {
   @Override
   public boolean handle(ClientboundStoreCookiePacket packet) {
     server.getEventManager()
-        .fire(new CookieStoreEvent(serverConn.getPlayer(), packet.getKey(), packet.getPayload()))
+        .fire(new CookieStoreEvent(serverConn.getPlayer(), packet.key(), packet.payload()))
         .thenAcceptAsync(event -> {
           if (event.getResult().isAllowed()) {
             final Key resultedKey = event.getResult().getKey() == null

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

@@ -141,7 +141,7 @@ public boolean handle(ClientboundServerLinksPacket packet) {
 
   @Override
   public boolean handle(KeepAlivePacket packet) {
-    serverConn.getPendingPings().put(packet.getRandomId(), System.nanoTime());
+    serverConn.getPendingPings().put(packet.randomId(), System.nanoTime());
     serverConn.getPlayer().getConnection().write(packet);
     return true;
   }
@@ -171,11 +171,11 @@ public boolean handle(final ResourcePackRequestPacket packet) {
           if (serverConn.getConnection() != null) {
             // We can technically skip these first 2 states, however, for conformity to normal state flow expectations...
             serverConn.getConnection().write(new ResourcePackResponsePacket(
-                    packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
+                    packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
             serverConn.getConnection().write(new ResourcePackResponsePacket(
-                packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DOWNLOADED));
+                packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DOWNLOADED));
             serverConn.getConnection().write(new ResourcePackResponsePacket(
-                packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
+                packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
           }
           if (modifiedPack) {
             logger.warn("A plugin has tried to modify a ResourcePack provided by the backend server "
@@ -187,12 +187,12 @@ public boolean handle(final ResourcePackRequestPacket packet) {
         }
       } else if (serverConn.getConnection() != null) {
         serverConn.getConnection().write(new ResourcePackResponsePacket(
-                packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DECLINED));
+                packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DECLINED));
       }
     }, playerConnection.eventLoop()).exceptionally((ex) -> {
       if (serverConn.getConnection() != null) {
         serverConn.getConnection().write(new ResourcePackResponsePacket(
-                packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DECLINED));
+                packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DECLINED));
       }
       logger.error("Exception while handling resource pack send for {}", playerConnection, ex);
       return null;
@@ -328,7 +328,7 @@ public boolean handle(TransferPacket packet) {
   @Override
   public boolean handle(ClientboundStoreCookiePacket packet) {
     server.getEventManager()
-        .fire(new CookieStoreEvent(serverConn.getPlayer(), packet.getKey(), packet.getPayload()))
+        .fire(new CookieStoreEvent(serverConn.getPlayer(), packet.key(), packet.payload()))
         .thenAcceptAsync(event -> {
           if (event.getResult().isAllowed()) {
             final Key resultedKey = event.getResult().getKey() == null

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

@@ -157,7 +157,7 @@ public boolean handle(ServerLoginSuccessPacket packet) {
     if (smc.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
       smc.setActiveSessionHandler(StateRegistry.PLAY, new TransitionSessionHandler(server, serverConn, resultFuture));
     } else {
-      smc.write(new LoginAcknowledgedPacket());
+      smc.write(LoginAcknowledgedPacket.INSTANCE);
       smc.setActiveSessionHandler(StateRegistry.CONFIG, new ConfigSessionHandler(server, serverConn, resultFuture));
       ConnectedPlayer player = serverConn.getPlayer();
       if (player.getClientSettingsPacket() != null) {

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

@@ -170,26 +170,26 @@ private void startHandshake() {
                 .orElseGet(() -> registeredServer.getServerInfo().getAddress())
                 .getHostString();
 
-    HandshakePacket handshake = new HandshakePacket();
-    handshake.setIntent(HandshakeIntent.LOGIN);
-    handshake.setProtocolVersion(protocolVersion);
+    String serverAddress;
     if (forwardingMode == PlayerInfoForwarding.LEGACY) {
-      handshake.setServerAddress(createLegacyForwardingAddress());
+      serverAddress = createLegacyForwardingAddress();
     } else if (forwardingMode == PlayerInfoForwarding.BUNGEEGUARD) {
       byte[] secret = server.getConfiguration().getForwardingSecret();
-      handshake.setServerAddress(createBungeeGuardForwardingAddress(secret));
+      serverAddress = createBungeeGuardForwardingAddress(secret);
     } else if (proxyPlayer.getConnection().getType() == ConnectionTypes.LEGACY_FORGE) {
-      handshake.setServerAddress(playerVhost + HANDSHAKE_HOSTNAME_TOKEN);
+      serverAddress = playerVhost + HANDSHAKE_HOSTNAME_TOKEN;
     } else if (proxyPlayer.getConnection().getType() instanceof ModernForgeConnectionType) {
-      handshake.setServerAddress(playerVhost + ((ModernForgeConnectionType) proxyPlayer
-              .getConnection().getType()).getModernToken());
+      serverAddress = playerVhost + ((ModernForgeConnectionType) proxyPlayer
+              .getConnection().getType()).getModernToken();
     } else {
-      handshake.setServerAddress(playerVhost);
+      serverAddress = playerVhost;
     }
 
-    handshake.setPort(proxyPlayer.getVirtualHost()
+    int port = proxyPlayer.getVirtualHost()
             .orElseGet(() -> registeredServer.getServerInfo().getAddress())
-            .getPort());
+            .getPort();
+
+    HandshakePacket handshake = new HandshakePacket(protocolVersion, serverAddress, port, HandshakeIntent.LOGIN);
     mc.delayedWrite(handshake);
 
     mc.setProtocolVersion(protocolVersion);

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

@@ -195,7 +195,7 @@ public boolean handle(LoginAcknowledgedPacket packet) {
   @Override
   public boolean handle(ServerboundCookieResponsePacket packet) {
     server.getEventManager()
-        .fire(new CookieReceiveEvent(connectedPlayer, packet.getKey(), packet.getPayload()))
+        .fire(new CookieReceiveEvent(connectedPlayer, packet.key(), packet.payload()))
         .thenAcceptAsync(event -> {
           if (event.getResult().isAllowed()) {
             // The received cookie must have been requested by a proxy plugin in login phase,
@@ -230,10 +230,9 @@ private void completeLoginProtocolPhaseAndInitialize(ConnectedPlayer player) {
           return;
         }
 
-        ServerLoginSuccessPacket success = new ServerLoginSuccessPacket();
-        success.setUsername(player.getUsername());
-        success.setProperties(player.getGameProfileProperties());
-        success.setUuid(player.getUniqueId());
+        ServerLoginSuccessPacket success = new ServerLoginSuccessPacket(
+            player.getUniqueId(), player.getUsername(), player.getGameProfileProperties()
+        );
         mcConnection.write(success);
 
         loginState = State.SUCCESS_SENT;

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

@@ -188,7 +188,7 @@ public boolean handle(KnownPacksPacket packet) {
   @Override
   public boolean handle(ServerboundCookieResponsePacket packet) {
     server.getEventManager()
-        .fire(new CookieReceiveEvent(player, packet.getKey(), packet.getPayload()))
+        .fire(new CookieReceiveEvent(player, packet.key(), packet.payload()))
         .thenAcceptAsync(event -> {
           if (event.getResult().isAllowed()) {
             final VelocityServerConnection serverConnection = player.getConnectionInFlight();