Optimizations

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/main/java/com/lunarclient/apollo/event/EventBus.java

@@ -26,6 +26,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -96,7 +97,8 @@ public void unregister(@NonNull Object instance) {
         for (Method method : this.getEventMethods(instance)) {
             List<Consumer<? extends Event>> listeners = this.events.get(method.getParameterTypes()[0]);
             if (listeners != null) {
-                listeners.removeIf(consumer -> consumer instanceof ReflectiveConsumer && ((ReflectiveConsumer<?>) consumer).getInstance() == instance);
+                listeners.removeIf(consumer -> consumer instanceof ReflectiveConsumer
+                    && ((ReflectiveConsumer<?>) consumer).getInstance() == instance);
             }
         }
     }
@@ -127,17 +129,24 @@ public <T extends Event> boolean unregister(@NonNull Class<T> event, @NonNull Co
     @SuppressWarnings("unchecked")
     public <T extends Event> EventResult<T> post(@NonNull T event) {
         CopyOnWriteArrayList<Consumer<? extends Event>> consumers = this.events.get(event.getClass());
-        List<Throwable> throwables = new ArrayList<>();
-        if (consumers != null) {
-            for (Consumer<? extends Event> consumer : consumers) {
-                try {
-                    ((Consumer<T>) consumer).accept(event);
-                } catch (Throwable throwable) {
-                    throwables.add(throwable);
+        if (consumers == null || consumers.isEmpty()) {
+            return new EventResult<>(event, Collections.emptyList());
+        }
+
+        List<Throwable> throwables = null;
+        for (Consumer<? extends Event> consumer : consumers) {
+            try {
+                ((Consumer<T>) consumer).accept(event);
+            } catch (Throwable throwable) {
+                if (throwables == null) {
+                    throwables = new ArrayList<>();
                 }
+
+                throwables.add(throwable);
             }
         }
-        return new EventResult<>(event, throwables);
+
+        return new EventResult<>(event, throwables == null ? Collections.emptyList() : throwables);
     }
 
     private List<Method> getEventMethods(Object instance) {

api/src/main/java/com/lunarclient/apollo/option/Option.java

@@ -130,23 +130,24 @@ public static <T extends Enum<T>> EnumOption.EnumOptionBuilder<T> enumerator() {
      */
     boolean notify;
 
+    /**
+     * Returns the option key.
+     *
+     * @return the key string
+     * @since 1.2.8
+     */
+    @EqualsAndHashCode.Exclude
+    String key;
+
     Option(M builder) {
         this.path = requireNonNull(builder.node, "node");
         this.typeToken = requireNonNull(builder.typeToken, "typeToken");
 
         this.comment = builder.comment;
         this.defaultValue = builder.defaultValue;
         this.notify = builder.notify;
-    }
 
-    /**
-     * Returns the key as a joined {@link String}.
-     *
-     * @return the key string
-     * @since 1.0.0
-     */
-    public String getKey() {
-        return String.join(".", this.getPath());
+        this.key = String.join(".", this.path);
     }
 
     @Override

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/beam/BeamModuleImpl.java

@@ -23,11 +23,11 @@
  */
 package com.lunarclient.apollo.module.beam;
 
+import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.beam.v1.DisplayBeaconBeamMessage;
 import com.lunarclient.apollo.beam.v1.RemoveBeaconBeamMessage;
 import com.lunarclient.apollo.beam.v1.ResetBeaconBeamsMessage;
 import com.lunarclient.apollo.network.NetworkTypes;
-import com.lunarclient.apollo.player.AbstractApolloPlayer;
 import com.lunarclient.apollo.recipients.Recipients;
 import lombok.NonNull;
 
@@ -46,7 +46,7 @@ public void displayBeam(@NonNull Recipients recipients, @NonNull Beam beam) {
             .setColor(NetworkTypes.toProtobuf(beam.getColor()))
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -55,7 +55,7 @@ public void removeBeam(@NonNull Recipients recipients, @NonNull String beamId) {
             .setId(beamId)
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -66,7 +66,7 @@ public void removeBeam(@NonNull Recipients recipients, @NonNull Beam beam) {
     @Override
     public void resetBeams(@NonNull Recipients recipients) {
         ResetBeaconBeamsMessage message = ResetBeaconBeamsMessage.getDefaultInstance();
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
 }

common/src/main/java/com/lunarclient/apollo/module/border/BorderModuleImpl.java

@@ -23,11 +23,11 @@
  */
 package com.lunarclient.apollo.module.border;
 
+import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.border.v1.DisplayBorderMessage;
 import com.lunarclient.apollo.border.v1.RemoveBorderMessage;
 import com.lunarclient.apollo.border.v1.ResetBordersMessage;
 import com.lunarclient.apollo.network.NetworkTypes;
-import com.lunarclient.apollo.player.AbstractApolloPlayer;
 import com.lunarclient.apollo.recipients.Recipients;
 import lombok.NonNull;
 
@@ -53,7 +53,7 @@ public void displayBorder(@NonNull Recipients recipients, @NonNull Border border
             .setDurationTicks(checkPositive(border.getDurationTicks(), "Border#durationTicks"))
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -62,7 +62,7 @@ public void removeBorder(@NonNull Recipients recipients, @NonNull String borderI
             .setId(borderId)
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -73,7 +73,7 @@ public void removeBorder(@NonNull Recipients recipients, @NonNull Border border)
     @Override
     public void resetBorders(@NonNull Recipients recipients) {
         ResetBordersMessage message = ResetBordersMessage.getDefaultInstance();
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
 }

common/src/main/java/com/lunarclient/apollo/module/chat/ChatModuleImpl.java

@@ -23,10 +23,10 @@
  */
 package com.lunarclient.apollo.module.chat;
 
+import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.chat.v1.DisplayLiveChatMessageMessage;
 import com.lunarclient.apollo.chat.v1.RemoveLiveChatMessageMessage;
 import com.lunarclient.apollo.common.ApolloComponent;
-import com.lunarclient.apollo.player.AbstractApolloPlayer;
 import com.lunarclient.apollo.recipients.Recipients;
 import lombok.NonNull;
 import net.kyori.adventure.text.Component;
@@ -45,7 +45,7 @@ public void displayLiveChatMessage(@NonNull Recipients recipients, @NonNull Comp
             .setMessageId(messageId)
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -54,7 +54,7 @@ public void removeLiveChatMessage(@NonNull Recipients recipients, int messageId)
             .setMessageId(messageId)
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
 }

common/src/main/java/com/lunarclient/apollo/module/coloredfire/ColoredFireModuleImpl.java

@@ -23,11 +23,11 @@
  */
 package com.lunarclient.apollo.module.coloredfire;
 
+import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.coloredfire.v1.OverrideColoredFireMessage;
 import com.lunarclient.apollo.coloredfire.v1.ResetColoredFireMessage;
 import com.lunarclient.apollo.coloredfire.v1.ResetColoredFiresMessage;
 import com.lunarclient.apollo.network.NetworkTypes;
-import com.lunarclient.apollo.player.AbstractApolloPlayer;
 import com.lunarclient.apollo.recipients.Recipients;
 import java.awt.Color;
 import java.util.UUID;
@@ -47,7 +47,7 @@ public void overrideColoredFire(@NonNull Recipients recipients, @NonNull UUID bu
             .setColor(NetworkTypes.toProtobuf(color))
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
@@ -56,13 +56,13 @@ public void resetColoredFire(@NonNull Recipients recipients, @NonNull UUID burni
             .setPlayerUuid(NetworkTypes.toProtobuf(burningPlayer))
             .build();
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
     @Override
     public void resetColoredFires(@NonNull Recipients recipients) {
         ResetColoredFiresMessage message = ResetColoredFiresMessage.getDefaultInstance();
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
+        ApolloManager.getNetworkManager().sendPacket(recipients, message);
     }
 
 }