v1.0.8.13: Item tooltips (TryGetRow + base item ID)

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

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.0</AssemblyVersion>
-		<FileVersion>1.0.8.0</FileVersion>
-		<InformationalVersion>1.0.8.0</InformationalVersion>
+		<AssemblyVersion>1.0.8.13</AssemblyVersion>
+		<FileVersion>1.0.8.13</FileVersion>
+		<InformationalVersion>1.0.8.13</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -24,6 +24,9 @@
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<Deterministic>true</Deterministic>
+		<!-- Do not emit PDBs in Release; prevents your local path from appearing in user crash logs -->
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.8.0",
+  "AssemblyVersion": "1.0.8.13",
   "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

@@ -89,9 +89,48 @@ namespace HSUI.Helpers
             return p;
         }
 
+        /// <summary>Track PvP state so we can restore PvE bars when leaving PvP (game sometimes leaves PvP data in StandardHotbars).</summary>
+        private static bool _pvpHotbarsActiveLastFrame;
+        private static bool _clientStatePvPLastFrame;
+        /// <summary>After leaving PvP, keep re-applying PvE load for this many frames in case the game overwrites.</summary>
+        private static int _restorePvEFramesLeft;
+
+        /// <summary>
+        /// Call once per frame (e.g. from Framework Update). When we detect leaving PvP, loads saved PvE hotbars into the live bars
+        /// and keeps re-applying for a short window so PvE actions are not overwritten by stale PvP state.
+        /// </summary>
+        public static unsafe void TryRestorePvEHotbarsAfterLeavePvP()
+        {
+            var module = RaptureHotbarModule.Instance();
+            if (module == null || !module->ModuleReady)
+                return;
+
+            bool pvpActive = module->PvPHotbarsActive;
+            bool clientPvP = Plugin.ClientState.IsPvP;
+
+            if (!pvpActive && !clientPvP)
+            {
+                bool justLeftPvP = _pvpHotbarsActiveLastFrame || _clientStatePvPLastFrame;
+                if (justLeftPvP)
+                    _restorePvEFramesLeft = 120; // ~2s at 60fps
+
+                if (_restorePvEFramesLeft > 0)
+                {
+                    uint classJobId = (uint)(module->ActiveHotbarClassJobId & 0x7F);
+                    for (uint barId = 0; barId < 10; barId++)
+                        module->LoadSavedHotbar(classJobId, barId);
+                    _restorePvEFramesLeft--;
+                }
+            }
+
+            _pvpHotbarsActiveLastFrame = pvpActive;
+            _clientStatePvPLastFrame = clientPvP;
+        }
+
         /// <summary>
         /// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots.
         /// hotbarIndex 1-10 maps to StandardHotbars 0-9.
+        /// Always reads from live Hotbars; when leaving PvP, TryRestorePvEHotbarsAfterLeavePvP loads saved PvE into live so we then show PvE.
         /// </summary>
         public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount)
         {
@@ -100,11 +139,11 @@ namespace HSUI.Helpers
             if (module == null || !module->ModuleReady)
                 return list;
 
-            var hotbars = module->StandardHotbars;
             int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1;
             int count = Math.Clamp(slotCount, 1, 12);
-
+            var hotbars = module->StandardHotbars;
             ref var bar = ref hotbars[barIdx];
+
             for (int i = 0; i < count; i++)
             {
                 var slot = bar.GetHotbarSlot((uint)i);
@@ -116,19 +155,37 @@ namespace HSUI.Helpers
                     continue;
                 }
 
-                if (slot->IsEmpty)
+                bool isEmpty = slot->IsEmpty && slot->CommandType != RaptureHotbarModule.HotbarSlotType.GearSet;
+                if (isEmpty)
                 {
                     list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
                     continue;
                 }
 
-                bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
+                var slotType = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
+                    ? RaptureHotbarModule.HotbarSlotType.GearSet
+                    : slot->ApparentSlotType;
+                uint actionId = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
+                    ? slot->CommandId
+                    : slot->ApparentActionId;
+
+                if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet)
+                    slot->LoadIconId();
+
+                bool usable = slot->IsSlotUsable(slotType, actionId);
                 uint iconId = slot->IconId;
-                uint actionId = slot->ApparentActionId;
-                var slotType = slot->ApparentSlotType;
+                if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
+                {
+                    int resolved = slot->GetIconIdForSlot(slotType, actionId);
+                    if (resolved > 0)
+                        iconId = (uint)resolved;
+                }
 
                 (int pct, int secsLeft) = GetSlotCooldown(slot);
                 (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
+                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/ActionChatLinkHelper.cs

@@ -51,6 +51,8 @@ namespace HSUI.Helpers
             _config = ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
 
         private void OnFrameworkUpdate(IFramework framework)
+        {
+            try
             {
                 if (!_config.ActionChatLinkEnabled) return;
 
@@ -97,6 +99,12 @@ namespace HSUI.Helpers
                 InsertOrCopyToChat(text);
                 _pendingActionId = 0;
             }
+            catch (Exception ex)
+            {
+                _pendingActionId = 0;
+                Plugin.Logger.Warning($"[ActionChatLink] OnFrameworkUpdate: {ex.Message}");
+            }
+        }
 
         /// <summary>Read action ID from AddonActionMenu. Tries ActionList and TraitList, HoveredItemIndex and HeldItemIndex.</summary>
         private static unsafe bool TryGetHoveredActionFromAddon(IntPtr addonAddress, out uint actionId)
@@ -104,6 +112,8 @@ namespace HSUI.Helpers
             actionId = 0;
             if (addonAddress == IntPtr.Zero) return false;
 
+            try
+            {
                 var addon = (AddonActionMenu*)addonAddress;
                 byte* basePtr = (byte*)addonAddress;
 
@@ -117,6 +127,11 @@ namespace HSUI.Helpers
                         if (actionId != 0) return true;
                     }
                 }
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] TryGetHoveredActionFromAddon: {ex.Message}");
+            }
             return false;
         }
 
@@ -124,6 +139,8 @@ namespace HSUI.Helpers
         private static unsafe bool IsMouseOverActionMenu(IntPtr addonAddress)
         {
             if (addonAddress == IntPtr.Zero) return false;
+            try
+            {
                 var addon = (AtkUnitBase*)addonAddress;
                 var root = addon->RootNode;
                 if (root == null || !addon->IsVisible) return false;
@@ -132,6 +149,12 @@ namespace HSUI.Helpers
                 float x = root->ScreenX, y = root->ScreenY, w = root->Width, h = root->Height;
                 return mp.X >= x && mp.X < x + w && mp.Y >= y && mp.Y < y + h;
             }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] IsMouseOverActionMenu: {ex.Message}");
+                return false;
+            }
+        }
 
         private static string? GetActionName(uint actionId)
         {

Helpers/InputsHelper.cs

@@ -470,6 +470,11 @@ namespace HSUI.Helpers
 
         public void OnFrameworkUpdate(IFramework framework)
         {
+            try
+            {
+                // When leaving PvP, force load PvE hotbars so HSUI bars don't keep showing PvP actions.
+                ActionBarsManager.TryRestorePvEHotbarsAfterLeavePvP();
+
                 // Keep WndProc hooked when: proxy mode (for mouseover) OR we need to block game drag
                 // release (so dropping on HSUI action bar doesn't execute the ability).
                 bool needHook = IsProxyEnabled || ShouldBlockGameDragRelease();
@@ -483,6 +488,11 @@ namespace HSUI.Helpers
                 else if (!needHook && _wndProcPtr != IntPtr.Zero)
                     RestoreWndProc();
             }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"[HSUI InputsHelper] OnFrameworkUpdate: {ex.Message}");
+            }
+        }
 
         private static bool ShouldBlockGameDragRelease()
         {
@@ -565,7 +575,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 +595,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}");
             }
         }
 

Helpers/MpTickHelper.cs

@@ -42,18 +42,16 @@ namespace HSUI.Helpers
         public double LastTick => LastTickTime;
 
         private void FrameworkOnOnUpdateEvent(IFramework framework)
+        {
+            try
             {
                 var player = Plugin.ObjectTable.LocalPlayer;
                 if (player is null)
-            {
                     return;
-            }
 
                 var now = ImGui.GetTime();
                 if (now - LastUpdate < PollingRate)
-            {
                     return;
-            }
 
                 LastUpdate = now;
 
@@ -63,16 +61,17 @@ namespace HSUI.Helpers
                 var lucidDreamingActive = Utils.StatusListForBattleChara(player).Any(e => e.StatusId == 1204);
 
                 if (!lucidDreamingActive && _lastMpValue < mp)
-            {
                     LastTickTime = now;
-            }
                 else if (LastTickTime + ServerTickRate <= now)
-            {
                     LastTickTime += ServerTickRate;
-            }
 
                 _lastMpValue = (int)mp;
             }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[HSUI MpTickHelper] FrameworkOnOnUpdateEvent: {ex.Message}");
+            }
+        }
 
         protected virtual void Dispose(bool disposing)
         {

Helpers/TexturesHelper.cs

@@ -22,9 +22,23 @@ namespace HSUI.Helpers
 
         public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true)
         {
-            GameIconLookup lookup = new GameIconLookup(iconId + stackCount, false, hdIcon);
+            if (iconId == 0)
+                return null;
+
+            try
+            {
+                // Game encodes item icons: iconId >= 1000000 means HQ; actual icon = iconId % 1000000
+                uint actualIconId = iconId >= 1000000 ? (iconId % 1000000) + stackCount : iconId + stackCount;
+                bool itemHq = iconId >= 1000000;
+                GameIconLookup lookup = new GameIconLookup(actualIconId, itemHq, hdIcon);
                 return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault();
             }
+            catch
+            {
+                // GetFromGameIcon can throw for invalid/unsupported icon IDs (e.g. certain inventory item icons during drag-drop)
+                return null;
+            }
+        }
 
         public static IDalamudTextureWrap? GetTextureFromPath(string path)
         {

Helpers/TooltipsHelper.cs

@@ -13,6 +13,14 @@ using System.Text;
 
 namespace HSUI.Helpers
 {
+    /// <summary>When showing an ID in the tooltip title, use Action for action IDs or Status for status effect IDs.</summary>
+    public enum TooltipIdKind
+    {
+        None = 0,
+        Action = 1,
+        Status = 2,
+    }
+
     public class TooltipsHelper : IDisposable
     {
         #region Singleton
@@ -65,12 +73,12 @@ namespace HSUI.Helpers
 
         private const float IconSize = 24f;
 
-        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null)
+        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
         {
-            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId);
+            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId, idKind);
         }
 
-        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null)
+        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null, TooltipIdKind idKind = TooltipIdKind.None)
         {
             if (text == null)
             {
@@ -99,7 +107,11 @@ namespace HSUI.Helpers
                     _currentTooltipTitle += $" ({name})";
                 }
 
-                if (_config.ShowStatusIDs)
+                bool showId = id != 0 && (
+                    (idKind == TooltipIdKind.Action && _config.ShowActionIDs) ||
+                    (idKind == TooltipIdKind.Status && _config.ShowStatusIDs) ||
+                    (idKind == TooltipIdKind.None && _config.ShowStatusIDs));
+                if (showId)
                 {
                     _currentTooltipTitle += " (ID: " + id + ")";
                 }
@@ -407,6 +419,10 @@ namespace HSUI.Helpers
         [Order(7)]
         public bool ShowStatusIDs = false;
 
+        [Checkbox("Show Action ID", help = "Show action ID in hotbar and action tooltips.")]
+        [Order(8)]
+        public bool ShowActionIDs = false;
+
         [Checkbox("Show Source Name")]
         [Order(10)]
         public bool ShowSourceName = false;

Interface/GeneralElements/ActionBarsHud.cs

@@ -253,7 +253,7 @@ namespace HSUI.Interface.GeneralElements
             });
 
             // Overlay at HIGHEST so it captures input above the bar; required for icon swap.
-            // Use unique ID per hotbar to avoid any cross-bar conflicts (bar 2–10 had input capture issues).
+            // Draw as a child of HSUI_HUD so hovering does not create a separate toplevel window that hides other HSUI elements.
             AddDrawAction(StrataLevel.HIGHEST, () =>
             {
                 var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
@@ -262,13 +262,11 @@ namespace HSUI.Interface.GeneralElements
                     | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
                     | ImGuiWindowFlags.NoNav;
 
-                ImGuiHelpers.ForceNextWindowMainViewport();
-                ImGui.SetNextWindowPos(topLeft);
-                ImGui.SetNextWindowSize(barSize);
                 string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input";
-                if (!ImGui.Begin(overlayId, flags))
+                ImGui.SetCursorScreenPos(topLeft);
+                if (!ImGui.BeginChild(overlayId, barSize, false, flags))
                 {
-                    ImGui.End();
+                    ImGui.EndChild();
                     return;
                 }
 
@@ -372,7 +370,7 @@ namespace HSUI.Interface.GeneralElements
                             if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                             {
                                 string body = string.IsNullOrEmpty(text) ? title : text;
-                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
+                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action);
                                 if (IsTooltipDebugEnabled())
                                     Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
                             }
@@ -394,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
                     _lastLoggedPickupSlotId = -1;
                 }
 
-                ImGui.End();
+                ImGui.EndChild();
             });
         }
 
@@ -431,7 +429,7 @@ namespace HSUI.Interface.GeneralElements
                         if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                         {
                             string body = string.IsNullOrEmpty(text) ? title : text;
-                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
+                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null, Helpers.TooltipIdKind.Action);
                             if (IsTooltipDebugEnabled())
                                 Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
                         }
@@ -604,7 +602,7 @@ namespace HSUI.Interface.GeneralElements
                     if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
                     {
                         int releaseIdx = GetSlotIndexAtPosition(topLeft, barSize, slotSize, pad, Config.SlotCount, Config.GetLayoutGrid().Cols, mp, debug);
-                        if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro))
+                        if (releaseIdx >= 0 && slotType != RaptureHotbarModule.HotbarSlotType.Empty && (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet))
                         {
                             if (!ImGui.GetIO().KeyShift)
                             {
@@ -703,7 +701,7 @@ namespace HSUI.Interface.GeneralElements
                     // stale (e.g. from macro menu UI), causing wrong placements (macro drag -> GeneralAction placed).
                     // If we never got valid payload (e.g. Macro Int2=0), skip the place.
                     bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
-                        (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro);
+                        (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
 
                     if (hasValidPayload)
                     {
@@ -1094,7 +1092,9 @@ namespace HSUI.Interface.GeneralElements
 
         private static unsafe uint GetIconIdForPayload(RaptureHotbarModule.HotbarSlotType slotType, uint id)
         {
-            if (id == 0) return 0;
+            // id 0 is valid for GearSet (first gearset in list) and Macro; don't short-circuit for those
+            if (id == 0 && slotType != RaptureHotbarModule.HotbarSlotType.GearSet && slotType != RaptureHotbarModule.HotbarSlotType.Macro)
+                return 0;
             if (slotType == RaptureHotbarModule.HotbarSlotType.Macro)
             {
                 var macroModule = RaptureMacroModule.Instance();
@@ -1152,6 +1152,19 @@ namespace HSUI.Interface.GeneralElements
         }
 
         private static unsafe (string title, string text) GetSlotTooltip(ActionBarsManager.SlotInfo slot)
+        {
+            try
+            {
+                return GetSlotTooltipCore(slot);
+            }
+            catch
+            {
+                // Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop)
+                return ("", "");
+            }
+        }
+
+        private static unsafe (string title, string text) GetSlotTooltipCore(ActionBarsManager.SlotInfo slot)
         {
             // GeneralAction uses a different ID space: GeneralAction 7 = Teleport links to Action 5. Look up via GeneralAction sheet.
             if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction)
@@ -1194,19 +1207,111 @@ 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>();
+                if (actionSheet != null)
+                {
+                    if (actionSheet.TryGetRow(slot.ActionId, out var actionRowOpt))
+                    {
+                        actionRow = actionRowOpt;
+                    }
+                    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;
+                        if (actionSheet.TryGetRow(mappedId, out var mappedRow))
+                        {
+                            actionIdForLookup = mappedId;
+                            actionRow = mappedRow;
+                        }
+                    }
+                }
+
+                // CraftAction fallback: when Action sheet lookup failed, try CraftAction sheet directly (hotbar stores CraftAction row ID).
+                if (!actionRow.HasValue && slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                {
+                    var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
+                    if (craftSheet != null && craftSheet.TryGetRow(slot.ActionId, out var craftRow))
+                    {
+                        try
+                        {
+                            var nameSe = craftRow.Name;
+                            string name = nameSe.ToString();
+                            if (string.IsNullOrWhiteSpace(name))
+                                name = nameSe.ToDalamudString().ToString();
+                            if (!string.IsNullOrWhiteSpace(name))
+                            {
+                                // CraftAction sheet has its own Description column with the full text
+                                string desc = "";
+                                try
+                                {
+                                    var descSe = craftRow.Description;
+                                    var descRaw = descSe.ToDalamudString().ToString();
+                                    if (!string.IsNullOrEmpty(descRaw))
+                                    {
+                                        try
+                                        {
+                                            var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
+                                            desc = evaluated.ExtractText();
+                                            if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                        }
+                                        catch { desc = descRaw; }
+                                        if (!string.IsNullOrEmpty(desc))
+                                            desc = EncryptedStringsHelper.GetString(desc);
+                                    }
+                                }
+                                catch { /* ignore */ }
+                                return (name, desc);
+                            }
+                        }
+                        catch { /* ignore */ }
+                    }
+                }
+
+                var row = actionRow;
                 if (row.HasValue)
                 {
                     string name = row.Value.Name.ToString();
                     string desc = "";
-                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
                     string descRaw = "";
-                    if (descRow.HasValue)
+                    // For CraftAction, use CraftAction.Description; ActionTransient returns the name instead of the full description
+                    if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                    {
+                        var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
+                        if (craftSheet != null && craftSheet.TryGetRow(actionIdForLookup, out var craftRow))
                         {
                             try
                             {
-                            var descSeStr = descRow.Value.Description;
-                            descRaw = descRow.Value.Description.ToDalamudString().ToString();
+                                var descSe = craftRow.Description;
+                                var craftDescRaw = descSe.ToDalamudString().ToString();
+                                if (!string.IsNullOrEmpty(craftDescRaw))
+                                {
+                                    try
+                                    {
+                                        var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
+                                        desc = evaluated.ExtractText();
+                                        if (string.IsNullOrEmpty(desc)) desc = craftDescRaw;
+                                    }
+                                    catch { desc = craftDescRaw; }
+                                    if (!string.IsNullOrEmpty(desc))
+                                        desc = EncryptedStringsHelper.GetString(desc);
+                                }
+                            }
+                            catch { /* ignore */ }
+                        }
+                    }
+                    else
+                    {
+                        var descSheet = Plugin.DataManager.GetExcelSheet<ActionTransient>();
+                        if (descSheet != null && descSheet.TryGetRow(actionIdForLookup, out var descRow))
+                        {
+                            try
+                            {
+                                var descSeStr = descRow.Description;
+                                descRaw = descRow.Description.ToDalamudString().ToString();
                                 try
                                 {
                                     var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
@@ -1222,6 +1327,7 @@ namespace HSUI.Interface.GeneralElements
                             }
                             catch { /* ignore */ }
                         }
+                    }
                     bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
                     int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
                     string potencyLine = potencyValue.HasValue ? $"Potency: {potencyValue.Value}" : "";
@@ -1335,13 +1441,13 @@ namespace HSUI.Interface.GeneralElements
 
             if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.Item)
             {
-                var row = Plugin.DataManager.GetExcelSheet<Item>()?.GetRow(slot.ActionId);
-                if (row.HasValue)
+                uint baseItemId = slot.ActionId >= 1000000 ? slot.ActionId - 1000000 : slot.ActionId;
+                if (Plugin.DataManager.GetExcelSheet<Item>()?.TryGetRow(baseItemId, out var itemRow) == true)
                 {
-                    string name = row.Value.Name.ToString();
+                    string name = itemRow.Name.ToString();
                     try
                     {
-                        string desc = row.Value.Description.ToDalamudString().ToString();
+                        string desc = itemRow.Description.ToDalamudString().ToString();
                         if (!string.IsNullOrEmpty(desc))
                             desc = EncryptedStringsHelper.GetString(desc);
                         return (name, desc);

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/Nameplates/NameplateConfig.cs

@@ -45,10 +45,6 @@ namespace HSUI.Interface.GeneralElements
         [Order(21)]
         public bool AlwaysShowTargetNameplate = true;
 
-        [Checkbox("In PvP, show only enemy player nameplates", spacing = true, help = "When in Frontlines, Rival Wings, or Crystal Conflict, hide ally player nameplates (party, alliance, teammates) and show only enemy players. Uses Enemy nameplate styling for PvP enemies.")]
-        [Order(22)]
-        public bool PvPShowOnlyEnemyPlayers = false;
-
         public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
     }
 

Interface/Nameplates/NameplatesHud.cs

@@ -128,23 +128,6 @@ namespace HSUI.Interface.Nameplates
                         return _playerHud;
                     }
 
-                    // In PvP, optionally show only enemy player nameplates (hide allies)
-                    if (Config.PvPShowOnlyEnemyPlayers && Plugin.ClientState.IsPvP)
-                    {
-                        if (data.GameObject is ICharacter character)
-                        {
-                            if ((character.StatusFlags & StatusFlags.PartyMember) != 0 ||
-                                (character.StatusFlags & StatusFlags.AllianceMember) != 0 ||
-                                (character.StatusFlags & StatusFlags.Friend) != 0)
-                            {
-                                return null; // Hide party, alliance, and friend nameplates
-                            }
-                        }
-                        // Other players: show only hostile (enemy team), hide allies
-                        if (data.GameObject == null) { return null; }
-                        return Utils.IsHostile(data.GameObject) ? _enemyHud : null;
-                    }
-
                     if (data.GameObject is ICharacter character2)
                     {
                         if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember

Interface/Party/AllianceManager.cs

@@ -280,14 +280,21 @@ 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>();
 
+                if (allianceIdx == 2)
+                {
+                    // Our party: _partyMembers via GetPartyMemberByIndex
                     for (int slot = 0; slot < 8; slot++)
                     {
-                    var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                        var pm = mainGroup.GetPartyMemberByIndex(slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         var pfMember = new PartyFramesMember(
                             pm->EntityId,
@@ -303,14 +310,14 @@ namespace HSUI.Interface.Party
                         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)
+                }
+                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.GetPartyMemberByIndex(slot);
+                        var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         var pfMember = new PartyFramesMember(
                             pm->EntityId,
@@ -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
-                            ? mainGroup.GetPartyMemberByIndex(slot)
-                            : mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                        PartyMember* pm;
+                        if (allianceIdx == 2)
+                            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);

Interface/Party/PartyFramesCooldownListHud.cs

@@ -289,7 +289,8 @@ namespace HSUI.Interface.Party
                         hoveringCooldown.Data.Name,
                         hoveringCooldown.Data.ActionId,
                         "",
-                        iconId
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Action
                     );
                 }
             }

Interface/PartyCooldowns/PartyCooldownsHud.cs

@@ -310,7 +310,8 @@ namespace HSUI.Interface.PartyCooldowns
                             cooldown.Data.Name,
                             cooldown.Data.ActionId,
                             "",
-                            iconId
+                            iconId,
+                            HSUI.Helpers.TooltipIdKind.Action
                         );
                     }
 

Interface/StatusEffects/StatusEffectsListHud.cs

@@ -474,7 +474,8 @@ namespace HSUI.Interface.StatusEffects
                         EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
                         data.Status.StatusId,
                         GetStatusActorName(data.Status),
-                        iconId
+                        iconId,
+                        HSUI.Helpers.TooltipIdKind.Status
                     );
                 }
 

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,46 @@
+# 1.0.8.13
+- **Hotbars**: Fixed item tooltips not showing — use TryGetRow for Item sheet and base item ID so tooltip no longer fails for some items.
+
+# 1.0.8.12
+- **Hotbars**: Fixed item icons not drawing on hotbar — game encodes HQ items as iconId + 1000000; now use iconId % 1000000 and itemHq flag so item icons (including HQ) display correctly.
+
+# 1.0.8.11
+- **Hotbars**: Fixed tooltip crash — Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop); GetSlotTooltip now catches and returns empty instead of crashing.
+
+# 1.0.8.10
+- **Hotbars**: Fixed crash when dragging items from inventory to hotbar — GetFromGameIcon can throw for invalid/unsupported icon IDs; now handled gracefully.
+- **Build**: Release builds no longer emit PDBs to avoid local path leakage in user crash logs.
+
+# 1.0.8.9
+- **Hotbars**: Gearset on slot now persists — do not treat slot as empty when CommandType is GearSet (gearset index 0 uses CommandId 0). Use CommandType/CommandId for GearSet display and resolve icon when IconId is still 0.
+
+# 1.0.8.8
+- **Hotbars**: Only refresh icon via LoadIconId() for GearSet slots so drag-and-drop of gearsets onto the bar works again.
+- **Hotbars**: Allow gearset index 0 (top-most gearset in list) — drop validation and icon lookup now accept id 0 for GearSet type.
+
+# 1.0.8.7
+- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
+
+# 1.0.8.6
+- **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
+
+# 1.0.8.5
+- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
+
+# 1.0.8.4
+- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 0–7, 8–15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance.
+- **Alliance Frames**: Visibility "Hide in duty" no longer hides alliance frames (they are only relevant in duty).
+- **Hotbars**: Crafting job action tooltips now display — fallback Action sheet lookup when hotbar stores CraftAction row ID.
+
+# 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

@@ -1,24 +1 @@
-[
-  {
-    "Author": "Knack117",
-    "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.",
-    "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.8.0",
-    "RepoUrl": "https://github.com/Knack117/HSUI",
-    "ApplicableVersion": "any",
-    "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
-    "CategoryTags": ["UI"],
-    "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",
-    "IsHide": false,
-    "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "LastUpdate": "1770007214"
-  }
-]
+[{"Author":"Knack117","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":"1.0.8.13: Item tooltips now show. 1.0.8.12: Item/HQ icons now draw on hotbar. 1.0.8.11: Hotbar tooltip crash fix (Lumina GetRow). 1.0.8.10: Hotbar crash fix when dragging inventory items; Release builds strip PDBs. 1.0.8.9: Gearset persists on slot (fix CommandId 0 treated as empty). 1.0.8.8: Gearset drag-drop fix; allow first gearset (index 0) on bar. 1.0.8.7: Fixed Gearset/Job Gear Set icon clearing when first equipment slot changes. 1.0.8.6: Crafting action tooltips now show full description instead of action name. 1.0.8.4: Alliance Frames 1 and 2 fix in raids; crafting action tooltips; Hide in duty no longer hides alliance frames. 1.0.8.3: Fix left-click staying broken after disable. 1.0.8.2: Charge icons stay lit until all charges spent.","InternalName":"HSUI","AssemblyVersion":"1.0.8.13","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI","ApplicableVersion":"any","Tags":["UI","HUD","Unit Frames","Nameplates","Party Frames","Hotbars"],"CategoryTags":["UI"],"DalamudApiLevel":14,"IconUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/raw/branch/main/Media/Images/icon.png","ImageUrls":[],"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.13/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.13/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.13/latest.zip","LastUpdate":"1760486400"}]