Avoid streams in packet/recipient conversions

Author: ItsNature

api/src/bukkit/java/com/lunarclient/apollo/BukkitApollo.java

@@ -30,12 +30,11 @@
 import com.lunarclient.apollo.player.ApolloPlayer;
 import com.lunarclient.apollo.player.ApolloPlayerManager;
 import com.lunarclient.apollo.recipients.Recipients;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -81,11 +80,12 @@ public static void runForPlayer(@NonNull UUID playerUuid, @NonNull Consumer<Apol
      */
     public static Recipients getRecipientsFrom(@NonNull Collection<Player> players) {
         ApolloPlayerManager playerManager = Apollo.getPlayerManager();
-        List<ApolloPlayer> apolloPlayers = players.stream()
-            .map(player -> playerManager.getPlayer(player.getUniqueId()))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .collect(Collectors.toList());
+        List<ApolloPlayer> apolloPlayers = new ArrayList<>(players.size());
+
+        for (Player player : players) {
+            playerManager.getPlayer(player.getUniqueId())
+                .ifPresent(apolloPlayers::add);
+        }
 
         return Recipients.of(apolloPlayers);
     }

api/src/bungee/java/com/lunarclient/apollo/BungeeApollo.java

@@ -26,12 +26,11 @@
 import com.lunarclient.apollo.player.ApolloPlayer;
 import com.lunarclient.apollo.player.ApolloPlayerManager;
 import com.lunarclient.apollo.recipients.Recipients;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
@@ -74,11 +73,12 @@ public static void runForPlayer(@NonNull UUID playerUuid, @NonNull Consumer<Apol
      */
     public static Recipients getRecipientsFrom(@NonNull Collection<ProxiedPlayer> players) {
         ApolloPlayerManager playerManager = Apollo.getPlayerManager();
-        List<ApolloPlayer> apolloPlayers = players.stream()
-            .map(player -> playerManager.getPlayer(player.getUniqueId()))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .collect(Collectors.toList());
+        List<ApolloPlayer> apolloPlayers = new ArrayList<>(players.size());
+
+        for (ProxiedPlayer player : players) {
+            playerManager.getPlayer(player.getUniqueId())
+                .ifPresent(apolloPlayers::add);
+        }
 
         return Recipients.of(apolloPlayers);
     }

api/src/folia/java/com/lunarclient/apollo/FoliaApollo.java

@@ -30,12 +30,11 @@
 import com.lunarclient.apollo.player.ApolloPlayer;
 import com.lunarclient.apollo.player.ApolloPlayerManager;
 import com.lunarclient.apollo.recipients.Recipients;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -81,11 +80,12 @@ public static void runForPlayer(@NonNull UUID playerUuid, @NonNull Consumer<Apol
      */
     public static Recipients getRecipientsFrom(@NonNull Collection<Player> players) {
         ApolloPlayerManager playerManager = Apollo.getPlayerManager();
-        List<ApolloPlayer> apolloPlayers = players.stream()
-            .map(player -> playerManager.getPlayer(player.getUniqueId()))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .collect(Collectors.toList());
+        List<ApolloPlayer> apolloPlayers = new ArrayList<>(players.size());
+
+        for (Player player : players) {
+            playerManager.getPlayer(player.getUniqueId())
+                .ifPresent(apolloPlayers::add);
+        }
 
         return Recipients.of(apolloPlayers);
     }

api/src/minestom/java/com/lunarclient/apollo/MinestomApollo.java

@@ -27,12 +27,11 @@
 import com.lunarclient.apollo.player.ApolloPlayer;
 import com.lunarclient.apollo.player.ApolloPlayerManager;
 import com.lunarclient.apollo.recipients.Recipients;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 import net.minestom.server.entity.Entity;
 import net.minestom.server.entity.Player;
@@ -76,11 +75,12 @@ public static void runForPlayer(@NonNull UUID playerUuid, @NonNull Consumer<Apol
      */
     public static Recipients getRecipientsFrom(@NonNull Collection<Player> players) {
         ApolloPlayerManager playerManager = Apollo.getPlayerManager();
-        List<ApolloPlayer> apolloPlayers = players.stream()
-            .map(player -> playerManager.getPlayer(player.getUuid()))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .collect(Collectors.toList());
+        List<ApolloPlayer> apolloPlayers = new ArrayList<>(players.size());
+
+        for (Player player : players) {
+            playerManager.getPlayer(player.getUuid())
+                .ifPresent(apolloPlayers::add);
+        }
 
         return Recipients.of(apolloPlayers);
     }

api/src/velocity/java/com/lunarclient/apollo/VelocityApollo.java

@@ -27,12 +27,11 @@
 import com.lunarclient.apollo.player.ApolloPlayerManager;
 import com.lunarclient.apollo.recipients.Recipients;
 import com.velocitypowered.api.proxy.Player;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 
 /**
@@ -75,11 +74,12 @@ public static void runForPlayer(@NonNull UUID playerUuid, @NonNull Consumer<Apol
      */
     public static Recipients getRecipientsFrom(@NonNull Collection<Player> players) {
         ApolloPlayerManager playerManager = Apollo.getPlayerManager();
-        List<ApolloPlayer> apolloPlayers = players.stream()
-            .map(player -> playerManager.getPlayer(player.getUniqueId()))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .collect(Collectors.toList());
+        List<ApolloPlayer> apolloPlayers = new ArrayList<>(players.size());
+
+        for (Player player : players) {
+            playerManager.getPlayer(player.getUniqueId())
+                .ifPresent(apolloPlayers::add);
+        }
 
         return Recipients.of(apolloPlayers);
     }

common/src/main/java/com/lunarclient/apollo/module/nametag/NametagModuleImpl.java

@@ -30,10 +30,9 @@
 import com.lunarclient.apollo.nametag.v1.ResetNametagsMessage;
 import com.lunarclient.apollo.network.NetworkTypes;
 import com.lunarclient.apollo.recipients.Recipients;
-import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.NonNull;
+import net.kyori.adventure.text.Component;
 
 /**
  * Provides the nametag module.
@@ -44,16 +43,14 @@ public final class NametagModuleImpl extends NametagModule {
 
     @Override
     public void overrideNametag(@NonNull Recipients recipients, @NonNull UUID playerUuid, @NonNull Nametag nametag) {
-        List<String> lines = nametag.getLines().stream()
-            .map(ApolloComponent::toJson)
-            .collect(Collectors.toList());
+        OverrideNametagMessage.Builder builder = OverrideNametagMessage.newBuilder()
+            .setPlayerUuid(NetworkTypes.toProtobuf(playerUuid));
 
-        OverrideNametagMessage message = OverrideNametagMessage.newBuilder()
-            .setPlayerUuid(NetworkTypes.toProtobuf(playerUuid))
-            .addAllAdventureJsonLines(lines)
-            .build();
+        for (Component line : nametag.getLines()) {
+            builder.addAdventureJsonLines(ApolloComponent.toJson(line));
+        }
 
-        ApolloManager.getNetworkManager().sendPacket(recipients, message);
+        ApolloManager.getNetworkManager().sendPacket(recipients, builder.build());
     }
 
     @Override

common/src/main/java/com/lunarclient/apollo/module/team/TeamModuleImpl.java

@@ -32,7 +32,6 @@
 import com.lunarclient.apollo.team.v1.UpdateTeamMembersMessage;
 import java.awt.Color;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.NonNull;
 import net.kyori.adventure.text.Component;
 
@@ -45,15 +44,13 @@ public final class TeamModuleImpl extends TeamModule {
 
     @Override
     public void updateTeamMembers(@NonNull Recipients recipients, @NonNull List<TeamMember> teamMembers) {
-        List<com.lunarclient.apollo.team.v1.TeamMember> teamMembersProto = teamMembers.stream()
-            .map(this::toProtobuf)
-            .collect(Collectors.toList());
+        UpdateTeamMembersMessage.Builder builder = UpdateTeamMembersMessage.newBuilder();
 
-        UpdateTeamMembersMessage message = UpdateTeamMembersMessage.newBuilder()
-            .addAllMembers(teamMembersProto)
-            .build();
+        for (TeamMember teamMember : teamMembers) {
+            builder.addMembers(this.toProtobuf(teamMember));
+        }
 
-        ApolloManager.getNetworkManager().sendPacket(recipients, message);
+        ApolloManager.getNetworkManager().sendPacket(recipients, builder.build());
     }
 
     @Override