Compare commits

...

6 Commits

21 changed files with 591 additions and 115 deletions
-6
View File
@@ -45,12 +45,6 @@ namespace HSUI.Interface
}
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
if (_errorMessage != null)
-26
View File
@@ -241,32 +241,6 @@ namespace HSUI.Config.Tree
ImGui.PopStyleColor();
ImGui.PopFont();
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();
+3 -3
View File
@@ -9,9 +9,9 @@
<PropertyGroup>
<AssemblyName>HSUI</AssemblyName>
<AssemblyVersion>1.0.3.0</AssemblyVersion>
<FileVersion>1.0.3.0</FileVersion>
<InformationalVersion>1.0.3.0</InformationalVersion>
<AssemblyVersion>1.0.7.1</AssemblyVersion>
<FileVersion>1.0.7.1</FileVersion>
<InformationalVersion>1.0.7.1</InformationalVersion>
</PropertyGroup>
<PropertyGroup>
+1 -1
View File
@@ -2,7 +2,7 @@
"Author": "Knack117",
"Name": "HSUI",
"InternalName": "HSUI",
"AssemblyVersion": "1.0.3.0",
"AssemblyVersion": "1.0.7.1",
"Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
"ApplicableVersion": "any",
"RepoUrl": "https://github.com/Knack117/HSUI",
+32 -4
View File
@@ -50,8 +50,12 @@ namespace HSUI.Helpers
public RaptureHotbarModule.HotbarSlotType SlotType { get; }
/// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
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; &gt;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;
IsEmpty = isEmpty;
@@ -61,6 +65,8 @@ namespace HSUI.Helpers
ActionId = actionId;
SlotType = slotType;
KeybindHint = keybindHint ?? "";
CurrentCharges = currentCharges;
MaxCharges = maxCharges;
}
}
@@ -106,13 +112,13 @@ namespace HSUI.Helpers
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;
}
if (slot->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;
}
@@ -122,7 +128,8 @@ namespace HSUI.Helpers
var slotType = slot->ApparentSlotType;
(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);
list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
}
return list;
@@ -132,6 +139,27 @@ namespace HSUI.Helpers
/// 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.
/// </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)
{
if (slot == null) return (0, 0);
+26 -9
View File
@@ -142,8 +142,22 @@ namespace HSUI.Helpers
return;
}
// Restore WndProc first so left-click works again immediately after unload.
// 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"));
_requestActionHook?.Disable();
@@ -151,9 +165,6 @@ namespace HSUI.Helpers
_executeSlotByIdHook?.Disable();
_executeSlotByIdHook?.Dispose();
// give imgui the control of inputs again
RestoreWndProc();
Instance = null!;
}
#endregion
@@ -556,15 +567,21 @@ namespace HSUI.Helpers
private 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\t\tOld _wndHandle = " + _wndHandle.ToString("X"));
Plugin.Logger.Info("\t\t\tOld _imguiWndProcPtr = " + _imguiWndProcPtr.ToString("X"));
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;
_imguiWndProcPtr = IntPtr.Zero;
}
+195 -9
View File
@@ -1,11 +1,15 @@
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Interface;
using Dalamud.Interface.Utility;
using HSUI.Config;
using HSUI.Config.Attributes;
using HSUI.Interface.GeneralElements;
using Dalamud.Bindings.ImGui;
using FFXIVClientStructs.FFXIV.Client.Game.Object;
using System;
using System.Numerics;
using System.Text;
namespace HSUI.Helpers
{
@@ -52,18 +56,21 @@ namespace HSUI.Helpers
private string? _currentTooltipTitle = null;
private Vector2 _titleSize;
private string? _previousRawText = null;
private uint? _currentIconId = null;
private Vector2 _position;
private Vector2 _size;
private bool _dataIsValid = false;
public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "")
private const float IconSize = 24f;
public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null)
{
ShowTooltip(text, ImGui.GetMousePos(), title, id, name);
ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId);
}
public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "")
public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null)
{
if (text == null)
{
@@ -79,6 +86,8 @@ namespace HSUI.Helpers
_previousRawText = text;
}
_currentIconId = iconId;
// calcualte title size
_titleSize = Vector2.Zero;
if (title != null)
@@ -110,7 +119,13 @@ namespace HSUI.Helpers
_textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
}
_size = new Vector2(Math.Max(_titleSize.X, _textSize.X) + Margin * 2, _titleSize.Y + _textSize.Y + Margin * 2);
float contentWidth = Math.Max(_titleSize.X, _textSize.X);
float contentHeight = _titleSize.Y + _textSize.Y;
float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
float iconGap = _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin : 0;
_size = new Vector2(
contentWidth + iconGap + Margin * 2,
Math.Max(contentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled : 0) + Margin * 2);
// position tooltip using the given coordinates as bottom center
position.X = position.X - _size.X / 2f;
@@ -124,6 +139,122 @@ namespace HSUI.Helpers
Plugin.Logger.Information($"[HSUI Tooltip DBG] ShowTooltip: title='{title}' textLen={text?.Length ?? 0} textPreview='{(text != null && text.Length > 80 ? text[..80] + "..." : text ?? "")}' pos=({_position.X:F0},{_position.Y:F0})");
}
private WorldObjectTooltipConfig? _worldTooltipConfig;
/// <summary>
/// Shows a tooltip for the game object the mouse is hovering over in the 3D world.
/// Call this each frame before Draw().
/// </summary>
public void ShowWorldObjectTooltip()
{
try
{
_worldTooltipConfig ??= ConfigurationManager.Instance.GetConfigObject<WorldObjectTooltipConfig>();
if (_worldTooltipConfig == null || !_worldTooltipConfig.Enabled)
return;
}
catch (Exception ex)
{
// Config not ready yet or not found - silently skip
if (_config.DebugTooltips)
Plugin.Logger.Warning($"[HSUI Tooltip] WorldObjectTooltipConfig not available: {ex.Message}");
return;
}
IGameObject? mouseOverTarget = Plugin.TargetManager.MouseOverTarget;
if (mouseOverTarget == null)
return;
// Don't show tooltip for ourselves
if (mouseOverTarget.GameObjectId == Plugin.ObjectTable.LocalPlayer?.GameObjectId)
return;
string name = mouseOverTarget.Name.ToString();
if (string.IsNullOrEmpty(name))
name = "Unknown";
var sb = new StringBuilder();
// Free Company tag for players
if (_worldTooltipConfig.ShowTitle && mouseOverTarget is IPlayerCharacter player)
{
string fcTag = player.CompanyTag.ToString();
if (!string.IsNullOrEmpty(fcTag))
sb.AppendLine($"«{fcTag}»");
}
// Level
if (_worldTooltipConfig.ShowLevel && mouseOverTarget is ICharacter charLevel)
{
byte level = charLevel.Level;
if (level > 0)
sb.AppendLine($"Level {level}");
}
// Job (for players)
if (_worldTooltipConfig.ShowJob && mouseOverTarget is IPlayerCharacter playerJob)
{
uint jobId = playerJob.ClassJob.RowId;
if (jobId > 0 && JobsHelper.JobNames.TryGetValue(jobId, out string? jobName))
sb.AppendLine($"Job: {jobName}");
}
// HP
if (_worldTooltipConfig.ShowHP && mouseOverTarget is ICharacter charHp)
{
uint currentHp = charHp.CurrentHp;
uint maxHp = charHp.MaxHp;
if (maxHp > 0)
{
float pct = (float)currentHp / maxHp * 100f;
sb.AppendLine($"HP: {currentHp:N0} / {maxHp:N0} ({pct:F0}%)");
}
}
// Distance
if (_worldTooltipConfig.ShowDistance)
{
var localPlayer = Plugin.ObjectTable.LocalPlayer;
if (localPlayer != null)
{
float dist = Vector3.Distance(localPlayer.Position, mouseOverTarget.Position);
sb.AppendLine($"Distance: {dist:F1}y");
}
}
// Object ID (debug)
if (_worldTooltipConfig.ShowObjectId)
{
sb.AppendLine($"ID: {mouseOverTarget.GameObjectId}");
}
string body = sb.ToString().TrimEnd('\r', '\n');
if (string.IsNullOrEmpty(body))
body = "(No info)";
uint? iconId = _worldTooltipConfig.ShowIcon ? GetWorldObjectIconId(mouseOverTarget) : null;
if (_worldTooltipConfig.DetachFromCursor)
{
ShowTooltip(body, _worldTooltipConfig.Position, name, 0, "", iconId);
}
else
{
ShowTooltipOnCursor(body, name, 0, "", iconId);
}
}
private static unsafe uint? GetWorldObjectIconId(IGameObject gameObject)
{
if (gameObject == null || gameObject.Address == IntPtr.Zero)
return null;
var obj = (GameObject*)gameObject.Address;
if (obj == null)
return null;
uint iconId = obj->NamePlateIconId;
return iconId > 0 ? iconId : null;
}
public void RemoveTooltip()
{
_dataIsValid = false;
@@ -173,14 +304,26 @@ namespace HSUI.Helpers
float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale;
string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
float wrapWidth = Math.Max(_titleSize.X, _textSize.X) + Margin;
float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
float iconGap = (_currentIconId.HasValue && _currentIconId.Value > 0) ? iconSizeScaled + Margin : 0;
float wrapWidth = (_currentIconId.HasValue && _currentIconId.Value > 0)
? _size.X - iconGap - Margin * 2
: Math.Max(_titleSize.X, _textSize.X) + Margin;
float textBlockX = windowMargin.X + Margin + iconGap;
if (_currentIconId.HasValue && _currentIconId.Value > 0)
{
var iconPos = _position + new Vector2(Margin, Margin);
DrawHelper.DrawIcon(_currentIconId.Value, iconPos, new Vector2(iconSizeScaled, iconSizeScaled), false, drawList);
}
if (_currentTooltipTitle != null)
{
// title
Vector2 cursorPos;
using (FontsManager.Instance.PushFont(fontId))
{
cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _titleSize.X / 2f, Margin);
cursorPos = new Vector2(textBlockX, Margin);
ImGui.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
ImGui.TextColored(_config.TitleColor.Vector, _currentTooltipTitle);
@@ -190,7 +333,7 @@ namespace HSUI.Helpers
// text
using (FontsManager.Instance.PushFont(fontId))
{
cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _textSize.X / 2f, Margin + _titleSize.Y);
cursorPos = new Vector2(textBlockX, Margin + _titleSize.Y);
ImGui.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
@@ -202,8 +345,8 @@ namespace HSUI.Helpers
// text
using (FontsManager.Instance.PushFont(fontId))
{
var cursorPos = windowMargin + new Vector2(Margin, Margin);
var textWidth = _size.X - Margin * 2;
var cursorPos = new Vector2(textBlockX, Margin);
var textWidth = _size.X - iconGap - Margin * 2;
ImGui.SetCursorPos(cursorPos);
ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection);
@@ -305,4 +448,47 @@ namespace HSUI.Helpers
Thickness = thickness;
}
}
[Section("Misc")]
[SubSection("World Tooltip", 0)]
public class WorldObjectTooltipConfig : PluginConfigObject
{
public new static WorldObjectTooltipConfig DefaultConfig() { return new WorldObjectTooltipConfig(); }
[Checkbox("Detach from Cursor", spacing = true)]
[Order(1)]
public bool DetachFromCursor = false;
[DragFloat2("Position (when detached)", min = -4000f, max = 4000f)]
[Order(2, collapseWith = nameof(DetachFromCursor))]
public Vector2 Position = new Vector2(100, 100);
[Checkbox("Show Icon (quest/NPC icons)", spacing = true)]
[Order(3)]
public bool ShowIcon = true;
[Checkbox("Show Level", spacing = true)]
[Order(5)]
public bool ShowLevel = true;
[Checkbox("Show HP")]
[Order(10)]
public bool ShowHP = true;
[Checkbox("Show Job (Players)")]
[Order(15)]
public bool ShowJob = true;
[Checkbox("Show FC Tag (Players)")]
[Order(20)]
public bool ShowTitle = false;
[Checkbox("Show Distance")]
[Order(25)]
public bool ShowDistance = true;
[Checkbox("Show Object ID")]
[Order(30)]
public bool ShowObjectId = false;
}
}
+21
View File
@@ -94,6 +94,27 @@ namespace HSUI.Helpers
return plateType >= 4 && plateType <= 11;
}
/// <summary>Returns Grand Company icon ID (Maelstrom, Flames, or Adders) for enemy players in PvP Frontline.
/// Nameplate color types 4, 5, 6 map to the three teams. Returns null when not a PvP enemy team (46).
/// Use iconOverrides for custom IDs: [0]=team1(plate4), [1]=team2(plate5), [2]=team3(plate6). Non-zero overrides default.</summary>
public static unsafe uint? GrandCompanyIconIdForPvPEnemy(IGameObject? obj, (int t1, int t2, int t3)? iconOverrides = null)
{
if (obj == null || !Plugin.ClientState.IsPvP) return null;
StructsGameObject* gameObject = (StructsGameObject*)obj.Address;
byte plateType = gameObject->GetNamePlateColorType();
if (plateType < 4 || plateType > 6) return null;
// 62601=Maelstrom, 62602=Twin Adder, 62603=Immortal Flames
uint iconId = plateType switch
{
4 => iconOverrides.HasValue && iconOverrides.Value.t1 > 0 ? (uint)iconOverrides.Value.t1 : 62601u,
5 => iconOverrides.HasValue && iconOverrides.Value.t2 > 0 ? (uint)iconOverrides.Value.t2 : 62602u,
6 => iconOverrides.HasValue && iconOverrides.Value.t3 > 0 ? (uint)iconOverrides.Value.t3 : 62603u,
_ => 0
};
return iconId > 0 ? iconId : null;
}
public static unsafe float ActorShieldValue(IGameObject? actor)
{
if (actor == null || actor is not ICharacter)
+38 -2
View File
@@ -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);
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);
}
}
}
}
@@ -364,7 +372,7 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{
string body = string.IsNullOrEmpty(text) ? title : text;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "");
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
}
@@ -423,7 +431,7 @@ namespace HSUI.Interface.GeneralElements
if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
{
string body = string.IsNullOrEmpty(text) ? title : text;
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "");
TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
if (IsTooltipDebugEnabled())
Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
}
@@ -1327,6 +1335,34 @@ namespace HSUI.Interface.GeneralElements
}
}
if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.MainCommand ||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.ExtraCommand)
{
if (Plugin.DataManager.GetExcelSheet<MainCommand>()?.TryGetRow(slot.ActionId, out var mcRow) == true)
{
string name = mcRow.Name.ToString();
string desc = "";
try
{
string descRaw = mcRow.Description.ToDalamudString().ToString();
if (!string.IsNullOrEmpty(descRaw))
{
try
{
var evaluated = Plugin.SeStringEvaluator.Evaluate(mcRow.Description.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 ?? "");
}
}
return (slot.SlotType.ToString(), "");
}
+7 -3
View File
@@ -63,15 +63,19 @@ namespace HSUI.Interface.GeneralElements
[Order(28)]
public bool ShowSlotNumbers = true;
[Checkbox("Show Combo Highlight")]
[Checkbox("Show Charge Count")]
[Order(29)]
public bool ShowChargeCount = true;
[Checkbox("Show Combo Highlight")]
[Order(30)]
public bool ShowComboHighlight = true;
[Checkbox("Show Keypress Flash")]
[Order(30)]
[Order(31)]
public bool ShowKeypressFlash = true;
[NestedConfig("Combo Highlight", 31)]
[NestedConfig("Combo Highlight", 32)]
public ComboHighlightConfig ComboHighlightConfig = new();
[Checkbox("Debug Drag & Drop")]
+23
View File
@@ -129,6 +129,29 @@ namespace HSUI.Interface.GeneralElements
}
}
/// <summary>Shows Grand Company icon (Maelstrom, Flames, or Adders) on enemy player nameplates in PvP Frontline.</summary>
public class NameplateCompanyIconConfig : NameplateIconConfig
{
[DragInt("Icon ID Team 1 (plateType 4)", min = 0, max = 999999)]
[Order(19)]
public int IconIdTeam1;
[DragInt("Icon ID Team 2 (plateType 5)", min = 0, max = 999999)]
[Order(20)]
public int IconIdTeam2;
[DragInt("Icon ID Team 3 (plateType 6)", min = 0, max = 999999)]
[Order(21)]
public int IconIdTeam3;
public NameplateCompanyIconConfig() : base() { }
public NameplateCompanyIconConfig(Vector2 position, Vector2 size, DrawAnchor anchor, DrawAnchor frameAnchor)
: base(position, size, anchor, frameAnchor)
{
}
}
public class NameplateRoleJobIconConfig : RoleJobIconConfig
{
public NameplateRoleJobIconConfig() : base() { }
+3
View File
@@ -522,6 +522,9 @@ namespace HSUI.Interface
DraggablesHelper.DrawElements(origin, _hudHelper, _hudElements.Values, _jobHud, _selectedElement);
}
// world object tooltip (mouseover in 3D world)
TooltipsHelper.Instance.ShowWorldObjectTooltip();
// tooltip
TooltipsHelper.Instance.Draw();
+47
View File
@@ -550,6 +550,53 @@ namespace HSUI.Interface.Nameplates
}
// company icon (PvP Frontline: Maelstrom, Flames, Adders)
var gcIconOverrides = (Config.CompanyIconConfig.IconIdTeam1, Config.CompanyIconConfig.IconIdTeam2, Config.CompanyIconConfig.IconIdTeam3);
if (Config.CompanyIconConfig.Enabled && Utils.GrandCompanyIconIdForPvPEnemy(data.GameObject, gcIconOverrides) is uint gcIconId)
{
anchor = anchors.GetAnchor(Config.CompanyIconConfig.NameplateLabelAnchor, Config.CompanyIconConfig.PrioritizeHealthBarAnchor);
anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.CompanyIconConfig.FrameAnchor);
var iconPos = Utils.GetAnchoredPosition(pos + Config.CompanyIconConfig.Position, Config.CompanyIconConfig.Size, Config.CompanyIconConfig.Anchor);
drawActions.Add((Config.CompanyIconConfig.StrataLevel, () =>
{
DrawHelper.DrawInWindow(_config.ID + "_enemyCompanyIcon", iconPos, Config.CompanyIconConfig.Size, false, (drawList) =>
{
DrawHelper.DrawIcon(gcIconId, iconPos, Config.CompanyIconConfig.Size, false, alpha, drawList);
});
}
));
}
// role/job icon (enemy players only; has ClassJob)
if (Config.RoleIconConfig.Enabled && data.GameObject is IPlayerCharacter playerCharacter)
{
uint jobId = playerCharacter.ClassJob.RowId;
uint iconId = Config.RoleIconConfig.UseRoleIcons
? JobsHelper.RoleIconIDForJob(jobId, Config.RoleIconConfig.UseSpecificDPSRoleIcons)
: JobsHelper.IconIDForJob(jobId, (uint)Config.RoleIconConfig.Style);
if (iconId > 0)
{
anchor = anchors.GetAnchor(Config.RoleIconConfig.NameplateLabelAnchor, Config.RoleIconConfig.PrioritizeHealthBarAnchor);
anchor = anchor ?? new NameplateAnchor(data.ScreenPosition, Vector2.Zero);
var pos = Utils.GetAnchoredPosition(_config.Position + anchor.Value.Position, -anchor.Value.Size, Config.RoleIconConfig.FrameAnchor);
var iconPos = Utils.GetAnchoredPosition(pos + Config.RoleIconConfig.Position, Config.RoleIconConfig.Size, Config.RoleIconConfig.Anchor);
drawActions.Add((Config.RoleIconConfig.StrataLevel, () =>
{
DrawHelper.DrawInWindow(_config.ID + "_enemyRoleJobIcon", iconPos, Config.RoleIconConfig.Size, false, (drawList) =>
{
DrawHelper.DrawIcon(iconId, iconPos, Config.RoleIconConfig.Size, false, alpha, drawList);
});
}
));
}
}
return drawActions;
}
+22
View File
@@ -45,6 +45,10 @@ namespace HSUI.Interface.GeneralElements
[Order(21)]
public bool AlwaysShowTargetNameplate = true;
[Checkbox("In PvP, show only enemy player nameplates", spacing = true, help = "When in Frontlines, Rival Wings, or Crystal Conflict, hide ally player nameplates (party, alliance, teammates) and show only enemy players. Uses Enemy nameplate styling for PvP enemies.")]
[Order(22)]
public bool PvPShowOnlyEnemyPlayers = false;
public int RaycastFlag() => OcclusionType == NameplatesOcclusionType.WallsAndObjects ? 0x2000 : 0x4000;
}
@@ -490,6 +494,24 @@ namespace HSUI.Interface.GeneralElements
)
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
[NestedConfig("Company Icon (PvP)", 46, collapsingHeader = false)]
public NameplateCompanyIconConfig CompanyIconConfig = new NameplateCompanyIconConfig(
new Vector2(-5, 0),
new Vector2(24, 24),
DrawAnchor.Right,
DrawAnchor.Left
)
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
[NestedConfig("Role/Job Icon (enemy players)", 47)]
public NameplateRoleJobIconConfig RoleIconConfig = new NameplateRoleJobIconConfig(
new Vector2(-35, 0),
new Vector2(24, 24),
DrawAnchor.Right,
DrawAnchor.Left
)
{ PrioritizeHealthBarAnchor = true, Strata = StrataLevel.LOWEST };
[NestedConfig("Debuffs", 50)]
public EnemyNameplateStatusEffectsListConfig DebuffsConfig = null!;
+20 -3
View File
@@ -128,17 +128,34 @@ namespace HSUI.Interface.Nameplates
return _playerHud;
}
// In PvP, optionally show only enemy player nameplates (hide allies)
if (Config.PvPShowOnlyEnemyPlayers && Plugin.ClientState.IsPvP)
{
if (data.GameObject is ICharacter character)
{
if ((character.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
if ((character.StatusFlags & StatusFlags.PartyMember) != 0 ||
(character.StatusFlags & StatusFlags.AllianceMember) != 0 ||
(character.StatusFlags & StatusFlags.Friend) != 0)
{
return null; // Hide party, alliance, and friend nameplates
}
}
// Other players: show only hostile (enemy team), hide allies
if (data.GameObject == null) { return null; }
return Utils.IsHostile(data.GameObject) ? _enemyHud : null;
}
if (data.GameObject is ICharacter character2)
{
if ((character2.StatusFlags & StatusFlags.PartyMember) != 0) // PartyMember
{
return _partyMemberHud;
}
else if ((character.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
else if ((character2.StatusFlags & StatusFlags.AllianceMember) != 0) // AllianceMember
{
return _allianceMemberHud;
}
else if ((character.StatusFlags & StatusFlags.Friend) != 0) // Friend
else if ((character2.StatusFlags & StatusFlags.Friend) != 0) // Friend
{
return _friendsHud;
}
+83 -8
View File
@@ -145,7 +145,7 @@ namespace HSUI.Interface.Party
return false;
}
/// <summary>Gets the alliance letter (A/B/C) for an internal group index. Uses member EntityId matching to CrossRealm when GroupManager/CrossRealm use different orderings.</summary>
/// <summary>Gets the alliance letter (A/B/C) for an internal group index. GroupManager ordering can differ from game display; use LocalPlayerGroupIndex to map when CrossRealm member data is unavailable.</summary>
public bool TryGetAllianceLetter(int allianceIndex, out string letter)
{
letter = "";
@@ -154,13 +154,27 @@ namespace HSUI.Interface.Party
var info = InfoProxyCrossRealm.Instance();
if (info != null && info->GroupCount >= 3)
{
// Get first member EntityId from our group (works for both GroupManager and CrossRealm data)
// Check if CrossRealm has member data - when empty, we're in-instance using GroupManager (indices differ from InfoProxy)
bool crossRealmHasData = false;
for (int i = 0; i < 3; i++)
{
if (info->CrossRealmGroups[i].GroupMemberCount > 0)
{
crossRealmHasData = true;
break;
}
}
if (crossRealmHasData)
{
// CrossRealm populated: use EntityId lookup or direct lookup
uint matchEntityId = 0;
if (_allianceMembers[allianceIndex].Count > 0)
matchEntityId = _allianceMembers[allianceIndex][0].ObjectId;
// Find which CrossRealm group contains this member - they may use different ordering than GroupManager
for (int crIdx = 0; crIdx < 3 && matchEntityId != 0; crIdx++)
if (matchEntityId != 0)
{
for (int crIdx = 0; crIdx < 3; crIdx++)
{
var crGroup = info->CrossRealmGroups[crIdx];
for (int j = 0; j < crGroup.GroupMemberCount; j++)
@@ -176,8 +190,8 @@ namespace HSUI.Interface.Party
}
}
}
}
// Direct lookup when CrossRealm index matches ours (e.g. both use same ordering)
var group = info->CrossRealmGroups[allianceIndex];
if (group.GroupMemberCount > 0)
{
@@ -189,7 +203,6 @@ namespace HSUI.Interface.Party
}
}
// GetGroupIndex(displayLetter) returns internal index - find which letter maps to our index
for (byte d = 0; d < 3; d++)
{
if (InfoProxyCrossRealm.GetGroupIndex(d) == allianceIndex)
@@ -200,7 +213,13 @@ namespace HSUI.Interface.Party
}
}
// Fallback when no CrossRealm data (PvP, in-instance)
// CrossRealm empty (in-instance with GroupManager): use direct GM-index mapping.
// GroupManager alliance index 0=A, 1=B, 2=C in the game's party list display order.
letter = ((char)('A' + allianceIndex)).ToString();
return true;
}
// Fallback when no CrossRealm/InfoProxy data (PvP edge cases)
letter = ((char)('A' + allianceIndex)).ToString();
return true;
}
@@ -265,6 +284,7 @@ namespace HSUI.Interface.Party
{
int count = 0;
var list = new List<IPartyFramesMember>();
for (int slot = 0; slot < 8; slot++)
{
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
@@ -283,6 +303,31 @@ namespace HSUI.Interface.Party
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)
{
for (int slot = 0; slot < 8; slot++)
{
var pm = mainGroup.GetPartyMemberByIndex(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])
{
_allianceMembers[allianceIdx].Clear();
@@ -295,7 +340,9 @@ namespace HSUI.Interface.Party
int ourIdx = 0;
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
{
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
PartyMember* pm = allianceIdx == 2
? mainGroup.GetPartyMemberByIndex(slot)
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
if (pm == null || pm->EntityId == 0) continue;
if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);
@@ -372,6 +419,34 @@ namespace HSUI.Interface.Party
else
Plugin.Logger.Information($"[Alliance] Display slot {slot}: no data");
}
// Letter-resolution path debug: which code path is used and why
bool crossRealmHasData = false;
if (info != null && info->GroupCount >= 3)
{
for (int i = 0; i < 3; i++)
{
if (info->CrossRealmGroups[i].GroupMemberCount > 0)
{
crossRealmHasData = true;
break;
}
}
}
Plugin.Logger.Information($"[Alliance] crossRealmHasData={crossRealmHasData} → {(crossRealmHasData ? "EntityId/GetGroupIndex path" : "LocalPlayerGroupIndex path")}");
int dbgPlayerIdx = inst.PlayerAllianceIndex;
byte dbgLocalDisplayIdx = info != null ? info->LocalPlayerGroupIndex : (byte)255;
Plugin.Logger.Information($"[Alliance] LocalPlayerGroupIndex mapping: playerIdx={dbgPlayerIdx} localDisplayIdx={dbgLocalDisplayIdx} (0=A,1=B,2=C for our alliance)");
Plugin.Logger.Information($"[Alliance] Formula: displayIndex = (gmIndex - playerIdx + localDisplayIdx + 3) % 3");
for (int i = 0; i < 3; i++)
{
int displayIndex = (i - dbgPlayerIdx + dbgLocalDisplayIdx + 3) % 3;
char computedLetter = displayIndex >= 0 && displayIndex < 3 ? (char)('A' + displayIndex) : '?';
string ours = i == dbgPlayerIdx ? " (OURS)" : "";
Plugin.Logger.Information($"[Alliance] GM[{i}] → displayIndex=({i}-{dbgPlayerIdx}+{dbgLocalDisplayIdx}+3)%3={displayIndex} → letter '{computedLetter}'{ours}");
}
Plugin.Logger.Information("=== End Alliance Debug ===");
}
@@ -283,10 +283,13 @@ namespace HSUI.Interface.Party
// tooltip
if (Config.ShowTooltips)
{
uint? iconId = hoveringCooldown.Data.IconId > 0 ? hoveringCooldown.Data.IconId : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(
hoveringCooldown.TooltipText(),
hoveringCooldown.Data.Name,
hoveringCooldown.Data.ActionId
hoveringCooldown.Data.ActionId,
"",
iconId
);
}
}
@@ -304,10 +304,13 @@ namespace HSUI.Interface.PartyCooldowns
pos = origin + new Vector2(pos.X - size.Y + 1, pos.Y);
if (Config.ShowTooltips && ImGui.IsMouseHoveringRect(pos, pos + _barConfig.Size))
{
uint? iconId = cooldown.Data.IconId > 0 ? cooldown.Data.IconId : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(
cooldown.TooltipText(),
cooldown.Data.Name,
cooldown.Data.ActionId
cooldown.Data.ActionId,
"",
iconId
);
}
@@ -468,11 +468,13 @@ namespace HSUI.Interface.StatusEffects
// tooltip
if (Config.ShowTooltips)
{
uint? iconId = data.Data.Icon > 0 ? data.Data.Icon : null;
TooltipsHelper.Instance.ShowTooltipOnCursor(
EncryptedStringsHelper.GetString(data.Data.Description.ToDalamudString().ToString()),
EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
data.Status.StatusId,
GetStatusActorName(data.Status)
GetStatusActorName(data.Status),
iconId
);
}
+20
View File
@@ -1,3 +1,23 @@
# 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
- **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.
# 1.0.5.0
- **World Object Tooltip**: Hover over players, NPCs, or objects in the world to see a tooltip with name, level, HP, job (players), FC tag (optional), distance, and object ID. Enable in Misc → World Tooltip; optional detach-from-cursor with fixed position.
# 1.0.4.0
- **PvP nameplates**: Grand Company icons on enemy nameplates (Maelstrom, Twin Adder, Immortal Flames — icon IDs 62601, 62602, 62603). Configurable icon IDs in Nameplates → Enemies → Company Icon (PvP) if you need to override.
- **PvP nameplates**: Role/Job icon on enemy player nameplates — enable in Nameplates → Enemies → Role/Job Icon (enemy players); supports job or role style like player nameplates.
- **Hotbars**: Main Actions and Extra Commands now show correct tooltip name and description from the MainCommand sheet (fixes "Main Action" / "Main Action" generic text).
- **Alliance Frames**: Further label fixes and debug output for alliance letter mapping.
# 1.0.3.0
- **Alliance Frames**: Fixed alliance letter labels (A/B/C) — correct display when player is in any alliance (A, B, or C); EntityId matching for proper letter resolution when GroupManager and CrossRealm use different orderings; improved PlayerAllianceIndex detection.
- **Alliance Frames**: PvP support — frames now display in Frontlines and Rival Wings.
+6 -5
View File
@@ -4,9 +4,9 @@
"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": "Alliance Frames: Fixed A/B/C labels when player in any alliance; PvP support. Hotbars: Shared bar persistence. Config: Save on teleport. Debug: /hsui_alliance_debug.",
"Changelog": "Removed Discord and Ko-fi links from config.",
"InternalName": "HSUI",
"AssemblyVersion": "1.0.3.0",
"AssemblyVersion": "1.0.7.1",
"RepoUrl": "https://github.com/Knack117/HSUI",
"ApplicableVersion": "any",
"Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
@@ -14,10 +14,11 @@
"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.3.0/latest.zip",
"DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.1/latest.zip",
"IsHide": false,
"IsTestingExclusive": false,
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip",
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.3.0/latest.zip"
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.1/latest.zip",
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.1/latest.zip",
"LastUpdate": "1738627200"
}
]