v1.0.8.12: Item/HQ icons draw on hotbar (iconId >= 1000000 encoding)

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

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.5</AssemblyVersion>
+		<AssemblyVersion>1.0.8.12</AssemblyVersion>
-		<FileVersion>1.0.8.5</FileVersion>
+		<FileVersion>1.0.8.12</FileVersion>
-		<InformationalVersion>1.0.8.5</InformationalVersion>
+		<InformationalVersion>1.0.8.12</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.5",
+  "AssemblyVersion": "1.0.8.12",
   "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,21 +155,34 @@ 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;
+                if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
-                var slotType = slot->ApparentSlotType;
+                {
+                    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);
-                // 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;

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()
         {

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

@@ -370,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}'");
                             }
@@ -429,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}'");
                         }
@@ -602,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)
                             {
@@ -701,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)
                     {
@@ -1092,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();
@@ -1150,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)
@@ -1196,21 +1211,63 @@ namespace HSUI.Interface.GeneralElements
                 LuminaAction? actionRow = null;
 
                 var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
-                var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
+                if (actionSheet != null)
-                if (actionRowOpt.HasValue)
                 {
-                    actionRow = actionRowOpt.Value;
+                    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;
-                    var mappedRow = actionSheet?.GetRow(mappedId);
+                        if (actionSheet.TryGetRow(mappedId, out var mappedRow))
-                    if (mappedRow.HasValue)
                         {
                             actionIdForLookup = mappedId;
-                        actionRow = mappedRow.Value;
+                            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 */ }
                     }
                 }
 
@@ -1219,14 +1276,42 @@ namespace HSUI.Interface.GeneralElements
                 {
                     string name = row.Value.Name.ToString();
                     string desc = "";
-                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
                     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;
+                                var descSe = craftRow.Description;
-                            descRaw = descRow.Value.Description.ToDalamudString().ToString();
+                                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());
@@ -1242,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}" : "";

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/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
                     );
                 }
 

changelog.md

@@ -1,3 +1,26 @@
+# 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.
 

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":"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.12","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.12/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.12/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.12/latest.zip","LastUpdate":"1760400000"}]
-  {
-    "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.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.2",
-    "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.2/latest.zip",
-    "IsHide": false,
-    "IsTestingExclusive": false,
-    "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.2/latest.zip",
-    "LastUpdate": "1770007214"
-  }
-]