v1.0.8.14: Mouse GCD Indicator (ring around cursor)

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

Config/ConfigurationManager.cs

@@ -675,6 +675,7 @@ namespace HSUI.Config
             // Other Elements
             typeof(ExperienceBarConfig),
             typeof(GCDIndicatorConfig),
+            typeof(MouseGCDIndicatorConfig),
             typeof(HotbarsConfig),
             typeof(Hotbar1BarConfig),
             typeof(Hotbar2BarConfig),

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.8</AssemblyVersion>
-		<FileVersion>1.0.8.8</FileVersion>
-		<InformationalVersion>1.0.8.8</InformationalVersion>
+		<AssemblyVersion>1.0.8.14</AssemblyVersion>
+		<FileVersion>1.0.8.14</FileVersion>
+		<InformationalVersion>1.0.8.14</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.8",
+  "AssemblyVersion": "1.0.8.14",
   "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,27 +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;
                 }
 
-                // For GearSet slots, refresh IconId from the gearset (e.g. job icon from first equipment slot).
-                // Only call for already-synced GearSet slots: calling LoadIconId() on other types or before the
-                // game has synced a just-dropped slot can prevent the drop from sticking.
-                if (slot->ApparentSlotType == RaptureHotbarModule.HotbarSlotType.GearSet)
+                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(slot->ApparentSlotType, slot->ApparentActionId);
+                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);
-                // 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

@@ -52,50 +52,58 @@ namespace HSUI.Helpers
 
         private void OnFrameworkUpdate(IFramework framework)
         {
-            if (!_config.ActionChatLinkEnabled) return;
-
-            bool shiftHeld = ImGui.IsKeyDown(ImGuiKey.LeftShift) || ImGui.IsKeyDown(ImGuiKey.RightShift);
-            bool leftClicked = ImGui.IsMouseClicked(ImGuiMouseButton.Left);
-
-            // ActionMenu must be visible
-            var addon = Plugin.GameGui.GetAddonByName("ActionMenu", 1);
-            if (addon == null || addon.Address == IntPtr.Zero)
+            try
             {
-                _pendingActionId = 0;
-                return;
-            }
+                if (!_config.ActionChatLinkEnabled) return;
 
-            // Capture action: 1) Addon list (ActionList or TraitList); 2) HoveredAction only when mouse is over ActionMenu (excludes hotbars)
-            if (shiftHeld)
-            {
-                if (TryGetHoveredActionFromAddon(addon.Address, out uint fromAddon))
-                    _pendingActionId = fromAddon;
-                else if (IsMouseOverActionMenu(addon.Address) && !ActionBarsHitTestHelper.IsMouseOverAnyHSUIHotbar())
+                bool shiftHeld = ImGui.IsKeyDown(ImGuiKey.LeftShift) || ImGui.IsKeyDown(ImGuiKey.RightShift);
+                bool leftClicked = ImGui.IsMouseClicked(ImGuiMouseButton.Left);
+
+                // ActionMenu must be visible
+                var addon = Plugin.GameGui.GetAddonByName("ActionMenu", 1);
+                if (addon == null || addon.Address == IntPtr.Zero)
                 {
-                    var ha = Plugin.GameGui.HoveredAction;
-                    if (ha != null && ha.ActionKind != HoverActionKind.None && ha.ActionID != 0)
-                        _pendingActionId = ha.ActionID;
+                    _pendingActionId = 0;
+                    return;
+                }
+
+                // Capture action: 1) Addon list (ActionList or TraitList); 2) HoveredAction only when mouse is over ActionMenu (excludes hotbars)
+                if (shiftHeld)
+                {
+                    if (TryGetHoveredActionFromAddon(addon.Address, out uint fromAddon))
+                        _pendingActionId = fromAddon;
+                    else if (IsMouseOverActionMenu(addon.Address) && !ActionBarsHitTestHelper.IsMouseOverAnyHSUIHotbar())
+                    {
+                        var ha = Plugin.GameGui.HoveredAction;
+                        if (ha != null && ha.ActionKind != HoverActionKind.None && ha.ActionID != 0)
+                            _pendingActionId = ha.ActionID;
+                        else
+                            _pendingActionId = 0;
+                        }
                     else
                         _pendingActionId = 0;
                 }
                 else
                     _pendingActionId = 0;
-            }
-            else
+
+                // On shift+click, use captured action or HoveredAction as fallback
+                if (!shiftHeld || !leftClicked) return;
+
+                if (_pendingActionId == 0) return;
+                uint idToUse = _pendingActionId;
+
+                string? actionName = GetActionName(idToUse);
+                if (string.IsNullOrWhiteSpace(actionName)) return;
+
+                string text = $"You should check out {actionName}";
+                InsertOrCopyToChat(text);
                 _pendingActionId = 0;
-
-            // On shift+click, use captured action or HoveredAction as fallback
-            if (!shiftHeld || !leftClicked) return;
-
-            if (_pendingActionId == 0) return;
-            uint idToUse = _pendingActionId;
-
-            string? actionName = GetActionName(idToUse);
-            if (string.IsNullOrWhiteSpace(actionName)) return;
-
-            string text = $"You should check out {actionName}";
-            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>
@@ -104,19 +112,26 @@ namespace HSUI.Helpers
             actionId = 0;
             if (addonAddress == IntPtr.Zero) return false;
 
-            var addon = (AddonActionMenu*)addonAddress;
-            byte* basePtr = (byte*)addonAddress;
-
-            foreach (var list in new[] { addon->ActionList, addon->TraitList })
+            try
             {
-                if (list == null) continue;
-                foreach (int idx in new[] { list->HoveredItemIndex, list->HeldItemIndex })
+                var addon = (AddonActionMenu*)addonAddress;
+                byte* basePtr = (byte*)addonAddress;
+
+                foreach (var list in new[] { addon->ActionList, addon->TraitList })
                 {
-                    if (idx < 0 || idx >= 80) continue;
-                    actionId = *(uint*)(basePtr + 0x338 + idx * 0x38 + 0x14);
-                    if (actionId != 0) return true;
+                    if (list == null) continue;
+                    foreach (int idx in new[] { list->HoveredItemIndex, list->HeldItemIndex })
+                    {
+                        if (idx < 0 || idx >= 80) continue;
+                        actionId = *(uint*)(basePtr + 0x338 + idx * 0x38 + 0x14);
+                        if (actionId != 0) return true;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Verbose($"[ActionChatLink] TryGetHoveredActionFromAddon: {ex.Message}");
+            }
             return false;
         }
 
@@ -124,13 +139,21 @@ namespace HSUI.Helpers
         private static unsafe bool IsMouseOverActionMenu(IntPtr addonAddress)
         {
             if (addonAddress == IntPtr.Zero) return false;
-            var addon = (AtkUnitBase*)addonAddress;
-            var root = addon->RootNode;
-            if (root == null || !addon->IsVisible) return false;
+            try
+            {
+                var addon = (AtkUnitBase*)addonAddress;
+                var root = addon->RootNode;
+                if (root == null || !addon->IsVisible) return false;
 
-            var mp = ImGui.GetMousePos();
-            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;
+                var mp = ImGui.GetMousePos();
+                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,18 +470,28 @@ namespace HSUI.Helpers
 
         public void OnFrameworkUpdate(IFramework framework)
         {
-            // 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();
-            if (needHook && _wndProcPtr == IntPtr.Zero)
+            try
             {
-                HookWndProc();
-                // Only log when we actually installed (HookWndProc can return early during init delay)
-                if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
-                    Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)");
+                // 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();
+                if (needHook && _wndProcPtr == IntPtr.Zero)
+                {
+                    HookWndProc();
+                    // Only log when we actually installed (HookWndProc can return early during init delay)
+                    if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
+                        Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)");
+                }
+                else if (!needHook && _wndProcPtr != IntPtr.Zero)
+                    RestoreWndProc();
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"[HSUI InputsHelper] OnFrameworkUpdate: {ex.Message}");
             }
-            else if (!needHook && _wndProcPtr != IntPtr.Zero)
-                RestoreWndProc();
         }
 
         private static bool ShouldBlockGameDragRelease()

Helpers/MpTickHelper.cs

@@ -43,35 +43,34 @@ namespace HSUI.Helpers
 
         private void FrameworkOnOnUpdateEvent(IFramework framework)
         {
-            var player = Plugin.ObjectTable.LocalPlayer;
-            if (player is null)
+            try
             {
-                return;
-            }
+                var player = Plugin.ObjectTable.LocalPlayer;
+                if (player is null)
+                    return;
 
-            var now = ImGui.GetTime();
-            if (now - LastUpdate < PollingRate)
+                var now = ImGui.GetTime();
+                if (now - LastUpdate < PollingRate)
+                    return;
+
+                LastUpdate = now;
+
+                var mp = player.CurrentMp;
+
+                // account for lucid dreaming screwing up mp calculations
+                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)
             {
-                return;
+                Plugin.Logger.Verbose($"[HSUI MpTickHelper] FrameworkOnOnUpdateEvent: {ex.Message}");
             }
-
-            LastUpdate = now;
-
-            var mp = player.CurrentMp;
-
-            // account for lucid dreaming screwing up mp calculations
-            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;
         }
 
         protected virtual void Dispose(bool disposing)

Helpers/TexturesHelper.cs

@@ -22,8 +22,22 @@ namespace HSUI.Helpers
 
         public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true)
         {
-            GameIconLookup lookup = new GameIconLookup(iconId + stackCount, false, hdIcon);
-            return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault();
+            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}'");
                         }
@@ -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)
@@ -1428,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/MouseGCDIndicatorConfig.cs

@@ -0,0 +1,74 @@
+using HSUI.Config;
+using HSUI.Config.Attributes;
+using HSUI.Enums;
+using System.Numerics;
+
+namespace HSUI.Interface.GeneralElements
+{
+    [DisableParentSettings("Position")]
+    [Section("Other Elements")]
+    [SubSection("Mouse GCD Indicator", 0)]
+    public class MouseGCDIndicatorConfig : MovablePluginConfigObject
+    {
+        [Checkbox("Always Show")]
+        [Order(3)]
+        public bool AlwaysShow = false;
+
+        [ColorEdit4("Background Color")]
+        [Order(16)]
+        public PluginConfigColor BackgroundColor = new PluginConfigColor(new Vector4(0f / 255f, 0f / 255f, 0f / 255f, 50f / 100f));
+
+        [ColorEdit4("Color")]
+        [Order(17)]
+        public PluginConfigColor FillColor = new PluginConfigColor(new(220f / 255f, 220f / 255f, 220f / 255f, 100f / 100f));
+
+        [Checkbox("Show Border")]
+        [Order(18)]
+        public bool ShowBorder = true;
+
+        [Checkbox("Instant GCDs only", spacing = true)]
+        [Order(19)]
+        public bool InstantGCDsOnly = false;
+
+        [Checkbox("Only show when under GCD Threshold", spacing = true)]
+        [Order(20)]
+        public bool LimitGCDThreshold = false;
+
+        [DragFloat("GCD Threshold", velocity = 0.01f)]
+        [Order(21, collapseWith = nameof(LimitGCDThreshold))]
+        public float GCDThreshold = 1.50f;
+
+        [Checkbox("Show GCD Queue Indicator", spacing = true)]
+        [Order(24)]
+        public bool ShowGCDQueueIndicator = true;
+
+        [ColorEdit4("GCD Queue Color")]
+        [Order(25, collapseWith = nameof(ShowGCDQueueIndicator))]
+        public PluginConfigColor QueueColor = new PluginConfigColor(new(13f / 255f, 207f / 255f, 31f / 255f, 100f / 100f));
+
+        [DragInt("Radius")]
+        [Order(35)]
+        public int CircleRadius = 40;
+
+        [DragInt("Thickness")]
+        [Order(40)]
+        public int CircleThickness = 10;
+
+        [DragInt("Start Angle", min = 0, max = 359)]
+        [Order(45)]
+        public int CircleStartAngle = 0;
+
+        [Checkbox("Rotate CCW")]
+        [Order(50)]
+        public bool RotateCCW = false;
+
+        [DragInt2("Cursor Center Offset", min = -64, max = 64)]
+        [Order(55)]
+        public Vector2 CursorCenterOffset = new Vector2(8, 16);
+
+        [NestedConfig("Visibility", 70)]
+        public VisibilityConfig VisibilityConfig = new VisibilityConfig();
+
+        public new static MouseGCDIndicatorConfig DefaultConfig() { return new MouseGCDIndicatorConfig() { Enabled = false, Strata = StrataLevel.MID_HIGH }; }
+    }
+}

Interface/GeneralElements/MouseGCDIndicatorHud.cs

@@ -0,0 +1,140 @@
+using System;
+using HSUI.Helpers;
+using Dalamud.Bindings.ImGui;
+using System.Collections.Generic;
+using System.Numerics;
+using HSUI.Config;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.Types;
+
+namespace HSUI.Interface.GeneralElements
+{
+    public class MouseGCDIndicatorHud : DraggableHudElement, IHudElementWithActor, IHudElementWithVisibilityConfig
+    {
+        private MouseGCDIndicatorConfig Config => (MouseGCDIndicatorConfig)_config;
+        public VisibilityConfig VisibilityConfig => Config.VisibilityConfig;
+
+        public IGameObject? Actor { get; set; } = null;
+
+        private float _lastTotalCastTime = 0;
+
+        public MouseGCDIndicatorHud(MouseGCDIndicatorConfig config, string displayName) : base(config, displayName) { }
+
+        protected override (List<Vector2>, List<Vector2>) ChildrenPositionsAndSizes()
+        {
+            return (new List<Vector2>(), new List<Vector2>());
+        }
+
+        protected override void DrawDraggableArea(Vector2 origin)
+        {
+            return;
+        }
+
+        public override void DrawChildren(Vector2 origin)
+        {
+            if (!Config.Enabled || Actor == null || Actor is not IPlayerCharacter)
+            {
+                return;
+            }
+
+            GCDHelper.GetGCDInfo((IPlayerCharacter)Actor, out var elapsed, out var total);
+
+            if (!Config.AlwaysShow && total == 0)
+            {
+                _lastTotalCastTime = 0;
+                return;
+            }
+
+            if (_lastTotalCastTime == 0 && Utils.IsActorCasting(Actor))
+            {
+                _lastTotalCastTime = ((IBattleChara)Actor).TotalCastTime;
+            }
+
+            var scale = elapsed / total;
+            if (scale <= 0)
+            {
+                _lastTotalCastTime = 0;
+                return;
+            }
+
+            bool instantGCDsOnly = Config.InstantGCDsOnly && _lastTotalCastTime != 0;
+            bool thresholdGCDs = Config.LimitGCDThreshold && _lastTotalCastTime > Config.GCDThreshold;
+
+            if (instantGCDsOnly || thresholdGCDs)
+            {
+                if (Config.AlwaysShow)
+                {
+                    elapsed = 0;
+                    total = 0;
+                }
+                else
+                {
+                    return;
+                }
+            }
+
+            Vector2 center = ImGui.GetMousePos() + Config.CursorCenterOffset;
+            AddDrawAction(_config.StrataLevel, () =>
+            {
+                DrawCircularIndicator(center, Config.CircleRadius, elapsed, total);
+            });
+        }
+
+        private void DrawCircularIndicator(Vector2 position, float radius, float current, float total)
+        {
+            total = Config.AlwaysShow && total == 0 ? 1 : total;
+            current = Config.AlwaysShow && current == 0 ? total : current;
+
+            var size = new Vector2(radius * 2);
+            DrawHelper.DrawInWindow(ID, position - size / 2, size, false, (drawList) =>
+            {
+                current = Math.Min(current, total);
+
+                const int segments = 100;
+                const float queueTime = 0.5f;
+                float startAngle = 0f;
+                float endAngle = 2f * (float)Math.PI;
+                float offset = (float)(-Math.PI / 2f + (Config.CircleStartAngle * (Math.PI / 180f)));
+
+                if (Config.RotateCCW)
+                {
+                    startAngle *= -1;
+                    endAngle *= -1;
+                }
+
+                if (Config.AlwaysShow && current == total)
+                {
+                    drawList.PathArcTo(position, radius, startAngle + offset, endAngle + offset, segments);
+                    drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                }
+                else
+                {
+                    float progressAngle = Math.Min(current, total - (Config.ShowGCDQueueIndicator ? queueTime : 0f)) / total * endAngle;
+
+                    drawList.PathArcTo(position, radius, startAngle + offset, progressAngle + offset, segments);
+                    drawList.PathStroke(Config.FillColor.Base, ImDrawFlags.None, Config.CircleThickness);
+
+                    if (Config.ShowGCDQueueIndicator && current > total - queueTime)
+                    {
+                        float oldAngle = progressAngle - 0.0003f * total * endAngle;
+                        progressAngle = current / total * endAngle;
+                        drawList.PathArcTo(position, radius, oldAngle + offset, progressAngle + offset, segments);
+                        drawList.PathStroke(Config.QueueColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                    }
+
+                    drawList.PathArcTo(position, radius, progressAngle + offset, endAngle + offset, segments);
+                    drawList.PathStroke(Config.BackgroundColor.Base, ImDrawFlags.None, Config.CircleThickness);
+                }
+
+                if (Config.ShowBorder)
+                {
+                    drawList.PathArcTo(position, radius - Config.CircleThickness / 2f, 0, endAngle, segments);
+                    drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
+
+                    drawList.PathArcTo(position, radius + Config.CircleThickness / 2f, 0, endAngle, segments);
+                    drawList.PathStroke(0xFF000000, ImDrawFlags.None, 1);
+                }
+            });
+        }
+    }
+}

Interface/HudManager.cs

@@ -379,6 +379,11 @@ namespace HSUI.Interface
             _hudElements.Add(gcdIndicatorConfig, gcdIndicator);
             _hudElementsUsingPlayer.Add(gcdIndicator);
 
+            var mouseGcdIndicatorConfig = ConfigurationManager.Instance.GetConfigObject<MouseGCDIndicatorConfig>();
+            var mouseGcdIndicator = new MouseGCDIndicatorHud(mouseGcdIndicatorConfig, "Mouse GCD Indicator");
+            _hudElements.Add(mouseGcdIndicatorConfig, mouseGcdIndicator);
+            _hudElementsUsingPlayer.Add(mouseGcdIndicator);
+
             var mpTickerConfig = ConfigurationManager.Instance.GetConfigObject<MPTickerConfig>();
             var mpTicker = new MPTickerHud(mpTickerConfig, "MP Ticker");
             _hudElements.Add(mpTickerConfig, mpTicker);

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,22 @@
+# 1.0.8.14
+- **Mouse GCD Indicator**: New HUD element (Other Elements → Mouse GCD Indicator) — circular GCD ring drawn around the cursor. Configurable radius, thickness, colors, queue indicator, and cursor center offset so the ring aligns with the cursor graphic.
+
+# 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.

pluginmaster.json

@@ -1 +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.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.8","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.8/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.8/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.8/latest.zip","LastUpdate":"1739232000"}]
+[{"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.14: Mouse GCD Indicator (ring around cursor). 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.14","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.14/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.14/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.14/latest.zip","LastUpdate":"1760486400"}]