From 2f9363b9ccaa7dfcaae332152264826e61459a21 Mon Sep 17 00:00:00 2001 From: Kaz Wolfe Date: Mon, 4 Aug 2025 23:24:37 -0700 Subject: [PATCH] chore: clean up lumina obsoletes and warnings --- .../ClientState/Conditions/ConditionFlag.cs | 6 ++++++ .../Game/Text/Evaluator/SeStringParameter.cs | 1 + Dalamud/Game/Text/SeStringHandling/SeString.cs | 1 + Dalamud/Interface/UiBuilder.cs | 18 +++++++++--------- Dalamud/Memory/MemoryHelper.cs | 17 ++++++++--------- Dalamud/Utility/SeStringExtensions.cs | 1 + 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs index 316887e33..19451dd5c 100644 --- a/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs +++ b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs @@ -65,6 +65,9 @@ public enum ConditionFlag /// RidingPillion = 10, + /// + /// Unable to execute command while mounted. + /// [Obsolete("Renamed to RidingPillion", true)] Mounted2 = 10, @@ -430,6 +433,9 @@ public enum ConditionFlag /// MountImmobile = 88, + /// + /// Unable to execute command in this state. + /// [Obsolete("Renamed to MountImmobile", true)] InThisState88 = 88, diff --git a/Dalamud/Game/Text/Evaluator/SeStringParameter.cs b/Dalamud/Game/Text/Evaluator/SeStringParameter.cs index c1f238f56..7201179ea 100644 --- a/Dalamud/Game/Text/Evaluator/SeStringParameter.cs +++ b/Dalamud/Game/Text/Evaluator/SeStringParameter.cs @@ -71,6 +71,7 @@ public readonly struct SeStringParameter public static implicit operator SeStringParameter(ReadOnlySeStringSpan value) => new(new ReadOnlySeString(value)); + [Obsolete("Switch to using ReadOnlySeString instead of Lumina's SeString.", true)] public static implicit operator SeStringParameter(LSeString value) => new(new ReadOnlySeString(value.RawData)); public static implicit operator SeStringParameter(DSeString value) => new(new ReadOnlySeString(value.Encode())); diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs index a30ad9bbe..8805c2177 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -118,6 +118,7 @@ public class SeString /// /// string to convert. /// Equivalent SeString. + [Obsolete("Switch to using ReadOnlySeString instead of Lumina's SeString.", true)] public static explicit operator SeString(Lumina.Text.SeString str) => str.ToDalamudString(); /// diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs index b870e7a94..64b785f59 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -532,15 +532,6 @@ public sealed class UiBuilder : IDisposable, IUiBuilder /// public bool ShouldUseReducedMotion => Service.Get().ReduceMotions ?? false; - private void OnDefaultStyleChanged() - => this.DefaultStyleChanged.InvokeSafely(); - - private void OnDefaultGlobalScaleChanged() - => this.DefaultGlobalScaleChanged.InvokeSafely(); - - private void OnDefaultFontChanged() - => this.DefaultFontChanged.InvokeSafely(); - /// /// Gets or sets a value indicating whether statistics about UI draw time should be collected. /// @@ -550,6 +541,15 @@ public sealed class UiBuilder : IDisposable, IUiBuilder internal static bool DoStats { get; set; } = false; #endif + private void OnDefaultStyleChanged() + => this.DefaultStyleChanged.InvokeSafely(); + + private void OnDefaultGlobalScaleChanged() + => this.DefaultGlobalScaleChanged.InvokeSafely(); + + private void OnDefaultFontChanged() + => this.DefaultFontChanged.InvokeSafely(); + /// /// Gets a value indicating whether this UiBuilder has a configuration UI registered. /// diff --git a/Dalamud/Memory/MemoryHelper.cs b/Dalamud/Memory/MemoryHelper.cs index 0f557c3f6..2eae1be6d 100644 --- a/Dalamud/Memory/MemoryHelper.cs +++ b/Dalamud/Memory/MemoryHelper.cs @@ -8,13 +8,12 @@ using Dalamud.Memory.Exceptions; using Dalamud.Utility; using FFXIVClientStructs.FFXIV.Client.System.Memory; using FFXIVClientStructs.FFXIV.Client.System.String; +using Lumina.Text.Payloads; +using Lumina.Text.ReadOnly; using Microsoft.Extensions.ObjectPool; using Windows.Win32.Foundation; using Windows.Win32.System.Memory; -using LPayloadType = Lumina.Text.Payloads.PayloadType; -using LSeString = Lumina.Text.SeString; - // Heavily inspired from Reloaded (https://github.com/Reloaded-Project/Reloaded.Memory) namespace Dalamud.Memory; @@ -414,7 +413,7 @@ public static unsafe class MemoryHelper containsNonRepresentedPayload = false; while (*pin != 0 && maxLength > 0) { - if (*pin != LSeString.StartByte) + if (*pin != ReadOnlySeString.Stx) { var len = *pin switch { @@ -439,7 +438,7 @@ public static unsafe class MemoryHelper --maxLength; // Payload type - var payloadType = (LPayloadType)(*pin++); + var payloadType = (MacroCode)(*pin++); // Payload length if (!ReadIntExpression(ref pin, ref maxLength, out var expressionLength)) @@ -450,19 +449,19 @@ public static unsafe class MemoryHelper maxLength -= unchecked((int)expressionLength); // End byte - if (*pin++ != LSeString.EndByte) + if (*pin++ != ReadOnlySeString.Etx) break; --maxLength; switch (payloadType) { - case LPayloadType.NewLine: + case MacroCode.NewLine: sb.AppendLine(); break; - case LPayloadType.Hyphen: + case MacroCode.Hyphen: sb.Append('–'); break; - case LPayloadType.SoftHyphen: + case MacroCode.SoftHyphen: sb.Append('\u00AD'); break; default: diff --git a/Dalamud/Utility/SeStringExtensions.cs b/Dalamud/Utility/SeStringExtensions.cs index 904375250..cd095c467 100644 --- a/Dalamud/Utility/SeStringExtensions.cs +++ b/Dalamud/Utility/SeStringExtensions.cs @@ -24,6 +24,7 @@ public static class SeStringExtensions /// /// The original Lumina SeString. /// The re-parsed Dalamud SeString. + [Obsolete("Switch to using ReadOnlySeString instead of Lumina's SeString.", true)] public static DSeString ToDalamudString(this LSeString originalString) => DSeString.Parse(originalString.RawData); ///