Merge branch 'api13' into DtrClickAddiction

Dalamud/Configuration/Internal/DalamudConfiguration.cs

@@ -152,23 +152,11 @@ internal sealed class DalamudConfiguration : IInternalDisposableService
     /// </summary>
     public float GlobalUiScale { get; set; } = 1.0f;
 
-    /// <summary>
-    /// Gets or sets a value indicating whether to use AXIS fonts from the game.
-    /// </summary>
-    [Obsolete($"See {nameof(DefaultFontSpec)}")]
-    public bool UseAxisFontsFromGame { get; set; } = true;
-
     /// <summary>
     /// Gets or sets the default font spec.
     /// </summary>
     public IFontSpec? DefaultFontSpec { get; set; }
 
-    /// <summary>
-    /// Gets or sets the gamma value to apply for Dalamud fonts. Do not use.
-    /// </summary>
-    [Obsolete("It happens that nobody touched this setting", true)]
-    public float FontGammaLevel { get; set; } = 1.4f;
-
     /// <summary>Gets or sets the opacity of the IME state indicator.</summary>
     /// <value>0 will hide the state indicator. 1 will make the state indicator fully visible. Values outside the
     /// range will be clamped to [0, 1].</value>

Dalamud/Game/Addon/Events/AddonEventEntry.cs

@@ -1,4 +1,4 @@
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using Dalamud.Utility;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
@@ -33,17 +33,10 @@ internal unsafe class AddonEventEntry
     /// </summary>
     public required nint Node { get; init; }
 
-    /// <summary>
-    /// Gets the handler that gets called when this event is triggered.
-    /// </summary>
-    [Obsolete("Use AddonEventDelegate Delegate instead")]
-    public IAddonEventManager.AddonEventHandler Handler { get; init; }
-
     /// <summary>
     /// Gets the delegate that gets called when this event is triggered.
     /// </summary>
-    [Api13ToDo("Make this field required")]
+    public required IAddonEventManager.AddonEventDelegate Delegate { get; init; }
-    public IAddonEventManager.AddonEventDelegate Delegate { get; init; }
 
     /// <summary>
     /// Gets the unique id for this event.

Dalamud/Game/Addon/Events/AddonEventManager.cs

@@ -73,29 +73,6 @@ internal unsafe class AddonEventManager : IInternalDisposableService
         this.addonLifecycle.UnregisterListener(this.finalizeEventListener);
     }
 
-    /// <summary>
-    /// Registers an event handler for the specified addon, node, and type.
-    /// </summary>
-    /// <param name="pluginId">Unique ID for this plugin.</param>
-    /// <param name="atkUnitBase">The parent addon for this event.</param>
-    /// <param name="atkResNode">The node that will trigger this event.</param>
-    /// <param name="eventType">The event type for this event.</param>
-    /// <param name="eventHandler">The handler to call when event is triggered.</param>
-    /// <returns>IAddonEventHandle used to remove the event.</returns>
-    internal IAddonEventHandle? AddEvent(Guid pluginId, IntPtr atkUnitBase, IntPtr atkResNode, AddonEventType eventType, IAddonEventManager.AddonEventHandler eventHandler)
-    {
-        if (this.pluginEventControllers.TryGetValue(pluginId, out var controller))
-        {
-            return controller.AddEvent(atkUnitBase, atkResNode, eventType, eventHandler);
-        }
-        else
-        {
-            Log.Verbose($"Unable to locate controller for {pluginId}. No event was added.");
-        }
-
-        return null;
-    }
-
     /// <summary>
     /// Registers an event handler for the specified addon, node, and type.
     /// </summary>
@@ -260,10 +237,6 @@ internal class AddonEventManagerPluginScoped : IInternalDisposableService, IAddo
         }).Wait();
     }
 
-    /// <inheritdoc/>
-    public IAddonEventHandle? AddEvent(IntPtr atkUnitBase, IntPtr atkResNode, AddonEventType eventType, IAddonEventManager.AddonEventHandler eventHandler)
-        => this.eventManagerService.AddEvent(this.plugin.EffectiveWorkingPluginId, atkUnitBase, atkResNode, eventType, eventHandler);
-
     /// <inheritdoc/>
     public IAddonEventHandle? AddEvent(nint atkUnitBase, nint atkResNode, AddonEventType eventType, IAddonEventManager.AddonEventDelegate eventDelegate)
         => this.eventManagerService.AddEvent(this.plugin.EffectiveWorkingPluginId, atkUnitBase, atkResNode, eventType, eventDelegate);

Dalamud/Game/Addon/Events/AddonEventType.cs

@@ -121,12 +121,6 @@ public enum AddonEventType : byte
     /// </summary>
     ListItemClick = 35,
 
-    /// <summary>
-    /// AtkComponentList Toggle.
-    /// </summary>
-    [Obsolete("Use ListItemClick")]
-    ListItemToggle = 35,
-
     /// <summary>
     /// AtkComponentList Double Click.
     /// </summary>

Dalamud/Game/Addon/Events/PluginEventController.cs

@@ -30,49 +30,6 @@ internal unsafe class PluginEventController : IDisposable
 
     private List<AddonEventEntry> Events { get; } = new();
 
-    /// <summary>
-    /// Adds a tracked event.
-    /// </summary>
-    /// <param name="atkUnitBase">The Parent addon for the event.</param>
-    /// <param name="atkResNode">The Node for the event.</param>
-    /// <param name="atkEventType">The Event Type.</param>
-    /// <param name="handler">The delegate to call when invoking this event.</param>
-    /// <returns>IAddonEventHandle used to remove the event.</returns>
-    [Obsolete("Use AddEvent that uses AddonEventDelegate instead of AddonEventHandler")]
-    public IAddonEventHandle AddEvent(nint atkUnitBase, nint atkResNode, AddonEventType atkEventType, IAddonEventManager.AddonEventHandler handler)
-    {
-        var node = (AtkResNode*)atkResNode;
-        var addon = (AtkUnitBase*)atkUnitBase;
-        var eventType = (AtkEventType)atkEventType;
-        var eventId = this.GetNextParamKey();
-        var eventGuid = Guid.NewGuid();
-
-        var eventHandle = new AddonEventHandle
-        {
-            AddonName = addon->NameString,
-            ParamKey = eventId,
-            EventType = atkEventType,
-            EventGuid = eventGuid,
-        };
-
-        var eventEntry = new AddonEventEntry
-        {
-            Addon = atkUnitBase,
-            Handler = handler,
-            Delegate = null,
-            Node = atkResNode,
-            EventType = atkEventType,
-            ParamKey = eventId,
-            Handle = eventHandle,
-        };
-
-        Log.Verbose($"Adding Event. {eventEntry.LogString}");
-        this.EventListener.RegisterEvent(addon, node, eventType, eventId);
-        this.Events.Add(eventEntry);
-
-        return eventHandle;
-    }
-
     /// <summary>
     /// Adds a tracked event.
     /// </summary>
@@ -101,7 +58,6 @@ internal unsafe class PluginEventController : IDisposable
         {
             Addon = atkUnitBase,
             Delegate = eventDelegate,
-            Handler = null,
             Node = atkResNode,
             EventType = atkEventType,
             ParamKey = eventId,
@@ -231,7 +187,6 @@ internal unsafe class PluginEventController : IDisposable
         this.EventListener.UnregisterEvent(atkResNode, eventType, eventEntry.ParamKey);
     }
 
-    [Api13ToDo("Remove invoke from eventInfo.Handler, and remove nullability from eventInfo.Delegate?.Invoke")]
     private void PluginEventListHandler(AtkEventListener* self, AtkEventType eventType, uint eventParam, AtkEvent* eventPtr, AtkEventData* eventDataPtr)
     {
         try
@@ -239,10 +194,7 @@ internal unsafe class PluginEventController : IDisposable
             if (eventPtr is null) return;
             if (this.Events.FirstOrDefault(handler => handler.ParamKey == eventParam) is not { } eventInfo) return;
 
-            // We stored the AtkUnitBase* in EventData->Node, and EventData->Target contains the node that triggered the event.
+            eventInfo.Delegate.Invoke((AddonEventType)eventType, new AddonEventData
-            eventInfo.Handler?.Invoke((AddonEventType)eventType, (nint)eventPtr->Node, (nint)eventPtr->Target);
-
-            eventInfo.Delegate?.Invoke((AddonEventType)eventType, new AddonEventData
             {
                 AddonPointer = (nint)eventPtr->Node,
                 NodeTargetPointer = (nint)eventPtr->Target,

Dalamud/Game/ClientState/Conditions/ConditionFlag.cs

@@ -188,12 +188,6 @@ public enum ConditionFlag
     /// </summary>
     ExecutingCraftingAction = 40,
 
-    /// <summary>
-    /// Unable to execute command while crafting.
-    /// </summary>
-    [Obsolete("Renamed to ExecutingCraftingAction.")]
-    Crafting40 = 40,
-
     /// <summary>
     /// Unable to execute command while preparing to craft.
     /// </summary>
@@ -205,12 +199,6 @@ public enum ConditionFlag
     /// <remarks> Includes fishing. </remarks>
     ExecutingGatheringAction = 42,
 
-    /// <summary>
-    /// Unable to execute command while gathering.
-    /// </summary>
-    [Obsolete("Renamed to ExecutingGatheringAction.")]
-    Gathering42 = 42,
-
     /// <summary>
     /// Unable to execute command while fishing.
     /// </summary>
@@ -235,12 +223,6 @@ public enum ConditionFlag
     /// </summary>
     Jumping = 48,
 
-    /// <summary>
-    /// Unable to execute command while auto-run is active.
-    /// </summary>
-    [Obsolete("To avoid confusion, renamed to UsingChocoboTaxi.")]
-    AutorunActive = 49,
-
     /// <summary>
     /// Unable to execute command while auto-run is active.
     /// </summary>
@@ -282,12 +264,6 @@ public enum ConditionFlag
     /// </summary>
     BoundByDuty56 = 56,
 
-    /// <summary>
-    /// Unable to execute command at this time.
-    /// </summary>
-    [Obsolete("Renamed to MountOrOrnamentTransition.")]
-    Unknown57 = 57,
-
     /// <summary>
     /// Unable to execute command at this time.
     /// </summary>
@@ -461,12 +437,6 @@ public enum ConditionFlag
     /// </summary>
     RolePlaying = 90,
 
-    /// <summary>
-    /// Unable to execute command while bound by duty.
-    /// </summary>
-    [Obsolete("Use InDutyQueue")]
-    BoundToDuty97 = 91,
-
     /// <summary>
     /// Unable to execute command while bound by duty.
     /// Specifically triggered when you are in a queue for a duty but not inside a duty.
@@ -483,12 +453,6 @@ public enum ConditionFlag
     /// </summary>
     WaitingToVisitOtherWorld = 93,
 
-    /// <summary>
-    /// Unable to execute command while using a parasol.
-    /// </summary>
-    [Obsolete("Renamed to UsingFashionAccessory.")]
-    UsingParasol = 94,
-
     /// <summary>
     /// Unable to execute command while using a fashion accessory.
     /// </summary>

Dalamud/Game/ClientState/Fates/Fate.cs

@@ -3,7 +3,6 @@ using System.Numerics;
 using Dalamud.Data;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
-using Dalamud.Utility;
 
 using Lumina.Excel;
 
@@ -69,12 +68,6 @@ public interface IFate : IEquatable<IFate>
     /// </summary>
     byte Progress { get; }
 
-    /// <summary>
-    /// Gets a value indicating whether this <see cref="Fate"/> has a EXP bonus.
-    /// </summary>
-    [Obsolete($"Use {nameof(HasBonus)} instead")]
-    bool HasExpBonus { get; }
-
     /// <summary>
     /// Gets a value indicating whether this <see cref="Fate"/> has a bonus.
     /// </summary>
@@ -222,10 +215,6 @@ internal unsafe partial class Fate : IFate
     /// <inheritdoc/>
     public byte Progress => this.Struct->Progress;
 
-    /// <inheritdoc/>
-    [Api13ToDo("Remove")]
-    public bool HasExpBonus => this.HasBonus;
-
     /// <inheritdoc/>
     public bool HasBonus => this.Struct->IsBonus;
 

Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs

@@ -3,7 +3,6 @@ using Dalamud.Utility;
 
 using Lumina.Extensions;
 
-using ItemKind = Dalamud.Game.Text.SeStringHandling.Payloads.ItemPayload.ItemKind;
 using LSheets = Lumina.Excel.Sheets;
 
 namespace Dalamud.Game.Text.Evaluator.Internal;

Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs

@@ -72,33 +72,6 @@ public class ItemPayload : Payload
     {
     }
 
-    /// <summary>
-    /// Kinds of items that can be fetched from this payload.
-    /// </summary>
-    [Api13ToDo("Move this out of ItemPayload. It's used in other classes too.")]
-    public enum ItemKind : uint
-    {
-        /// <summary>
-        /// Normal items.
-        /// </summary>
-        Normal,
-
-        /// <summary>
-        /// Collectible Items.
-        /// </summary>
-        Collectible = 500_000,
-
-        /// <summary>
-        /// High-Quality items.
-        /// </summary>
-        Hq = 1_000_000,
-
-        /// <summary>
-        /// Event/Key items.
-        /// </summary>
-        EventItem = 2_000_000,
-    }
-
     /// <inheritdoc/>
     public override PayloadType Type => PayloadType.Item;
 

Dalamud/Game/Text/SeStringHandling/SeString.cs

@@ -181,7 +181,7 @@ public class SeString
     /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
     /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
     public static SeString CreateItemLink(uint itemId, bool isHq, string? displayNameOverride = null) =>
-        CreateItemLink(itemId, isHq ? ItemPayload.ItemKind.Hq : ItemPayload.ItemKind.Normal, displayNameOverride);
+        CreateItemLink(itemId, isHq ? ItemKind.Hq : ItemKind.Normal, displayNameOverride);
 
     /// <summary>
     /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
@@ -190,7 +190,7 @@ public class SeString
     /// <param name="kind">The kind of item to link.</param>
     /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
     /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-    public static SeString CreateItemLink(uint itemId, ItemPayload.ItemKind kind = ItemPayload.ItemKind.Normal, string? displayNameOverride = null)
+    public static SeString CreateItemLink(uint itemId, ItemKind kind = ItemKind.Normal, string? displayNameOverride = null)
     {
         var clientState = Service<ClientState.ClientState>.Get();
         var seStringEvaluator = Service<SeStringEvaluator>.Get();

Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using Dalamud.Game.Text.SeStringHandling.Payloads;
+using Dalamud.Utility;
 
 namespace Dalamud.Game.Text.SeStringHandling;
 
@@ -126,7 +127,7 @@ public class SeStringBuilder
     /// <param name="kind">Kind of item to encode.</param>
     /// <param name="itemNameOverride">Override for the item's name.</param>
     /// <returns>The current builder.</returns>
-    public SeStringBuilder AddItemLink(uint itemId, ItemPayload.ItemKind kind = ItemPayload.ItemKind.Normal, string? itemNameOverride = null) =>
+    public SeStringBuilder AddItemLink(uint itemId, ItemKind kind = ItemKind.Normal, string? itemNameOverride = null) =>
         this.Append(SeString.CreateItemLink(itemId, kind, itemNameOverride));
 
     /// <summary>

Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs

@@ -1,6 +1,6 @@
-using Dalamud.Game.Gui;
+using Dalamud.Game.Gui;
 using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
+using Dalamud.Utility;
 
 using ImGuiNET;
 
@@ -59,7 +59,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
                 this.currentSubStep++;
                 break;
             case SubStep.PrintHqItem:
-                toPrint = SeString.CreateItemLink(hqItemId, ItemPayload.ItemKind.Hq);
+                toPrint = SeString.CreateItemLink(hqItemId, ItemKind.Hq);
                 this.currentSubStep++;
                 break;
             case SubStep.HoverHqItem:
@@ -69,7 +69,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
                 this.currentSubStep++;
                 break;
             case SubStep.PrintCollectable:
-                toPrint = SeString.CreateItemLink(collectableItemId, ItemPayload.ItemKind.Collectible);
+                toPrint = SeString.CreateItemLink(collectableItemId, ItemKind.Collectible);
                 this.currentSubStep++;
                 break;
             case SubStep.HoverCollectable:
@@ -79,7 +79,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
                 this.currentSubStep++;
                 break;
             case SubStep.PrintEventItem:
-                toPrint = SeString.CreateItemLink(eventItemId, ItemPayload.ItemKind.EventItem);
+                toPrint = SeString.CreateItemLink(eventItemId, ItemKind.EventItem);
                 this.currentSubStep++;
                 break;
             case SubStep.HoverEventItem:

Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.cs

@@ -1,4 +1,4 @@
-using System.Buffers;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -120,19 +120,11 @@ internal sealed partial class FontAtlasFactory
     public IFontSpec DefaultFontSpec =>
         this.DefaultFontSpecOverride
         ?? Service<DalamudConfiguration>.Get().DefaultFontSpec
-#pragma warning disable CS0618 // Type or member is obsolete
+        ?? new SingleFontSpec()
-        ?? (Service<DalamudConfiguration>.Get().UseAxisFontsFromGame
+        {
-#pragma warning restore CS0618 // Type or member is obsolete
+            FontId = new GameFontAndFamilyId(GameFontFamily.Axis),
-                ? new()
+            SizePx = InterfaceManager.DefaultFontSizePx,
-                {
+        };
-                    FontId = new GameFontAndFamilyId(GameFontFamily.Axis),
-                    SizePx = InterfaceManager.DefaultFontSizePx,
-                }
-                : new SingleFontSpec
-                {
-                    FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansJpMedium),
-                    SizePx = InterfaceManager.DefaultFontSizePx + 1,
-                });
 
     /// <summary>
     /// Gets the service instance of <see cref="Framework"/>.

Dalamud/Plugin/Services/IAddonEventManager.cs

@@ -8,15 +8,6 @@ namespace Dalamud.Plugin.Services;
 /// </summary>
 public interface IAddonEventManager
 {
-    /// <summary>
-    /// Delegate to be called when an event is received.
-    /// </summary>
-    /// <param name="atkEventType">Event type for this event handler.</param>
-    /// <param name="atkUnitBase">The parent addon for this event handler.</param>
-    /// <param name="atkResNode">The specific node that will trigger this event handler.</param>
-    [Obsolete("Use AddonEventDelegate instead")]
-    public delegate void AddonEventHandler(AddonEventType atkEventType, nint atkUnitBase, nint atkResNode);
-
     /// <summary>
     /// Delegate to be called when an event is received.
     /// </summary>
@@ -24,17 +15,6 @@ public interface IAddonEventManager
     /// <param name="data">The event data object for use in handling this event.</param>
     public delegate void AddonEventDelegate(AddonEventType atkEventType, AddonEventData data);
 
-    /// <summary>
-    /// Registers an event handler for the specified addon, node, and type.
-    /// </summary>
-    /// <param name="atkUnitBase">The parent addon for this event.</param>
-    /// <param name="atkResNode">The node that will trigger this event.</param>
-    /// <param name="eventType">The event type for this event.</param>
-    /// <param name="eventHandler">The handler to call when event is triggered.</param>
-    /// <returns>IAddonEventHandle used to remove the event. Null if no event was added.</returns>
-    [Obsolete("Use AddEvent with AddonEventDelegate instead of AddonEventHandler")]
-    IAddonEventHandle? AddEvent(nint atkUnitBase, nint atkResNode, AddonEventType eventType, AddonEventHandler eventHandler);
-
     /// <summary>
     /// Registers an event handler for the specified addon, node, and type.
     /// </summary>

Dalamud/Utility/ItemUtil.cs

@@ -7,10 +7,34 @@ using Lumina.Excel.Sheets;
 using Lumina.Text;
 using Lumina.Text.ReadOnly;
 
-using static Dalamud.Game.Text.SeStringHandling.Payloads.ItemPayload;
-
 namespace Dalamud.Utility;
 
+/// <summary>
+/// Kinds of items that can be fetched from this payload.
+/// </summary>
+public enum ItemKind : uint
+{
+    /// <summary>
+    /// Normal items.
+    /// </summary>
+    Normal,
+
+    /// <summary>
+    /// Collectible Items.
+    /// </summary>
+    Collectible = 500_000,
+
+    /// <summary>
+    /// High-Quality items.
+    /// </summary>
+    Hq = 1_000_000,
+
+    /// <summary>
+    /// Event/Key items.
+    /// </summary>
+    EventItem = 2_000_000,
+}
+
 /// <summary>
 /// Utilities related to Items.
 /// </summary>

Dalamud/Utility/Util.cs

@@ -605,37 +605,6 @@ public static class Util
         NativeFunctions.FlashWindowEx(ref flashInfo);
     }
 
-    /// <summary>
-    /// Overwrite text in a file by first writing it to a temporary file, and then
-    /// moving that file to the path specified.
-    /// </summary>
-    /// <param name="path">The path of the file to write to.</param>
-    /// <param name="text">The text to write.</param>
-    [Api13ToDo("Remove.")]
-    [Obsolete("Replaced with FilesystemUtil.WriteAllTextSafe()")]
-    public static void WriteAllTextSafe(string path, string text) => FilesystemUtil.WriteAllTextSafe(path, text);
-
-    /// <summary>
-    /// Overwrite text in a file by first writing it to a temporary file, and then
-    /// moving that file to the path specified.
-    /// </summary>
-    /// <param name="path">The path of the file to write to.</param>
-    /// <param name="text">The text to write.</param>
-    /// <param name="encoding">Encoding to use.</param>
-    [Api13ToDo("Remove.")]
-    [Obsolete("Replaced with FilesystemUtil.WriteAllTextSafe()")]
-    public static void WriteAllTextSafe(string path, string text, Encoding encoding) => FilesystemUtil.WriteAllTextSafe(path, text, encoding);
-
-    /// <summary>
-    /// Overwrite data in a file by first writing it to a temporary file, and then
-    /// moving that file to the path specified.
-    /// </summary>
-    /// <param name="path">The path of the file to write to.</param>
-    /// <param name="bytes">The data to write.</param>
-    [Api13ToDo("Remove.")]
-    [Obsolete("Replaced with FilesystemUtil.WriteAllBytesSafe()")]
-    public static void WriteAllBytesSafe(string path, byte[] bytes) => FilesystemUtil.WriteAllBytesSafe(path, bytes);
-
     /// <summary>Gets a temporary file name, for use as the sourceFileName in
     /// <see cref="File.Replace(string,string,string?)"/>.</summary>
     /// <param name="targetFile">The target file.</param>