finish bungee impl

Author: ItsNature

bungee/src/main/java/com/lunarclient/apollo/listener/ApolloMetadataListener.java

@@ -73,15 +73,21 @@ public ApolloMetadataListener(Plugin plugin) {
      */
     @EventHandler
     public void onPluginMessage(PluginMessageEvent event) {
+        if (!(event.getSender() instanceof ProxiedPlayer)) {
+            System.out.println("Not a player Brand");
+            return;
+        }
+
+        ProxiedPlayer player = (ProxiedPlayer) event.getSender();
         String tag = event.getTag();
 
         if (tag.equals("minecraft:brand") || tag.equals("MC|Brand")) {
-            this.handleBrand(event.getData(), event.getSender());
+            this.handleBrand(event.getData(), player);
             return;
         }
 
         if (tag.equals("fml:handshake") || tag.equals("FML|HS")) {
-            this.handleFml(event.getData(), event.getSender());
+            this.handleFml(event.getData(), player);
         }
     }
 
@@ -100,17 +106,20 @@ public void onPreLogin(PreLoginEvent event) {
             return;
         }
 
+        String hostString;
+
+        if (host.getAddress() != null) {
+            hostString = host.getAddress().getHostAddress();
+        } else {
+            hostString = host.getHostName();
+        }
+
         BungeeMetadataManager manager = (BungeeMetadataManager) ApolloManager.getMetadataManager();
-        manager.getServerAddress().add(host.getAddress().getHostAddress() + ":" + host.getPort());
-        ApolloBungeePlatform.getInstance().getPlatformLogger().log(Level.WARNING, host.getAddress().getHostAddress() + ":" + host.getPort());
+        manager.getServerAddress().add(hostString + ":" + host.getPort());
+        ApolloBungeePlatform.getInstance().getPlatformLogger().log(Level.WARNING, hostString + ":" + host.getPort());
     }
 
     private void handleBrand(byte[] data, Connection sender) {
-        if (!(sender instanceof ProxiedPlayer)) {
-            System.out.println("Not a player Brand");
-            return;
-        }
-
         String brand = new String(data, StandardCharsets.UTF_8);
         ApolloBungeePlatform.getInstance().getPlatformLogger().log(Level.WARNING, ((ProxiedPlayer) sender).getName() + " is using client brand: " + brand);
 
@@ -119,18 +128,12 @@ private void handleBrand(byte[] data, Connection sender) {
     }
 
     private void handleFml(byte[] data, Connection sender) {
-        if (!(sender instanceof ProxiedPlayer)) {
-            System.out.println("Not a player FML");
-            return;
-        }
-
         ProxiedPlayer player = (ProxiedPlayer) sender;
 
         ByteArrayDataInput in = ByteStreams.newDataInput(data);
         byte discriminator = in.readByte();
 
         if (discriminator != 2) {
-            System.out.println("Discriminator is not 2: " + discriminator);
             return;
         }
 

bungee/src/main/java/com/lunarclient/apollo/metadata/BungeeMetadata.java

@@ -24,9 +24,10 @@
 package com.lunarclient.apollo.metadata;
 
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
+import java.util.Map;
+import java.util.Set;
 import lombok.Builder;
 import lombok.ToString;
-import java.util.Set;
 
 /**
  * Represents the bungee metadata implementation.
@@ -46,4 +47,23 @@ public class BungeeMetadata extends PlatformMetadata {
      */
     private final Set<String> clientBrands;
 
+    /**
+     * Tracks forge mods sent with the forge handshake.
+     *
+     * <p>A {@link Map} of {@link String} mod id
+     * as a key and {@link String} version as value.</p>
+     *
+     * @since 1.1.9
+     */
+    private final Map<String, String> mods;
+
+    /**
+     * Tracks the server IP and port the player used to connect.
+     *
+     * <p>A {@link Set} of {@link String} server addresses in the format: <code>host:port</code></p>
+     *
+     * @since 1.1.9
+     */
+    private final Set<String> serverAddress;
+
 }

bungee/src/main/java/com/lunarclient/apollo/metadata/BungeeMetadataManager.java

@@ -25,12 +25,11 @@
 
 import com.lunarclient.apollo.stats.metadata.ApolloMetadataManager;
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
-import lombok.Getter;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import lombok.Getter;
 
 /**
  * The Bungee implementation of {@link ApolloMetadataManager}.
@@ -48,11 +47,16 @@ public class BungeeMetadataManager implements ApolloMetadataManager {
     public PlatformMetadata extract() {
         return BungeeMetadata.builder()
             .clientBrands(new HashSet<>(this.clientBrands))
+            .mods(new HashMap<>(this.mods))
+            .serverAddress(new HashSet<>(this.serverAddress))
             .build();
     }
 
     @Override
     public void clear() {
         this.clientBrands.clear();
+        this.mods.clear();
+        this.serverAddress.clear();
     }
+
 }

bungee/src/main/java/com/lunarclient/apollo/util/ByteBufUtil.java

@@ -33,6 +33,14 @@
  */
 public final class ByteBufUtil {
 
+    /**
+     * Reads an int from the given input stream.
+     *
+     * @param in in the {@link ByteArrayDataInput} to read from
+     * @return the read int
+     * @throws IllegalArgumentException if the value length is invalid or too large
+     * @since 1.1.9
+     */
     public static int readVarInt(ByteArrayDataInput in) {
         int i = 0;
         int j = 0;
@@ -53,6 +61,14 @@ public static int readVarInt(ByteArrayDataInput in) {
         return i;
     }
 
+    /**
+     * Reads a UTF-8 encoded string from the given input stream.
+     *
+     * @param in the {@link ByteArrayDataInput} to read from
+     * @return the decoded string
+     * @throws IllegalArgumentException if the value length is invalid or too large
+     * @since 1.1.9
+     */
     public static String readString(ByteArrayDataInput in) {
         int length = ByteBufUtil.readVarInt(in);
         byte[] bytes = new byte[length];

common/src/main/java/com/lunarclient/apollo/stats/metadata/ApolloMetadataManager.java

@@ -23,15 +23,12 @@
  */
 package com.lunarclient.apollo.stats.metadata;
 
-import org.jetbrains.annotations.ApiStatus;
-
 /**
  * Represents the Apollo metadata manager, responsible for
  * managing and extracting metadata related to the platform.
  *
  * @since 1.1.9
  */
-@ApiStatus.NonExtendable
 public interface ApolloMetadataManager {
 
     /**

velocity/src/main/java/com/lunarclient/apollo/ApolloVelocityPlatform.java

@@ -221,13 +221,34 @@ public void onProxyShutdown(ProxyShutdownEvent event) {
         ((ApolloModuleManagerImpl) Apollo.getModuleManager()).disableModules();
     }
 
-    static {
+    /**
+     * Creates a {@link MinecraftChannelIdentifier} in a way that supports both
+     * modern and legacy Velocity APIs.
+     *
+     * @param channel the channel in {@code namespace:key} format (e.g. {@code minecraft:brand})
+     * @return the channel identifier object for the provided channel
+     * @throws IllegalArgumentException if the channel format is invalid
+     * @since 1.1.9
+     */
+    public static MinecraftChannelIdentifier createChannelIdentifier(String channel) {
         try {
-            PLUGIN_CHANNEL = MinecraftChannelIdentifier.from(ApolloManager.PLUGIN_MESSAGE_CHANNEL);
-        } catch (NoSuchMethodError e) {
-            String[] messageChannel = ApolloManager.PLUGIN_MESSAGE_CHANNEL.split(":");
-            PLUGIN_CHANNEL = MinecraftChannelIdentifier.create(messageChannel[0], messageChannel[1]);
+            return MinecraftChannelIdentifier.from(channel);
+        } catch (NoSuchMethodError | IllegalArgumentException e) {
+            if (channel.contains("|")) {
+                return MinecraftChannelIdentifier.create(channel, "");
+            }
+
+            String[] parts = channel.split(":", 2);
+            if (parts.length != 2) {
+                throw new IllegalArgumentException("Invalid channel identifier: " + channel);
+            }
+
+            return MinecraftChannelIdentifier.create(parts[0], parts[1]);
         }
     }
 
+    static {
+        PLUGIN_CHANNEL = ApolloVelocityPlatform.createChannelIdentifier(ApolloManager.PLUGIN_MESSAGE_CHANNEL);
+    }
+
 }