From c0c61c66bece36e3df02af5e788d3bda88a3296b Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 24 Mar 2025 19:21:04 +0100 Subject: [PATCH] Fix warnings --- Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs | 9 ++++++--- .../Text/Evaluator/Internal/SheetRedirectResolver.cs | 3 ++- Dalamud/Utility/ItemUtil.cs | 8 +++----- Dalamud/Utility/Util.cs | 2 -- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs index 4c27ae83a..899ea78eb 100644 --- a/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs +++ b/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs @@ -22,6 +22,9 @@ public unsafe class SMNGauge : JobGaugeBase /// public ushort SummonTimerRemaining => this.Struct->SummonTimer; + /// + /// Gets the time remaining for the current attunement. + /// [Obsolete("Typo fixed. Use AttunementTimerRemaining instead.", true)] public ushort AttunmentTimerRemaining => this.AttunementTimerRemaining; @@ -102,19 +105,19 @@ public unsafe class SMNGauge : JobGaugeBase /// Gets a value indicating whether if Ifrit is currently attuned. /// /// true or false. - public bool IsIfritAttuned => this.AttunementType == SummonAttunement.IFRIT; + public bool IsIfritAttuned => this.AttunementType == SummonAttunement.Ifrit; /// /// Gets a value indicating whether if Titan is currently attuned. /// /// true or false. - public bool IsTitanAttuned => this.AttunementType == SummonAttunement.TITAN; + public bool IsTitanAttuned => this.AttunementType == SummonAttunement.Titan; /// /// Gets a value indicating whether if Garuda is currently attuned. /// /// true or false. - public bool IsGarudaAttuned => this.AttunementType == SummonAttunement.GARUDA; + public bool IsGarudaAttuned => this.AttunementType == SummonAttunement.Garuda; /// /// Gets a value indicating whether there are any Aetherflow stacks available. diff --git a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs index 57a58c80d..49af895d9 100644 --- a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs +++ b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs @@ -85,8 +85,9 @@ internal class SheetRedirectResolver : IServiceType { flags |= SheetRedirectFlags.HighQuality; } - else if (kind == ItemKind.Collectible || sheetName == "ItemMP") // MP for Masterpiece?! + else if (kind == ItemKind.Collectible || sheetName == "ItemMP") { + // MP for Masterpiece?! flags |= SheetRedirectFlags.Collectible; } diff --git a/Dalamud/Utility/ItemUtil.cs b/Dalamud/Utility/ItemUtil.cs index de1e5a721..32160aa15 100644 --- a/Dalamud/Utility/ItemUtil.cs +++ b/Dalamud/Utility/ItemUtil.cs @@ -2,14 +2,12 @@ using System.Runtime.CompilerServices; using Dalamud.Data; using Dalamud.Game; -using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text; - using Lumina.Excel.Sheets; +using Lumina.Text; using Lumina.Text.ReadOnly; using static Dalamud.Game.Text.SeStringHandling.Payloads.ItemPayload; -using Lumina.Text; namespace Dalamud.Utility; @@ -128,10 +126,10 @@ internal static class ItemUtil switch (kind) { - case ItemPayload.ItemKind.Hq: + case ItemKind.Hq: builder.Append($" {(char)SeIconChar.HighQuality}"); break; - case ItemPayload.ItemKind.Collectible: + case ItemKind.Collectible: builder.Append($" {(char)SeIconChar.Collectible}"); break; } diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs index 2fcc4806a..87cb86e1c 100644 --- a/Dalamud/Utility/Util.cs +++ b/Dalamud/Utility/Util.cs @@ -12,14 +12,12 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; -using Dalamud.Configuration.Internal; using Dalamud.Data; using Dalamud.Game; using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; -using Dalamud.Logging.Internal; using Dalamud.Interface.Utility.Raii; using Dalamud.Support; using ImGuiNET;