Convert client brands & mods metadata to be a count-based system

Author: ItsNature

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

@@ -94,7 +94,9 @@ private void registerBrandListener() {
 
     private void collectBrand(String brand) {
         BukkitMetadataManager manager = (BukkitMetadataManager) ApolloManager.getMetadataManager();
-        manager.getClientBrands().add(brand);
+        Map<String, Integer> brands = manager.getClientBrands();
+
+        brands.put(brand, brands.getOrDefault(brand, 0) + 1);
     }
 
 }

bukkit/src/main/java/com/lunarclient/apollo/metadata/BukkitMetadata.java

@@ -25,7 +25,6 @@
 
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
 import java.util.Map;
-import java.util.Set;
 import lombok.Builder;
 import lombok.ToString;
 
@@ -41,11 +40,12 @@ public class BukkitMetadata extends PlatformMetadata {
     /**
      * Tracks client brands sent by the players.
      *
-     * <p>A {@link Set} of {@link String} client brands.</p>
+     * <p>Represents a {@link Map} of {@link String} client brand as a key
+     * and {@link Integer} count of how many times that brand has been reported.</p>
      *
      * @since 1.1.9
      */
-    private final Set<String> clientBrands;
+    private final Map<String, Integer> clientBrands;
 
     /**
      * Tracks the total number of resource pack status events received.

bukkit/src/main/java/com/lunarclient/apollo/metadata/BukkitMetadataManager.java

@@ -26,9 +26,7 @@
 import com.lunarclient.apollo.stats.metadata.ApolloMetadataManager;
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import lombok.Getter;
 
 /**
@@ -39,13 +37,13 @@
 @Getter
 public class BukkitMetadataManager implements ApolloMetadataManager {
 
-    private final Set<String> clientBrands = new HashSet<>();
+    private final Map<String, Integer> clientBrands = new HashMap<>();
     private final Map<String, Integer> resourcePackStatuses = new HashMap<>();
 
     @Override
     public PlatformMetadata extract() {
         return BukkitMetadata.builder()
-            .clientBrands(new HashSet<>(this.clientBrands))
+            .clientBrands(new HashMap<>(this.clientBrands))
             .resourcePackStatuses(new HashMap<>(this.resourcePackStatuses))
             .build();
     }

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

@@ -32,6 +32,7 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.Map;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -129,7 +130,9 @@ public void onPreLogin(PreLoginEvent event) {
 
     private void collectBrand(String brand) {
         BungeeMetadataManager manager = (BungeeMetadataManager) ApolloManager.getMetadataManager();
-        manager.getClientBrands().add(brand);
+        Map<String, Integer> brands = manager.getClientBrands();
+
+        brands.put(brand, brands.getOrDefault(brand, 0) + 1);
     }
 
     private void handleFml(byte[] data) {
@@ -142,14 +145,16 @@ private void handleFml(byte[] data) {
                 return;
             }
 
-            int count = ByteBufUtil.readVarInt(in);
+            BungeeMetadataManager manager = (BungeeMetadataManager) ApolloManager.getMetadataManager();
+            Map<String, Integer> mods = manager.getMods();
 
+            int count = ByteBufUtil.readVarInt(in);
             for (int i = 0; i < count; i++) {
                 String modId = ByteBufUtil.readString(in);
                 String version = ByteBufUtil.readString(in);
+                String key = modId + ":" + version;
 
-                BungeeMetadataManager manager = (BungeeMetadataManager) ApolloManager.getMetadataManager();
-                manager.getMods().put(modId, version);
+                mods.put(key, mods.getOrDefault(key, 0) + 1);
             }
         } catch (Exception ignored) {
         }

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

@@ -41,21 +41,22 @@ public class BungeeMetadata extends PlatformMetadata {
     /**
      * Tracks client brands sent by the players.
      *
-     * <p>A {@link Set} of {@link String} client brands.</p>
+     * <p>Represents a {@link Map} of {@link String} client brand as a key
+     * and {@link Integer} count of how many times that brand has been reported.</p>
      *
      * @since 1.1.9
      */
-    private final Set<String> clientBrands;
+    private final Map<String, Integer> 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>
+     * <p>A {@link Map} of {@link String} mod info in the format: <code>id:version</code>
+     * as a key and {@link Integer} count of how many times that mod has been reported.</p>
      *
      * @since 1.1.9
      */
-    private final Map<String, String> mods;
+    private final Map<String, Integer> mods;
 
     /**
      * Tracks the server IP and port the player used to connect.

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

@@ -39,14 +39,14 @@
 @Getter
 public class BungeeMetadataManager implements ApolloMetadataManager {
 
-    private final Set<String> clientBrands = new HashSet<>();
-    private final Map<String, String> mods = new HashMap<>();
+    private final Map<String, Integer> clientBrands = new HashMap<>();
+    private final Map<String, Integer> mods = new HashMap<>();
     private final Set<String> serverAddress = new HashSet<>();
 
     @Override
     public PlatformMetadata extract() {
         return BungeeMetadata.builder()
-            .clientBrands(new HashSet<>(this.clientBrands))
+            .clientBrands(new HashMap<>(this.clientBrands))
             .mods(new HashMap<>(this.mods))
             .serverAddress(new HashSet<>(this.serverAddress))
             .build();

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

@@ -70,7 +70,9 @@ private void onPlayerJoin(PlayerJoinEvent event) {
             }
 
             FoliaMetadataManager manager = (FoliaMetadataManager) ApolloManager.getMetadataManager();
-            manager.getClientBrands().add(brand);
+            Map<String, Integer> brands = manager.getClientBrands();
+
+            brands.put(brand, brands.getOrDefault(brand, 0) + 1);
         }, 20L * 3);
     }
 

folia/src/main/java/com/lunarclient/apollo/metadata/FoliaMetadata.java

@@ -25,7 +25,6 @@
 
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
 import java.util.Map;
-import java.util.Set;
 import lombok.Builder;
 import lombok.ToString;
 
@@ -41,11 +40,12 @@ public class FoliaMetadata extends PlatformMetadata {
     /**
      * Tracks client brands sent by the players.
      *
-     * <p>A {@link Set} of {@link String} client brands.</p>
+     * <p>Represents a {@link Map} of {@link String} client brand as a key
+     * and {@link Integer} count of how many times that brand has been reported.</p>
      *
      * @since 1.1.9
      */
-    private final Set<String> clientBrands;
+    private final Map<String, Integer> clientBrands;
 
     /**
      * Tracks the total number of resource pack status events received.

folia/src/main/java/com/lunarclient/apollo/metadata/FoliaMetadataManager.java

@@ -26,9 +26,7 @@
 import com.lunarclient.apollo.stats.metadata.ApolloMetadataManager;
 import com.lunarclient.apollo.stats.metadata.PlatformMetadata;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.Getter;
 
@@ -40,13 +38,13 @@
 @Getter
 public class FoliaMetadataManager implements ApolloMetadataManager {
 
-    private final Set<String> clientBrands = ConcurrentHashMap.newKeySet();
+    private final Map<String, Integer> clientBrands = new ConcurrentHashMap<>();
     private final Map<String, Integer> resourcePackStatuses = new ConcurrentHashMap<>();
 
     @Override
     public PlatformMetadata extract() {
         return FoliaMetadata.builder()
-            .clientBrands(new HashSet<>(this.clientBrands))
+            .clientBrands(new HashMap<>(this.clientBrands))
             .resourcePackStatuses(new HashMap<>(this.resourcePackStatuses))
             .build();
     }

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

@@ -67,8 +67,11 @@ private void onPlayerPluginMessage(PlayerPluginMessageEvent event) {
         }
 
         ByteBuffer buffer = ByteBuffer.wrap(event.getMessage());
+        String brand = ByteBufUtil.readString(buffer);
         MinestomMetadataManager manager = (MinestomMetadataManager) ApolloManager.getMetadataManager();
-        manager.getClientBrands().add(ByteBufUtil.readString(buffer));
+        Map<String, Integer> brands = manager.getClientBrands();
+
+        brands.put(brand, brands.getOrDefault(brand, 0) + 1);
     }
 
 }