Merge pull request #6 from Diddyy/feature/catalog-integration-base

Fix revision parser mapping duplicates and serializer payloads

Author: billsonnn

TurboSamplePlugin/Revision/Revision20260112/Parsers/Quest/GetDailyTasksMessageParser.cs

@@ -0,0 +1,11 @@
+using Turbo.Primitives.Messages.Incoming.Quest;
+using Turbo.Primitives.Networking;
+using Turbo.Primitives.Packets;
+
+namespace TurboSamplePlugin.Revision.Revision20260112.Parsers.Quest;
+
+internal class GetDailyTasksMessageParser : IParser
+{
+    public IMessageEvent Parse(IClientPacket packet) => new GetDailyTasksMessage();
+}
+

TurboSamplePlugin/Revision/Revision20260112/Parsers/Room/Engine/ClickCharacterMessageParser.cs

@@ -0,0 +1,12 @@
+using Turbo.Primitives.Messages.Incoming.Room.Engine;
+using Turbo.Primitives.Networking;
+using Turbo.Primitives.Packets;
+
+namespace TurboSamplePlugin.Revision.Revision20260112.Parsers.Room.Engine;
+
+internal class ClickCharacterMessageParser : IParser
+{
+    public IMessageEvent Parse(IClientPacket packet) =>
+        new ClickCharacterMessage { UserId = packet.PopInt() };
+}
+

TurboSamplePlugin/Revision/Revision20260112/Parsers/Users/BlockListInitMessageParser.cs

@@ -0,0 +1,11 @@
+using Turbo.Primitives.Messages.Incoming.Users;
+using Turbo.Primitives.Networking;
+using Turbo.Primitives.Packets;
+
+namespace TurboSamplePlugin.Revision.Revision20260112.Parsers.Users;
+
+internal class BlockListInitMessageParser : IParser
+{
+    public IMessageEvent Parse(IClientPacket packet) => new BlockListInitMessage();
+}
+

TurboSamplePlugin/Revision/Revision20260112/Revision20260112.cs

@@ -9,6 +9,7 @@
 using Turbo.Primitives.Messages.Outgoing.Catalog;
 using Turbo.Primitives.Messages.Outgoing.Collectibles;
 using Turbo.Primitives.Messages.Outgoing.FriendList;
+using Turbo.Primitives.Messages.Outgoing.Groupforums;
 using Turbo.Primitives.Messages.Outgoing.Handshake;
 using Turbo.Primitives.Messages.Outgoing.Inventory.Achievements;
 using Turbo.Primitives.Messages.Outgoing.Inventory.Avatareffect;
@@ -22,7 +23,9 @@
 using Turbo.Primitives.Messages.Outgoing.Mysterybox;
 using Turbo.Primitives.Messages.Outgoing.Navigator;
 using Turbo.Primitives.Messages.Outgoing.NewNavigator;
+using Turbo.Primitives.Messages.Outgoing.Nft;
 using Turbo.Primitives.Messages.Outgoing.Notifications;
+using Turbo.Primitives.Messages.Outgoing.Perk;
 using Turbo.Primitives.Messages.Outgoing.Preferences;
 using Turbo.Primitives.Messages.Outgoing.Room.Action;
 using Turbo.Primitives.Messages.Outgoing.Room.Bots;
@@ -110,6 +113,7 @@
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Catalog;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Collectibles;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.FriendList;
+using TurboSamplePlugin.Revision.Revision20260112.Serializers.Groupforums;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Handshake;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Inventory.Achievements;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Inventory.Avatareffect;
@@ -123,7 +127,9 @@
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Mysterybox;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Navigator;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.NewNavigator;
+using TurboSamplePlugin.Revision.Revision20260112.Serializers.Nft;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Notifications;
+using TurboSamplePlugin.Revision.Revision20260112.Serializers.Perk;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Preferences;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Room.Action;
 using TurboSamplePlugin.Revision.Revision20260112.Serializers.Room.Bots;
@@ -946,8 +952,8 @@ public class Revision20260112 : IRevision
                 MessageEvent.GetConcurrentUsersRewardMessageEvent,
                 new GetConcurrentUsersRewardMessageParser()
             },
+            { MessageEvent.GetDailyTasksEvent, new GetDailyTasksMessageParser() },
             { MessageEvent.GetDailyQuestMessageEvent, new GetDailyQuestMessageParser() },
-            { MessageEvent.GetDailyTasksEvent, new GetDailyQuestMessageParser() },
             { MessageEvent.GetQuestsMessageEvent, new GetQuestsMessageParser() },
             {
                 MessageEvent.GetSeasonalQuestsOnlyMessageEvent,
@@ -991,7 +997,6 @@ public class Revision20260112 : IRevision
             },
             { MessageEvent.DanceMessageEvent, new DanceMessageParser() },
             { MessageEvent.DropCarryItemMessageEvent, new DropCarryItemMessageParser() },
-            { MessageEvent.ClickCharacterEvent, new LookToMessageParser() },
             { MessageEvent.LookToMessageEvent, new LookToMessageParser() },
             { MessageEvent.PassCarryItemMessageEvent, new PassCarryItemMessageParser() },
             { MessageEvent.PassCarryItemToPetMessageEvent, new PassCarryItemToPetMessageParser() },
@@ -1015,6 +1020,7 @@ public class Revision20260112 : IRevision
             #endregion
 
             #region Room Engine
+            { MessageEvent.ClickCharacterEvent, new ClickCharacterMessageParser() },
             { MessageEvent.ClickFurniMessageEvent, new ClickFurniMessageParser() },
             {
                 MessageEvent.GetFurnitureAliasesMessageEvent,
@@ -1331,8 +1337,8 @@ public class Revision20260112 : IRevision
                 MessageEvent.GetHabboGroupDetailsMessageEvent,
                 new GetHabboGroupDetailsMessageParser()
             },
+            { MessageEvent.BlockListInitEvent, new BlockListInitMessageParser() },
             { MessageEvent.GetIgnoredUsersMessageEvent, new GetIgnoredUsersMessageParser() },
-            { MessageEvent.BlockListInitEvent, new GetIgnoredUsersMessageParser() },
             {
                 MessageEvent.GetMemberGuildItemCountMessageEvent,
                 new GetMemberGuildItemCountMessageParser()
@@ -1782,6 +1788,12 @@ public class Revision20260112 : IRevision
                     MessageComposer.SilverBalanceMessageComposer
                 )
             },
+            {
+                typeof(UserNftChatStylesMessageComposer),
+                new UserNftChatStylesMessageComposerSerializer(
+                    MessageComposer.UserNftChatStylesMessageComposer
+                )
+            },
             #endregion
 
             #region FriendList
@@ -1863,6 +1875,15 @@ public class Revision20260112 : IRevision
             },
             #endregion
 
+            #region Groupforums
+            {
+                typeof(UnreadForumsCountMessageComposer),
+                new UnreadForumsCountMessageComposerSerializer(
+                    MessageComposer.UnreadForumsCountMessageComposer
+                )
+            },
+            #endregion
+
             #region Inventory
 
             #region Inventory Achievements
@@ -2431,6 +2452,15 @@ public class Revision20260112 : IRevision
             },
             #endregion
 
+            #region Perk
+            {
+                typeof(PerkAllowancesMessageComposer),
+                new PerkAllowancesMessageComposerSerializer(
+                    MessageComposer.PerkAllowancesMessageComposer
+                )
+            },
+            #endregion
+
             #region Preferences
             {
                 typeof(AccountPreferencesEventMessageComposer),
@@ -3132,6 +3162,12 @@ public class Revision20260112 : IRevision
                     MessageComposer.ExtendedProfileChangedMessageComposer
                 )
             },
+            {
+                typeof(IgnoredUsersMessageComposer),
+                new IgnoredUsersMessageComposerSerializer(
+                    MessageComposer.IgnoredUsersMessageComposer
+                )
+            },
             {
                 typeof(ScrSendUserInfoMessageComposer),
                 new ScrSendUserInfoMessageSerializer(MessageComposer.ScrSendUserInfoComposer)

TurboSamplePlugin/Revision/Revision20260112/Serializers/Catalog/NotEnoughBalanceMessageComposerSerializer.cs

@@ -8,6 +8,8 @@ internal class NotEnoughBalanceMessageComposerSerializer(int header)
 {
     protected override void Serialize(IServerPacket packet, NotEnoughBalanceMessageComposer message)
     {
-        //
+        packet.WriteBoolean(message.NotEnoughCredits);
+        packet.WriteBoolean(message.NotEnoughActivityPoints);
+        packet.WriteInteger(message.ActivityPointType);
     }
 }

TurboSamplePlugin/Revision/Revision20260112/Serializers/Groupforums/UnreadForumsCountMessageComposerSerializer.cs

@@ -11,6 +11,6 @@ protected override void Serialize(
         UnreadForumsCountMessageComposer message
     )
     {
-        //
+        packet.WriteInteger(message.UnreadForumsCount);
     }
 }

TurboSamplePlugin/Revision/Revision20260112/Serializers/Inventory/Badges/BadgePointLimitsEventMessageComposerSerializer.cs

@@ -11,6 +11,14 @@ protected override void Serialize(
         BadgePointLimitsEventMessageComposer message
     )
     {
-        //
+        packet.WriteInteger(message.LimitsByBadgeCodePrefix.Count);
+
+        foreach (var group in message.LimitsByBadgeCodePrefix)
+        {
+            packet.WriteString(group.BadgeCodePrefix).WriteInteger(group.Levels.Count);
+
+            foreach (var level in group.Levels)
+                packet.WriteInteger(level.Level).WriteInteger(level.Limit);
+        }
     }
 }

TurboSamplePlugin/Revision/Revision20260112/Serializers/Nft/UserNftChatStylesMessageComposerSerializer.cs

@@ -11,6 +11,9 @@ protected override void Serialize(
         UserNftChatStylesMessageComposer message
     )
     {
-        //
+        packet.WriteInteger(message.ChatStyleIds.Count);
+
+        foreach (var chatStyleId in message.ChatStyleIds)
+            packet.WriteInteger(chatStyleId);
     }
 }

TurboSamplePlugin/Revision/Revision20260112/Serializers/Notifications/MOTDNotificationEventMessageComposerSerializer.cs

@@ -11,6 +11,9 @@ protected override void Serialize(
         MOTDNotificationEventMessageComposer message
     )
     {
-        //
+        packet.WriteInteger(message.Messages.Count);
+
+        foreach (var motd in message.Messages)
+            packet.WriteString(motd);
     }
 }

TurboSamplePlugin/Revision/Revision20260112/Serializers/Perk/PerkAllowancesMessageComposerSerializer.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Turbo.Primitives.Messages.Outgoing.Perk;
 using Turbo.Primitives.Packets;
 
@@ -8,6 +9,9 @@ internal class PerkAllowancesMessageComposerSerializer(int header)
 {
     protected override void Serialize(IServerPacket packet, PerkAllowancesMessageComposer message)
     {
-        //
+        packet.WriteInteger(message.Perks.Count());
+
+        foreach (var perk in message.Perks)
+            packet.WriteString(perk.Code).WriteString(perk.ErrorMessage).WriteBoolean(perk.IsAllowed);
     }
 }