Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ffbdd0b51 | |||
| 280004bdb0 | |||
| d8da154e72 | |||
| db6e91afd1 | |||
| 01426d3c30 | |||
| cb3d6b5e0b | |||
| 9391ef1451 | |||
| 3b5ddbe2f9 | |||
| 57d1bc5c0f | |||
| f4912bbdb2 | |||
| 61a3de4d09 | |||
| eba2a33649 | |||
| 11e30309c4 | |||
| c49d22d867 | |||
| 78b37a3f15 | |||
| 9f41c18c0b | |||
| d95884fe7d |
@@ -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)
|
||||||
|
|||||||
@@ -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
@@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyName>HSUI</AssemblyName>
|
<AssemblyName>HSUI</AssemblyName>
|
||||||
<AssemblyVersion>1.0.6.0</AssemblyVersion>
|
<AssemblyVersion>1.0.8.9</AssemblyVersion>
|
||||||
<FileVersion>1.0.6.0</FileVersion>
|
<FileVersion>1.0.8.9</FileVersion>
|
||||||
<InformationalVersion>1.0.6.0</InformationalVersion>
|
<InformationalVersion>1.0.8.9</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"Author": "Knack117",
|
"Author": "Knack117",
|
||||||
"Name": "HSUI",
|
"Name": "HSUI",
|
||||||
"InternalName": "HSUI",
|
"InternalName": "HSUI",
|
||||||
"AssemblyVersion": "1.0.6.0",
|
"AssemblyVersion": "1.0.8.9",
|
||||||
"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",
|
||||||
|
|||||||
@@ -50,8 +50,12 @@ namespace HSUI.Helpers
|
|||||||
public RaptureHotbarModule.HotbarSlotType SlotType { get; }
|
public RaptureHotbarModule.HotbarSlotType SlotType { get; }
|
||||||
/// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
|
/// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
|
||||||
public string KeybindHint { get; }
|
public string KeybindHint { get; }
|
||||||
|
/// <summary>Current charges for charge-based actions; 0 when not applicable.</summary>
|
||||||
|
public int CurrentCharges { get; }
|
||||||
|
/// <summary>Max charges for charge-based actions; >1 only for actions with charges.</summary>
|
||||||
|
public int MaxCharges { get; }
|
||||||
|
|
||||||
public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "")
|
public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "", int currentCharges = 0, int maxCharges = 0)
|
||||||
{
|
{
|
||||||
IconId = iconId;
|
IconId = iconId;
|
||||||
IsEmpty = isEmpty;
|
IsEmpty = isEmpty;
|
||||||
@@ -61,6 +65,8 @@ namespace HSUI.Helpers
|
|||||||
ActionId = actionId;
|
ActionId = actionId;
|
||||||
SlotType = slotType;
|
SlotType = slotType;
|
||||||
KeybindHint = keybindHint ?? "";
|
KeybindHint = keybindHint ?? "";
|
||||||
|
CurrentCharges = currentCharges;
|
||||||
|
MaxCharges = maxCharges;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,23 +112,48 @@ namespace HSUI.Helpers
|
|||||||
|
|
||||||
if (slot == null)
|
if (slot == null)
|
||||||
{
|
{
|
||||||
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind));
|
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (slot->IsEmpty)
|
// GearSet with id 0 is valid (first gearset); the game's IsEmpty (CommandId == 0) would wrongly treat it as empty.
|
||||||
|
bool isEmpty = slot->IsEmpty && slot->CommandType != RaptureHotbarModule.HotbarSlotType.GearSet;
|
||||||
|
if (isEmpty)
|
||||||
{
|
{
|
||||||
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind));
|
list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
|
// Use CommandType/CommandId for GearSet so we handle gearset 0 and slots not yet synced to Apparent*.
|
||||||
|
var slotType = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
|
||||||
|
? RaptureHotbarModule.HotbarSlotType.GearSet
|
||||||
|
: slot->ApparentSlotType;
|
||||||
|
uint actionId = slot->CommandType == RaptureHotbarModule.HotbarSlotType.GearSet
|
||||||
|
? slot->CommandId
|
||||||
|
: slot->ApparentActionId;
|
||||||
|
|
||||||
|
// For GearSet slots, refresh IconId from the gearset (e.g. job icon from first equipment slot).
|
||||||
|
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;
|
// GearSet 0 or just-dropped: game may not have synced Apparent* so IconId can be 0; resolve for display.
|
||||||
var slotType = slot->ApparentSlotType;
|
if (slotType == RaptureHotbarModule.HotbarSlotType.GearSet && iconId == 0)
|
||||||
|
{
|
||||||
|
int resolved = slot->GetIconIdForSlot(slotType, actionId);
|
||||||
|
if (resolved > 0)
|
||||||
|
iconId = (uint)resolved;
|
||||||
|
}
|
||||||
|
|
||||||
(int pct, int secsLeft) = GetSlotCooldown(slot);
|
(int pct, int secsLeft) = GetSlotCooldown(slot);
|
||||||
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind));
|
(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));
|
||||||
}
|
}
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
@@ -132,6 +163,27 @@ namespace HSUI.Helpers
|
|||||||
/// Gets cooldown for a hotbar slot. For Action/GeneralAction/PetAction, uses ActionManager recast API
|
/// Gets cooldown for a hotbar slot. For Action/GeneralAction/PetAction, uses ActionManager recast API
|
||||||
/// (more accurate for adjusted IDs, recast groups). Falls back to slot's GetSlotActionCooldownPercentage for Items/Macros.
|
/// (more accurate for adjusted IDs, recast groups). Falls back to slot's GetSlotActionCooldownPercentage for Items/Macros.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <summary>
|
||||||
|
/// Gets current and max charges for a slot. Only applies to Action type; returns (0,0) otherwise.
|
||||||
|
/// </summary>
|
||||||
|
private static unsafe (int CurrentCharges, int MaxCharges) GetSlotCharges(RaptureHotbarModule.HotbarSlotType slotType, uint actionId)
|
||||||
|
{
|
||||||
|
if (slotType != RaptureHotbarModule.HotbarSlotType.Action || actionId == 0)
|
||||||
|
return (0, 0);
|
||||||
|
|
||||||
|
var actionManager = ActionManager.Instance();
|
||||||
|
if (actionManager == null)
|
||||||
|
return (0, 0);
|
||||||
|
|
||||||
|
uint effectiveId = actionManager->GetAdjustedActionId(actionId);
|
||||||
|
ushort maxCh = ActionManager.GetMaxCharges(effectiveId, 0);
|
||||||
|
if (maxCh <= 1)
|
||||||
|
return (0, 0);
|
||||||
|
|
||||||
|
uint currentCh = actionManager->GetCurrentCharges(effectiveId);
|
||||||
|
return ((int)currentCh, (int)maxCh);
|
||||||
|
}
|
||||||
|
|
||||||
private static unsafe (int CooldownPercent, int SecondsLeft) GetSlotCooldown(RaptureHotbarModule.HotbarSlot* slot)
|
private static unsafe (int CooldownPercent, int SecondsLeft) GetSlotCooldown(RaptureHotbarModule.HotbarSlot* slot)
|
||||||
{
|
{
|
||||||
if (slot == null) return (0, 0);
|
if (slot == null) return (0, 0);
|
||||||
@@ -513,16 +565,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+44
-12
@@ -142,8 +142,22 @@ namespace HSUI.Helpers
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigurationManager.Instance.ResetEvent -= OnConfigReset;
|
// Restore WndProc first so left-click works again immediately after unload.
|
||||||
Plugin.Framework.Update -= OnFrameworkUpdate;
|
// After a game/Dalamud patch, other singletons may be disposed before us;
|
||||||
|
// if we unsub or touch config first and that throws, we would never restore and LButton stays broken.
|
||||||
|
RestoreWndProc();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ConfigurationManager.Instance.ResetEvent -= OnConfigReset;
|
||||||
|
}
|
||||||
|
catch { /* Instance may already be disposed */ }
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Plugin.Framework.Update -= OnFrameworkUpdate;
|
||||||
|
}
|
||||||
|
catch { /* Framework may already be disposed */ }
|
||||||
|
|
||||||
Plugin.Logger.Info("\t\tDisposing _requestActionHook: " + (_requestActionHook?.Address.ToString("X") ?? "null"));
|
Plugin.Logger.Info("\t\tDisposing _requestActionHook: " + (_requestActionHook?.Address.ToString("X") ?? "null"));
|
||||||
_requestActionHook?.Disable();
|
_requestActionHook?.Disable();
|
||||||
@@ -151,9 +165,6 @@ namespace HSUI.Helpers
|
|||||||
_executeSlotByIdHook?.Disable();
|
_executeSlotByIdHook?.Disable();
|
||||||
_executeSlotByIdHook?.Dispose();
|
_executeSlotByIdHook?.Dispose();
|
||||||
|
|
||||||
// give imgui the control of inputs again
|
|
||||||
RestoreWndProc();
|
|
||||||
|
|
||||||
Instance = null!;
|
Instance = null!;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -554,19 +565,40 @@ 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;
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
Plugin.Logger.Info("\t\tRestoring WndProc");
|
Plugin.Logger.Info("\t\tRestoring WndProc");
|
||||||
Plugin.Logger.Info("\t\t\tOld _wndHandle = " + _wndHandle.ToString("X"));
|
|
||||||
Plugin.Logger.Info("\t\t\tOld _imguiWndProcPtr = " + _imguiWndProcPtr.ToString("X"));
|
|
||||||
|
|
||||||
SetWindowLongPtr(_wndHandle, GWL_WNDPROC, _imguiWndProcPtr);
|
SetWindowLongPtr(_wndHandle, GWL_WNDPROC, _imguiWndProcPtr);
|
||||||
Plugin.Logger.Info("\t\t\tDone!");
|
Plugin.Logger.Info("\t\t\tWndProc restored.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Plugin.Logger.Warning($"\t\tRestoreWndProc failed: {ex.Message}");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
_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}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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")]
|
||||||
|
|||||||
@@ -216,6 +216,14 @@ namespace HSUI.Interface.GeneralElements
|
|||||||
Vector2 labelPos = new Vector2(pos.X + size.X - labelSize.X - 2, pos.Y + size.Y - labelSize.Y - 2);
|
Vector2 labelPos = new Vector2(pos.X + size.X - labelSize.X - 2, pos.Y + size.Y - labelSize.Y - 2);
|
||||||
DrawHelper.DrawOutlinedText(label, labelPos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
|
DrawHelper.DrawOutlinedText(label, labelPos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Config.ShowChargeCount && !slot.IsEmpty && slot.MaxCharges > 1)
|
||||||
|
{
|
||||||
|
string chargeText = slot.CurrentCharges.ToString();
|
||||||
|
Vector2 chargeSize = ImGui.CalcTextSize(chargeText);
|
||||||
|
Vector2 chargePos = new Vector2(pos.X + 2, pos.Y + 2);
|
||||||
|
DrawHelper.DrawOutlinedText(chargeText, chargePos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,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 2–10 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);
|
||||||
@@ -254,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -386,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
|
|||||||
_lastLoggedPickupSlotId = -1;
|
_lastLoggedPickupSlotId = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui.End();
|
ImGui.EndChild();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -596,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)
|
||||||
{
|
{
|
||||||
@@ -613,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)
|
||||||
{
|
{
|
||||||
@@ -695,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)
|
||||||
{
|
{
|
||||||
@@ -1042,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
|
||||||
@@ -1068,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();
|
||||||
@@ -1168,33 +1194,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;
|
||||||
|
|||||||
@@ -63,15 +63,19 @@ namespace HSUI.Interface.GeneralElements
|
|||||||
[Order(28)]
|
[Order(28)]
|
||||||
public bool ShowSlotNumbers = true;
|
public bool ShowSlotNumbers = true;
|
||||||
|
|
||||||
[Checkbox("Show Combo Highlight")]
|
[Checkbox("Show Charge Count")]
|
||||||
[Order(29)]
|
[Order(29)]
|
||||||
|
public bool ShowChargeCount = true;
|
||||||
|
|
||||||
|
[Checkbox("Show Combo Highlight")]
|
||||||
|
[Order(30)]
|
||||||
public bool ShowComboHighlight = true;
|
public bool ShowComboHighlight = true;
|
||||||
|
|
||||||
[Checkbox("Show Keypress Flash")]
|
[Checkbox("Show Keypress Flash")]
|
||||||
[Order(30)]
|
[Order(31)]
|
||||||
public bool ShowKeypressFlash = true;
|
public bool ShowKeypressFlash = true;
|
||||||
|
|
||||||
[NestedConfig("Combo Highlight", 31)]
|
[NestedConfig("Combo Highlight", 32)]
|
||||||
public ComboHighlightConfig ComboHighlightConfig = new();
|
public ComboHighlightConfig ComboHighlightConfig = new();
|
||||||
|
|
||||||
[Checkbox("Debug Drag & Drop")]
|
[Checkbox("Debug Drag & Drop")]
|
||||||
|
|||||||
@@ -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; }
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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());
|
||||||
|
|||||||
@@ -1,3 +1,44 @@
|
|||||||
|
# 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 0–7, 8–15) 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 slot’s 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
|
||||||
|
- **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).
|
||||||
|
|
||||||
# 1.0.6.0
|
# 1.0.6.0
|
||||||
- **Tooltips**: Icons in tooltips — action bars, status effects, and party cooldowns now show the item's icon next to the tooltip text when available.
|
- **Tooltips**: Icons in tooltips — action bars, status effects, and party cooldowns now show the item's icon next to the tooltip text when available.
|
||||||
- **World Object Tooltip**: Quest/NPC icons — hovering over NPCs or objects displays their quest or state icon (e.g., exclamation marks, turn-in checks) in the tooltip. Toggle in Misc → World Tooltip → Show Icon.
|
- **World Object Tooltip**: Quest/NPC icons — hovering over NPCs or objects displays their quest or state icon (e.g., exclamation marks, turn-in checks) in the tooltip. Toggle in Misc → World Tooltip → Show Icon.
|
||||||
|
|||||||
+1
-24
@@ -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.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.9","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.9/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.9/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.9/latest.zip","LastUpdate":"1739318400"}]
|
||||||
{
|
|
||||||
"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": "Tooltips: Icons in tooltips for action bars, status effects, party cooldowns. World Object Tooltip: quest/NPC icons shown when hovering over NPCs/objects (toggle in Misc → World Tooltip).",
|
|
||||||
"InternalName": "HSUI",
|
|
||||||
"AssemblyVersion": "1.0.6.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.6.0/latest.zip",
|
|
||||||
"IsHide": false,
|
|
||||||
"IsTestingExclusive": false,
|
|
||||||
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.6.0/latest.zip",
|
|
||||||
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.6.0/latest.zip",
|
|
||||||
"LastUpdate": "1738454400"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|||||||
Reference in New Issue
Block a user