Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 280004bdb0 | |||
| d8da154e72 | |||
| db6e91afd1 | |||
| 01426d3c30 | |||
| cb3d6b5e0b | |||
| 9391ef1451 | |||
| 3b5ddbe2f9 |
+3
-3
@@ -9,9 +9,9 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<AssemblyName>HSUI</AssemblyName>
|
||||
<AssemblyVersion>1.0.8.3</AssemblyVersion>
|
||||
<FileVersion>1.0.8.3</FileVersion>
|
||||
<InformationalVersion>1.0.8.3</InformationalVersion>
|
||||
<AssemblyVersion>1.0.8.8</AssemblyVersion>
|
||||
<FileVersion>1.0.8.8</FileVersion>
|
||||
<InformationalVersion>1.0.8.8</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"Author": "Knack117",
|
||||
"Name": "HSUI",
|
||||
"InternalName": "HSUI",
|
||||
"AssemblyVersion": "1.0.8.3",
|
||||
"AssemblyVersion": "1.0.8.8",
|
||||
"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",
|
||||
|
||||
@@ -122,6 +122,12 @@ namespace HSUI.Helpers
|
||||
continue;
|
||||
}
|
||||
|
||||
// For GearSet slots, refresh IconId from the gearset (e.g. job icon from first equipment slot).
|
||||
// Only call for already-synced GearSet slots: calling LoadIconId() on other types or before the
|
||||
// game has synced a just-dropped slot can prevent the drop from sticking.
|
||||
if (slot->ApparentSlotType == RaptureHotbarModule.HotbarSlotType.GearSet)
|
||||
slot->LoadIconId();
|
||||
|
||||
bool usable = slot->IsSlotUsable(slot->ApparentSlotType, slot->ApparentActionId);
|
||||
uint iconId = slot->IconId;
|
||||
uint actionId = slot->ApparentActionId;
|
||||
|
||||
@@ -253,7 +253,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
});
|
||||
|
||||
// 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, () =>
|
||||
{
|
||||
var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
|
||||
@@ -262,13 +262,11 @@ namespace HSUI.Interface.GeneralElements
|
||||
| ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
|
||||
| ImGuiWindowFlags.NoNav;
|
||||
|
||||
ImGuiHelpers.ForceNextWindowMainViewport();
|
||||
ImGui.SetNextWindowPos(topLeft);
|
||||
ImGui.SetNextWindowSize(barSize);
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -394,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
_lastLoggedPickupSlotId = -1;
|
||||
}
|
||||
|
||||
ImGui.End();
|
||||
ImGui.EndChild();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -604,7 +602,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
if (ImGui.IsMouseReleased(ImGuiMouseButton.Left))
|
||||
{
|
||||
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)
|
||||
{
|
||||
@@ -703,7 +701,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
// 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.
|
||||
bool hasValidPayload = slotType != RaptureHotbarModule.HotbarSlotType.Empty &&
|
||||
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro);
|
||||
(id != 0 || slotType == RaptureHotbarModule.HotbarSlotType.Macro || slotType == RaptureHotbarModule.HotbarSlotType.GearSet);
|
||||
|
||||
if (hasValidPayload)
|
||||
{
|
||||
@@ -1094,7 +1092,9 @@ namespace HSUI.Interface.GeneralElements
|
||||
|
||||
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)
|
||||
{
|
||||
var macroModule = RaptureMacroModule.Instance();
|
||||
@@ -1194,19 +1194,111 @@ namespace HSUI.Interface.GeneralElements
|
||||
slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
|
||||
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)
|
||||
{
|
||||
string name = row.Value.Name.ToString();
|
||||
string desc = "";
|
||||
var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
|
||||
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)
|
||||
{
|
||||
var craftSheet = Plugin.DataManager.GetExcelSheet<Lumina.Excel.Sheets.CraftAction>();
|
||||
if (craftSheet != null && craftSheet.TryGetRow(actionIdForLookup, out var craftRow))
|
||||
{
|
||||
try
|
||||
{
|
||||
var descSeStr = descRow.Value.Description;
|
||||
descRaw = descRow.Value.Description.ToDalamudString().ToString();
|
||||
var descSe = craftRow.Description;
|
||||
var craftDescRaw = descSe.ToDalamudString().ToString();
|
||||
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 { /* ignore */ }
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
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());
|
||||
@@ -1222,6 +1314,7 @@ namespace HSUI.Interface.GeneralElements
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
}
|
||||
}
|
||||
bool isCombatAction = IsCombatAction(slot.SlotType, row.Value);
|
||||
int? potencyValue = isCombatAction ? TryGetPotencyValue(row.Value) : null;
|
||||
string potencyLine = potencyValue.HasValue ? $"Potency: {potencyValue.Value}" : "";
|
||||
|
||||
@@ -96,6 +96,9 @@ namespace HSUI.Interface
|
||||
if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
|
||||
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 isInDuty = IsInDuty() && !isInIslandSanctuary;
|
||||
IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
|
||||
@@ -127,7 +130,8 @@ namespace HSUI.Interface
|
||||
|
||||
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; }
|
||||
|
||||
|
||||
@@ -280,14 +280,21 @@ namespace HSUI.Interface.Party
|
||||
bool anyChanged = false;
|
||||
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++)
|
||||
{
|
||||
int count = 0;
|
||||
var list = new List<IPartyFramesMember>();
|
||||
|
||||
if (allianceIdx == 2)
|
||||
{
|
||||
// Our party: _partyMembers via GetPartyMemberByIndex
|
||||
for (int slot = 0; slot < 8; slot++)
|
||||
{
|
||||
var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
var pm = mainGroup.GetPartyMemberByIndex(slot);
|
||||
if (pm == null || pm->EntityId == 0) continue;
|
||||
var pfMember = new PartyFramesMember(
|
||||
pm->EntityId,
|
||||
@@ -303,14 +310,14 @@ 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)
|
||||
}
|
||||
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.GetPartyMemberByIndex(slot);
|
||||
var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
|
||||
if (pm == null || pm->EntityId == 0) continue;
|
||||
var pfMember = new PartyFramesMember(
|
||||
pm->EntityId,
|
||||
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
|
||||
int ourIdx = 0;
|
||||
for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
|
||||
{
|
||||
PartyMember* pm = allianceIdx == 2
|
||||
? mainGroup.GetPartyMemberByIndex(slot)
|
||||
: mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
|
||||
PartyMember* pm;
|
||||
if (allianceIdx == 2)
|
||||
pm = mainGroup.GetPartyMemberByIndex(slot);
|
||||
else
|
||||
pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + 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);
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
# 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
-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.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",
|
||||
"AssemblyVersion": "1.0.8.2",
|
||||
"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.8.2/latest.zip",
|
||||
"IsHide": false,
|
||||
"IsTestingExclusive": false,
|
||||
"DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||
"DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
|
||||
"LastUpdate": "1770007214"
|
||||
}
|
||||
]
|
||||
[{"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.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.8","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.8/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.8/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.8/latest.zip","LastUpdate":"1739232000"}]
|
||||
|
||||
Reference in New Issue
Block a user