diff --git a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs index f851e7686..262e7ad21 100644 --- a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs +++ b/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; diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs index 25cdf7f9f..0c1f75a1d 100644 --- a/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs @@ -72,33 +72,6 @@ public class ItemPayload : Payload { } - /// - /// Kinds of items that can be fetched from this payload. - /// - [Api13ToDo("Move this out of ItemPayload. It's used in other classes too.")] - public enum ItemKind : uint - { - /// - /// Normal items. - /// - Normal, - - /// - /// Collectible Items. - /// - Collectible = 500_000, - - /// - /// High-Quality items. - /// - Hq = 1_000_000, - - /// - /// Event/Key items. - /// - EventItem = 2_000_000, - } - /// public override PayloadType Type => PayloadType.Item; diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs index b7618305a..a30ad9bbe 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -181,7 +181,7 @@ public class SeString /// An optional name override to display, instead of the actual item name. /// An SeString containing all the payloads necessary to display an item link in the chat log. 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); /// /// 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 /// The kind of item to link. /// An optional name override to display, instead of the actual item name. /// An SeString containing all the payloads necessary to display an item link in the chat log. - 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.Get(); var seStringEvaluator = Service.Get(); diff --git a/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs b/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs index d5080e6e8..ae673e516 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs +++ b/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 /// Kind of item to encode. /// Override for the item's name. /// The current builder. - 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)); /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs index 0988413b0..02bb7f8f0 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs +++ b/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: diff --git a/Dalamud/Utility/ItemUtil.cs b/Dalamud/Utility/ItemUtil.cs index 0b37a6abb..5f718bcee 100644 --- a/Dalamud/Utility/ItemUtil.cs +++ b/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; +/// +/// Kinds of items that can be fetched from this payload. +/// +public enum ItemKind : uint +{ + /// + /// Normal items. + /// + Normal, + + /// + /// Collectible Items. + /// + Collectible = 500_000, + + /// + /// High-Quality items. + /// + Hq = 1_000_000, + + /// + /// Event/Key items. + /// + EventItem = 2_000_000, +} + /// /// Utilities related to Items. ///