feat: Patch the client to support Hypixel

feat: Patch the client to support Hypixel

Author: milutinke

MinecraftClient/Logger/FileLogLogger.cs

@@ -90,6 +90,17 @@ public override void Debug(string msg)
             }
         }
 
+        public override void PacketDebug(string msg)
+        {
+            if (Settings.Config.Logging.PacketDebugMessages)
+            {
+                if (ShouldDisplay(FilterChannel.Debug, msg))
+                {
+                    LogAndSave("§8[DEBUG] " + msg);
+                }
+            }
+        }
+
         public override void Error(string msg)
         {
             base.Error(msg);

MinecraftClient/Logger/FilteredLogger.cs

@@ -57,6 +57,17 @@ public override void Debug(string msg)
             }
         }
 
+        public override void PacketDebug(string msg)
+        {
+            if (Settings.Config.Logging.PacketDebugMessages)
+            {
+                if (ShouldDisplay(FilterChannel.Debug, msg))
+                {
+                    Log("§8[DEBUG] " + msg);
+                }
+            }
+        }
+
         public override void Info(string msg)
         {
             if (InfoEnabled)

MinecraftClient/Logger/ILogger.cs

@@ -16,6 +16,10 @@ public interface ILogger
         void Debug(string msg, params object[] args);
         void Debug(object msg);
 
+        void PacketDebug(string msg);
+        void PacketDebug(string msg, params object[] args);
+        void PacketDebug(object msg);
+
         void Warn(string msg);
         void Warn(string msg, params object[] args);
         void Warn(object msg);

MinecraftClient/Logger/LoggerBase.cs

@@ -40,6 +40,18 @@ public void Debug(object msg)
             Debug(msg.ToString() ?? string.Empty);
         }
 
+        public abstract void PacketDebug(string msg);
+
+        public void PacketDebug(string msg, params object[] args)
+        {
+            PacketDebug(string.Format(msg, args));
+        }
+
+        public void PacketDebug(object msg)
+        {
+            PacketDebug(msg.ToString() ?? string.Empty);
+        }
+
         public abstract void Error(string msg);
 
         public void Error(string msg, params object[] args)

MinecraftClient/McClient.cs

@@ -3435,7 +3435,8 @@ public void OnGameJoined(bool isOnlineMode)
             if (!String.IsNullOrWhiteSpace(bandString))
                 handler.SendBrandInfo(bandString.Trim());
 
-            if (Config.MCSettings.Enabled)
+            // 1.20.2+ expects ClientInformation during configuration; older servers still want it here.
+            if (Config.MCSettings.Enabled && protocolversion < Protocol18Handler.MC_1_20_2_Version)
                 handler.SendClientSettings(
                     Config.MCSettings.Locale,
                     Config.MCSettings.RenderDistance,

MinecraftClient/Protocol/Handlers/DataTypes.cs

@@ -1424,17 +1424,24 @@ public string ReadNextChat(Queue<byte> cache)
         {
             if (protocolversion >= Protocol18Handler.MC_1_20_4_Version)
             {
-                // Read as NBT
-                var r = ReadNextNbt(cache);
-                var msg = ChatParser.ParseText(r);
-                return msg;
-            }
-            else
-            {
-                // Read as String
-                var json = ReadNextString(cache);
-                return ChatParser.ParseText(json);
+                // Vanilla 1.20.4+ uses NBT here, but Hypixel exposed a JSON-string fallback on the same path.
+                Queue<byte> fallbackCache = new(cache);
+                try
+                {
+                    var r = ReadNextNbt(cache);
+                    return ChatParser.ParseText(r);
+                }
+                catch (System.IO.InvalidDataException)
+                {
+                    cache.Clear();
+                    foreach (var b in fallbackCache)
+                        cache.Enqueue(b);
+                }
             }
+
+            // Read as String
+            var json = ReadNextString(cache);
+            return ChatParser.ParseText(json);
         }
 
         /// <summary>