Compare commits

..

20 Commits

Author SHA1 Message Date
KnackAtNite cdffaeb168 v1.0.8.12: Item/HQ icons draw on hotbar (iconId >= 1000000 encoding)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:51:04 -05:00
KnackAtNite 346969835a v1.0.8.11: Hotbar tooltip crash fix (Lumina GetRow)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:37:10 -05:00
KnackAtNite 2ac48bbd81 v1.0.8.10: Hotbar crash fix when dragging inventory items; Release builds strip PDBs
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-10 21:24:16 -05:00
KnackAtNite ccee580789 PvP hotbar fix: load saved PvE on zone leave then use live bars; Show Action ID in tooltips
- On leaving PvP, LoadSavedHotbar for all 10 bars (via TryRestorePvEHotbarsAfterLeavePvP in Framework update) and re-apply for ~2s so live Hotbars show PvE
- GetSlotData always reads from live StandardHotbars so combo updates (e.g. Pictomancer) and icons work normally
- Misc: Show Action ID option in Misc -> Tooltips; hotbar/party cooldown tooltips pass TooltipIdKind for Action vs Status IDs

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 16:26:26 -05:00
KnackAtNite 5ffbdd0b51 Release v1.0.8.9: Gearset persists on slot
- Do not treat slot as empty when CommandType is GearSet (CommandId 0 valid)
- Use CommandType/CommandId for GearSet display; resolve icon when IconId 0
- Bump version, changelog, pluginmaster

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:29:37 -05:00
KnackAtNite 280004bdb0 Release v1.0.8.8: Gearset drag-drop and index 0 fix
- Only call LoadIconId() for GearSet slots so drop still sticks
- Allow gearset id 0 (first in list) in drop validation and GetIconIdForPayload
- Bump version, changelog, pluginmaster

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:24:40 -05:00
KnackAtNite d8da154e72 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>
2026-02-08 15:16:14 -05:00
KnackAtNite db6e91afd1 Action bars: fix Gearset/Job Gear Set icon clearing when first gear slot changes
Call LoadIconId() before reading slot IconId so the game populates the icon
from ApparentSlotType/ApparentActionId (e.g. job icon for GearSet). Without
this, when the first equipment slot in a gearset changes the cached IconId
can be 0 and the bar shows a blank icon.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 15:13:46 -05:00
KnackAtNite 01426d3c30 v1.0.8.6: Fix crafting action tooltips - use CraftAction.Description instead of ActionTransient
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-08 00:47:35 -05:00
KnackAtNite cb3d6b5e0b 1.0.8.5: Fix other HSUI elements disappearing on hotbar hover (child window overlay)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 23:36:46 -05:00
KnackAtNite 9391ef1451 Bump to 1.0.8.4, changelog for alliance/crafting/visibility fixes
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 22:39:48 -05:00
KnackAtNite 3b5ddbe2f9 Alliance frames, crafting tooltips, visibility: fix display and tooltips
- Alliance Frames: Populate other alliances (A/B) via GetAllianceMemberByIndex flat indices (0-7, 8-15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance; keep own party from GetPartyMemberByIndex.
- Alliance Frames: Visibility: do not apply HideInDuty to Alliance Frames so they show in alliance raids when visibility rules are enabled.
- Hotbars: Crafting action tooltips: fallback Action sheet lookup with +100000 offset when hotbar stores CraftAction row ID.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 22:34:10 -05:00
KnackAtNite 57d1bc5c0f 1.0.8.3: Restore WndProc at start of teardown so left-click works after disable
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 10:57:36 -05:00
KnackAtNite f4912bbdb2 1.0.8.2: Charge icons stay lit until all charges spent (slot recast + ActionManager). Changelog 1.0.8.1/1.0.8.2.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 02:01:20 -05:00
KnackAtNite 61a3de4d09 Bump to 1.0.8.1 for release (changelog, pluginmaster)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 01:28:46 -05:00
KnackAtNite eba2a33649 Don't grey out action icons until all charges are spent
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-07 01:24:04 -05:00
KnackAtNite 11e30309c4 Bump version to 1.0.8.1
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-03 22:56:56 -05:00
KnackAtNite c49d22d867 Action bars: use GetAdjustedActionId for Action slot display (combo/HSRCombos)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-03 22:51:37 -05:00
KnackAtNite 78b37a3f15 v1.0.8.0: Action Chat Link, hotbar job-specific persistence fix
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 23:40:50 -05:00
KnackAtNite 9f41c18c0b v1.0.7.1: Remove Discord and Ko-fi links from in-game config
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-01 15:01:45 -05:00
21 changed files with 673 additions and 192 deletions
-6
View File
@@ -45,12 +45,6 @@ namespace HSUI.Interface
} }
ImGuiHelper.DrawSeparator(1, 1); ImGuiHelper.DrawSeparator(1, 1);
ImGui.Text("To browse presets made by users of the HSUI community join our Discord and find the #profiles channel.");
if (ImGui.Button("HSUI Discord", new Vector2(560, 24)))
{
Utils.OpenUrl("https://discord.gg/xzde5qQayh");
}
// error modal // error modal
if (_errorMessage != null) if (_errorMessage != null)
-26
View File
@@ -241,32 +241,6 @@ namespace HSUI.Config.Tree
ImGui.PopStyleColor(); ImGui.PopStyleColor();
ImGui.PopFont(); ImGui.PopFont();
ImGuiHelper.SetTooltip("Changelog"); ImGuiHelper.SetTooltip("Changelog");
// discord button
ImGui.PushFont(UiBuilder.IconFont);
ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(114f / 255f, 137f / 255f, 218f / 255f, alpha));
ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(114f / 255f, 137f / 255f, 218f / 255f, alpha * .85f));
ImGui.SetCursorPos(new Vector2(48 * _scale, y));
if (ImGui.Button(FontAwesomeIcon.Link.ToIconString(), new Vector2(24 * _scale, 24 * _scale)))
{
Utils.OpenUrl("https://discord.gg/xzde5qQayh");
}
ImGui.PopStyleColor(2);
ImGui.PopFont();
ImGuiHelper.SetTooltip("HSUI Discord");
// discord button
ImGui.PushFont(UiBuilder.IconFont);
ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(255f / 255f, 94f / 255f, 91f / 255f, alpha));
ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(255f / 255f, 94f / 255f, 91f / 255f, alpha * .85f));
ImGui.SetCursorPos(new Vector2(77 * _scale, y));
if (ImGui.Button(FontAwesomeIcon.MugHot.ToIconString(), new Vector2(24 * _scale, 24 * _scale)))
{
Utils.OpenUrl("https://ko-fi.com/Tischel");
}
ImGui.PopStyleColor(2);
ImGui.PopFont();
ImGuiHelper.SetTooltip("Tip the developer at ko-fi.com");
} }
ImGui.EndChild(); ImGui.EndChild();
+6 -3
View File
@@ -9,9 +9,9 @@
<PropertyGroup> <PropertyGroup>
<AssemblyName>HSUI</AssemblyName> <AssemblyName>HSUI</AssemblyName>
<AssemblyVersion>1.0.7.0</AssemblyVersion> <AssemblyVersion>1.0.8.12</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion> <FileVersion>1.0.8.12</FileVersion>
<InformationalVersion>1.0.7.0</InformationalVersion> <InformationalVersion>1.0.8.12</InformationalVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@@ -24,6 +24,9 @@
<PropertyGroup Condition="'$(Configuration)'=='Release'"> <PropertyGroup Condition="'$(Configuration)'=='Release'">
<Deterministic>true</Deterministic> <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>
<PropertyGroup> <PropertyGroup>
+1 -1
View File
@@ -2,7 +2,7 @@
"Author": "Knack117", "Author": "Knack117",
"Name": "HSUI", "Name": "HSUI",
"InternalName": "HSUI", "InternalName": "HSUI",
"AssemblyVersion": "1.0.7.0", "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.", "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", "ApplicableVersion": "any",
"RepoUrl": "https://github.com/Knack117/HSUI", "RepoUrl": "https://github.com/Knack117/HSUI",
+83 -10
View File
@@ -89,9 +89,48 @@ namespace HSUI.Helpers
return p; 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> /// <summary>
/// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots. /// Reads hotbar slot data from RaptureHotbarModule. Returns up to slotCount slots.
/// hotbarIndex 1-10 maps to StandardHotbars 0-9. /// 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> /// </summary>
public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount) public unsafe List<SlotInfo> GetSlotData(int hotbarIndex, int slotCount)
{ {
@@ -100,11 +139,11 @@ namespace HSUI.Helpers
if (module == null || !module->ModuleReady) if (module == null || !module->ModuleReady)
return list; return list;
var hotbars = module->StandardHotbars;
int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1; int barIdx = Math.Clamp(hotbarIndex, 1, 10) - 1;
int count = Math.Clamp(slotCount, 1, 12); int count = Math.Clamp(slotCount, 1, 12);
var hotbars = module->StandardHotbars;
ref var bar = ref hotbars[barIdx]; ref var bar = ref hotbars[barIdx];
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
var slot = bar.GetHotbarSlot((uint)i); var slot = bar.GetHotbarSlot((uint)i);
@@ -116,19 +155,37 @@ namespace HSUI.Helpers
continue; 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)); list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
continue; 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 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 pct, int secsLeft) = GetSlotCooldown(slot);
(int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId); (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
uint apparentCharges = slotType == RaptureHotbarModule.HotbarSlotType.Action ? slot->GetApparentIconRecastCharges() : 0;
if (maxCharges > 1 && (apparentCharges > 0 || currentCharges > 0))
usable = true;
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges)); list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
} }
@@ -541,16 +598,32 @@ namespace HSUI.Helpers
return true; return true;
} }
/// <summary>Sets a slot and persists to disk. For shared hotbars, explicitly writes to classJobId 0 to ensure persistence across job changes and teleports.</summary> /// <summary>Sets a slot and persists to disk. For shared hotbars, explicitly writes to classJobId 0.
/// For job-specific hotbars, explicitly writes to current class job ID to ensure persistence when switching jobs.</summary>
public static unsafe void SetAndSaveSlotInternal(RaptureHotbarModule* module, uint barId, uint slotId, RaptureHotbarModule.HotbarSlotType slotType, uint commandId, RaptureHotbarModule.HotbarSlot* slotPtr = null) public static unsafe void SetAndSaveSlotInternal(RaptureHotbarModule* module, uint barId, uint slotId, RaptureHotbarModule.HotbarSlotType slotType, uint commandId, RaptureHotbarModule.HotbarSlot* slotPtr = null)
{ {
var ptr = slotPtr != null ? slotPtr : module->GetSlotById(barId, slotId); var ptr = slotPtr != null ? slotPtr : module->GetSlotById(barId, slotId);
if (module->IsHotbarShared(barId) && ptr != null) if (ptr == null) return;
if (module->IsHotbarShared(barId))
{ {
// Shared hotbars: explicitly write to classJobId 0 (shared storage) for correct persistence across teleports/job changes // Shared hotbars: explicitly write to classJobId 0 (shared storage) for persistence across job changes and teleports
module->WriteSavedSlot(0, barId, slotId, ptr, false, false); module->WriteSavedSlot(0, barId, slotId, ptr, false, false);
} }
// SetAndSaveSlot triggers file save; for shared bars also ensures save is queued (WriteSavedSlot may only update _savedHotbars) else
{
// Job-specific hotbars: explicitly write to current class job ID so saves persist when switching jobs
uint classJobId = (uint)(module->ActiveHotbarClassJobId & 0x7F); // strip 0x80 flag if set
if (classJobId == 0)
{
var player = Plugin.ObjectTable?.LocalPlayer;
if (player != null)
classJobId = player.ClassJob.RowId;
}
if (classJobId != 0)
module->WriteSavedSlot(classJobId, barId, slotId, ptr, false, false);
}
// SetAndSaveSlot updates live slot and triggers file save
module->SetAndSaveSlot(barId, slotId, slotType, commandId, ignoreSharedHotbars: false, allowSaveToPvP: true); module->SetAndSaveSlot(barId, slotId, slotType, commandId, ignoreSharedHotbars: false, allowSaveToPvP: true);
} }
} }
+231
View File
@@ -0,0 +1,231 @@
/*
* ActionChatLinkHelper: Shift+click on actions in the Actions & Traits menu to insert
* "You should check out {ActionName}" into the chat input (or clipboard if chat not focused).
*/
using Dalamud.Bindings.ImGui;
using Dalamud.Plugin.Services;
using Dalamud.Game.Gui;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI;
using HSUI.Config;
using System;
using System.Numerics;
using LuminaAction = Lumina.Excel.Sheets.Action;
namespace HSUI.Helpers
{
public sealed class ActionChatLinkHelper : IDisposable
{
public static ActionChatLinkHelper? Instance { get; private set; }
private readonly IFramework _framework;
/// <summary>Store last hovered action when ActionMenu is visible and shift held, so we have it at click time.</summary>
private uint _pendingActionId;
private ActionChatLinkHelper(IFramework framework)
{
_framework = framework;
_framework.Update += OnFrameworkUpdate;
ConfigurationManager.Instance.ResetEvent += OnConfigReset;
OnConfigReset(ConfigurationManager.Instance);
}
private WorldObjectTooltipConfig _config = null!;
public static void Initialize()
{
if (Instance != null) return;
Instance = new ActionChatLinkHelper(Plugin.Framework);
}
public void Dispose()
{
_framework.Update -= OnFrameworkUpdate;
try { ConfigurationManager.Instance.ResetEvent -= OnConfigReset; } catch { }
Instance = null;
}
private void OnConfigReset(ConfigurationManager _) =>
_config = ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
private void OnFrameworkUpdate(IFramework framework)
{
try
{
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)
{
_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;
// 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>
private static unsafe bool TryGetHoveredActionFromAddon(IntPtr addonAddress, out uint actionId)
{
actionId = 0;
if (addonAddress == IntPtr.Zero) return false;
try
{
var addon = (AddonActionMenu*)addonAddress;
byte* basePtr = (byte*)addonAddress;
foreach (var list in new[] { addon->ActionList, addon->TraitList })
{
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;
}
/// <summary>True if mouse is within ActionMenu addon bounds (so we can safely use HoveredAction — excludes hotbars).</summary>
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;
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)
{
try
{
var sheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
var row = sheet?.GetRow(actionId);
return row.HasValue ? row.Value.Name.ToString() : null;
}
catch { return null; }
}
private static void InsertOrCopyToChat(string text)
{
if (TryInsertIntoActiveTextInput(text))
return;
// Fallback: copy to clipboard and notify (leave text on clipboard for user to paste)
try
{
ImGui.SetClipboardText(text);
Plugin.Chat.Print("[HSUI] Copied to clipboard — open chat and press Ctrl+V to paste.");
}
catch (Exception ex)
{
Plugin.Logger.Warning($"[ActionChatLink] Failed to copy to clipboard: {ex.Message}");
}
}
private static unsafe bool TryInsertIntoActiveTextInput(string text)
{
try
{
var raptureAtk = RaptureAtkModule.Instance();
if (raptureAtk == null || !raptureAtk->IsTextInputActive())
return false;
var stage = AtkStage.Instance();
if (stage == null) return false;
var focus = stage->GetFocus();
if (focus == null) return false;
// Traverse up to find the text input component
var node = focus;
while (node != null)
{
if (node->Type == NodeType.Component)
{
var componentNode = (AtkComponentNode*)node;
var component = componentNode->Component;
if (component != null)
{
if (component->GetComponentType() == ComponentType.TextInput)
{
var textInput = (AtkComponentTextInput*)component;
textInput->InsertText(text, false);
return true;
}
}
}
node = node->ParentNode;
}
return false;
}
catch (Exception ex)
{
Plugin.Logger.Warning($"[ActionChatLink] InsertText failed: {ex.Message}");
return false;
}
}
}
}
+36 -11
View File
@@ -470,18 +470,28 @@ namespace HSUI.Helpers
public void OnFrameworkUpdate(IFramework framework) public void OnFrameworkUpdate(IFramework framework)
{ {
// Keep WndProc hooked when: proxy mode (for mouseover) OR we need to block game drag try
// release (so dropping on HSUI action bar doesn't execute the ability).
bool needHook = IsProxyEnabled || ShouldBlockGameDragRelease();
if (needHook && _wndProcPtr == IntPtr.Zero)
{ {
HookWndProc(); // When leaving PvP, force load PvE hotbars so HSUI bars don't keep showing PvP actions.
// Only log when we actually installed (HookWndProc can return early during init delay) ActionBarsManager.TryRestorePvEHotbarsAfterLeavePvP();
if (_wndProcPtr != IntPtr.Zero && IsActionBarDragDropDebugEnabled())
Plugin.Logger.Information("[HSUI DragDrop DBG] WndProc hook INSTALLED (needHook=true for drag-block)"); // 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() private static bool ShouldBlockGameDragRelease()
@@ -565,7 +575,8 @@ namespace HSUI.Helpers
Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X")); Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X"));
} }
private void RestoreWndProc() /// <summary>Restore the game window's WndProc so left-click works again. Idempotent.</summary>
internal void RestoreWndProc()
{ {
if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero) if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
return; return;
@@ -584,6 +595,20 @@ namespace HSUI.Helpers
{ {
_wndHandle = IntPtr.Zero; _wndHandle = IntPtr.Zero;
_imguiWndProcPtr = IntPtr.Zero; _imguiWndProcPtr = IntPtr.Zero;
_wndProcPtr = IntPtr.Zero;
}
}
/// <summary>Call at the very start of plugin disable so left-click is restored even if disposal fails later.</summary>
public static void RestoreWndProcIfNeeded()
{
try
{
Instance?.RestoreWndProc();
}
catch (Exception ex)
{
Plugin.Logger?.Warning($"[HSUI] RestoreWndProcIfNeeded: {ex.Message}");
} }
} }
+24 -25
View File
@@ -43,35 +43,34 @@ namespace HSUI.Helpers
private void FrameworkOnOnUpdateEvent(IFramework framework) private void FrameworkOnOnUpdateEvent(IFramework framework)
{ {
var player = Plugin.ObjectTable.LocalPlayer; try
if (player is null)
{ {
return; var player = Plugin.ObjectTable.LocalPlayer;
} if (player is null)
return;
var now = ImGui.GetTime(); var now = ImGui.GetTime();
if (now - LastUpdate < PollingRate) 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) protected virtual void Dispose(bool disposing)
+16 -2
View File
@@ -22,8 +22,22 @@ namespace HSUI.Helpers
public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true) public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, uint stackCount = 0, bool hdIcon = true)
{ {
GameIconLookup lookup = new GameIconLookup(iconId + stackCount, false, hdIcon); if (iconId == 0)
return Plugin.TextureProvider.GetFromGameIcon(lookup).GetWrapOrDefault(); 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) public static IDalamudTextureWrap? GetTextureFromPath(string path)
+25 -5
View File
@@ -13,6 +13,14 @@ using System.Text;
namespace HSUI.Helpers 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 public class TooltipsHelper : IDisposable
{ {
#region Singleton #region Singleton
@@ -65,12 +73,12 @@ namespace HSUI.Helpers
private const float IconSize = 24f; 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) if (text == null)
{ {
@@ -99,7 +107,11 @@ namespace HSUI.Helpers
_currentTooltipTitle += $" ({name})"; _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 + ")"; _currentTooltipTitle += " (ID: " + id + ")";
} }
@@ -407,6 +419,10 @@ namespace HSUI.Helpers
[Order(7)] [Order(7)]
public bool ShowStatusIDs = false; 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")] [Checkbox("Show Source Name")]
[Order(10)] [Order(10)]
public bool ShowSourceName = false; public bool ShowSourceName = false;
@@ -467,8 +483,12 @@ namespace HSUI.Helpers
[Order(3)] [Order(3)]
public bool ShowIcon = true; public bool ShowIcon = true;
[Checkbox("Shift+Click action in Actions & Traits → insert \"You should check out X\" in chat", help = "When chat is focused, inserts directly. Otherwise copies to clipboard.")]
[Order(4)]
public bool ActionChatLinkEnabled = true;
[Checkbox("Show Level", spacing = true)] [Checkbox("Show Level", spacing = true)]
[Order(5)] [Order(6)]
public bool ShowLevel = true; public bool ShowLevel = true;
[Checkbox("Show HP")] [Checkbox("Show HP")]
+153 -29
View File
@@ -253,7 +253,7 @@ namespace HSUI.Interface.GeneralElements
}); });
// Overlay at HIGHEST so it captures input above the bar; required for icon swap. // Overlay at HIGHEST so it captures input above the bar; required for icon swap.
// Use unique ID per hotbar to avoid any cross-bar conflicts (bar 210 had input capture issues). // Draw as a child of HSUI_HUD so hovering does not create a separate toplevel window that hides other HSUI elements.
AddDrawAction(StrataLevel.HIGHEST, () => AddDrawAction(StrataLevel.HIGHEST, () =>
{ {
var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount); var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
@@ -262,13 +262,11 @@ namespace HSUI.Interface.GeneralElements
| ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
| ImGuiWindowFlags.NoNav; | ImGuiWindowFlags.NoNav;
ImGuiHelpers.ForceNextWindowMainViewport();
ImGui.SetNextWindowPos(topLeft);
ImGui.SetNextWindowSize(barSize);
string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input"; string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input";
if (!ImGui.Begin(overlayId, flags)) ImGui.SetCursorScreenPos(topLeft);
if (!ImGui.BeginChild(overlayId, barSize, false, flags))
{ {
ImGui.End(); ImGui.EndChild();
return; return;
} }
@@ -372,7 +370,7 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text)) if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{ {
string body = string.IsNullOrEmpty(text) ? title : 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()) if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'"); Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
} }
@@ -394,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
_lastLoggedPickupSlotId = -1; _lastLoggedPickupSlotId = -1;
} }
ImGui.End(); ImGui.EndChild();
}); });
} }
@@ -431,7 +429,7 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text)) if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{ {
string body = string.IsNullOrEmpty(text) ? title : 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()) if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'"); Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
} }
@@ -604,7 +602,7 @@ namespace HSUI.Interface.GeneralElements
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left)) if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
{ {
int releaseIdx = GetSlotIndexAtPosition(topLeft, barSize, slotSize, pad, Config.SlotCount, Config.GetLayoutGrid().Cols, mp, debug); 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) if (!ImGui.GetIO().KeyShift)
{ {
@@ -621,7 +619,7 @@ namespace HSUI.Interface.GeneralElements
displaySlot->Set(slotType, id); displaySlot->Set(slotType, id);
displaySlot->LoadIconId(); displaySlot->LoadIconId();
} }
module->SetAndSaveSlot(barId, (uint)releaseIdx, slotType, id); ActionBarsManager.SetAndSaveSlotInternal(module, barId, (uint)releaseIdx, slotType, id, displaySlot);
uint iconId = GetIconIdForPayload(slotType, id); uint iconId = GetIconIdForPayload(slotType, id);
if (iconId == 0) if (iconId == 0)
{ {
@@ -703,7 +701,7 @@ namespace HSUI.Interface.GeneralElements
// stale (e.g. from macro menu UI), causing wrong placements (macro drag -> GeneralAction placed). // 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. // If we never got valid payload (e.g. Macro Int2=0), skip the place.
bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty && bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro); (id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
if (hasValidPayload) if (hasValidPayload)
{ {
@@ -1050,6 +1048,24 @@ namespace HSUI.Interface.GeneralElements
return false; return false;
} }
/// <summary>Maps HoverActionKind to HotbarSlotType for tooltip lookups. Returns Empty if not supported.</summary>
public static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeForHover(HoverActionKind kind) =>
GetHotbarSlotTypeFromHoverActionKind(kind);
/// <summary>
/// Gets tooltip (title, text, iconId) for an action when hovered in chat or elsewhere.
/// Used by global tooltip to show action details when hovering over linked actions in chat.
/// </summary>
public static (string title, string text, uint iconId)? GetActionTooltipForHover(RaptureHotbarModule.HotbarSlotType slotType, uint actionId)
{
if (actionId == 0) return null;
var slot = new ActionBarsManager.SlotInfo(0, false, true, 0, 0, actionId, slotType, "", 0, 0);
var (title, text) = GetSlotTooltip(slot);
if (string.IsNullOrEmpty(title) && string.IsNullOrEmpty(text)) return null;
uint iconId = GetIconIdForPayload(slotType, actionId);
return (title, string.IsNullOrEmpty(text) ? title : text, iconId);
}
private static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeFromHoverActionKind(HoverActionKind kind) private static RaptureHotbarModule.HotbarSlotType GetHotbarSlotTypeFromHoverActionKind(HoverActionKind kind)
{ {
return kind switch return kind switch
@@ -1076,7 +1092,9 @@ namespace HSUI.Interface.GeneralElements
private static unsafe uint GetIconIdForPayload(RaptureHotbarModule.HotbarSlotType slotType, uint id) 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) if (slotType == RaptureHotbarModule.HotbarSlotType.Macro)
{ {
var macroModule = RaptureMacroModule.Instance(); var macroModule = RaptureMacroModule.Instance();
@@ -1134,6 +1152,19 @@ namespace HSUI.Interface.GeneralElements
} }
private static unsafe (string title, string text) GetSlotTooltip(ActionBarsManager.SlotInfo slot) 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. // GeneralAction uses a different ID space: GeneralAction 7 = Teleport links to Action 5. Look up via GeneralAction sheet.
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction) if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.GeneralAction)
@@ -1176,33 +1207,126 @@ namespace HSUI.Interface.GeneralElements
slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction || slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction) slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction)
{ {
var row = Plugin.DataManager.GetExcelSheet<LuminaAction>()?.GetRow(slot.ActionId); uint actionIdForLookup = slot.ActionId;
LuminaAction? actionRow = null;
var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
if (actionSheet != null)
{
if (actionSheet.TryGetRow(slot.ActionId, out var actionRowOpt))
{
actionRow = actionRowOpt;
}
else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
{
// Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
const uint CraftActionToActionOffset = 100000;
uint mappedId = slot.ActionId + CraftActionToActionOffset;
if (actionSheet.TryGetRow(mappedId, out var mappedRow))
{
actionIdForLookup = mappedId;
actionRow = mappedRow;
}
}
}
// CraftAction fallback: when Action sheet lookup failed, try CraftAction sheet directly (hotbar stores CraftAction row ID).
if (!actionRow.HasValue && slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
{
var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
if (craftSheet != null && craftSheet.TryGetRow(slot.ActionId, out var craftRow))
{
try
{
var nameSe = craftRow.Name;
string name = nameSe.ToString();
if (string.IsNullOrWhiteSpace(name))
name = nameSe.ToDalamudString().ToString();
if (!string.IsNullOrWhiteSpace(name))
{
// CraftAction sheet has its own Description column with the full text
string desc = "";
try
{
var descSe = craftRow.Description;
var descRaw = descSe.ToDalamudString().ToString();
if (!string.IsNullOrEmpty(descRaw))
{
try
{
var evaluated = Plugin.SeStringEvaluator.Evaluate(descSe.AsSpan());
desc = evaluated.ExtractText();
if (string.IsNullOrEmpty(desc)) desc = descRaw;
}
catch { desc = descRaw; }
if (!string.IsNullOrEmpty(desc))
desc = EncryptedStringsHelper.GetString(desc);
}
}
catch { /* ignore */ }
return (name, desc);
}
}
catch { /* ignore */ }
}
}
var row = actionRow;
if (row.HasValue) if (row.HasValue)
{ {
string name = row.Value.Name.ToString(); string name = row.Value.Name.ToString();
string desc = ""; string desc = "";
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
string descRaw = ""; 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 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); bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null; int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
@@ -96,6 +96,9 @@ namespace HSUI.Interface
if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; } if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
if (element != null && !element.GetConfig().Enabled) { return false; } if (element != null && !element.GetConfig().Enabled) { return false; }
// Alliance frames only matter in alliance raids (duty). HideInDuty would hide them exactly when needed.
bool isAllianceFrames = element != null && element.GetType() == typeof(AllianceFramesHud);
bool isInIslandSanctuary = IsInIslandSanctuary(); bool isInIslandSanctuary = IsInIslandSanctuary();
bool isInDuty = IsInDuty() && !isInIslandSanctuary; bool isInDuty = IsInDuty() && !isInIslandSanctuary;
IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer; IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
@@ -127,7 +130,8 @@ namespace HSUI.Interface
if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; } if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; }
if (HideInDuty && isInDuty) { return false; } // Alliance frames only matter in alliance raids (duty). Skip HideInDuty for them.
if (HideInDuty && isInDuty && !isAllianceFrames) { return false; }
if (HideInIslandSanctuary && isInIslandSanctuary) { return false; } if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
-4
View File
@@ -45,10 +45,6 @@ namespace HSUI.Interface.GeneralElements
[Order(21)] [Order(21)]
public bool AlwaysShowTargetNameplate = true; 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; public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
} }
-17
View File
@@ -128,23 +128,6 @@ namespace HSUI.Interface.Nameplates
return _playerHud; 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 (data.GameObject is ICharacter character2)
{ {
if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
+34 -25
View File
@@ -280,34 +280,18 @@ namespace HSUI.Interface.Party
bool anyChanged = false; bool anyChanged = false;
ref var mainGroup = ref gm->MainGroup; ref var mainGroup = ref gm->MainGroup;
// GroupManager layout: _allianceMembers flat array (indices 0-19) has groups 0 and 1.
// Group 2 (our party) is stored in _partyMembers. GetAllianceMemberByGroupAndIndex(0/1, slot)
// returns empty in-instance for some game versions; use GetAllianceMemberByIndex with flat
// indices: group 0 = indices 0-7, group 1 = indices 8-15.
for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++) for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
{ {
int count = 0; int count = 0;
var list = new List<IPartyFramesMember>(); var list = new List<IPartyFramesMember>();
for (int slot = 0; slot < 8; slot++) if (allianceIdx == 2)
{
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
if (pm == null || pm->EntityId == 0) continue;
var pfMember = new PartyFramesMember(
pm->EntityId,
count,
count,
EnmityLevel.Last,
PartyMemberStatus.None,
ReadyCheckStatus.None,
false,
false
);
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
list.Add(pfMember);
count++;
}
// GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
// When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
if (count == 0 && allianceIdx == 2)
{ {
// Our party: _partyMembers via GetPartyMemberByIndex
for (int slot = 0; slot < 8; slot++) for (int slot = 0; slot < 8; slot++)
{ {
var pm = mainGroup.GetPartyMemberByIndex(slot); var pm = mainGroup.GetPartyMemberByIndex(slot);
@@ -327,6 +311,29 @@ namespace HSUI.Interface.Party
count++; count++;
} }
} }
else
{
// Other alliances: _allianceMembers flat indices. Group 0 = 0-7, group 1 = 8-15.
int baseIdx = allianceIdx * 8;
for (int slot = 0; slot < 8; slot++)
{
var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
if (pm == null || pm->EntityId == 0) continue;
var pfMember = new PartyFramesMember(
pm->EntityId,
count,
count,
EnmityLevel.Last,
PartyMemberStatus.None,
ReadyCheckStatus.None,
false,
false
);
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
list.Add(pfMember);
count++;
}
}
if (count != _lastMemberCounts[allianceIdx]) if (count != _lastMemberCounts[allianceIdx])
{ {
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
int ourIdx = 0; int ourIdx = 0;
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++) for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
{ {
PartyMember* pm = allianceIdx == 2 PartyMember* pm;
? mainGroup.GetPartyMemberByIndex(slot) if (allianceIdx == 2)
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot); pm = mainGroup.GetPartyMemberByIndex(slot);
else
pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
if (pm == null || pm->EntityId == 0) continue; if (pm == null || pm->EntityId == 0) continue;
if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember) if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob); pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
@@ -289,7 +289,8 @@ namespace HSUI.Interface.Party
hoveringCooldown.Data.Name, hoveringCooldown.Data.Name,
hoveringCooldown.Data.ActionId, hoveringCooldown.Data.ActionId,
"", "",
iconId iconId,
HSUI.Helpers.TooltipIdKind.Action
); );
} }
} }
@@ -310,7 +310,8 @@ namespace HSUI.Interface.PartyCooldowns
cooldown.Data.Name, cooldown.Data.Name,
cooldown.Data.ActionId, cooldown.Data.ActionId,
"", "",
iconId iconId,
HSUI.Helpers.TooltipIdKind.Action
); );
} }
@@ -474,7 +474,8 @@ namespace HSUI.Interface.StatusEffects
EncryptedStringsHelper.GetString(data.Data.Name.ToString()), EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
data.Status.StatusId, data.Status.StatusId,
GetStatusActorName(data.Status), GetStatusActorName(data.Status),
iconId iconId,
HSUI.Helpers.TooltipIdKind.Status
); );
} }
+5
View File
@@ -136,6 +136,7 @@ namespace HSUI
ActionBarsManager.Initialize(); ActionBarsManager.Initialize();
TextTagsHelper.Initialize(); TextTagsHelper.Initialize();
TooltipsHelper.Initialize(); TooltipsHelper.Initialize();
ActionChatLinkHelper.Initialize();
PetRenamerHelper.Initialize(); PetRenamerHelper.Initialize();
HonorificHelper.Initialize(); HonorificHelper.Initialize();
WotsitHelper.Initialize(); WotsitHelper.Initialize();
@@ -437,6 +438,9 @@ namespace HSUI
{ {
if (!disposing) return; if (!disposing) return;
// Restore game window WndProc first so left-click works again immediately, even if teardown throws.
InputsHelper.RestoreWndProcIfNeeded();
// Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown // Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
try try
{ {
@@ -479,6 +483,7 @@ namespace HSUI
TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose()); TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose());
TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose()); TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose());
TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose()); TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose());
TryDispose("ActionChatLinkHelper", () => ActionChatLinkHelper.Instance?.Dispose());
TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose()); TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose());
TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose()); TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose());
TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose()); TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose());
+47
View File
@@ -1,3 +1,50 @@
# 1.0.8.12
- **Hotbars**: Fixed item icons not drawing on hotbar — game encodes HQ items as iconId + 1000000; now use iconId % 1000000 and itemHq flag so item icons (including HQ) display correctly.
# 1.0.8.11
- **Hotbars**: Fixed tooltip crash — Lumina GetRow can throw for invalid/transitional row IDs (e.g. during inventory drag-drop); GetSlotTooltip now catches and returns empty instead of crashing.
# 1.0.8.10
- **Hotbars**: Fixed crash when dragging items from inventory to hotbar — GetFromGameIcon can throw for invalid/unsupported icon IDs; now handled gracefully.
- **Build**: Release builds no longer emit PDBs to avoid local path leakage in user crash logs.
# 1.0.8.9
- **Hotbars**: Gearset on slot now persists — do not treat slot as empty when CommandType is GearSet (gearset index 0 uses CommandId 0). Use CommandType/CommandId for GearSet display and resolve icon when IconId is still 0.
# 1.0.8.8
- **Hotbars**: Only refresh icon via LoadIconId() for GearSet slots so drag-and-drop of gearsets onto the bar works again.
- **Hotbars**: Allow gearset index 0 (top-most gearset in list) — drop validation and icon lookup now accept id 0 for GearSet type.
# 1.0.8.7
- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
# 1.0.8.6
- **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
# 1.0.8.5
- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
# 1.0.8.4
- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 07, 815) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance.
- **Alliance Frames**: Visibility "Hide in duty" no longer hides alliance frames (they are only relevant in duty).
- **Hotbars**: Crafting job action tooltips now display — fallback Action sheet lookup when hotbar stores CraftAction row ID.
# 1.0.8.3
- **Fix**: Left-click no longer sometimes stays broken after disabling HSUI. WndProc is restored at the very start of plugin teardown so the game window gets normal input back even if disposal fails later.
# 1.0.8.2
- **Action bars**: Charge icons stay lit until all charges are spent — uses the slots recast charge count and ActionManager so abilities with charges remaining no longer grey out incorrectly.
# 1.0.8.1
- **Action bars**: Do not grey out action icons until all charges are spent (initial fix for multi-charge abilities).
# 1.0.8.0
- **Action Chat Link**: Shift+click an action in the Actions & Traits menu to insert "You should check out {ActionName}" into chat (or clipboard if chat not focused). Enable in Misc → World Tooltip. Restricted to Actions & Traits only — hotbar shift+click unaffected.
- **Fix**: Job-specific hotbar actions now persist when changing jobs. Explicitly write to the current class job ID so saves survive job/role switches.
# 1.0.7.1
- **UI**: Removed Discord and Ko-fi links from in-game config.
# 1.0.7.0 # 1.0.7.0
- **Hotbars**: Charge count on slots — abilities with charges (e.g. 2-stack) show the current charge number in the top-left of the slot; keybind stays in the bottom-right. Toggle in Hotbars → Show Charge Count. - **Hotbars**: Charge count on slots — abilities with charges (e.g. 2-stack) show the current charge number in the top-left of the slot; keybind stays in the bottom-right. Toggle in Hotbars → Show Charge Count.
- **Fix**: Left-click no longer stays broken after disabling HSUI. WndProc is restored first on plugin unload so the game window gets normal input back even when disposal order changes (e.g. after a patch). - **Fix**: Left-click no longer stays broken after disabling HSUI. WndProc is restored first on plugin unload so the game window gets normal input back even when disposal order changes (e.g. after a patch).
+1 -24
View File
@@ -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": "Hotbars: Charge count on slots (top-left). Fix: Left-click works again after disabling plugin (WndProc restore on unload).",
"InternalName": "HSUI",
"AssemblyVersion": "1.0.7.0",
"RepoUrl": "https://github.com/Knack117/HSUI",
"ApplicableVersion": "any",
"Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
"CategoryTags": ["UI"],
"DalamudApiLevel": 14,
"IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
"ImageUrls": [],
"DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
"IsHide": false,
"IsTestingExclusive": false,
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
"LastUpdate": "1738540800"
}
]