better autoretainer handling

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 I try to keep this changelog up to date with the latest changes in the project.
 
+## [1.5.2.0]
+- better AutoRetainer handling
+
 ## [1.5.1.0]
 - timer bugfix
 

HoardFarm/IPC/AutoRetainerIPC.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using ECommons.EzIpcManager;
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+namespace HoardFarm.IPC;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "UnassignedReadonlyField")]
+public class AutoRetainerIPC
+{
+    public AutoRetainerIPC()
+    {
+        EzIPC.Init(this, "AutoRetainer.PluginState");
+    }
+
+    [EzIPC] public readonly Func<bool> IsBusy;
+    [EzIPC] public readonly Func<int> GetInventoryFreeSlotCount;
+}

HoardFarm/ImGuiEx/ImGuiEx.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 using Dalamud.Interface;
+using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.Internal.Notifications;
 using Dalamud.Interface.Utility;
 using ECommons.ImGuiMethods;
@@ -32,7 +33,7 @@ public record HeaderIconOptions
     private static uint headerCurrentPos = 0;
     private static float headerImGuiButtonWidth = 0;
 
-    public static bool AddHeaderIcon(string id, FontAwesomeIcon icon, HeaderIconOptions options = null)
+    public static bool AddHeaderIcon(string id, FontAwesomeIcon icon, HeaderIconOptions? options = null)
     {
         if (ImGui.IsWindowCollapsed()) return false;
 
@@ -72,7 +73,12 @@ public static bool AddHeaderIcon(string id, FontAwesomeIcon icon, HeaderIconOpti
             if (ImGui.IsMouseReleased(options.MouseButton))
                 pressed = true;
             if (options.ToastTooltipOnClick && ImGui.IsMouseReleased(options.ToastTooltipOnClickButton))
-                PluginInterface.UiBuilder.AddNotification(options.Tooltip!, null, NotificationType.Info);
+                NotificationManager.AddNotification(new Notification
+                {
+                    Type = NotificationType.Info,
+                    Content = options.Tooltip,
+                    Title = null,
+                });
         }
 
         ImGui.SetCursorPos(buttonPos);

HoardFarm/Service/HoardFarmService.cs

@@ -342,7 +342,9 @@ private void UpdateObjectPositions()
 
     private bool CheckRetainer()
     {
-        if (Config.DoRetainers && RetainerService.CheckRetainersDone(Config.RetainerMode == 1))
+        if (Config.DoRetainers 
+            && RetainerService.CheckRetainersDone(Config.RetainerMode == 1) 
+            && RetainerScv.CanRunRetainer())
         {
             RetainerScv.StartProcess();
             return true;

HoardFarm/Service/PluginService.cs

@@ -39,6 +39,8 @@ public class PluginService
     [PluginService]
     public static ITargetManager TargetManager { get; private set; } = null!;
     [PluginService]
+    public static INotificationManager NotificationManager { get; private set; } = null!;
+    [PluginService]
     public static IPluginLog PluginLog { get; private set; } = null!;
     public static Configuration Config { get; set; } = null!;
     public static HoardFarmService HoardService { get; set; } = null!;

HoardFarm/Service/RetainerService.cs

@@ -15,32 +15,39 @@ namespace HoardFarm.Service;
 public class RetainerService : IDisposable
 {
     public bool Running {get; private set;}
-    private bool finished;
     private readonly Timer updateTimer;
     private DateTime startedAt;
+    private bool autoRetainerEnabled;
+    private readonly AutoRetainerIPC autoRetainerIcp = new();
+
+    private DateTime? autoRetainerRunningTreshold;
 
     public RetainerService()
     {
-        RetainerApi.OnRetainerPostprocessStep += CheckRetainerPostProcess;
         updateTimer = new Timer();
         updateTimer.Elapsed += OnTimerUpdate;
         updateTimer.Interval = 1000;
         updateTimer.Enabled = false;
     }
 
-
     public void Dispose()
     {
-        RetainerApi.OnRetainerPostprocessStep -= CheckRetainerPostProcess;
         updateTimer.Dispose();
     }
 
     public void StartProcess()
     {
-        Running = true;
-        finished = false;
-        updateTimer.Enabled = true;
-        startedAt = DateTime.Now;
+        if (CanRunRetainer())
+        {
+            Running = true;
+            autoRetainerEnabled = false;
+            updateTimer.Enabled = true;
+            startedAt = DateTime.Now;
+        }
+        else
+        {
+            PluginLog.Information("Not enough inventory space to run retainers.");
+        }
     }
 
     public unsafe void FinishProcess()
@@ -61,7 +68,6 @@ public unsafe void FinishProcess()
         }
     }
 
-
     private unsafe void OnTimerUpdate(object? sender, ElapsedEventArgs e)
     {
         if (DateTime.Now.Subtract(startedAt).TotalMinutes > 5)
@@ -75,7 +81,7 @@ private unsafe void OnTimerUpdate(object? sender, ElapsedEventArgs e)
             return;
         }
 
-        if (!TaskManager.IsBusy && Running)
+        if (!TaskManager.IsBusy && Running && !AutoRetainerRunning())
         {
             if (Player.Territory != LimsaMapId)
             {
@@ -100,13 +106,15 @@ private unsafe void OnTimerUpdate(object? sender, ElapsedEventArgs e)
                 {
                     Enqueue(() => { 
                         EnableAutoRetainer();
+                        autoRetainerEnabled = true;
                         return true;
                     });
                 }
                 return;
             }
 
-            if (CheckRetainerListOpen() && finished)
+            // We not reach here until autoretainer is done
+            if (autoRetainerEnabled && !AutoRetainerRunning())
             {
                 FinishProcess();
             }
@@ -159,31 +167,31 @@ private void DisableAutoRetainer()
             });
         }
     }
-
-    private void CheckRetainerPostProcess(string retainername)
-    {
-        PluginLog.Information($"Retainer {retainername} has finished processing.");
-        if (CheckAllRetainersOnVenture())
-        {
-            PluginLog.Information("All retainers are processed.");
-            finished = true;
-        }
-    }
 
     public static bool CheckRetainersDone(bool all = true)
     {
         var data = RetainerApi.GetOfflineCharacterData(ClientState.LocalContentId).RetainerData;
         return all ? data.All(e => CheckIsDone(e.VentureEndsAt)) : data.Any(e => CheckIsDone(e.VentureEndsAt));
     }
 
-    public static bool CheckAllRetainersOnVenture()
-    {
-        var data = RetainerApi.GetOfflineCharacterData(ClientState.LocalContentId).RetainerData;
-        return data.All(e => CheckIsDone(e.VentureEndsAt) == false);
-    }
-
     private static bool CheckIsDone(long time)
     {
         return time+10 <= CSFramework.GetServerTime();
     }
+
+    private bool AutoRetainerRunning()
+    {
+        if (autoRetainerIcp.IsBusy())
+            autoRetainerRunningTreshold = null;
+        else
+            autoRetainerRunningTreshold ??= DateTime.Now.AddSeconds(10);
+
+        return autoRetainerRunningTreshold == null || autoRetainerRunningTreshold > DateTime.Now; 
+    }
+
+    public bool CanRunRetainer()
+    {
+        return autoRetainerIcp.GetInventoryFreeSlotCount() > 4;
+    }
+
 }

HoardFarm/Utils/Utils.cs

@@ -149,4 +149,15 @@ public static unsafe bool CanUseMagicite()
 
         return false;
     }
+
+    public static bool AutoRetainerVersionHighEnough()
+    {
+        if (DalamudReflector.TryGetDalamudPlugin("AutoRetainer", out var plugin, false, true))
+        {
+            var minimalVersion = new Version(4, 2, 6, 3);
+            return plugin.GetType().Assembly.GetName().Version >= minimalVersion;
+        }
+
+        return false;
+    }
 }

HoardFarm/Windows/MainWindow.cs

@@ -187,14 +187,14 @@ public override void Draw()
 
     private void DrawRetainerSettings()
     {
-        using (_ = ImRaii.Disabled(!RetainerApi.Ready))
+        using (_ = ImRaii.Disabled(!RetainerApi.Ready || !AutoRetainerVersionHighEnough()))
         {
             var enabled = Config.DoRetainers;
             if (ImGui.Checkbox("Do retainers:", ref enabled)) Config.DoRetainers = enabled;
         }
 
         var hoverText = "Ports to Limsa Lominsa and runs retainers between runs if done.";
-        if (!RetainerApi.Ready) hoverText = "This features requires AutoRetainer to be installed and configured.";
+        if (!RetainerApi.Ready) hoverText = "This features requires AutoRetainer 4.2.6.3 or higher to be installed and configured.";
 
         if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) ImGui.SetTooltip(hoverText);