Reimplement Message_Open handler for setting status label from quest

ethanmoffat · Apr 5, 2022 · ca9611f · ca9611f
1 parent 574fb4f
commit ca9611f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 32 deletions.
diff --git a/EOLib/Domain/Interact/Quest/IStatusLabelNotifier.cs b/EOLib/Domain/Interact/Quest/IStatusLabelNotifier.cs
@@ -0,0 +1,15 @@
+using AutomaticTypeMapper;
+
+namespace EOLib.Domain.Interact.Quest
+{
+    public interface IStatusLabelNotifier
+    {
+        void ShowWarning(string message);
+    }
+
+    [AutoMappedType]
+    public class NoOpStatusLabelNotifier : IStatusLabelNotifier
+    {
+        public void ShowWarning(string message) { }
+    }
+}
diff --git a/EOLib/Net/API/Message.cs b/EOLib/Net/API/Message.cs
diff --git a/EOLib/Net/API/PacketAPI.cs b/EOLib/Net/API/PacketAPI.cs
@@ -24,7 +24,6 @@ public PacketAPI(EOClient client)
             _createChestMembers();
             _createInitMembers();
             _createLockerMembers();
-            _createMessageMembers();
             _createMusicMembers();
             _createPartyMembers();
             _createNPCMembers();

diff --git a/EOLib/PacketHandlers/Quest/QuestStatusMessageHandler.cs b/EOLib/PacketHandlers/Quest/QuestStatusMessageHandler.cs
@@ -0,0 +1,43 @@
+using AutomaticTypeMapper;
+using EOLib.Domain.Chat;
+using EOLib.Domain.Interact.Quest;
+using EOLib.Domain.Login;
+using EOLib.Net;
+using EOLib.Net.Handlers;
+using System.Collections.Generic;
+
+namespace EOLib.PacketHandlers.Quest
+{
+    [AutoMappedType]
+    public class QuestStatusMessageHandler : InGameOnlyPacketHandler
+    {
+        private readonly IChatRepository _chatRepository;
+        private readonly IEnumerable<IStatusLabelNotifier> _statusLabelNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Message;
+
+        public override PacketAction Action => PacketAction.Open;
+
+        public QuestStatusMessageHandler(IPlayerInfoProvider playerInfoProvider,
+                                         IChatRepository chatRepository,
+                                         IEnumerable<IStatusLabelNotifier> statusLabelNotifiers)
+            : base(playerInfoProvider)
+        {
+            _chatRepository = chatRepository;
+            _statusLabelNotifiers = statusLabelNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            var message = packet.ReadEndString();
+
+            foreach (var notifier in _statusLabelNotifiers)
+                notifier.ShowWarning(message);
+
+            var chatData = new ChatData(string.Empty, message, ChatIcon.QuestMessage, ChatColor.Server);
+            _chatRepository.AllChat[ChatTab.System].Add(chatData);
+
+            return true;
+        }
+    }
+}
diff --git a/EndlessClient/HUD/StatusLabelSetter.cs b/EndlessClient/HUD/StatusLabelSetter.cs
@@ -1,11 +1,12 @@
 using System;
 using AutomaticTypeMapper;
+using EOLib.Domain.Interact.Quest;
 using EOLib.Localization;
 
 namespace EndlessClient.HUD
 {
     [MappedType(BaseType = typeof(IStatusLabelSetter))]
-    public class StatusLabelSetter : IStatusLabelSetter
+    public class StatusLabelSetter : IStatusLabelSetter, IStatusLabelNotifier
     {
         private readonly IStatusLabelTextRepository _statusLabelTextRepository;
         private readonly ILocalizedStringFinder _localizedStringFinder;
@@ -40,6 +41,11 @@ public void SetStatusLabel(EOResourceID type, string text)
             SetStatusLabelText(_localizedStringFinder.GetString(type), text);
         }
 
+        public void ShowWarning(string message)
+        {
+            SetStatusLabel(EOResourceID.STATUS_LABEL_TYPE_WARNING, message);
+        }
+
         private void SetStatusLabelText(string type, string text, string extra = "")
         {
             _statusLabelTextRepository.StatusText = $"[ {type} ] {text}{extra}";

diff --git a/EndlessClient/Old/PacketAPICallbackManager.cs b/EndlessClient/Old/PacketAPICallbackManager.cs
@@ -5,8 +5,6 @@
 using EndlessClient.Dialogs;
 using EndlessClient.Dialogs.Old;
 using EOLib.Domain.Character;
-using EOLib.Domain.Chat;
-using EOLib.Domain.Map;
 using EOLib.Localization;
 using EOLib.Net.API;
 using XNAControls.Old;
@@ -74,7 +72,6 @@ public void AssignCallbacks()
             m_packetAPI.OnQuestDialog += _questDialog;
             m_packetAPI.OnViewQuestProgress += _questProgress;
             m_packetAPI.OnViewQuestHistory += _questHistory;
-            m_packetAPI.OnStatusMessage += _setStatusLabel;
 
             m_packetAPI.OnPlaySoundEffect += _playSoundEffect;
 
@@ -369,12 +366,6 @@ private void _questHistory(short numquests, List<string> completedquestnames)
             QuestProgressDialog.Instance.SetHistoryDisplayData(numquests, completedquestnames);
         }
 
-        private void _setStatusLabel(string message)
-        {
-            m_game.Hud.SetStatusLabel(EOResourceID.STATUS_LABEL_TYPE_WARNING, message);
-            m_game.Hud.AddChat(ChatTab.System, "", message, ChatIcon.QuestMessage, ChatColor.Server);
-        }
-
         private void _playSoundEffect(int effectID)
         {
             try