Release v1.0.8.7: Gearset icon fix

- Bump version to 1.0.8.7
- Changelog: fix Gearset/Job Gear Set icon clearing when first equipment slot changes
- pluginmaster: update AssemblyVersion, Changelog, download links, LastUpdate

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.7</AssemblyVersion>
-		<FileVersion>1.0.8.5</FileVersion>
+		<FileVersion>1.0.8.7</FileVersion>
-		<InformationalVersion>1.0.8.5</InformationalVersion>
+		<InformationalVersion>1.0.8.7</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

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

@@ -122,6 +122,11 @@ namespace HSUI.Helpers
                     continue;
                 }
 
+                // Populate IconId from ApparentSlotType/ApparentActionId. Required for GearSet and other
+                // dynamic types: the game derives the job icon from the gearset (e.g. first equipment slot).
+                // Without this, when the first gear slot changes the cached IconId can be 0 and the bar shows a blank.
+                slot->LoadIconId();
+
                 bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
                 uint iconId = slot->IconId;
                 uint actionId = slot->ApparentActionId;

Interface/GeneralElements/ActionBarsHud.cs

@@ -1196,21 +1196,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))
-                }
-                else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
-                {
-                    // Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
-                    const uint CraftActionToActionOffset = 100000;
-                    uint mappedId = slot.ActionId + CraftActionToActionOffset;
-                    var mappedRow = actionSheet?.GetRow(mappedId);
-                    if (mappedRow.HasValue)
                     {
-                        actionIdForLookup = mappedId;
+                        actionRow = actionRowOpt;
-                        actionRow = mappedRow.Value;
+                    }
+                    else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                    {
+                        // Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
+                        const uint CraftActionToActionOffset = 100000;
+                        uint mappedId = slot.ActionId + CraftActionToActionOffset;
+                        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 */ }
                     }
                 }
 
@@ -1219,28 +1261,57 @@ 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)
                     {
-                        try
+                        var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
+                        if (craftSheet != null && craftSheet.TryGetRow(actionIdForLookup, out var craftRow))
                         {
-                            var descSeStr = descRow.Value.Description;
-                            descRaw = descRow.Value.Description.ToDalamudString().ToString();
                             try
                             {
-                                var evaluated = Plugin.SeStringEvaluator.Evaluate(descSeStr.AsSpan());
+                                var descSe = craftRow.Description;
-                                desc = evaluated.ExtractText();
+                                var craftDescRaw = descSe.ToDalamudString().ToString();
-                                if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                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
+                            catch { /* ignore */ }
-                            {
+                        }
-                                desc = descRaw;
+                    }
-                            }
+                    else
-                            if (!string.IsNullOrEmpty(desc))
+                    {
-                                desc = EncryptedStringsHelper.GetString(desc);
+                        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());
+                                    desc = evaluated.ExtractText();
+                                    if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                                }
+                                catch
+                                {
+                                    desc = descRaw;
+                                }
+                                if (!string.IsNullOrEmpty(desc))
+                                    desc = EncryptedStringsHelper.GetString(desc);
+                            }
+                            catch { /* ignore */ }
                         }
-                        catch { /* ignore */ }
                     }
                     bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
                     int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;

changelog.md

@@ -1,3 +1,9 @@
+# 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.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.7","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.7/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.7/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.7/latest.zip","LastUpdate":"1739145600"}]
-  {
-    "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"
-  }
-]