Handle dialog open packets that were not initiated client-side

ethanmoffat · Sep 20, 2022 · c12bd67 · c12bd67
1 parent 5433ead
commit c12bd67
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/EOLib/Domain/Notifiers/IUserInterfaceNotifier.cs b/EOLib/Domain/Notifiers/IUserInterfaceNotifier.cs
@@ -1,16 +1,21 @@
 using AutomaticTypeMapper;
+using EOLib.Net;
 using System.Collections.Generic;
 
 namespace EOLib.Domain.Notifiers
 {
     public interface IUserInterfaceNotifier
     {
+        void NotifyPacketDialog(PacketFamily packetFamily);
+
         void NotifyMessageDialog(string title, IReadOnlyList<string> messages);
     }
 
     [AutoMappedType]
     public class NoOpUserInterfaceNotifier : IUserInterfaceNotifier
     {
+        public void NotifyPacketDialog(PacketFamily packetFamily) { }
+
         public void NotifyMessageDialog(string title, IReadOnlyList<string> messages) { }
     }
 }
diff --git a/EOLib/PacketHandlers/Chest/ChestOpenHandler.cs b/EOLib/PacketHandlers/Chest/ChestOpenHandler.cs
@@ -1,26 +1,30 @@
 using AutomaticTypeMapper;
-using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net;
 using EOLib.Net.Handlers;
+using System.Collections.Generic;
 
 namespace EOLib.PacketHandlers.Chest
 {
     [AutoMappedType]
     public class ChestOpenHandler : InGameOnlyPacketHandler
     {
         private readonly IChestDataRepository _chestDataRepository;
+        private readonly IEnumerable<IUserInterfaceNotifier> _userInterfaceNotifiers;
 
         public override PacketFamily Family => PacketFamily.Chest;
 
         public override PacketAction Action => PacketAction.Open;
 
         public ChestOpenHandler(IPlayerInfoProvider playerInfoProvider,
-                                IChestDataRepository chestDataRepository)
+                                IChestDataRepository chestDataRepository,
+                                IEnumerable<IUserInterfaceNotifier> userInterfaceNotifiers)
             : base(playerInfoProvider)
         {
             _chestDataRepository = chestDataRepository;
+            _userInterfaceNotifiers = userInterfaceNotifiers;
         }
 
         public override bool HandlePacket(IPacket packet)
@@ -35,6 +39,9 @@ public override bool HandlePacket(IPacket packet)
             while (packet.ReadPosition < packet.Length)
                 _chestDataRepository.Items.Add(new ChestItem(packet.ReadShort(), packet.ReadThree(), i++));
 
+            foreach (var notifier in _userInterfaceNotifiers)
+                notifier.NotifyPacketDialog(Family);
+
             return true;
         }
     }

diff --git a/EOLib/PacketHandlers/Locker/LockerOpenHandler.cs b/EOLib/PacketHandlers/Locker/LockerOpenHandler.cs
@@ -2,8 +2,10 @@
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net;
 using EOLib.Net.Handlers;
+using System.Collections.Generic;
 
 namespace EOLib.PacketHandlers.Locker
 {
@@ -14,16 +16,19 @@ namespace EOLib.PacketHandlers.Locker
     public class LockerOpenHandler : InGameOnlyPacketHandler
     {
         private readonly ILockerDataRepository _lockerDataRepository;
+        private readonly IEnumerable<IUserInterfaceNotifier> _userInterfaceNotifiers;
 
         public override PacketFamily Family => PacketFamily.Locker;
 
         public override PacketAction Action => PacketAction.Open;
 
         public LockerOpenHandler(IPlayerInfoProvider playerInfoProvider,
-                                 ILockerDataRepository lockerDataRepository)
+                                 ILockerDataRepository lockerDataRepository,
+                                 IEnumerable<IUserInterfaceNotifier> userInterfaceNotifiers)
             : base(playerInfoProvider)
         {
             _lockerDataRepository = lockerDataRepository;
+            _userInterfaceNotifiers = userInterfaceNotifiers;
         }
 
         public override bool HandlePacket(IPacket packet)
@@ -37,6 +42,9 @@ public override bool HandlePacket(IPacket packet)
             while (packet.ReadPosition < packet.Length)
                 _lockerDataRepository.Items.Add(new InventoryItem(packet.ReadShort(), packet.ReadThree()));
 
+            foreach (var notifier in _userInterfaceNotifiers)
+                notifier.NotifyPacketDialog(Family);
+
             return true;
         }
     }

diff --git a/EndlessClient/HUD/ServerMessageActions.cs b/EndlessClient/HUD/ServerMessageActions.cs
@@ -1,20 +1,30 @@
 using AutomaticTypeMapper;
 using EndlessClient.Dialogs.Actions;
 using EOLib.Domain.Notifiers;
+using EOLib.Net;
 using System.Collections.Generic;
 
 namespace EndlessClient.HUD
 {
     [AutoMappedType]
-    public class ServerMessageActions : IUserInterfaceNotifier
+    public class UserInterfaceActions : IUserInterfaceNotifier
     {
         private readonly IInGameDialogActions _inGameDialogActions;
 
-        public ServerMessageActions(IInGameDialogActions inGameDialogActions)
+        public UserInterfaceActions(IInGameDialogActions inGameDialogActions)
         {
             _inGameDialogActions = inGameDialogActions;
         }
 
+        public void NotifyPacketDialog(PacketFamily packetFamily)
+        {
+            switch (packetFamily)
+            {
+                case PacketFamily.Locker: _inGameDialogActions.ShowLockerDialog(); break;
+                case PacketFamily.Chest: _inGameDialogActions.ShowChestDialog(); break;
+            }
+        }
+
         public void NotifyMessageDialog(string title, IReadOnlyList<string> messages)
         {
             _inGameDialogActions.ShowMessageDialog(title, messages);