Compare commits

..

7 Commits

11 changed files with 282 additions and 48 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();
+3 -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.2</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion> <FileVersion>1.0.8.2</FileVersion>
<InformationalVersion>1.0.7.0</InformationalVersion> <InformationalVersion>1.0.8.2</InformationalVersion>
</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.2",
"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",
+25 -4
View File
@@ -129,6 +129,11 @@ namespace HSUI.Helpers
(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);
// 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;
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 +546,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);
} }
} }
+208
View File
@@ -0,0 +1,208 @@
/*
* 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)
{
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;
}
/// <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;
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;
}
}
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;
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;
}
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;
}
}
}
}
+5 -1
View File
@@ -467,8 +467,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")]
+19 -1
View File
@@ -621,7 +621,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)
{ {
@@ -1050,6 +1050,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
+2
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();
@@ -479,6 +480,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());
+13
View File
@@ -1,3 +1,16 @@
# 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).
+6 -6
View File
@@ -4,9 +4,9 @@
"Name": "HSUI", "Name": "HSUI",
"Punchline": "A modern HUD replacement built for customization.", "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.", "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).", "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", "InternalName": "HSUI",
"AssemblyVersion": "1.0.7.0", "AssemblyVersion": "1.0.8.2",
"RepoUrl": "https://github.com/Knack117/HSUI", "RepoUrl": "https://github.com/Knack117/HSUI",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"], "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
@@ -14,11 +14,11 @@
"DalamudApiLevel": 14, "DalamudApiLevel": 14,
"IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png", "IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
"ImageUrls": [], "ImageUrls": [],
"DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip", "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
"IsHide": false, "IsHide": false,
"IsTestingExclusive": false, "IsTestingExclusive": false,
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip", "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip", "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
"LastUpdate": "1738540800" "LastUpdate": "1770007214"
} }
] ]