diff --git a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs index fcfe7766f..c7184ca11 100644 --- a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs +++ b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs @@ -21,16 +21,6 @@ namespace Dalamud.Game.Addon.Lifecycle; [ServiceManager.EarlyLoadedService] internal unsafe class AddonLifecycle : IDisposable, IServiceType { - /// - /// List of all AddonLifecycle ReceiveEvent Listener Hooks. - /// - internal readonly List ReceiveEventListeners = new(); - - /// - /// List of all AddonLifecycle Event Listeners. - /// - internal readonly List EventListeners = new(); - private static readonly ModuleLog Log = new("AddonLifecycle"); [ServiceManager.ServiceDependency] @@ -81,6 +71,16 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType private delegate void AddonOnRequestedUpdateDelegate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData); private delegate byte AddonOnRefreshDelegate(AtkUnitManager* unitManager, AtkUnitBase* addon, uint valueCount, AtkValue* values); + + /// + /// Gets a list of all AddonLifecycle ReceiveEvent Listener Hooks. + /// + internal List ReceiveEventListeners { get; } = new(); + + /// + /// Gets a list of all AddonLifecycle Event Listeners. + /// + internal List EventListeners { get; } = new(); /// public void Dispose() diff --git a/Dalamud/Game/Gui/Dtr/DtrBar.cs b/Dalamud/Game/Gui/Dtr/DtrBar.cs index 993bb951f..2e5ecb9c5 100644 --- a/Dalamud/Game/Gui/Dtr/DtrBar.cs +++ b/Dalamud/Game/Gui/Dtr/DtrBar.cs @@ -413,7 +413,7 @@ internal sealed unsafe class DtrBar : IDisposable, IServiceType, IDtrBar newTextNode->AtkResNode.NodeID = nodeId; newTextNode->AtkResNode.Type = NodeType.Text; newTextNode->AtkResNode.NodeFlags = NodeFlags.AnchorLeft | NodeFlags.AnchorTop | NodeFlags.Enabled | NodeFlags.RespondToMouse | NodeFlags.HasCollision | NodeFlags.EmitsEvents; - newTextNode->AtkResNode.DrawFlags = 12; + newTextNode->AtkResNode.ViewFlags = (NodeViewFlags)12; newTextNode->AtkResNode.SetWidth(22); newTextNode->AtkResNode.SetHeight(22); newTextNode->AtkResNode.SetPositionFloat(-200, 2); diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs index 8cce5c286..47c38b227 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -368,17 +368,6 @@ public class SeString return null; } - private static string GetMapLinkNameString(string placeName, int? instance, string coordinateString) - { - var instanceString = string.Empty; - if (instance is > 0 and < 10) - { - instanceString = (SeIconChar.Instance1 + instance.Value - 1).ToIconString(); - } - - return $"{placeName}{instanceString} {coordinateString}"; - } - /// /// Creates an SeString representing an entire payload chain that can be used to link party finder listings in the chat log. /// @@ -512,4 +501,15 @@ public class SeString { return this.TextValue; } + + private static string GetMapLinkNameString(string placeName, int? instance, string coordinateString) + { + var instanceString = string.Empty; + if (instance is > 0 and < 10) + { + instanceString = (SeIconChar.Instance1 + instance.Value - 1).ToIconString(); + } + + return $"{placeName}{instanceString} {coordinateString}"; + } } diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index a6c4e243c..816352d80 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -249,7 +249,6 @@ internal class DalamudInterface : IDisposable, IServiceType /// /// Opens the on the plugin installed. /// - /// The page of the installer to open. public void OpenPluginInstaller() { this.pluginWindow.OpenTo(this.configuration.PluginInstallerOpen); @@ -394,6 +393,7 @@ internal class DalamudInterface : IDisposable, IServiceType /// /// Toggles the . /// + /// The page of the installer to open. public void TogglePluginInstallerWindowTo(PluginInstallerWindow.PluginInstallerOpenKind kind) => this.pluginWindow.ToggleTo(kind); /// diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs index 14f062e01..99af6102c 100644 --- a/Dalamud/Interface/Internal/UiDebug.cs +++ b/Dalamud/Interface/Internal/UiDebug.cs @@ -215,7 +215,7 @@ internal unsafe class UiDebug while (b > byte.MaxValue) b -= byte.MaxValue; while (b < byte.MinValue) b += byte.MaxValue; textNode->AlignmentFontType = (byte)b; - textNode->AtkResNode.DrawFlags |= 0x1; + textNode->AtkResNode.ViewFlags |= NodeViewFlags.IsDirty; } ImGui.Text($"Color: #{textNode->TextColor.R:X2}{textNode->TextColor.G:X2}{textNode->TextColor.B:X2}{textNode->TextColor.A:X2}"); diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs index a0cba737c..7dc8e2f3c 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs @@ -1,6 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Drawing; using System.Linq; + using Dalamud.Game.Addon.Lifecycle; using Dalamud.Interface.Utility; using ImGuiNET; diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs index 600e423e1..49f083728 100644 --- a/Dalamud/Interface/Windowing/Window.cs +++ b/Dalamud/Interface/Windowing/Window.cs @@ -1,6 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; using System.Runtime.InteropServices; + using CheapLoc; using Dalamud.Configuration.Internal; using Dalamud.Game.ClientState.Keys;