Alliance frames, crafting tooltips, visibility: fix display and tooltips

- Alliance Frames: Populate other alliances (A/B) via GetAllianceMemberByIndex flat indices (0-7, 8-15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance; keep own party from GetPartyMemberByIndex.
- Alliance Frames: Visibility: do not apply HideInDuty to Alliance Frames so they show in alliance raids when visibility rules are enabled.
- Hotbars: Crafting action tooltips: fallback Action sheet lookup with +100000 offset when hotbar stores CraftAction row ID.

Co-authored-by: Cursor <cursoragent@cursor.com>

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.1</AssemblyVersion>
+		<AssemblyVersion>1.0.8.3</AssemblyVersion>
-		<FileVersion>1.0.8.1</FileVersion>
+		<FileVersion>1.0.8.3</FileVersion>
-		<InformationalVersion>1.0.8.1</InformationalVersion>
+		<InformationalVersion>1.0.8.3</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.8.1",
+  "AssemblyVersion": "1.0.8.3",
   "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
   "ApplicableVersion": "any",
   "RepoUrl": "https://github.com/Knack117/HSUI",

Helpers/ActionBarsManager.cs

@@ -127,25 +127,13 @@ namespace HSUI.Helpers
                 uint actionId = slot->ApparentActionId;
                 var slotType = slot->ApparentSlotType;
 
-                // Resolve adjusted action for Action type (combo/continuation replacement, e.g. HSRCombos / XIVCombo)
-                // so HSUI bars show the correct icon and action for the current combo step.
-                if (slotType == RaptureHotbarModule.HotbarSlotType.Action && actionId != 0)
-                {
-                    var actionManager = Instance();
-                    if (actionManager != null)
-                    {
-                        uint effectiveId = actionManager->GetAdjustedActionId(actionId);
-                        if (effectiveId != actionId)
-                        {
-                            actionId = effectiveId;
-                            // Use effective action id as icon (matches most actions); tooltip path will resolve correct icon by ActionId
-                            iconId = effectiveId;
-                        }
-                    }
-                }
-
                 (int pct, int secsLeft) = GetSlotCooldown(slot);
                 (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
+                // For charge-based actions, don't grey out the icon until all charges are spent.
+                // Use both the slot's recast-charge count and ActionManager so we catch all cases.
+                uint apparentCharges = slotType == RaptureHotbarModule.HotbarSlotType.Action ? slot->GetApparentIconRecastCharges() : 0;
+                if (maxCharges > 1 && (apparentCharges > 0 || currentCharges > 0))
+                    usable = true;
                 list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
             }
 

Helpers/InputsHelper.cs

@@ -565,7 +565,8 @@ namespace HSUI.Helpers
             Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X"));
         }
 
-        private void RestoreWndProc()
+        /// <summary>Restore the game window's WndProc so left-click works again. Idempotent.</summary>
+        internal void RestoreWndProc()
         {
             if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
                 return;
@@ -584,6 +585,20 @@ namespace HSUI.Helpers
             {
                 _wndHandle = IntPtr.Zero;
                 _imguiWndProcPtr = IntPtr.Zero;
+                _wndProcPtr = IntPtr.Zero;
+            }
+        }
+
+        /// <summary>Call at the very start of plugin disable so left-click is restored even if disposal fails later.</summary>
+        public static void RestoreWndProcIfNeeded()
+        {
+            try
+            {
+                Instance?.RestoreWndProc();
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger?.Warning($"[HSUI] RestoreWndProcIfNeeded: {ex.Message}");
             }
         }
 

Interface/GeneralElements/ActionBarsHud.cs

@@ -1194,12 +1194,34 @@ namespace HSUI.Interface.GeneralElements
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction)
             {
-                var row = Plugin.DataManager.GetExcelSheet<LuminaAction>()?.GetRow(slot.ActionId);
+                uint actionIdForLookup = slot.ActionId;
+                LuminaAction? actionRow = null;
+
+                var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
+                var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
+                if (actionRowOpt.HasValue)
+                {
+                    actionRow = actionRowOpt.Value;
+                }
+                else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                {
+                    // Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
+                    const uint CraftActionToActionOffset = 100000;
+                    uint mappedId = slot.ActionId + CraftActionToActionOffset;
+                    var mappedRow = actionSheet?.GetRow(mappedId);
+                    if (mappedRow.HasValue)
+                    {
+                        actionIdForLookup = mappedId;
+                        actionRow = mappedRow.Value;
+                    }
+                }
+
+                var row = actionRow;
                 if (row.HasValue)
                 {
                     string name = row.Value.Name.ToString();
                     string desc = "";
-                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
+                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
                     string descRaw = "";
                     if (descRow.HasValue)
                     {

Interface/GeneralElements/VisibilityConfig.cs

@@ -96,6 +96,9 @@ namespace HSUI.Interface
             if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
             if (element != null && !element.GetConfig().Enabled) { return false; }
 
+            // Alliance frames only matter in alliance raids (duty). HideInDuty would hide them exactly when needed.
+            bool isAllianceFrames = element != null && element.GetType() == typeof(AllianceFramesHud);
+
             bool isInIslandSanctuary = IsInIslandSanctuary();
             bool isInDuty = IsInDuty() && !isInIslandSanctuary;
             IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
@@ -127,7 +130,8 @@ namespace HSUI.Interface
 
             if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; }
 
-            if (HideInDuty && isInDuty) { return false; }
+            // Alliance frames only matter in alliance raids (duty). Skip HideInDuty for them.
+            if (HideInDuty && isInDuty && !isAllianceFrames) { return false; }
 
             if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
 

Interface/Party/AllianceManager.cs

@@ -280,34 +280,18 @@ namespace HSUI.Interface.Party
             bool anyChanged = false;
             ref var mainGroup = ref gm->MainGroup;
 
+            // GroupManager layout: _allianceMembers flat array (indices 0-19) has groups 0 and 1.
+            // Group 2 (our party) is stored in _partyMembers. GetAllianceMemberByGroupAndIndex(0/1, slot)
+            // returns empty in-instance for some game versions; use GetAllianceMemberByIndex with flat
+            // indices: group 0 = indices 0-7, group 1 = indices 8-15.
             for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
             {
                 int count = 0;
                 var list = new List<IPartyFramesMember>();
 
-                for (int slot = 0; slot < 8; slot++)
+                if (allianceIdx == 2)
-                {
-                    var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
-                    if (pm == null || pm->EntityId == 0) continue;
-                    var pfMember = new PartyFramesMember(
-                        pm->EntityId,
-                        count,
-                        count,
-                        EnmityLevel.Last,
-                        PartyMemberStatus.None,
-                        ReadyCheckStatus.None,
-                        false,
-                        false
-                    );
-                    pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
-                    list.Add(pfMember);
-                    count++;
-                }
-
-                // GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
-                // When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
-                if (count == 0 && allianceIdx == 2)
                 {
+                    // Our party: _partyMembers via GetPartyMemberByIndex
                     for (int slot = 0; slot < 8; slot++)
                     {
                         var pm = mainGroup.GetPartyMemberByIndex(slot);
@@ -327,6 +311,29 @@ namespace HSUI.Interface.Party
                         count++;
                     }
                 }
+                else
+                {
+                    // Other alliances: _allianceMembers flat indices. Group 0 = 0-7, group 1 = 8-15.
+                    int baseIdx = allianceIdx * 8;
+                    for (int slot = 0; slot < 8; slot++)
+                    {
+                        var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
+                        if (pm == null || pm->EntityId == 0) continue;
+                        var pfMember = new PartyFramesMember(
+                            pm->EntityId,
+                            count,
+                            count,
+                            EnmityLevel.Last,
+                            PartyMemberStatus.None,
+                            ReadyCheckStatus.None,
+                            false,
+                            false
+                        );
+                        pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
+                        list.Add(pfMember);
+                        count++;
+                    }
+                }
 
                 if (count != _lastMemberCounts[allianceIdx])
                 {
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
                     int ourIdx = 0;
                     for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
                     {
-                        PartyMember* pm = allianceIdx == 2
+                        PartyMember* pm;
-                            ? mainGroup.GetPartyMemberByIndex(slot)
+                        if (allianceIdx == 2)
-                            : mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                            pm = mainGroup.GetPartyMemberByIndex(slot);
+                        else
+                            pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
                             pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);

Plugin.cs

@@ -438,6 +438,9 @@ namespace HSUI
         {
             if (!disposing) return;
 
+            // Restore game window WndProc first so left-click works again immediately, even if teardown throws.
+            InputsHelper.RestoreWndProcIfNeeded();
+
             // Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
             try
             {

changelog.md

@@ -1,3 +1,12 @@
+# 1.0.8.3
+- **Fix**: Left-click no longer sometimes stays broken after disabling HSUI. WndProc is restored at the very start of plugin teardown so the game window gets normal input back even if disposal fails later.
+
+# 1.0.8.2
+- **Action bars**: Charge icons stay lit until all charges are spent — uses the slot’s recast charge count and ActionManager so abilities with charges remaining no longer grey out incorrectly.
+
+# 1.0.8.1
+- **Action bars**: Do not grey out action icons until all charges are spent (initial fix for multi-charge abilities).
+
 # 1.0.8.0
 - **Action Chat Link**: Shift+click an action in the Actions & Traits menu to insert "You should check out {ActionName}" into chat (or clipboard if chat not focused). Enable in Misc → World Tooltip. Restricted to Actions & Traits only — hotbar shift+click unaffected.
 - **Fix**: Job-specific hotbar actions now persist when changing jobs. Explicitly write to the current class job ID so saves survive job/role switches.

pluginmaster.json

@@ -4,9 +4,9 @@
     "Name": "HSUI",
     "Punchline": "A modern HUD replacement built for customization.",
     "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
-    "Changelog": "Action Chat Link: Shift+click actions in Actions & Traits to insert 'You should check out X' into chat. Fix: Job-specific hotbar actions now persist when changing jobs.",
+    "Changelog": "1.0.8.2: Charge icons stay lit until all charges spent. 1.0.8.1: Do not grey out action icons until all charges spent.",
     "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.8.0",
+    "AssemblyVersion": "1.0.8.2",
     "RepoUrl": "https://github.com/Knack117/HSUI",
     "ApplicableVersion": "any",
     "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
@@ -14,11 +14,11 @@
     "DalamudApiLevel": 14,
     "IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
     "ImageUrls": [],
-    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
+    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
     "IsHide": false,
     "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
+    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
+    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
     "LastUpdate": "1770007214"
   }
 ]