fix brand collecting on bukkit & bungee

Author: ItsNature

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

@@ -23,9 +23,14 @@
  */
 package com.lunarclient.apollo.listener;
 
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
 import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.metadata.BukkitMetadataManager;
-import java.nio.charset.StandardCharsets;
+import com.lunarclient.apollo.util.ByteBufUtil;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
 import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -67,21 +72,29 @@ private void onResourcePackStatus(PlayerResourcePackStatusEvent event) {
     }
 
     private void registerBrandListener() {
-        PluginMessageListener listener = (channel, player, bytes) -> {
-            String brand = new String(bytes, StandardCharsets.UTF_8);
-
-            BukkitMetadataManager manager = (BukkitMetadataManager) ApolloManager.getMetadataManager();
-            manager.getClientBrands().add(brand);
-        };
-
         Messenger messenger = this.plugin.getServer().getMessenger();
 
         try {
+            PluginMessageListener listener = (channel, player, bytes) -> {
+                try (DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes))) {
+                    this.collectBrand(in.readUTF());
+                } catch (IOException ignored) {
+                }
+            };
+
             messenger.registerIncomingPluginChannel(this.plugin, "MC|Brand", listener);
         } catch (IllegalArgumentException ignored) {
         }
 
-        messenger.registerIncomingPluginChannel(this.plugin, "minecraft:brand", listener);
+        messenger.registerIncomingPluginChannel(this.plugin, "minecraft:brand", (channel, player, bytes) -> {
+            ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
+            this.collectBrand(ByteBufUtil.readString(in));
+        });
+    }
+
+    private void collectBrand(String brand) {
+        BukkitMetadataManager manager = (BukkitMetadataManager) ApolloManager.getMetadataManager();
+        manager.getClientBrands().add(brand);
     }
 
 }

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

@@ -0,0 +1,83 @@
+/*
+ * This file is part of Apollo, licensed under the MIT License.
+ *
+ * Copyright (c) 2023 Moonsworth
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.lunarclient.apollo.util;
+
+import com.google.common.io.ByteArrayDataInput;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Represents a util for reading byte buffs.
+ *
+ * @since 1.1.9
+ */
+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;
+
+        while (true) {
+            byte b = in.readByte();
+            i |= (b & 0x7F) << j++ * 7;
+
+            if (j > 5) {
+                throw new RuntimeException("VarInt too big");
+            }
+
+            if ((b & 0x80) != 128) {
+                break;
+            }
+        }
+
+        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];
+        in.readFully(bytes);
+
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    private ByteBufUtil() {
+    }
+
+}

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

@@ -28,8 +28,10 @@
 import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.metadata.BungeeMetadataManager;
 import com.lunarclient.apollo.util.ByteBufUtil;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -75,14 +77,27 @@ public void onPluginMessage(PluginMessageEvent event) {
         }
 
         String tag = event.getTag();
+        byte[] data = event.getData();
 
-        if (tag.equals("minecraft:brand") || tag.equals("MC|Brand")) {
-            this.handleBrand(event.getData());
-            return;
-        }
+        switch (tag) {
+            case "MC|Brand": {
+                try (DataInputStream in = new DataInputStream(new ByteArrayInputStream(data))) {
+                    this.collectBrand(in.readUTF());
+                } catch (IOException ignored) {
+                }
 
-        if (tag.equals("fml:handshake") || tag.equals("FML|HS")) {
-            this.handleFml(event.getData());
+                break;
+            }
+            case "minecraft:brand": {
+                ByteArrayDataInput in = ByteStreams.newDataInput(data);
+                this.collectBrand(ByteBufUtil.readString(in));
+                break;
+            }
+            case "fml:handshake":
+            case "FML|HS": {
+                this.handleFml(data);
+                break;
+            }
         }
     }
 
@@ -112,8 +127,7 @@ public void onPreLogin(PreLoginEvent event) {
         manager.getServerAddress().add(hostString + ":" + host.getPort());
     }
 
-    private void handleBrand(byte[] data) {
-        String brand = new String(data, StandardCharsets.UTF_8);
+    private void collectBrand(String brand) {
         BungeeMetadataManager manager = (BungeeMetadataManager) ApolloManager.getMetadataManager();
         manager.getClientBrands().add(brand);
     }