Merge pull request #9 from BeldaFr/main

Dawtrail update
BeldaFr · Aug 11, 2024 · f107e90 · f107e90
2 parents fad7e2f + 546e8f4
commit f107e90
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Eorzap/Configuration.cs b/Eorzap/Configuration.cs
@@ -55,9 +55,9 @@ public class Configuration : IPluginConfiguration
 
         // the below exist just to make saving less cumbersome
         [NonSerialized]
-        private DalamudPluginInterface? PluginInterface;
+        private IDalamudPluginInterface? PluginInterface;
 
-        public void Initialize(DalamudPluginInterface pluginInterface)
+        public void Initialize(IDalamudPluginInterface pluginInterface)
         {
             this.PluginInterface = pluginInterface;
         }

diff --git a/Eorzap/Plugin.cs b/Eorzap/Plugin.cs
@@ -23,7 +23,7 @@ public sealed class Plugin : IDalamudPlugin
         public string Name => "Eorzap";
         private const string CommandName = "/eorzap";
 
-        private DalamudPluginInterface PluginInterface { get; init; }
+        private IDalamudPluginInterface PluginInterface { get; init; }
         private ICommandManager CommandManager { get; init; }
         private IChatGui Chat { get; init; } = null!;
         public Configuration Configuration { get; init; }
@@ -33,9 +33,9 @@ public sealed class Plugin : IDalamudPlugin
         private MainWindow MainWindow { get; init; }
 
         public Plugin(
-            [RequiredVersion("1.0")] DalamudPluginInterface pluginInterface,
-            [RequiredVersion("1.0")] ICommandManager commandManager,
-            [RequiredVersion("1.0")] IChatGui chat)
+            IDalamudPluginInterface pluginInterface,
+            ICommandManager commandManager,
+            IChatGui chat)
         {
             this.PluginInterface = pluginInterface;
             this.CommandManager = commandManager;
@@ -58,7 +58,7 @@ public Plugin(
 
             this.PluginInterface.UiBuilder.Draw += DrawUI;
             this.PluginInterface.UiBuilder.OpenConfigUi += DrawConfigUI;
-            this.Chat.ChatMessage += OnChatMessage;
+            this.Chat.ChatMessage += this.OnChatMessage;
         }
 
         public void Dispose()
@@ -69,7 +69,7 @@ public void Dispose()
             MainWindow.Dispose();
 
             this.CommandManager.RemoveHandler(CommandName);
-            this.Chat.ChatMessage -= OnChatMessage;
+            //this.Chat.ChatMessage -= OnChatMessage;
         }
 
         private void OnCommand(string command, string args)
@@ -89,7 +89,7 @@ public void DrawConfigUI()
         }
 
         //public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
-        private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled)
+        public void OnChatMessage(XivChatType type, int timestamp, ref SeString sender, ref SeString message, ref bool isHandled)
         {
             // for now only check a message if in a FC
             // Need to add a config file to check which chat to check

diff --git a/Eorzap/packages.lock.json b/Eorzap/packages.lock.json
@@ -1,12 +1,12 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0-windows7.0": {
+    "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
       }
     }
   }