Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb3d6b5e0b | |||
| 9391ef1451 | |||
| 3b5ddbe2f9 | |||
| 57d1bc5c0f | |||
| f4912bbdb2 | |||
| 61a3de4d09 | |||
| eba2a33649 | |||
| 11e30309c4 | |||
| c49d22d867 | |||
| 78b37a3f15 |
+3
-3
@@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyName>HSUI</AssemblyName>
|
<AssemblyName>HSUI</AssemblyName>
|
||||||
<AssemblyVersion>1.0.7.1</AssemblyVersion>
|
<AssemblyVersion>1.0.8.5</AssemblyVersion>
|
||||||
<FileVersion>1.0.7.1</FileVersion>
|
<FileVersion>1.0.8.5</FileVersion>
|
||||||
<InformationalVersion>1.0.7.1</InformationalVersion>
|
<InformationalVersion>1.0.8.5</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"Author": "Knack117",
|
"Author": "Knack117",
|
||||||
"Name": "HSUI",
|
"Name": "HSUI",
|
||||||
"InternalName": "HSUI",
|
"InternalName": "HSUI",
|
||||||
"AssemblyVersion": "1.0.7.1",
|
"AssemblyVersion": "1.0.8.5",
|
||||||
"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",
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+16
-1
@@ -565,7 +565,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 +585,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}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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")]
|
||||||
|
|||||||
@@ -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 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);
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -394,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
|
|||||||
_lastLoggedPickupSlotId = -1;
|
_lastLoggedPickupSlotId = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui.End();
|
ImGui.EndChild();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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)
|
||||||
{
|
{
|
||||||
@@ -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
|
||||||
@@ -1176,12 +1192,34 @@ 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>();
|
||||||
|
var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
|
||||||
|
if (actionRowOpt.HasValue)
|
||||||
|
{
|
||||||
|
actionRow = actionRowOpt.Value;
|
||||||
|
}
|
||||||
|
else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
|
||||||
|
{
|
||||||
|
// Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
|
||||||
|
const uint CraftActionToActionOffset = 100000;
|
||||||
|
uint mappedId = slot.ActionId + CraftActionToActionOffset;
|
||||||
|
var mappedRow = actionSheet?.GetRow(mappedId);
|
||||||
|
if (mappedRow.HasValue)
|
||||||
|
{
|
||||||
|
actionIdForLookup = mappedId;
|
||||||
|
actionRow = mappedRow.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
|
||||||
string descRaw = "";
|
string descRaw = "";
|
||||||
if (descRow.HasValue)
|
if (descRow.HasValue)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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,24 @@
|
|||||||
|
# 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
|
# 1.0.7.1
|
||||||
- **UI**: Removed Discord and Ko-fi links from in-game config.
|
- **UI**: Removed Discord and Ko-fi links from in-game config.
|
||||||
|
|
||||||
|
|||||||
+6
-6
@@ -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": "Removed Discord and Ko-fi links from config.",
|
"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.1",
|
"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.1/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.1/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.1/latest.zip",
|
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||||
"LastUpdate": "1738627200"
|
"LastUpdate": "1770007214"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user