Questionable/Controller/GatheringController.cs

@@ -51,7 +51,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
         IServiceProvider serviceProvider,
         IDataManager dataManager,
         IPluginLog pluginLog)
-        : base(chatGui, condition, serviceProvider, dataManager, logger)
+        : base(chatGui, condition, serviceProvider, logger)
     {
         _movementController = movementController;
         _gatheringPointRegistry = gatheringPointRegistry;

Questionable/Controller/MiniTaskController.cs

@@ -2,18 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Game.ClientState.Conditions;
-using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
-using LLib;
-using Lumina.Excel.GeneratedSheets;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps;
+using Questionable.Controller.Steps.Common;
 using Questionable.Controller.Steps.Interactions;
 using Questionable.Controller.Steps.Shared;
-using Questionable.Functions;
 using Questionable.Model.Questing;
-using Mount = Questionable.Controller.Steps.Common.Mount;
 
 namespace Questionable.Controller;
 
@@ -26,17 +22,13 @@ internal abstract class MiniTaskController<T>
     private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<T> _logger;
 
-    private readonly string _actionCanceledText;
-
     protected MiniTaskController(IChatGui chatGui, ICondition condition, IServiceProvider serviceProvider,
-        IDataManager dataManager, ILogger<T> logger)
+        ILogger<T> logger)
     {
         _chatGui = chatGui;
         _logger = logger;
         _serviceProvider = serviceProvider;
         _condition = condition;
-
-        _actionCanceledText = dataManager.GetString<LogMessage>(1314, x => x.Text)!;
     }
 
     protected virtual void UpdateCurrentTask()
@@ -180,22 +172,4 @@ internal abstract class MiniTaskController<T>
         foreach (ITask task in _taskQueue.RemainingTasks)
             _logger.LogInformation("- {TaskName}", task);
     }
-
-    public void OnErrorToast(ref SeString message, ref bool isHandled)
-    {
-        if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware)
-        {
-            if (toastAware.OnErrorToast(message))
-            {
-                isHandled = true;
-            }
-        }
-
-        if (!isHandled)
-        {
-            if (GameFunctions.GameStringEquals(_actionCanceledText, message.TextValue) &&
-                !_condition[ConditionFlag.InFlight])
-                InterruptQueueWithCombat();
-        }
-    }
 }

Questionable/Controller/QuestController.cs

@@ -43,6 +43,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
     private readonly TaskCreator _taskCreator;
     private readonly ILogger<QuestController> _logger;
 
+    private readonly string _actionCanceledText;
+
     private readonly object _progressLock = new();
 
     private QuestProgress? _startedQuest;
@@ -82,7 +84,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
         TaskCreator taskCreator,
         IServiceProvider serviceProvider,
         IDataManager dataManager)
-        : base(chatGui, condition, serviceProvider, dataManager, logger)
+        : base(chatGui, condition, serviceProvider, logger)
     {
         _clientState = clientState;
         _gameFunctions = gameFunctions;
@@ -103,6 +105,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
         _condition.ConditionChange += OnConditionChange;
         _toastGui.Toast += OnNormalToast;
         _toastGui.ErrorToast += OnErrorToast;
+
+        _actionCanceledText = dataManager.GetString<LogMessage>(1314, x => x.Text)!;
     }
 
     public EAutomationType AutomationType
@@ -805,6 +809,24 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
         _gatheringController.OnNormalToast(message);
     }
 
+    private void OnErrorToast(ref SeString message, ref bool isHandled)
+    {
+        if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware)
+        {
+            if (toastAware.OnErrorToast(message))
+            {
+                isHandled = true;
+            }
+        }
+
+        if (!isHandled)
+        {
+            if (GameFunctions.GameStringEquals(_actionCanceledText, message.TextValue) &&
+                !_condition[ConditionFlag.InFlight])
+                InterruptQueueWithCombat();
+        }
+    }
+
     public void Dispose()
     {
         _toastGui.ErrorToast -= OnErrorToast;

Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Numerics;
 using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps.Shared;
@@ -27,7 +26,7 @@ internal static class MoveToLandingLocation
         MoveTo.MoveExecutor moveExecutor,
         GameFunctions gameFunctions,
         IObjectTable objectTable,
-        ILogger<MoveToLandingLocationExecutor> logger) : TaskExecutor<Task>, IToastAware
+        ILogger<MoveToLandingLocationExecutor> logger) : TaskExecutor<Task>
     {
         private ITask _moveTask = null!;
 
@@ -58,6 +57,5 @@ internal static class MoveToLandingLocation
         }
 
         public override ETaskResult Update() => moveExecutor.Update();
-        public bool OnErrorToast(SeString message) => moveExecutor.OnErrorToast(message);
     }
 }

Questionable/Controller/Steps/Shared/Gather.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Game.Text;
-using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
 using FFXIVClientStructs.FFXIV.Client.Game;
@@ -125,8 +124,7 @@ internal static class Gather
         }
     }
 
-    internal sealed class StartGathering(GatheringController gatheringController) : TaskExecutor<GatheringTask>,
-        IToastAware
+    internal sealed class StartGathering(GatheringController gatheringController) : TaskExecutor<GatheringTask>
     {
         protected override bool Start()
         {
@@ -142,13 +140,6 @@ internal static class Gather
 
             return ETaskResult.StillRunning;
         }
-
-        public bool OnErrorToast(SeString message)
-        {
-            bool isHandled = false;
-            gatheringController.OnErrorToast(ref message, ref isHandled);
-            return isHandled;
-        }
     }
 
     /// <summary>