Add plugin lock feature

PunishXIV · Nov 5, 2023 · d073e37 · d073e37
1 parent ce7f1a2
commit d073e37
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 21 deletions.
diff --git a/YesAlready/Features/AddonContentsFinderConfirmFeature.cs b/YesAlready/Features/AddonContentsFinderConfirmFeature.cs
@@ -23,7 +23,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.ContentsFinderConfirmEnabled)
+        if (!P.Active || !P.Config.ContentsFinderConfirmEnabled)
             return;
 
         ClickContentsFinderConfirm.Using((nint)addon).Commence();

diff --git a/YesAlready/Features/AddonFGSEnterDialog.cs b/YesAlready/Features/AddonFGSEnterDialog.cs
@@ -24,7 +24,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.FallGuysRegisterConfirm)
+        if (!P.Active || !P.Config.FallGuysRegisterConfirm)
             return;
 
         Callback.Fire(addon, true, 0);

diff --git a/YesAlready/Features/AddonFGSExitDialog.cs b/YesAlready/Features/AddonFGSExitDialog.cs
@@ -25,7 +25,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.FallGuysExitConfirm)
+        if (!P.Active || !P.Config.FallGuysExitConfirm)
             return;
 
         Callback.Fire(addon, true, 0);

diff --git a/YesAlready/Features/AddonGrandCompanySupplyRewardFeature.cs b/YesAlready/Features/AddonGrandCompanySupplyRewardFeature.cs
@@ -26,7 +26,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.GrandCompanySupplyReward)
+        if (!P.Active || !P.Config.GrandCompanySupplyReward)
             return;
 
         ClickGrandCompanySupplyReward.Using((IntPtr)addon).Deliver();

diff --git a/YesAlready/Features/AddonGuildLeveDifficultyFeature.cs b/YesAlready/Features/AddonGuildLeveDifficultyFeature.cs
@@ -23,7 +23,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.GuildLeveDifficultyConfirm)
+        if (!P.Active || !P.Config.GuildLeveDifficultyConfirm)
             return;
 
         Callback.Fire(addon, true, 0, addon->AtkValues[1].Int);

diff --git a/YesAlready/Features/AddonInclusionShopFeature.cs b/YesAlready/Features/AddonInclusionShopFeature.cs
@@ -29,7 +29,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.InclusionShopRememberEnabled)
+        if (!P.Active || !P.Config.InclusionShopRememberEnabled)
             return;
 
         Svc.Log.Debug($"Firing 12,{P.Config.InclusionShopRememberCategory}");

diff --git a/YesAlready/Features/AddonItemInspectionResultFeature.cs b/YesAlready/Features/AddonItemInspectionResultFeature.cs
@@ -29,7 +29,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.ItemInspectionResultEnabled)
+        if (!P.Active || !P.Config.ItemInspectionResultEnabled)
             return;
 
         var addonPtr = (AddonItemInspectionResult*)addon;

diff --git a/YesAlready/Features/AddonJournalResultFeature.cs b/YesAlready/Features/AddonJournalResultFeature.cs
@@ -25,7 +25,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.JournalResultCompleteEnabled)
+        if (!P.Active || !P.Config.JournalResultCompleteEnabled)
             return;
 
         var addonPtr = (AddonJournalResult*)addon;

diff --git a/YesAlready/Features/AddonMateriaRetrieveDialogFeature.cs b/YesAlready/Features/AddonMateriaRetrieveDialogFeature.cs
@@ -24,7 +24,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.MateriaRetrieveDialogEnabled)
+        if (!P.Active || !P.Config.MateriaRetrieveDialogEnabled)
             return;
 
         ClickMateriaRetrieveDialog.Using((nint)addon).Begin();

diff --git a/YesAlready/Features/AddonMaterializeDialogFeature.cs b/YesAlready/Features/AddonMaterializeDialogFeature.cs
@@ -24,7 +24,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.MaterializeDialogEnabled)
+        if (!P.Active || !P.Config.MaterializeDialogEnabled)
             return;
 
         ClickMaterializeDialog.Using((nint)addon).Materialize();

diff --git a/YesAlready/Features/AddonRetainerTaskAskFeature.cs b/YesAlready/Features/AddonRetainerTaskAskFeature.cs
@@ -24,7 +24,7 @@ protected static unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInf
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.RetainerTaskAskEnabled)
+        if (!P.Active || !P.Config.RetainerTaskAskEnabled)
             return;
 
         ClickRetainerTaskAsk.Using((nint)addon).Assign();

diff --git a/YesAlready/Features/AddonRetainerTaskResultFeature.cs b/YesAlready/Features/AddonRetainerTaskResultFeature.cs
@@ -27,7 +27,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.RetainerTaskResultEnabled)
+        if (!P.Active || !P.Config.RetainerTaskResultEnabled)
             return;
 
         var addonPtr = (AddonRetainerTaskResult*)addon;

diff --git a/YesAlready/Features/AddonSalvageDialogFeature.cs b/YesAlready/Features/AddonSalvageDialogFeature.cs
@@ -25,7 +25,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled)
+        if (!P.Active)
             return;
 
         if (P.Config.DesynthBulkDialogEnabled)

diff --git a/YesAlready/Features/AddonSelectIconStringFeature.cs b/YesAlready/Features/AddonSelectIconStringFeature.cs
@@ -28,7 +28,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled)
+        if (!P.Active)
             return;
 
         var addonPtr = (AddonSelectIconString*)addon;

diff --git a/YesAlready/Features/AddonSelectStringFeature.cs b/YesAlready/Features/AddonSelectStringFeature.cs
@@ -28,7 +28,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled)
+        if (!P.Active)
             return;
 
         var addonPtr = (AddonSelectString*)addon;

diff --git a/YesAlready/Features/AddonSelectYesNoFeature.cs b/YesAlready/Features/AddonSelectYesNoFeature.cs
@@ -31,7 +31,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled)
+        if (!P.Active)
             return;
 
         var dataPtr = (AddonSelectYesNoOnSetupData*)addon;

diff --git a/YesAlready/Features/AddonShopCardDialogFeature.cs b/YesAlready/Features/AddonShopCardDialogFeature.cs
@@ -25,7 +25,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.ShopCardDialog)
+        if (!P.Active || !P.Config.ShopCardDialog)
             return;
 
         var addonPtr = (AddonShopCardDialog*)addon;

diff --git a/YesAlready/Features/AddonShopExchangeItemDialogFeature.cs b/YesAlready/Features/AddonShopExchangeItemDialogFeature.cs
@@ -24,7 +24,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled || !P.Config.ShopExchangeItemDialogEnabled)
+        if (!P.Active || !P.Config.ShopExchangeItemDialogEnabled)
             return;
 
         Callback.Fire(addon, true, 0);

diff --git a/YesAlready/Features/AddonTalkFeature.cs b/YesAlready/Features/AddonTalkFeature.cs
@@ -32,7 +32,7 @@ protected unsafe void AddonSetup(AddonEvent eventType, AddonArgs addonInfo)
     {
         var addon = (AtkUnitBase*)addonInfo.Addon;
 
-        if (!P.Config.Enabled)
+        if (!P.Active)
             return;
 
         var addonPtr = (AddonTalk*)addon;

diff --git a/YesAlready/IPC/BlockListHandler.cs b/YesAlready/IPC/BlockListHandler.cs
@@ -0,0 +1,22 @@
+using ECommons.DalamudServices;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YesAlready.IPC
+{
+    internal class BlockListHandler
+    {
+        internal const string BlockListNamespace = "YesAlready.StopRequests";
+        internal HashSet<string> BlockList;
+        internal bool Locked => BlockList.Count != 0;
+
+        internal BlockListHandler() 
+        {
+            BlockList = Svc.PluginInterface.GetOrCreateData<HashSet<string>>(BlockListNamespace, () => []);
+            BlockList.Clear();
+        }
+    }
+}
diff --git a/YesAlready/UI/MainWindow.cs b/YesAlready/UI/MainWindow.cs
@@ -11,6 +11,8 @@
 using ClickLib.Exceptions;
 using System.Linq;
 using PunishLib.ImGuiMethods;
+using Dalamud.Interface.Colors;
+using ECommons;
 
 namespace YesAlready.UI;
 
@@ -62,6 +64,15 @@ public override void Draw()
         if (ImGui.Button("Disable Features")) EnableFeatures(false);
 #endif
 
+        if (P.BlockListHandler.Locked)
+        {
+            ImGuiEx.Text(ImGuiColors.DalamudRed, $"Yes Already function is paused because following plugins have requested it: {P.BlockListHandler.BlockList.Print()}");
+            if(ImGui.Button("Force unlock"))
+            {
+                P.BlockListHandler.BlockList.Clear();
+            }
+        }
+
         var enabled = P.Config.Enabled;
         if (ImGui.Checkbox("Enabled", ref enabled))
         {

diff --git a/YesAlready/YesAlready.cs b/YesAlready/YesAlready.cs
@@ -17,6 +17,7 @@
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.IoC;
 using Dalamud.Plugin.Services;
+using YesAlready.IPC;
 namespace YesAlready;
 
 public class YesAlready : IDalamudPlugin
@@ -37,6 +38,9 @@ public class YesAlready : IDalamudPlugin
     internal static DalamudPluginInterface pi;
 
     private readonly DtrBarEntry dtrEntry;
+    internal BlockListHandler BlockListHandler;
+
+    internal bool Active => Config.Enabled && !BlockListHandler.Locked;
 
     public YesAlready(DalamudPluginInterface pluginInterface)
     {
@@ -46,6 +50,7 @@ public YesAlready(DalamudPluginInterface pluginInterface)
         Ws = new();
         MainWindow = new();
         Ws.AddWindow(MainWindow);
+        BlockListHandler = new();
 
         Config = pi.GetPluginConfig() as Configuration ?? new Configuration();
         Configuration.Initialize(Svc.PluginInterface);
@@ -183,7 +188,7 @@ private void FrameworkUpdate(object framework)
 
         if (dtrEntry.Shown)
         {
-            dtrEntry.Text = new SeString(new TextPayload($"{Name}: {(P.Config.Enabled ? "On" : "Off")}"));
+            dtrEntry.Text = new SeString(new TextPayload($"{Name}: {(P.Config.Enabled ? (P.BlockListHandler.Locked?"Paused":"On") : "Off")}"));
             dtrEntry.OnClick = () => P.Config.Enabled ^= true;
         }
     }

diff --git a/YesAlready/YesAlready.csproj b/YesAlready/YesAlready.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Authors>daemitus, croizat</Authors>
-        <Version>1.4.0.0</Version>
+        <Version>1.4.0.1</Version>
     </PropertyGroup>
 
     <PropertyGroup>