Improved Duty Finder Settings (Caraxi#811)

Author: Aireil

SimpleTweaksPlugin.csproj

@@ -74,7 +74,6 @@
         <Compile Remove="Tweaks\UiAdjustment\HideAchievementsNotifications.cs"/>
         <Compile Remove="Tweaks\UiAdjustment\HideGuildhestObjectivePopup.cs"/>
         <Compile Remove="Tweaks\UiAdjustment\HideQualityWhenNoHQ.cs"/>
-        <Compile Remove="Tweaks\UiAdjustment\ImprovedDutyFinderSettings.cs"/>
         <Compile Remove="Tweaks\UiAdjustment\ImprovedWorldVisit.cs"/>
         <Compile Remove="Tweaks\UiAdjustment\MarketEnhancements.cs"/>
         <Compile Remove="Tweaks\UiAdjustment\MoveCutsceneTalk.cs"/>

Tweaks/UiAdjustment/ImprovedDutyFinderSettings.cs

@@ -4,8 +4,8 @@
 using Dalamud.Utility;
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
-using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using FFXIVClientStructs.FFXIV.Client.System.Memory;
+using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using Lumina.Excel.GeneratedSheets;
 using SimpleTweaksPlugin.Events;
@@ -36,13 +36,13 @@ public DutyFinderSettingDisplay(DutyFinderSetting setting, int icon, uint toolti
         private SimpleEvent eventManager;
 
         private void HideTooltip(AtkUnitBase* unitBase) {
-            AtkStage.GetSingleton()->TooltipManager.HideTooltip(unitBase->ID);
+            AtkStage.Instance()->TooltipManager.HideTooltip(unitBase->Id);
         }
 
         private void ShowTooltip(AtkUnitBase* unitBase, AtkResNode* node) {
             var tooltipId = GetTooltip();
             var tooltip = Service.Data.GetExcelSheet<Addon>()?.GetRow(tooltipId)?.Text.ToDalamudString()?.TextValue ?? $"{Setting}";
-            AtkStage.GetSingleton()->TooltipManager.ShowTooltip(unitBase->ID, node, tooltip);
+            AtkStage.Instance()->TooltipManager.ShowTooltip(unitBase->Id, node, tooltip);
         }
 
         public SimpleEvent Event {
@@ -128,9 +128,9 @@ private void SetupAddon(AtkUnitBase* unitBase) {
         var container = IMemorySpace.GetUISpace()->Create<AtkResNode>();
         container->SetWidth(defaultContainer->GetWidth());
         container->SetHeight(defaultContainer->GetHeight());
-        container->SetPositionFloat(defaultContainer->GetX(), defaultContainer->GetY());
+        container->SetPositionFloat(defaultContainer->GetXFloat(), defaultContainer->GetYFloat());
         container->SetScale(1, 1);
-        container->NodeID = CustomNodes.Get($"{nameof(ImprovedDutyFinderSettings)}_Container");
+        container->NodeId = CustomNodes.Get($"{nameof(ImprovedDutyFinderSettings)}_Container");
         container->Type = NodeType.Res;
         container->ToggleVisibility(true);
         UiHelper.LinkNodeAfterTargetNode(container, unitBase, defaultContainer);
@@ -144,7 +144,7 @@ private void SetupAddon(AtkUnitBase* unitBase) {
             var imgNode = UiHelper.MakeImageNode(CustomNodes.Get($"{nameof(ImprovedDutyFinderSettings)}_Icon_{settingDetail.Setting}"), new UiHelper.PartInfo(0, 0, 24, 24));
             UiHelper.LinkNodeAtEnd(imgNode, container, unitBase);
 
-            imgNode->AtkResNode.SetPositionFloat(basedOn->GetX(), basedOn->GetY());
+            imgNode->AtkResNode.SetPositionFloat(basedOn->GetXFloat(), basedOn->GetYFloat());
             imgNode->AtkResNode.SetWidth(basedOn->GetWidth());
             imgNode->AtkResNode.SetHeight(basedOn->GetHeight());
 
@@ -290,7 +290,7 @@ private enum DutyFinderSetting {
         LimitedLevelingRoulette = 11,
     }
 
-    [Signature("E8 ?? ?? ?? ?? 48 8B 07 33 F6")]
+    [Signature("E8 ?? ?? ?? ?? 49 8B 06 33 ED")]
     private static delegate* unmanaged<byte*, nint, void> _setContentsFinderSettings;
 
     private static byte GetCurrentSettingValue(DutyFinderSetting dutyFinderSetting) {
@@ -314,8 +314,8 @@ private static byte GetCurrentSettingValue(DutyFinderSetting dutyFinderSetting)
 
     private void ToggleSetting(DutyFinderSetting setting) {
         // block setting change if queued for a duty
-        if (Service.Condition[ConditionFlag.BoundToDuty97]) {
-            var condition = Service.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.Condition>()?.GetRow((uint)ConditionFlag.BoundToDuty97)?.LogMessage?.Value?.Text?.ToDalamudString();
+        if (Service.Condition[ConditionFlag.InDutyQueue]) {
+            var condition = Service.Data.GetExcelSheet<Condition>()?.GetRow((uint)ConditionFlag.InDutyQueue)?.LogMessage?.Value?.Text?.ToDalamudString();
             Service.Toasts.ShowError(condition ?? "Unable to execute command while bound by duty.");
             return;
         }
@@ -348,7 +348,7 @@ private void ToggleSetting(DutyFinderSetting setting) {
         }
 
         fixed (byte* arrayPtr = array) {
-            _setContentsFinderSettings(arrayPtr, (nint)Framework.Instance()->GetUiModule());
+            _setContentsFinderSettings(arrayPtr, (nint)UIModule.Instance());
         }
     }