1.0.8.3: Restore WndProc at start of teardown so left-click works after disable

Co-authored-by: Cursor <cursoragent@cursor.com>

Config/ConfigurationManager.cs

@@ -154,6 +154,7 @@ namespace HSUI.Config
             CheckVersion();
 
             Plugin.ClientState.Logout += OnLogout;
+            Plugin.ClientState.TerritoryChanged += OnTerritoryChanged;
             Plugin.JobChangedEvent += OnJobChanged;
 
             _configBaseNode.CreateNodesIfNeeded();
@@ -179,6 +180,7 @@ namespace HSUI.Config
 
             ConfigBaseNode.ConfigObjectResetEvent -= OnConfigObjectReset;
             Plugin.ClientState.Logout -= OnLogout;
+            Plugin.ClientState.TerritoryChanged -= OnTerritoryChanged;
             Plugin.JobChangedEvent -= OnJobChanged;
 
             Instance = null!;
@@ -197,6 +199,13 @@ namespace HSUI.Config
             ProfilesManager.Instance?.SaveCurrentProfile();
         }
 
+        private void OnTerritoryChanged(ushort territoryId)
+        {
+            // Persist config on teleport/zone change so changes aren't lost during loading screens
+            if (ConfigBaseNode.NeedsSave)
+                SaveConfigurations();
+        }
+
         private void OnJobChanged(uint jobId)
         {
             UpdateCurrentProfile();
@@ -602,6 +611,16 @@ namespace HSUI.Config
 
             // Party Frames
             typeof(PartyFramesConfig),
+            typeof(AllianceFramesHealthBarsConfig),
+            typeof(AllianceFramesManaBarConfig),
+            typeof(AllianceFramesCastbarConfig),
+            typeof(AllianceFramesIconsConfig),
+            typeof(AllianceFramesBuffsConfig),
+            typeof(AllianceFramesDebuffsConfig),
+            typeof(AllianceFramesTrackersConfig),
+            typeof(AllianceFramesCooldownListConfig),
+            typeof(AllianceFrames1Config),
+            typeof(AllianceFrames2Config),
             typeof(PartyFramesHealthBarsConfig),
             typeof(PartyFramesManaBarConfig),
             typeof(PartyFramesCastbarConfig),

Config/ImportConfig.cs

@@ -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)

Config/Tree/BaseNode.cs

@@ -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();

Config/Tree/ConfigPageNode.cs

@@ -290,16 +290,26 @@ namespace HSUI.Config.Tree
             Type type = ConfigObject.GetType();
             ImportData? importData = ProfilesManager.Instance?.DefaultImportData(type);
 
-            if (importData == null)
+            PluginConfigObject? config = null;
+            if (importData != null)
             {
-                Plugin.Logger.Error("Error finding default import data for type " + type.ToString());
-                return;
+                config = importData.GetObject();
             }
 
-            PluginConfigObject? config = importData.GetObject();
             if (config == null)
             {
-                Plugin.Logger.Error("Error importing default import data for type " + type.ToString());
+                // Fallback: invoke static DefaultConfig() when no import data (e.g. new config types not yet in Default.HSUI)
+                MethodInfo? defaultConfigMethod = type.GetMethod("DefaultConfig", BindingFlags.Public | BindingFlags.Static);
+                if (defaultConfigMethod != null && defaultConfigMethod.ReturnType != typeof(void))
+                {
+                    object? result = defaultConfigMethod.Invoke(null, null);
+                    config = result as PluginConfigObject;
+                }
+            }
+
+            if (config == null)
+            {
+                Plugin.Logger.Error("Error resetting config for type " + type.ToString() + " (no import data and no DefaultConfig)");
                 return;
             }
 

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.2.7</AssemblyVersion>
-		<FileVersion>1.0.2.7</FileVersion>
-		<InformationalVersion>1.0.2.7</InformationalVersion>
+		<AssemblyVersion>1.0.8.3</AssemblyVersion>
+		<FileVersion>1.0.8.3</FileVersion>
+		<InformationalVersion>1.0.8.3</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.2.7",
+  "AssemblyVersion": "1.0.8.3",
   "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",

Helpers/ActionBarsManager.cs

@@ -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,13 @@ 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);
+                // 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;
@@ -132,6 +144,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);
@@ -169,6 +202,10 @@ namespace HSUI.Helpers
                     int secsLeft = (int)Math.Ceiling(remaining);
                     return (pct, secsLeft);
                 }
+                // Cooldown complete (elapsed >= total). Return 0 — do NOT fall through to GetSlotCooldownFromSlot,
+                // as the slot can report a stale/false cooldown (e.g. shared recast group or cached state).
+                if (total > 0.001f)
+                    return (0, 0);
             }
 
             return GetSlotCooldownFromSlot(slot);
@@ -270,8 +307,8 @@ namespace HSUI.Helpers
             slotPtrB->LoadIconId();
             if (typeA == RaptureHotbarModule.HotbarSlotType.Item)
                 slotPtrB->LoadCostDataForSlot(true);
-            module->SetAndSaveSlot((uint)(barA - 1), (uint)a, typeB, idB);
-            module->SetAndSaveSlot((uint)(barB - 1), (uint)b, typeA, idA);
+            SetAndSaveSlotInternal(module, (uint)(barA - 1), (uint)a, typeB, idB, slotPtrA);
+            SetAndSaveSlotInternal(module, (uint)(barB - 1), (uint)b, typeA, idA, slotPtrB);
 
             // Read back to verify
             slotPtrA = module->GetSlotById((uint)(barA - 1), (uint)a);
@@ -505,8 +542,37 @@ namespace HSUI.Helpers
                 slotPtr->Set(RaptureHotbarModule.HotbarSlotType.Empty, 0);
                 slotPtr->LoadIconId();
             }
-            module->SetAndSaveSlot((uint)barIdx, (uint)slot, RaptureHotbarModule.HotbarSlotType.Empty, 0);
+            SetAndSaveSlotInternal(module, (uint)barIdx, (uint)slot, RaptureHotbarModule.HotbarSlotType.Empty, 0, slotPtr);
             return true;
         }
+
+        /// <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)
+        {
+            var ptr = slotPtr != null ? slotPtr : module->GetSlotById(barId, slotId);
+            if (ptr == null) return;
+
+            if (module->IsHotbarShared(barId))
+            {
+                // Shared hotbars: explicitly write to classJobId 0 (shared storage) for persistence across job changes and teleports
+                module->WriteSavedSlot(0, barId, slotId, ptr, false, false);
+            }
+            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);
+        }
     }
 }

Helpers/ActionChatLinkHelper.cs

@@ -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;
+            }
+        }
+    }
+}

Helpers/InputsHelper.cs

@@ -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
@@ -554,19 +565,40 @@ namespace HSUI.Helpers
             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\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;
+                _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}");
             }
         }
 

Helpers/TooltipsHelper.cs

@@ -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,51 @@ 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("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)]
+        [Order(6)]
+        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;
+    }
 }

Helpers/Utils.cs

@@ -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 (4–6).
+        /// 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)

Interface/GeneralElements/ActionBarsHud.cs

@@ -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}'");
                         }
@@ -613,7 +621,7 @@ namespace HSUI.Interface.GeneralElements
                                             displaySlot->Set(slotType, id);
                                             displaySlot->LoadIconId();
                                         }
-                                        module->SetAndSaveSlot(barId, (uint)releaseIdx, slotType, id);
+                                        ActionBarsManager.SetAndSaveSlotInternal(module, barId, (uint)releaseIdx, slotType, id, displaySlot);
                                         uint iconId = GetIconIdForPayload(slotType, id);
                                         if (iconId == 0)
                                         {
@@ -725,7 +733,7 @@ namespace HSUI.Interface.GeneralElements
                                     displaySlot->Set(slotType, id);
                                     displaySlot->LoadIconId();
                                 }
-                                module->SetAndSaveSlot(barId, (uint)idx, slotType, id);
+                                ActionBarsManager.SetAndSaveSlotInternal(module, barId, (uint)idx, slotType, id, displaySlot);
                                 try { dm->CancelDragDrop(true, true); }
                                 catch (Exception ex2) { Plugin.Logger.Warning($"[HSUI DragDrop] CancelDragDrop: {ex2.Message}"); }
 
@@ -1042,6 +1050,24 @@ namespace HSUI.Interface.GeneralElements
             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)
         {
             return kind switch
@@ -1327,6 +1353,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(), "");
         }
 

Interface/GeneralElements/HotbarsConfig.cs

@@ -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")]

Interface/GeneralElements/IconConfig.cs

@@ -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() { }

Interface/HudHelper.cs

@@ -106,6 +106,7 @@ namespace HSUI.Interface
 
                 UpdateJobGauges();
                 UpdateDefaultHudElementsHidden();
+                UpdateDefaultCastBar();
                 UpdateDefaultNameplates();
             }
             catch (Exception ex)
@@ -133,6 +134,7 @@ namespace HSUI.Interface
             {
                 case "HideDefaultHudWhenReplaced":
                     UpdateDefaultHudElementsHidden();
+                    UpdateDefaultCastBar();
                     break;
                 case "HideDefaultCastbar":
                     UpdateDefaultCastBar();
@@ -242,6 +244,11 @@ namespace HSUI.Interface
             if (partyFrames?.Enabled == true)
                 AddElements(ElementKind.PartyList);
 
+            var alliance1 = ConfigurationManager.Instance?.GetConfigObject<AllianceFrames1Config>();
+            var alliance2 = ConfigurationManager.Instance?.GetConfigObject<AllianceFrames2Config>();
+            if ((alliance1?.Enabled == true || alliance2?.Enabled == true))
+                AddElements(ElementKind.AllianceList1, ElementKind.AllianceList2);
+
             var enemyList = ConfigurationManager.Instance?.GetConfigObject<EnemyListConfig>();
             if (enemyList?.Enabled == true)
                 AddElements(ElementKind.EnemyList);
@@ -334,7 +341,11 @@ namespace HSUI.Interface
 
         private unsafe void UpdateDefaultCastBar(bool forceVisible = false)
         {
-            if (Config.HideDefaultCastbar && !_hidingCastBar)
+            // Hide when explicit config says so, or when HSUI is replacing it (HideDefaultHudWhenReplaced + player castbar enabled)
+            bool playerCastbarEnabled = ConfigurationManager.Instance?.GetConfigObject<PlayerCastbarConfig>()?.Enabled ?? false;
+            bool shouldHide = Config.HideDefaultCastbar || (Config.HideDefaultHudWhenReplaced && playerCastbarEnabled);
+
+            if (shouldHide && !_hidingCastBar)
             {
                 Plugin.AddonLifecycle.RegisterListener(AddonEvent.PreDraw, "_CastBar", (addonEvent, args) =>
                 {
@@ -350,7 +361,7 @@ namespace HSUI.Interface
 
                 _hidingCastBar = true;
             }
-            else if ((forceVisible || !Config.HideDefaultCastbar) && _hidingCastBar)
+            else if ((forceVisible || !shouldHide) && _hidingCastBar)
             {
                 Plugin.AddonLifecycle.UnregisterListener(AddonEvent.PreDraw, "_CastBar");
 

Interface/HudManager.cs

@@ -247,6 +247,16 @@ namespace HSUI.Interface
             _hudElements.Add(partyFramesConfig, partyFramesHud);
             _hudElementsWithPreview.Add(partyFramesHud);
 
+            var allianceFrames1Config = ConfigurationManager.Instance.GetConfigObject<AllianceFrames1Config>();
+            var allianceFrames1Hud = new AllianceFramesHud(allianceFrames1Config, "Alliance Frames 1");
+            _hudElements.Add(allianceFrames1Config, allianceFrames1Hud);
+            _hudElementsWithPreview.Add(allianceFrames1Hud);
+
+            var allianceFrames2Config = ConfigurationManager.Instance.GetConfigObject<AllianceFrames2Config>();
+            var allianceFrames2Hud = new AllianceFramesHud(allianceFrames2Config, "Alliance Frames 2");
+            _hudElements.Add(allianceFrames2Config, allianceFrames2Hud);
+            _hudElementsWithPreview.Add(allianceFrames2Hud);
+
             var enemyListConfig = ConfigurationManager.Instance.GetConfigObject<EnemyListConfig>();
             var enemyListHud = new EnemyListHud(enemyListConfig, "Enemy List");
             _hudElements.Add(enemyListConfig, enemyListHud);
@@ -512,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();
 

Interface/Nameplates/Nameplate.cs

@@ -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;
         }
 

Interface/Nameplates/NameplateConfig.cs

@@ -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!;
 

Interface/Nameplates/NameplatesHud.cs

@@ -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;
                         }

Interface/Party/AllianceFramesConfig.cs

@@ -0,0 +1,253 @@
+using HSUI.Config;
+using HSUI.Config.Attributes;
+using HSUI.Enums;
+using HSUI.Helpers;
+using HSUI.Interface.Bars;
+using HSUI.Interface.GeneralElements;
+using HSUI.Interface.StatusEffects;
+using Dalamud.Bindings.ImGui;
+using System.Numerics;
+
+namespace HSUI.Interface.Party
+{
+    [Exportable(false)]
+    [Disableable(false)]
+    [DisableParentSettings("Position", "Anchor", "BackgroundColor", "FillColor", "HideWhenInactive", "DrawBorder", "BorderColor", "BorderThickness")]
+    [Section("Alliance Frames", true)]
+    [SubSection("Health Bar", 0)]
+    public class AllianceFramesHealthBarsConfig : PartyFramesHealthBarsConfig
+    {
+        public new static AllianceFramesHealthBarsConfig DefaultConfig()
+        {
+            var config = new AllianceFramesHealthBarsConfig(Vector2.Zero, new(100, 22), PluginConfigColor.Empty);
+            config.MouseoverAreaConfig.Enabled = false;
+            config.Padding = new Vector2(2, 1);
+            config.ShowLabels = false;
+            config.NameLabelConfig.Enabled = false;
+            config.HealthLabelConfig.Enabled = false;
+            config.OrderNumberConfig.Enabled = false;
+            return config;
+        }
+
+        public AllianceFramesHealthBarsConfig(Vector2 position, Vector2 size, PluginConfigColor fillColor, BarDirection fillDirection = BarDirection.Right)
+            : base(position, size, fillColor, fillDirection)
+        {
+        }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Mana Bar", 0)]
+    public class AllianceFramesManaBarConfig : PartyFramesManaBarConfig
+    {
+        public new static AllianceFramesManaBarConfig DefaultConfig()
+        {
+            var config = new AllianceFramesManaBarConfig(new Vector2(0, 0), new Vector2(100, 6));
+            config.Enabled = false;
+            return config;
+        }
+        public AllianceFramesManaBarConfig(Vector2 position, Vector2 size) : base(position, size) { }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Castbar", 0)]
+    public class AllianceFramesCastbarConfig : PartyFramesCastbarConfig
+    {
+        public new static AllianceFramesCastbarConfig DefaultConfig()
+        {
+            var size = new Vector2(102, 10);
+            var pos = new Vector2(-1, 0);
+            var castNameConfig = new LabelConfig(new Vector2(5, 0), "", DrawAnchor.Left, DrawAnchor.Left);
+            var castTimeConfig = new NumericLabelConfig(new Vector2(-5, 0), "", DrawAnchor.Right, DrawAnchor.Right);
+            castTimeConfig.Enabled = false;
+            castTimeConfig.NumberFormat = 1;
+            var config = new AllianceFramesCastbarConfig(pos, size, castNameConfig, castTimeConfig);
+            config.Enabled = false;
+            return config;
+        }
+        public AllianceFramesCastbarConfig(Vector2 position, Vector2 size, LabelConfig castNameConfig, NumericLabelConfig castTimeConfig)
+            : base(position, size, castNameConfig, castTimeConfig) { }
+    }
+
+    [Disableable(false)]
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Icons", 0)]
+    public class AllianceFramesIconsConfig : PartyFramesIconsConfig
+    {
+        public new static AllianceFramesIconsConfig DefaultConfig()
+        {
+            var config = new AllianceFramesIconsConfig();
+            config.Role.Enabled = false;
+            config.Sign.Enabled = false;
+            config.Leader.Enabled = false;
+            config.PlayerStatus.Enabled = false;
+            config.ReadyCheckStatus.Icon.Enabled = false;
+            config.WhosTalking.Enabled = false;
+            return config;
+        }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Buffs", 0)]
+    public class AllianceFramesBuffsConfig : PartyFramesBuffsConfig
+    {
+        public new static AllianceFramesBuffsConfig DefaultConfig()
+        {
+            var durationConfig = new LabelConfig(new Vector2(0, -4), "", DrawAnchor.Bottom, DrawAnchor.Center);
+            var stacksConfig = new LabelConfig(new Vector2(-3, 4), "", DrawAnchor.TopRight, DrawAnchor.Center);
+            stacksConfig.Color = new(Vector4.UnitW);
+            stacksConfig.OutlineColor = new(Vector4.One);
+            var iconConfig = new StatusEffectIconConfig(durationConfig, stacksConfig);
+            iconConfig.DispellableBorderConfig.Enabled = false;
+            iconConfig.Size = new Vector2(24, 24);
+            var pos = new Vector2(-2, 2);
+            var size = new Vector2(iconConfig.Size.X * 4 + 6, iconConfig.Size.Y);
+            var config = new AllianceFramesBuffsConfig(DrawAnchor.TopRight, pos, size, true, false, false, GrowthDirections.Left | GrowthDirections.Down, iconConfig);
+            config.Limit = 4;
+            config.Enabled = false;
+            return config;
+        }
+        public AllianceFramesBuffsConfig(DrawAnchor anchor, Vector2 position, Vector2 size, bool showBuffs, bool showDebuffs, bool showPermanentEffects,
+            GrowthDirections growthDirections, StatusEffectIconConfig iconConfig)
+            : base(anchor, position, size, showBuffs, showDebuffs, showPermanentEffects, growthDirections, iconConfig) { }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Debuffs", 0)]
+    public class AllianceFramesDebuffsConfig : PartyFramesDebuffsConfig
+    {
+        public new static AllianceFramesDebuffsConfig DefaultConfig()
+        {
+            var durationConfig = new LabelConfig(new Vector2(0, -4), "", DrawAnchor.Bottom, DrawAnchor.Center);
+            var stacksConfig = new LabelConfig(new Vector2(-3, 4), "", DrawAnchor.TopRight, DrawAnchor.Center);
+            stacksConfig.Color = new(Vector4.UnitW);
+            stacksConfig.OutlineColor = new(Vector4.One);
+            var iconConfig = new StatusEffectIconConfig(durationConfig, stacksConfig);
+            iconConfig.Size = new Vector2(20, 20);
+            iconConfig.DurationLabelConfig.Enabled = false;
+            iconConfig.StacksLabelConfig.Enabled = false;
+            var pos = new Vector2(-2, -2);
+            var size = new Vector2(iconConfig.Size.X * 4 + 4, iconConfig.Size.Y);
+            var config = new AllianceFramesDebuffsConfig(DrawAnchor.BottomRight, pos, size, false, true, false, GrowthDirections.Left | GrowthDirections.Up, iconConfig);
+            config.Limit = 4;
+            return config;
+        }
+        public AllianceFramesDebuffsConfig(DrawAnchor anchor, Vector2 position, Vector2 size, bool showBuffs, bool showDebuffs, bool showPermanentEffects,
+            GrowthDirections growthDirections, StatusEffectIconConfig iconConfig)
+            : base(anchor, position, size, showBuffs, showDebuffs, showPermanentEffects, growthDirections, iconConfig) { }
+    }
+
+    [Disableable(false)]
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Trackers", 0)]
+    public class AllianceFramesTrackersConfig : PartyFramesTrackersConfig
+    {
+        public new static AllianceFramesTrackersConfig DefaultConfig()
+        {
+            var config = new AllianceFramesTrackersConfig();
+            config.Raise.Enabled = false;
+            config.Raise.Icon.Enabled = false;
+            config.Invuln.Enabled = false;
+            config.Invuln.Icon.Enabled = false;
+            config.Cleanse.Enabled = false;
+            return config;
+        }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Cooldowns", 0)]
+    public class AllianceFramesCooldownListConfig : PartyFramesCooldownListConfig
+    {
+        public new static AllianceFramesCooldownListConfig DefaultConfig()
+        {
+            var config = new AllianceFramesCooldownListConfig();
+            config.Position = new Vector2(-2, 0);
+            config.Size = new Vector2(40 * 8 + 6, 40);
+            config.Enabled = false;
+            return config;
+        }
+    }
+
+    /// <summary>Base config for alliance frames. Slot 0 and 1 = the two alliances the player is NOT in.</summary>
+    public abstract class AllianceFramesConfigBase : MovablePluginConfigObject
+    {
+        public abstract int SlotIndex { get; }
+        public abstract string FramesLabel { get; }
+
+        [Checkbox("Preview", isMonitored = true)]
+        [Order(4)]
+        public bool Preview = false;
+
+        [DragInt("Rows", spacing = true, isMonitored = true, min = 1, max = 8, velocity = 0.2f)]
+        [Order(10)]
+        public int Rows = 4;
+
+        [DragInt("Columns", isMonitored = true, min = 1, max = 8, velocity = 0.2f)]
+        [Order(11)]
+        public int Columns = 2;
+
+        [Anchor("Bars Anchor", isMonitored = true, spacing = true)]
+        [Order(15)]
+        public DrawAnchor BarsAnchor = DrawAnchor.TopLeft;
+
+        [Checkbox("Fill Rows First", isMonitored = true)]
+        [Order(20)]
+        public bool FillRowsFirst = true;
+
+        [Checkbox("Show when not in alliance raid", help = "When enabled, shows a placeholder frame outside raids so you can position it. Disable to hide frames entirely when not in a 24-player alliance raid.")]
+        [Order(25)]
+        public bool ShowWhenNotInRaid = false;
+
+        [NestedConfig("Title Label", 60)]
+        public AllianceFramesTitleLabel TitleLabelConfig = new AllianceFramesTitleLabel(Vector2.Zero, "", DrawAnchor.Left, DrawAnchor.Left);
+
+        [NestedConfig("Visibility", 200)]
+        public VisibilityConfig VisibilityConfig = new VisibilityConfig();
+    }
+
+    [Exportable(false)]
+    [DisableParentSettings("FrameAnchor", "UseJobColor", "UseRoleColor")]
+    public class AllianceFramesTitleLabel : LabelConfig
+    {
+        public AllianceFramesTitleLabel(Vector2 position, string text, DrawAnchor frameAnchor, DrawAnchor textAnchor)
+            : base(position, text, frameAnchor, textAnchor) { }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Alliance Frames 1", 0)]
+    public class AllianceFrames1Config : AllianceFramesConfigBase
+    {
+        public override int SlotIndex => 0;
+        public override string FramesLabel => "Alliance Frames 1";
+
+        public new static AllianceFrames1Config DefaultConfig()
+        {
+            var config = new AllianceFrames1Config();
+            config.Position = new Vector2(-ImGui.GetMainViewport().Size.X / 3 - 180, -350);
+            return config;
+        }
+    }
+
+    [Exportable(false)]
+    [Section("Alliance Frames", true)]
+    [SubSection("Alliance Frames 2", 0)]
+    public class AllianceFrames2Config : AllianceFramesConfigBase
+    {
+        public override int SlotIndex => 1;
+        public override string FramesLabel => "Alliance Frames 2";
+
+        public new static AllianceFrames2Config DefaultConfig()
+        {
+            var config = new AllianceFrames2Config();
+            config.Position = new Vector2(-ImGui.GetMainViewport().Size.X / 3 - 180, -230);
+            return config;
+        }
+    }
+}

Interface/Party/AllianceFramesHud.cs

@@ -0,0 +1,285 @@
+using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Bindings.ImGui;
+using HSUI.Config;
+using HSUI.Enums;
+using HSUI.Helpers;
+using HSUI.Interface.GeneralElements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+
+namespace HSUI.Interface.Party
+{
+    public class AllianceFramesHud : DraggableHudElement, IHudElementWithMouseOver, IHudElementWithPreview, IHudElementWithVisibilityConfig
+    {
+        private AllianceFramesConfigBase Config => (AllianceFramesConfigBase)_config;
+        public VisibilityConfig VisibilityConfig => Config.VisibilityConfig;
+        private PartyFramesConfigs Configs;
+
+        private Vector2 _contentMargin = new Vector2(2, 2);
+        private static readonly int MaxMemberCount = 8;
+
+        private Vector2 _origin;
+        private LayoutInfo _layoutInfo;
+        private uint _memberCount = 0;
+        private bool _layoutDirty = true;
+
+        private readonly List<PartyFramesBar> bars;
+        private LabelHud _titleLabelHud;
+
+        public AllianceFramesHud(AllianceFramesConfigBase config, string displayName) : base(config, displayName)
+        {
+            Configs = PartyFramesConfigs.GetAllianceConfigs();
+
+            config.ValueChangeEvent += OnLayoutPropertyChanged;
+            Configs.HealthBar.ValueChangeEvent += OnLayoutPropertyChanged;
+            Configs.HealthBar.ColorsConfig.ValueChangeEvent += OnLayoutPropertyChanged;
+
+            bars = new List<PartyFramesBar>(MaxMemberCount);
+            for (int i = 0; i < bars.Capacity; i++)
+            {
+                var bar = new PartyFramesBar("HSUI_allianceFramesBar_" + Config.SlotIndex + "_" + i, Configs);
+                bars.Add(bar);
+            }
+
+            _titleLabelHud = new LabelHud(Config.TitleLabelConfig);
+
+            AllianceManager.Instance.MembersChangedEvent += OnMembersChanged;
+        }
+
+        protected override void InternalDispose()
+        {
+            foreach (var bar in bars)
+            {
+                try { bar.Dispose(); }
+                catch (Exception ex) { Plugin.Logger.Error($"Error disposing AllianceFramesBar: {ex.Message}"); }
+            }
+            bars.Clear();
+
+            _config.ValueChangeEvent -= OnLayoutPropertyChanged;
+            Configs.HealthBar.ValueChangeEvent -= OnLayoutPropertyChanged;
+            Configs.HealthBar.ColorsConfig.ValueChangeEvent -= OnLayoutPropertyChanged;
+            AllianceManager.Instance.MembersChangedEvent -= OnMembersChanged;
+        }
+
+        private void OnLayoutPropertyChanged(object sender, OnChangeBaseArgs args)
+        {
+            if (args.PropertyName == "Size" || args.PropertyName == "FillRowsFirst" ||
+                args.PropertyName == "BarsAnchor" || args.PropertyName == "Padding" ||
+                args.PropertyName == "Rows" || args.PropertyName == "Columns")
+            {
+                _layoutDirty = true;
+            }
+        }
+
+        private void OnMembersChanged(AllianceManager sender)
+        {
+            _layoutDirty = true;
+        }
+
+        private void UpdateBars(Vector2 contentStartPos)
+        {
+            var members = AllianceManager.Instance.GetMembersForOtherAlliance(Config.SlotIndex);
+            uint memberCount = (uint)members.Count;
+            uint row = 0, col = 0;
+
+            CalculateBarPosition(contentStartPos, Size, out float x, out float y);
+
+            for (int i = 0; i < bars.Count; i++)
+            {
+                var bar = bars[i];
+                if (i >= memberCount)
+                {
+                    bar.Visible = false;
+                    continue;
+                }
+
+                bar.Member = members[i];
+                bar.Visible = true;
+
+                bar.Position = new Vector2(
+                    x + Configs.HealthBar.Size.X * col + (Configs.HealthBar.Padding.X - 1) * col,
+                    y + Configs.HealthBar.Size.Y * row + (Configs.HealthBar.Padding.Y - 1) * row
+                );
+
+                if (Config.FillRowsFirst)
+                {
+                    col++;
+                    if (col >= _layoutInfo.TotalColCount) { col = 0; row++; }
+                }
+                else
+                {
+                    row++;
+                    if (row >= _layoutInfo.TotalRowCount) { row = 0; col++; }
+                }
+            }
+        }
+
+        private void UpdateBarsPosition(Vector2 delta)
+        {
+            foreach (var bar in bars)
+                bar.Position = bar.Position + delta;
+        }
+
+        private void CalculateBarPosition(Vector2 position, Vector2 spaceSize, out float x, out float y)
+        {
+            x = position.X;
+            y = position.Y;
+            if (Config.BarsAnchor == DrawAnchor.Top || Config.BarsAnchor == DrawAnchor.Center || Config.BarsAnchor == DrawAnchor.Bottom)
+                x += (spaceSize.X - _layoutInfo.ContentSize.X) / 2f;
+            else if (Config.BarsAnchor == DrawAnchor.TopRight || Config.BarsAnchor == DrawAnchor.Right || Config.BarsAnchor == DrawAnchor.BottomRight)
+                x += spaceSize.X - _layoutInfo.ContentSize.X;
+            if (Config.BarsAnchor == DrawAnchor.Left || Config.BarsAnchor == DrawAnchor.Center || Config.BarsAnchor == DrawAnchor.Right)
+                y += (spaceSize.Y - _layoutInfo.ContentSize.Y) / 2f;
+            else if (Config.BarsAnchor == DrawAnchor.BottomLeft || Config.BarsAnchor == DrawAnchor.Bottom || Config.BarsAnchor == DrawAnchor.BottomRight)
+                y += spaceSize.Y - _layoutInfo.ContentSize.Y;
+        }
+
+        private Vector2 Size => new Vector2(
+            Config.Columns * Configs.HealthBar.Size.X + (Config.Columns - 1) * Configs.HealthBar.Padding.X,
+            Config.Rows * Configs.HealthBar.Size.Y + (Config.Rows - 1) * Configs.HealthBar.Padding.Y
+        );
+
+        private void UpdateLayout(Vector2 origin)
+        {
+            var members = AllianceManager.Instance.GetMembersForOtherAlliance(Config.SlotIndex);
+            uint count = (uint)members.Count;
+            Vector2 contentStartPos = origin + Config.Position;
+
+            if (_layoutDirty || _memberCount != count)
+            {
+                _layoutInfo = LayoutHelper.CalculateLayout(
+                    Size, Configs.HealthBar.Size, count, Configs.HealthBar.Padding, Config.FillRowsFirst
+                );
+                UpdateBars(contentStartPos);
+            }
+            else if (_origin != contentStartPos)
+            {
+                UpdateBarsPosition(contentStartPos - _origin);
+            }
+
+            _layoutDirty = false;
+            _origin = contentStartPos;
+            _memberCount = count;
+        }
+
+        public void StopPreview()
+        {
+            Config.Preview = false;
+            foreach (var bar in bars)
+                bar.StopPreview();
+        }
+
+        protected override (List<Vector2>, List<Vector2>) ChildrenPositionsAndSizes()
+        {
+            return (new List<Vector2>() { Config.Position + Size / 2f }, new List<Vector2>() { Size });
+        }
+
+        public void StopMouseover()
+        {
+            foreach (var bar in bars)
+                bar.StopMouseover();
+        }
+
+        public override void DrawChildren(Vector2 origin)
+        {
+            if (!_config.Enabled)
+                return;
+
+            bool inRaid = AllianceManager.Instance.IsInAllianceRaid;
+            var members = AllianceManager.Instance.GetMembersForOtherAlliance(Config.SlotIndex);
+
+            if (!inRaid && !Config.Preview && !Config.ShowWhenNotInRaid)
+                return;
+
+            if (members.Count < 1 && !Config.Preview && !Config.ShowWhenNotInRaid)
+                return;
+
+            // Show placeholder when not in raid (for positioning) or when Preview is on
+            if ((Config.Preview || Config.ShowWhenNotInRaid) && members.Count < 1)
+            {
+                _layoutInfo = LayoutHelper.CalculateLayout(Size, Configs.HealthBar.Size, 8, Configs.HealthBar.Padding, Config.FillRowsFirst);
+                for (int i = 0; i < 8; i++)
+                {
+                    bars[i].Member = new FakePartyFramesMember(i);
+                    bars[i].Visible = true;
+                }
+                for (int i = 8; i < bars.Count; i++)
+                    bars[i].Visible = false;
+                CalculateBarPosition(origin + Config.Position, Size, out float px, out float py);
+                uint row = 0, col = 0;
+                for (int i = 0; i < 8; i++)
+                {
+                    bars[i].Position = new Vector2(
+                        px + Configs.HealthBar.Size.X * col + (Configs.HealthBar.Padding.X - 1) * col,
+                        py + Configs.HealthBar.Size.Y * row + (Configs.HealthBar.Padding.Y - 1) * row
+                    );
+                    if (Config.FillRowsFirst) { col++; if (col >= _layoutInfo.TotalColCount) { col = 0; row++; } }
+                    else { row++; if (row >= _layoutInfo.TotalRowCount) { row = 0; col++; } }
+                }
+                AddDrawAction(StrataLevel.LOWEST, () =>
+                {
+                    var drawList = ImGui.GetWindowDrawList();
+                    Vector2 bgPos = origin + Config.Position - _contentMargin;
+                    Vector2 bgSize = Size + _contentMargin * 2;
+                    drawList.AddRectFilled(bgPos, bgPos + bgSize, 0x66000000);
+                    drawList.AddRect(bgPos, bgPos + bgSize, 0x66FFFFFF);
+                });
+                for (int i = 0; i < 8; i++)
+                    AddDrawActions(bars[i].GetBarDrawActions(origin));
+                foreach (var bar in bars)
+                    AddDrawActions(bar.GetElementsDrawActions(origin));
+                Config.TitleLabelConfig.SetText(Config.FramesLabel + " (Preview)");
+                AddDrawAction(Config.TitleLabelConfig.StrataLevel, () => _titleLabelHud.Draw(origin + Config.Position));
+                return;
+            }
+
+            if (Config.Preview)
+            {
+                AddDrawAction(StrataLevel.LOWEST, () =>
+                {
+                    var drawList = ImGui.GetWindowDrawList();
+                    Vector2 bgPos = origin + Config.Position - _contentMargin;
+                    Vector2 bgSize = Size + _contentMargin * 2;
+                    drawList.AddRectFilled(bgPos, bgPos + bgSize, 0x66000000);
+                    drawList.AddRect(bgPos, bgPos + bgSize, 0x66FFFFFF);
+                });
+            }
+
+            UpdateLayout(origin);
+
+            IGameObject? target = Plugin.TargetManager.SoftTarget ?? Plugin.TargetManager.Target;
+            int targetIndex = -1;
+
+            for (int i = 0; i < members.Count; i++)
+            {
+                var member = bars[i].Member;
+                if (member != null && target != null && member.ObjectId == target.GameObjectId)
+                {
+                    targetIndex = i;
+                    continue;
+                }
+                AddDrawActions(bars[i].GetBarDrawActions(origin));
+            }
+
+            if (targetIndex >= 0)
+                AddDrawActions(bars[targetIndex].GetBarDrawActions(origin, Configs.HealthBar.ColorsConfig.TargetBordercolor));
+
+            foreach (var bar in bars)
+                AddDrawActions(bar.GetElementsDrawActions(origin));
+
+            string titleText = Config.FramesLabel;
+            if (inRaid && AllianceManager.Instance.TryGetAllianceIndexForSlot(Config.SlotIndex, out int allianceIdx)
+                && AllianceManager.Instance.TryGetAllianceLetter(allianceIdx, out string letter))
+            {
+                titleText = $"Alliance {letter}";
+            }
+            Config.TitleLabelConfig.SetText(titleText);
+            AddDrawAction(Config.TitleLabelConfig.StrataLevel, () =>
+            {
+                _titleLabelHud.Draw(origin + Config.Position);
+            });
+        }
+    }
+}

Interface/Party/AllianceManager.cs

@@ -0,0 +1,497 @@
+using Dalamud.Game.ClientState.Objects.Types;
+using HSUI.Helpers;
+using FFXIVClientStructs.FFXIV.Client.Game.Group;
+using FFXIVClientStructs.FFXIV.Client.UI.Info;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace HSUI.Interface.Party
+{
+    public delegate void AllianceMembersChangedEventHandler(AllianceManager sender);
+
+    /// <summary>
+    /// Provides member lists for Alliance A, B, and C when in 24-player raid content.
+    /// Only populated when CrossRealm has 3 groups (alliance raid).
+    /// </summary>
+    public unsafe class AllianceManager : IDisposable
+    {
+        public static AllianceManager Instance { get; private set; } = null!;
+
+        private readonly List<IPartyFramesMember>[] _allianceMembers = new List<IPartyFramesMember>[3];
+        private int[] _lastMemberCounts = new int[3];
+        private bool _wasInAllianceRaid = false;
+
+        private AllianceManager()
+        {
+            for (int i = 0; i < 3; i++)
+                _allianceMembers[i] = new List<IPartyFramesMember>();
+        }
+
+        public static void Initialize()
+        {
+            Instance = new AllianceManager();
+        }
+
+        public void Dispose()
+        {
+            for (int i = 0; i < 3; i++)
+                _allianceMembers[i].Clear();
+            Instance = null!;
+        }
+
+        /// <summary>Internal alliance index (0, 1, or 2) containing the local player, or -1 if not in alliance raid / unknown.</summary>
+        public int PlayerAllianceIndex
+        {
+            get
+            {
+                var player = Plugin.ObjectTable?.LocalPlayer;
+                if (player == null) return -1;
+                uint playerEntityId = player.EntityId;
+                ulong playerObjectId = (ulong)player.GameObjectId;
+
+                // Primary: Check our populated member lists first - most reliable (GroupManager/CrossRealm ordering may differ)
+                for (int i = 0; i < 3; i++)
+                {
+                    foreach (var m in _allianceMembers[i])
+                    {
+                        if (m.ObjectId == playerEntityId || (ulong)m.ObjectId == playerObjectId) return i;
+                        if (m.Character != null && m.Character.Address == player.Address) return i;
+                    }
+                }
+
+                // Fallback: InfoProxyCrossRealm.LocalPlayerGroupIndex (when in duty finder / cross-world before instance)
+                var info = InfoProxyCrossRealm.Instance();
+                if (info != null && info->IsInAllianceRaid && info->GroupCount >= 3)
+                {
+                    byte localIdx = info->LocalPlayerGroupIndex;
+                    if (localIdx < 3) return localIdx;
+                }
+
+                // Fallback: CrossRealm iteration
+                if (info != null && info->IsInAllianceRaid && info->GroupCount >= 3)
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        var group = info->CrossRealmGroups[i];
+                        for (int j = 0; j < group.GroupMemberCount; j++)
+                        {
+                            var member = group.GroupMembers[j];
+                            if (member.EntityId == playerEntityId) return i;
+                        }
+                    }
+                }
+
+                // Fallback 3: Match any of our party members - we're in the same alliance as them
+                var partyList = Plugin.PartyList;
+                if (partyList != null)
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        foreach (var m in _allianceMembers[i])
+                        {
+                            foreach (var pm in partyList)
+                            {
+                                if (pm != null && pm.EntityId == m.ObjectId)
+                                {
+                                    return i;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Fallback: GroupManager - player is in MainGroup._partyMembers (their 8-man).
+                // Group layout: 0,1 = other alliances from _allianceMembers; 2 = main party from _partyMembers.
+                var gm = GroupManager.Instance();
+                if (gm != null && gm->MainGroup.IsAlliance)
+                {
+                    ref var mainGroup = ref gm->MainGroup;
+                    if (mainGroup.GetPartyMemberByEntityId(playerEntityId) != null)
+                    {
+                        return 2; // Player in main party = group 2 (our alliance)
+                    }
+                }
+
+                return -1;
+            }
+        }
+
+        /// <summary>Slot 0 = first other alliance, slot 1 = second. Excludes the player's alliance.</summary>
+        public IReadOnlyList<IPartyFramesMember> GetMembersForOtherAlliance(int slotIndex)
+        {
+            if (slotIndex < 0 || slotIndex > 1) return Array.Empty<IPartyFramesMember>();
+            if (!TryGetAllianceIndexForSlot(slotIndex, out int allianceIdx)) return Array.Empty<IPartyFramesMember>();
+            return _allianceMembers[allianceIdx].AsReadOnly();
+        }
+
+        /// <summary>Gets the alliance index (0=A, 1=B, 2=C) for the given slot. Returns false when not in raid.</summary>
+        public bool TryGetAllianceIndexForSlot(int slotIndex, out int allianceIndex)
+        {
+            allianceIndex = -1;
+            if (slotIndex < 0 || slotIndex > 1) return false;
+            int playerIdx = PlayerAllianceIndex;
+            int idx = 0;
+            for (int i = 0; i < 3; i++)
+            {
+                if (i == playerIdx) continue;
+                if (idx == slotIndex)
+                {
+                    allianceIndex = i;
+                    return true;
+                }
+                idx++;
+            }
+            return false;
+        }
+
+        /// <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 = "";
+            if (allianceIndex < 0 || allianceIndex > 2) return false;
+
+            var info = InfoProxyCrossRealm.Instance();
+            if (info != null && info->GroupCount >= 3)
+            {
+                // 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;
+
+                    if (matchEntityId != 0)
+                    {
+                        for (int crIdx = 0; crIdx < 3; crIdx++)
+                        {
+                            var crGroup = info->CrossRealmGroups[crIdx];
+                            for (int j = 0; j < crGroup.GroupMemberCount; j++)
+                            {
+                                if (crGroup.GroupMembers[j].EntityId == matchEntityId)
+                                {
+                                    byte displayIdx = crGroup.GroupMembers[j].GroupIndex;
+                                    if (displayIdx < 3)
+                                    {
+                                        letter = ((char)('A' + displayIdx)).ToString();
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var group = info->CrossRealmGroups[allianceIndex];
+                    if (group.GroupMemberCount > 0)
+                    {
+                        byte displayIdx = group.GroupMembers[0].GroupIndex;
+                        if (displayIdx < 3)
+                        {
+                            letter = ((char)('A' + displayIdx)).ToString();
+                            return true;
+                        }
+                    }
+
+                    for (byte d = 0; d < 3; d++)
+                    {
+                        if (InfoProxyCrossRealm.GetGroupIndex(d) == allianceIndex)
+                        {
+                            letter = ((char)('A' + d)).ToString();
+                            return true;
+                        }
+                    }
+                }
+
+                // 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;
+        }
+
+        /// <summary>True when in 24-player content with 3 alliances (PvE) or PvP Frontlines/Rival Wings.</summary>
+        public bool IsInAllianceRaid
+        {
+            get
+            {
+                var gm = GroupManager.Instance();
+                if (gm != null)
+                {
+                    // GroupManager: IsAlliance = 3x8 (alliance raids, Frontlines), IsSmallGroupAlliance = 6x4 (Rival Wings)
+                    if (gm->MainGroup.IsAlliance || gm->MainGroup.IsSmallGroupAlliance)
+                        return true;
+                }
+                var info = InfoProxyCrossRealm.Instance();
+                if (info == null) return false;
+                if (info->IsInAllianceRaid) return true;
+                return info->IsCrossRealm && info->GroupCount >= 3;
+            }
+        }
+
+        public event AllianceMembersChangedEventHandler? MembersChangedEvent;
+
+        public void Update()
+        {
+            var gm = GroupManager.Instance();
+            // Use GroupManager for PvE alliance raids and PvP (Frontlines, Rival Wings) - CrossRealm is not populated in PvP
+            bool useGroupManager = gm != null && (gm->MainGroup.IsAlliance || gm->MainGroup.IsSmallGroupAlliance);
+
+            if (useGroupManager)
+            {
+                UpdateFromGroupManager(gm);
+                return;
+            }
+
+            var info = InfoProxyCrossRealm.Instance();
+            if (info == null || !info->IsInAllianceRaid || info->GroupCount < 3)
+            {
+                if (_wasInAllianceRaid)
+                {
+                    _wasInAllianceRaid = false;
+                    for (int i = 0; i < 3; i++)
+                        _allianceMembers[i].Clear();
+                    MembersChangedEvent?.Invoke(this);
+                }
+                return;
+            }
+
+            _wasInAllianceRaid = true;
+            UpdateFromCrossRealm(info);
+        }
+
+        private void UpdateFromGroupManager(GroupManager* gm)
+        {
+            _wasInAllianceRaid = true;
+            bool anyChanged = false;
+            ref var mainGroup = ref gm->MainGroup;
+
+            for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
+            {
+                int count = 0;
+                var list = new List<IPartyFramesMember>();
+
+                for (int slot = 0; slot < 8; slot++)
+                {
+                    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)
+                {
+                    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();
+                    _allianceMembers[allianceIdx].AddRange(list);
+                    _lastMemberCounts[allianceIdx] = count;
+                    anyChanged = true;
+                }
+                else
+                {
+                    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);
+                        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);
+                        ourIdx++;
+                    }
+                }
+            }
+            if (anyChanged)
+                MembersChangedEvent?.Invoke(this);
+        }
+
+        /// <summary>Dumps alliance detection and letter-mapping debug info to the log. Run /hsui debug alliance while in an alliance raid.</summary>
+        public static void DumpAllianceDebugToLog()
+        {
+            var inst = Instance;
+            if (inst == null) { Plugin.Logger.Information("[HSUI Alliance DBG] AllianceManager not initialized."); return; }
+
+            var player = Plugin.ObjectTable?.LocalPlayer;
+            uint playerEntityId = player?.EntityId ?? 0;
+            string playerName = player?.Name.ToString() ?? "(null)";
+
+            Plugin.Logger.Information("=== HSUI Alliance Debug ===");
+            Plugin.Logger.Information($"[Alliance] IsInAllianceRaid={inst.IsInAllianceRaid}");
+            Plugin.Logger.Information($"[Alliance] Player: EntityId={playerEntityId} Name={playerName}");
+
+            var gm = GroupManager.Instance();
+            bool useGM = gm != null && (gm->MainGroup.IsAlliance || gm->MainGroup.IsSmallGroupAlliance);
+            Plugin.Logger.Information($"[Alliance] Data source: GroupManager={useGM} (IsAlliance={gm != null && gm->MainGroup.IsAlliance}, IsSmallGroupAlliance={gm != null && gm->MainGroup.IsSmallGroupAlliance})");
+
+            var info = InfoProxyCrossRealm.Instance();
+            if (info != null)
+            {
+                Plugin.Logger.Information($"[Alliance] InfoProxyCrossRealm: GroupCount={info->GroupCount} IsInAllianceRaid={info->IsInAllianceRaid} LocalPlayerGroupIndex={info->LocalPlayerGroupIndex}");
+                if (info->GroupCount >= 3)
+                {
+                    for (byte d = 0; d < 3; d++)
+                        Plugin.Logger.Information($"[Alliance] GetGroupIndex({d}) => internal index {InfoProxyCrossRealm.GetGroupIndex(d)}");
+                }
+            }
+            else
+                Plugin.Logger.Information("[Alliance] InfoProxyCrossRealm: null");
+
+            int playerIdx = inst.PlayerAllianceIndex;
+            Plugin.Logger.Information($"[Alliance] PlayerAllianceIndex={playerIdx} (internal index we treat as 'our' alliance, will exclude from display)");
+
+            for (int i = 0; i < 3; i++)
+            {
+                int count = inst._allianceMembers[i].Count;
+                string firstEntityId = count > 0 ? inst._allianceMembers[i][0].ObjectId.ToString() : "none";
+                string firstName = count > 0 ? inst._allianceMembers[i][0].Name : "";
+                bool hasPlayer = playerEntityId != 0 && inst._allianceMembers[i].Any(m => m.ObjectId == playerEntityId);
+                string letter = inst.TryGetAllianceLetter(i, out string l) ? l : "?";
+                Plugin.Logger.Information($"[Alliance] _allianceMembers[{i}]: count={count} firstEntityId={firstEntityId} firstName={firstName} hasPlayer={hasPlayer} resolvedLetter={letter}");
+            }
+
+            if (info != null && info->GroupCount >= 3)
+            {
+                for (int crIdx = 0; crIdx < 3; crIdx++)
+                {
+                    var grp = info->CrossRealmGroups[crIdx];
+                    int gc = grp.GroupMemberCount;
+                    string crFirstEntity = gc > 0 ? grp.GroupMembers[0].EntityId.ToString() : "none";
+                    string crFirstName = gc > 0 ? grp.GroupMembers[0].NameString : "";
+                    byte crGroupIndex = gc > 0 ? grp.GroupMembers[0].GroupIndex : (byte)255;
+                    char crLetter = crGroupIndex < 3 ? (char)('A' + crGroupIndex) : '?';
+                    Plugin.Logger.Information($"[Alliance] CrossRealmGroups[{crIdx}]: count={gc} firstEntityId={crFirstEntity} firstName={crFirstName} GroupIndex={crGroupIndex} => letter '{crLetter}'");
+                }
+            }
+
+            for (int slot = 0; slot <= 1; slot++)
+            {
+                if (inst.TryGetAllianceIndexForSlot(slot, out int aidx) && inst.TryGetAllianceLetter(aidx, out string let))
+                    Plugin.Logger.Information($"[Alliance] Display slot {slot}: allianceIndex={aidx} letter={let}");
+                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 ===");
+        }
+
+        private void UpdateFromCrossRealm(InfoProxyCrossRealm* info)
+        {
+            bool anyChanged = false;
+            for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
+            {
+                var group = info->CrossRealmGroups[allianceIdx];
+                int count = group.GroupMemberCount;
+
+                if (count != _lastMemberCounts[allianceIdx])
+                {
+                    _allianceMembers[allianceIdx].Clear();
+                    _lastMemberCounts[allianceIdx] = count;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        CrossRealmMember member = group.GroupMembers[i];
+                        var partyMember = new PartyFramesMember(
+                            member,
+                            i,
+                            i,
+                            PartyMemberStatus.None,
+                            ReadyCheckStatus.None,
+                            member.IsPartyLeader,
+                            false
+                        );
+                        _allianceMembers[allianceIdx].Add(partyMember);
+                    }
+                    anyChanged = true;
+                }
+                else
+                {
+                    for (int i = 0; i < _allianceMembers[allianceIdx].Count; i++)
+                    {
+                        if (_allianceMembers[allianceIdx][i] is PartyFramesMember pfMember)
+                        {
+                            pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, pfMember.IsPartyLeader, pfMember.JobId);
+                        }
+                    }
+                }
+            }
+            if (anyChanged)
+                MembersChangedEvent?.Invoke(this);
+        }
+    }
+}

Interface/Party/PartyFramesBar.cs

@@ -576,6 +576,8 @@ namespace HSUI.Interface.Party
             }
             ));
 
+            if (_configs.HealthBar.ShowLabels)
+            {
                 // name
                 bool drawName = ShouldDrawName(character, showingRaise, showingInvuln);
                 if (drawName)
@@ -653,6 +655,7 @@ namespace HSUI.Interface.Party
                     }
                     ));
                 }
+            }
 
             return drawActions;
         }

Interface/Party/PartyFramesConfig.cs

@@ -88,6 +88,10 @@ namespace HSUI.Interface.Party
         [Order(31)]
         public Vector2 Padding = new Vector2(0, 0);
 
+        [Checkbox("Show Labels", help = "Show name, health, order number, and status text on the bar.")]
+        [Order(32)]
+        public bool ShowLabels = true;
+
         [NestedConfig("Name Label", 44)]
         public EditableLabelConfig NameLabelConfig = new EditableLabelConfig(Vector2.Zero, "[name:initials].", DrawAnchor.Center, DrawAnchor.Center);
 

Interface/Party/PartyFramesCooldownListHud.cs

@@ -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
                     );
                 }
             }

Interface/Party/PartyFramesHud.cs

@@ -459,7 +459,19 @@ namespace HSUI.Interface.Party
             );
         }
 
-
+        public static PartyFramesConfigs GetAllianceConfigs()
+        {
+            return new PartyFramesConfigs(
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesHealthBarsConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesManaBarConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesCastbarConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesIconsConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesBuffsConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesDebuffsConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesTrackersConfig>(),
+                ConfigurationManager.Instance.GetConfigObject<AllianceFramesCooldownListConfig>()
+            );
+        }
     }
     #endregion
 }

Interface/PartyCooldowns/PartyCooldownsHud.cs

@@ -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
                         );
                     }
 

Interface/StatusEffects/StatusEffectsListHud.cs

@@ -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
                     );
                 }
 

Plugin.cs

@@ -130,11 +130,13 @@ namespace HSUI
             InputsHelper.Initialize();
             NameplatesManager.Initialize();
             PartyManager.Initialize();
+            AllianceManager.Initialize();
             PartyCooldownsManager.Initialize();
             PullTimerHelper.Initialize();
             ActionBarsManager.Initialize();
             TextTagsHelper.Initialize();
             TooltipsHelper.Initialize();
+            ActionChatLinkHelper.Initialize();
             PetRenamerHelper.Initialize();
             HonorificHelper.Initialize();
             WotsitHelper.Initialize();
@@ -163,7 +165,21 @@ namespace HSUI
                         + "/hsui debug tooltips → Toggles debug logging for tooltips.\n"
                         + "/hsui debug hud → Dumps HudLayout addon names and hashes to the log (for HUD hiding).\n"
                         + "/hsui debug hotbarslots → Dumps all hotbar slot CommandType/CommandId to the log (for SwapSlots diagnosis).\n"
-                        + "/hsui debug macro <bar> <slot> → Dumps HotbarSlot + RaptureMacroModule.Macro memory for the slot (macro persistence).",
+                        + "/hsui debug macro <bar> <slot> → Dumps HotbarSlot + RaptureMacroModule.Macro memory for the slot (macro persistence).\n"
+                        + "/hsui_alliance_debug → Dumps alliance frame detection and letter-mapping debug info (run while in alliance raid).",
+                    ShowInHelp = true
+                }
+            );
+
+            CommandManager.AddHandler(
+                "/hsui_alliance_debug",
+                new CommandInfo((_, _) =>
+                {
+                    HSUI.Interface.Party.AllianceManager.DumpAllianceDebugToLog();
+                    Chat.Print("HSUI: Alliance debug info dumped to the log (Dalamud log window or dev plugin).");
+                })
+                {
+                    HelpMessage = "Dumps alliance frame detection and letter-mapping debug info. Run while in an alliance raid.",
                     ShowInHelp = true
                 }
             );
@@ -338,6 +354,12 @@ namespace HSUI
                             Chat.Print("Usage: /hsui debug macro <bar> <slot>  (e.g. /hsui debug macro 1 2)");
                         break;
 
+                    case { } when string.Equals(arguments.Trim(), "debug alliance", StringComparison.OrdinalIgnoreCase)
+                        || string.Equals(arguments.Trim(), "debugalliance", StringComparison.OrdinalIgnoreCase):
+                        HSUI.Interface.Party.AllianceManager.DumpAllianceDebugToLog();
+                        Chat.Print("HSUI: Alliance debug info dumped to the log (Dalamud log window or dev plugin).");
+                        break;
+
                     default:
                         configManager.ToggleConfigWindow();
                         break;
@@ -384,6 +406,8 @@ namespace HSUI
                 catch (Exception ex) { Logger.Warning($"NameplatesManager.Update: {ex.Message}"); }
                 try { PartyManager.Instance?.Update(); }
                 catch (Exception ex) { Logger.Warning($"PartyManager.Update: {ex.Message}"); }
+                try { AllianceManager.Instance?.Update(); }
+                catch (Exception ex) { Logger.Warning($"AllianceManager.Update: {ex.Message}"); }
 
                 try
                 {
@@ -414,11 +438,15 @@ namespace HSUI
         {
             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
             try
             {
                 Logger.Info("\tRemoving commands...");
                 CommandManager.RemoveHandler("/hsui");
+                CommandManager.RemoveHandler("/hsui debugalliance");
                 CommandManager.RemoveHandler("/hui");
             }
             catch (Exception e) { Logger.Error("Error removing commands: " + e.Message); }
@@ -448,12 +476,14 @@ namespace HSUI
             TryDispose("GlobalColors", () => GlobalColors.Instance?.Dispose());
             TryDispose("NameplatesManager", () => NameplatesManager.Instance?.Dispose());
             TryDispose("PartyCooldownsManager", () => PartyCooldownsManager.Instance?.Dispose());
+            TryDispose("AllianceManager", () => AllianceManager.Instance?.Dispose());
             TryDispose("PartyManager", () => PartyManager.Instance?.Dispose());
             TryDispose("PullTimerHelper", () => PullTimerHelper.Instance?.Dispose());
             TryDispose("ActionBarsManager", () => ActionBarsManager.Instance?.Dispose());
             TryDispose("ProfilesManager", () => ProfilesManager.Instance?.Dispose());
             TryDispose("SpellHelper", () => SpellHelper.Instance?.Dispose());
             TryDispose("TooltipsHelper", () => TooltipsHelper.Instance?.Dispose());
+            TryDispose("ActionChatLinkHelper", () => ActionChatLinkHelper.Instance?.Dispose());
             TryDispose("HonorificHelper", () => HonorificHelper.Instance?.Dispose());
             TryDispose("PetRenamerHelper", () => PetRenamerHelper.Instance?.Dispose());
             TryDispose("WotsitHelper", () => WotsitHelper.Instance?.Dispose());

changelog.md

@@ -1,3 +1,49 @@
+# 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
+- **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.
+- **Config**: Save on territory change — config persists when teleporting or changing zones so hotbar layout and other changes aren't lost during loading screens.
+- **Hotbars**: Shared hotbar persistence — explicitly write to classJobId 0 (shared storage) so changes to shared bars persist across teleports and job changes.
+- **Debug**: Added `/hsui_alliance_debug` command — dumps alliance detection and letter-mapping info to the log when run in an alliance raid.
+
+# 1.0.2.9
+- **Hotbars**: Fixed false second cooldown — some 60s actions were showing another cooldown after the real one finished; now correctly returns ready when ActionManager says cooldown is complete.
+
+# 1.0.2.8
+- **Cast bar**: Default progress bar is now hidden when HSUI cast bar is enabled (with "Hide Default HUD When Replaced" on).
+
 # 1.0.2.7
 - **Hotbars**: Fixed Mount/Companion/Emote tooltips — now show actual mount name and description instead of generic "Mount".
 

pluginmaster.json

@@ -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": "Hotbars: Fixed Mount/Companion/Emote tooltips. Now show actual mount name and description.",
+    "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.2.7",
+    "AssemblyVersion": "1.0.8.2",
     "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.2.7/latest.zip",
+    "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.2.7/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.2.7/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.8.2/latest.zip",
+    "LastUpdate": "1770007214"
   }
 ]