diff --git a/Dalamud/Game/Addon/Events/AddonEventEntry.cs b/Dalamud/Game/Addon/Events/AddonEventEntry.cs index b127d2b8e..8b5808087 100644 --- a/Dalamud/Game/Addon/Events/AddonEventEntry.cs +++ b/Dalamud/Game/Addon/Events/AddonEventEntry.cs @@ -20,7 +20,7 @@ internal unsafe class AddonEventEntry /// /// Gets the pointer to the addons AtkUnitBase. /// - required public nint Addon { get; init; } + public required nint Addon { get; init; } /// /// Gets the name of the addon this args referrers to. diff --git a/Dalamud/Game/Marketboard/MarketBoard.cs b/Dalamud/Game/Marketboard/MarketBoard.cs index 2223cc1a8..3642b86b8 100644 --- a/Dalamud/Game/Marketboard/MarketBoard.cs +++ b/Dalamud/Game/Marketboard/MarketBoard.cs @@ -1,16 +1,14 @@ -using Dalamud.IoC; +using Dalamud.Game.Network.Internal; +using Dalamud.Game.Network.Structures; +using Dalamud.IoC; using Dalamud.IoC.Internal; using Dalamud.Plugin.Services; namespace Dalamud.Game.MarketBoard; -using Network.Internal; -using Network.Structures; - /// -/// This class provides access to market board events +/// This class provides access to market board events. /// -[InterfaceVersion("1.0")] [ServiceManager.EarlyLoadedService] internal class MarketBoard : IInternalDisposableService, IMarketBoard { @@ -85,7 +83,6 @@ internal class MarketBoard : IInternalDisposableService, IMarketBoard /// Plugin scoped version of MarketBoard. /// [PluginInterface] -[InterfaceVersion("1.0")] [ServiceManager.ScopedService] #pragma warning disable SA1015 [ResolveVia] diff --git a/Dalamud/Game/Network/Internal/NetworkHandlers.cs b/Dalamud/Game/Network/Internal/NetworkHandlers.cs index 0d08b90d9..23bfe2db2 100644 --- a/Dalamud/Game/Network/Internal/NetworkHandlers.cs +++ b/Dalamud/Game/Network/Internal/NetworkHandlers.cs @@ -29,13 +29,6 @@ internal unsafe class NetworkHandlers : IInternalDisposableService { private readonly IMarketBoardUploader uploader; - private readonly IObservable mbPurchaseObservable; - private readonly IObservable mbHistoryObservable; - private readonly IObservable mbTaxesObservable; - private readonly IObservable mbItemRequestObservable; - private readonly IObservable mbOfferingsObservable; - private readonly IObservable mbPurchaseSentObservable; - private readonly IDisposable handleMarketBoardItemRequest; private readonly IDisposable handleMarketTaxRates; private readonly IDisposable handleMarketBoardPurchaseHandler; @@ -68,7 +61,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService this.CfPop = _ => { }; - this.mbPurchaseObservable = Observable.Create(observer => + this.MbPurchaseObservable = Observable.Create(observer => { this.MarketBoardPurchaseReceived += Observe; return () => { this.MarketBoardPurchaseReceived -= Observe; }; @@ -79,7 +72,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService } }); - this.mbHistoryObservable = Observable.Create(observer => + this.MbHistoryObservable = Observable.Create(observer => { this.MarketBoardHistoryReceived += Observe; return () => { this.MarketBoardHistoryReceived -= Observe; }; @@ -90,7 +83,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService } }); - this.mbTaxesObservable = Observable.Create(observer => + this.MbTaxesObservable = Observable.Create(observer => { this.MarketBoardTaxesReceived += Observe; return () => { this.MarketBoardTaxesReceived -= Observe; }; @@ -102,7 +95,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService } }); - this.mbItemRequestObservable = Observable.Create(observer => + this.MbItemRequestObservable = Observable.Create(observer => { this.MarketBoardItemRequestStartReceived += Observe; return () => this.MarketBoardItemRequestStartReceived -= Observe; @@ -113,7 +106,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService } }); - this.mbOfferingsObservable = Observable.Create(observer => + this.MbOfferingsObservable = Observable.Create(observer => { this.MarketBoardOfferingsReceived += Observe; return () => { this.MarketBoardOfferingsReceived -= Observe; }; @@ -124,7 +117,7 @@ internal unsafe class NetworkHandlers : IInternalDisposableService } }); - this.mbPurchaseSentObservable = Observable.Create(observer => + this.MbPurchaseSentObservable = Observable.Create(observer => { this.MarketBoardPurchaseRequestSent += Observe; return () => { this.MarketBoardPurchaseRequestSent -= Observe; }; @@ -209,17 +202,35 @@ internal unsafe class NetworkHandlers : IInternalDisposableService private event Action? MarketBoardPurchaseRequestSent; - public IObservable MbPurchaseObservable => this.mbPurchaseObservable; + /// + /// Gets an observable to track marketboard purchase events. + /// + public IObservable MbPurchaseObservable { get; } - public IObservable MbHistoryObservable => this.mbHistoryObservable; + /// + /// Gets an observable to track marketboard history events. + /// + public IObservable MbHistoryObservable { get; } - public IObservable MbTaxesObservable => this.mbTaxesObservable; + /// + /// Gets an observable to track marketboard tax events. + /// + public IObservable MbTaxesObservable { get; } - public IObservable MbItemRequestObservable => this.mbItemRequestObservable; + /// + /// Gets an observable to track marketboard item request events. + /// + public IObservable MbItemRequestObservable { get; } - public IObservable MbOfferingsObservable => this.mbOfferingsObservable; + /// + /// Gets an observable to track marketboard offerings events. + /// + public IObservable MbOfferingsObservable { get; } - public IObservable MbPurchaseSentObservable => this.mbPurchaseSentObservable; + /// + /// Gets an observable to track marketboard purchase request events. + /// + public IObservable MbPurchaseSentObservable { get; } /// /// Disposes of managed and unmanaged resources. diff --git a/Dalamud/Game/Network/Structures/IMarketBoardCurrentOfferings.cs b/Dalamud/Game/Network/Structures/IMarketBoardCurrentOfferings.cs new file mode 100644 index 000000000..bbb7fdd73 --- /dev/null +++ b/Dalamud/Game/Network/Structures/IMarketBoardCurrentOfferings.cs @@ -0,0 +1,131 @@ +using System.Collections.Generic; + +namespace Dalamud.Game.Network.Structures; + +/// +/// An interface that represents the current market board offerings. +/// +public interface IMarketBoardCurrentOfferings +{ + /// + /// Gets the list of individual item listings. + /// + IReadOnlyList ItemListings { get; } + + /// + /// Gets the listing end index. + /// + int ListingIndexEnd { get; } + + /// + /// Gets the listing start index. + /// + int ListingIndexStart { get; } + + /// + /// Gets the request ID. + /// + int RequestId { get; } +} + +/// +/// An interface that represents the current market board offering of a single item from the . +/// +public interface IMarketBoardItemListing +{ + /// + /// Gets the artisan ID. + /// + ulong ArtisanId { get; } + + /// + /// Gets the item ID. + /// + uint ItemId { get; } + + /// + /// Gets a value indicating whether the item is HQ. + /// + bool IsHq { get; } + + /// + /// Gets the item quantity. + /// + uint ItemQuantity { get; } + + /// + /// Gets the time this offering was last reviewed. + /// + DateTime LastReviewTime { get; } + + /// + /// Gets the listing ID. + /// + ulong ListingId { get; } + + /// + /// Gets the list of materia attached to this item. + /// + IReadOnlyList Materia { get; } + + /// + /// Gets the amount of attached materia. + /// + int MateriaCount { get; } + + /// + /// Gets a value indicating whether this item is on a mannequin. + /// + bool OnMannequin { get; } + + /// + /// Gets the player name. + /// + string PlayerName { get; } + + /// + /// Gets the price per unit. + /// + uint PricePerUnit { get; } + + /// + /// Gets the city ID of the retainer selling the item. + /// + int RetainerCityId { get; } + + /// + /// Gets the ID of the retainer selling the item. + /// + ulong RetainerId { get; } + + /// + /// Gets the name of the retainer. + /// + string RetainerName { get; } + + /// + /// Gets the stain or applied dye of the item. + /// + int StainId { get; } + + /// + /// Gets the total tax. + /// + uint TotalTax { get; } +} + +/// +/// An interface that represents the materia slotted to an . +/// +public interface IItemMateria +{ + /// + /// Gets the materia index. + /// + int Index { get; } + + /// + /// Gets the materia ID. + /// + int MateriaId { get; } +} diff --git a/Dalamud/Game/Network/Structures/IMarketBoardHistory.cs b/Dalamud/Game/Network/Structures/IMarketBoardHistory.cs new file mode 100644 index 000000000..650c68ca0 --- /dev/null +++ b/Dalamud/Game/Network/Structures/IMarketBoardHistory.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; + +namespace Dalamud.Game.Network.Structures; + +/// +/// An interface that represents the market board history from the game. +/// +public interface IMarketBoardHistory +{ + /// + /// Gets the item ID. + /// + uint ItemId { get; } + + /// + /// Gets the list of individual item history listings. + /// + IReadOnlyList HistoryListings { get; } +} + +/// +/// An interface that represents the market board history of a single item from . +/// +public interface IMarketBoardHistoryListing +{ + /// + /// Gets the buyer's name. + /// + string BuyerName { get; } + + /// + /// Gets a value indicating whether the item is HQ. + /// + bool IsHq { get; } + + /// + /// Gets a value indicating whether the item is on a mannequin. + /// + bool OnMannequin { get; } + + /// + /// Gets the time of purchase. + /// + DateTime PurchaseTime { get; } + + /// + /// Gets the quantity. + /// + uint Quantity { get; } + + /// + /// Gets the sale price. + /// + uint SalePrice { get; } +} diff --git a/Dalamud/Game/Network/Structures/IMarketBoardPurchase.cs b/Dalamud/Game/Network/Structures/IMarketBoardPurchase.cs new file mode 100644 index 000000000..cc12c3492 --- /dev/null +++ b/Dalamud/Game/Network/Structures/IMarketBoardPurchase.cs @@ -0,0 +1,18 @@ +namespace Dalamud.Game.Network.Structures; + +/// +/// An interface that represents market board purchase information. This message is received from the +/// server when a purchase is made at a market board. +/// +public interface IMarketBoardPurchase +{ + /// + /// Gets the item ID of the item that was purchased. + /// + uint CatalogId { get; } + + /// + /// Gets the quantity of the item that was purchased. + /// + uint ItemQuantity { get; } +} diff --git a/Dalamud/Game/Network/Structures/IMarketBoardPurchaseHandler.cs b/Dalamud/Game/Network/Structures/IMarketBoardPurchaseHandler.cs new file mode 100644 index 000000000..94994e27e --- /dev/null +++ b/Dalamud/Game/Network/Structures/IMarketBoardPurchaseHandler.cs @@ -0,0 +1,33 @@ +namespace Dalamud.Game.Network.Structures; + +/// +/// An interface that represents market board purchase information. This message is sent from the +/// client when a purchase is made at a market board. +/// +public interface IMarketBoardPurchaseHandler +{ + /// + /// Gets the object ID of the retainer associated with the sale. + /// + ulong RetainerId { get; } + + /// + /// Gets the object ID of the item listing. + /// + ulong ListingId { get; } + + /// + /// Gets the item ID of the item that was purchased. + /// + uint CatalogId { get; } + + /// + /// Gets the quantity of the item that was purchased. + /// + uint ItemQuantity { get; } + + /// + /// Gets the unit price of the item. + /// + uint PricePerUnit { get; } +} diff --git a/Dalamud/Game/Network/Structures/IMarketTaxRates.cs b/Dalamud/Game/Network/Structures/IMarketTaxRates.cs new file mode 100644 index 000000000..555b482ad --- /dev/null +++ b/Dalamud/Game/Network/Structures/IMarketTaxRates.cs @@ -0,0 +1,47 @@ +namespace Dalamud.Game.Network.Structures; + +/// +/// An interface that represents the tax rates received by the client when interacting with a retainer vocate. +/// +public interface IMarketTaxRates +{ + /// + /// Gets the category of this ResultDialog packet. + /// + uint Category { get; } + + /// + /// Gets the tax rate in Limsa Lominsa. + /// + uint LimsaLominsaTax { get; } + + /// + /// Gets the tax rate in Gridania. + /// + uint GridaniaTax { get; } + + /// + /// Gets the tax rate in Ul'dah. + /// + uint UldahTax { get; } + + /// + /// Gets the tax rate in Ishgard. + /// + uint IshgardTax { get; } + + /// + /// Gets the tax rate in Kugane. + /// + uint KuganeTax { get; } + + /// + /// Gets the tax rate in the Crystarium. + /// + uint CrystariumTax { get; } + + /// + /// Gets the tax rate in the Crystarium. + /// + uint SharlayanTax { get; } +} diff --git a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs index 324a00d65..18c59e4be 100644 --- a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs +++ b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs @@ -17,10 +17,7 @@ public class MarketBoardCurrentOfferings : IMarketBoardCurrentOfferings /// Gets the list of individual item listings. /// IReadOnlyList IMarketBoardCurrentOfferings.ItemListings => this.InternalItemListings; - - internal List InternalItemListings { get; set; } = new List(); - - + /// /// Gets the listing end index. /// @@ -35,6 +32,11 @@ public class MarketBoardCurrentOfferings : IMarketBoardCurrentOfferings /// Gets the request ID. /// public int RequestId { get; internal set; } + + /// + /// Gets or sets the internal read-write list of marketboard item listings. + /// + internal List InternalItemListings { get; set; } = []; /// /// Read a object from memory. @@ -236,132 +238,3 @@ public class MarketBoardCurrentOfferings : IMarketBoardCurrentOfferings } } } - -/// -/// An interface that represents the current market board offerings. -/// -public interface IMarketBoardCurrentOfferings -{ - /// - /// Gets the list of individual item listings. - /// - IReadOnlyList ItemListings { get; } - - /// - /// Gets the listing end index. - /// - int ListingIndexEnd { get; } - - /// - /// Gets the listing start index. - /// - int ListingIndexStart { get; } - - /// - /// Gets the request ID. - /// - int RequestId { get; } -} - -/// -/// An interface that represents the current market board offering of a single item from the . -/// -public interface IMarketBoardItemListing -{ - /// - /// Gets the artisan ID. - /// - ulong ArtisanId { get; } - - /// - /// Gets the item ID. - /// - uint ItemId { get; } - - /// - /// Gets a value indicating whether the item is HQ. - /// - bool IsHq { get; } - - /// - /// Gets the item quantity. - /// - uint ItemQuantity { get; } - - /// - /// Gets the time this offering was last reviewed. - /// - DateTime LastReviewTime { get; } - - /// - /// Gets the listing ID. - /// - ulong ListingId { get; } - - /// - /// Gets the list of materia attached to this item. - /// - IReadOnlyList Materia { get; } - - /// - /// Gets the amount of attached materia. - /// - int MateriaCount { get; } - - /// - /// Gets a value indicating whether this item is on a mannequin. - /// - bool OnMannequin { get; } - - /// - /// Gets the player name. - /// - string PlayerName { get; } - - /// - /// Gets the price per unit. - /// - uint PricePerUnit { get; } - - /// - /// Gets the city ID of the retainer selling the item. - /// - int RetainerCityId { get; } - - /// - /// Gets the ID of the retainer selling the item. - /// - ulong RetainerId { get; } - - /// - /// Gets the name of the retainer. - /// - string RetainerName { get; } - - /// - /// Gets the stain or applied dye of the item. - /// - int StainId { get; } - - /// - /// Gets the total tax. - /// - uint TotalTax { get; } -} - -/// -/// An interface that represents the materia slotted to an . -/// -public interface IItemMateria -{ - /// - /// Gets the materia index. - /// - int Index { get; } - - /// - /// Gets the materia ID. - /// - int MateriaId { get; } -} - diff --git a/Dalamud/Game/Network/Structures/MarketBoardHistory.cs b/Dalamud/Game/Network/Structures/MarketBoardHistory.cs index fd1011bca..354d83c60 100644 --- a/Dalamud/Game/Network/Structures/MarketBoardHistory.cs +++ b/Dalamud/Game/Network/Structures/MarketBoardHistory.cs @@ -26,6 +26,9 @@ public class MarketBoardHistory : IMarketBoardHistory /// public uint CatalogId2 { get; private set; } + /// + /// Gets the ID (for EXD) for the item being sold. + /// public uint ItemId => this.CatalogId; /// @@ -136,55 +139,3 @@ public class MarketBoardHistory : IMarketBoardHistory public uint SalePrice { get; internal set; } } } - -/// -/// An interface that represents the market board history from the game. -/// -public interface IMarketBoardHistory -{ - /// - /// Gets the item ID. - /// - uint ItemId { get; } - - /// - /// Gets the list of individual item history listings. - /// - IReadOnlyList HistoryListings { get; } -} - -/// -/// An interface that represents the market board history of a single item from . -/// -public interface IMarketBoardHistoryListing -{ - /// - /// Gets the buyer's name. - /// - string BuyerName { get; } - - /// - /// Gets a value indicating whether the item is HQ. - /// - bool IsHq { get; } - - /// - /// Gets a value indicating whether the item is on a mannequin. - /// - bool OnMannequin { get; } - - /// - /// Gets the time of purchase. - /// - DateTime PurchaseTime { get; } - - /// - /// Gets the quantity. - /// - uint Quantity { get; } - - /// - /// Gets the sale price. - /// - uint SalePrice { get; } -} diff --git a/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs b/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs index 4221188e4..f432f00e2 100644 --- a/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs +++ b/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs @@ -41,20 +41,3 @@ public class MarketBoardPurchase : IMarketBoardPurchase return output; } } - -/// -/// An interface that represents market board purchase information. This message is received from the -/// server when a purchase is made at a market board. -/// -public interface IMarketBoardPurchase -{ - /// - /// Gets the item ID of the item that was purchased. - /// - uint CatalogId { get; } - - /// - /// Gets the quantity of the item that was purchased. - /// - uint ItemQuantity { get; } -} diff --git a/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs b/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs index 3fadc70b5..3f9f36ce9 100644 --- a/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs +++ b/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs @@ -59,35 +59,3 @@ public class MarketBoardPurchaseHandler : IMarketBoardPurchaseHandler return output; } } - -/// -/// An interface that represents market board purchase information. This message is sent from the -/// client when a purchase is made at a market board. -/// -public interface IMarketBoardPurchaseHandler -{ - /// - /// Gets the object ID of the retainer associated with the sale. - /// - ulong RetainerId { get; } - - /// - /// Gets the object ID of the item listing. - /// - ulong ListingId { get; } - - /// - /// Gets the item ID of the item that was purchased. - /// - uint CatalogId { get; } - - /// - /// Gets the quantity of the item that was purchased. - /// - uint ItemQuantity { get; } - - /// - /// Gets the unit price of the item. - /// - uint PricePerUnit { get; } -} diff --git a/Dalamud/Game/Network/Structures/MarketTaxRates.cs b/Dalamud/Game/Network/Structures/MarketTaxRates.cs index d5802f106..00c3c1582 100644 --- a/Dalamud/Game/Network/Structures/MarketTaxRates.cs +++ b/Dalamud/Game/Network/Structures/MarketTaxRates.cs @@ -100,49 +100,3 @@ public class MarketTaxRates : IMarketTaxRates }; } } - -/// -/// An interface that represents the tax rates received by the client when interacting with a retainer vocate. -/// -public interface IMarketTaxRates -{ - /// - /// Gets the category of this ResultDialog packet. - /// - uint Category { get; } - - /// - /// Gets the tax rate in Limsa Lominsa. - /// - uint LimsaLominsaTax { get; } - - /// - /// Gets the tax rate in Gridania. - /// - uint GridaniaTax { get; } - - /// - /// Gets the tax rate in Ul'dah. - /// - uint UldahTax { get; } - - /// - /// Gets the tax rate in Ishgard. - /// - uint IshgardTax { get; } - - /// - /// Gets the tax rate in Kugane. - /// - uint KuganeTax { get; } - - /// - /// Gets the tax rate in the Crystarium. - /// - uint CrystariumTax { get; } - - /// - /// Gets the tax rate in the Crystarium. - /// - uint SharlayanTax { get; } -} diff --git a/Dalamud/Interface/ColorHelpers.cs b/Dalamud/Interface/ColorHelpers.cs index fe4c19329..318805529 100644 --- a/Dalamud/Interface/ColorHelpers.cs +++ b/Dalamud/Interface/ColorHelpers.cs @@ -152,7 +152,7 @@ public static class ColorHelpers /// /// Performs a swap of endianness /// Exmaple: - /// (FFXIV) RGBA to ABGR (ImGui) + /// (FFXIV) RGBA to ABGR (ImGui). /// /// Color value in byte order X Y Z W. /// Endian swapped color value with new byte order W Z Y X. diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs index 73d7c7e84..98d4c29e3 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs @@ -1,17 +1,14 @@ using System.Collections.Concurrent; +using System.Globalization; +using Dalamud.Game.MarketBoard; +using Dalamud.Game.Network.Structures; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using ImGuiNET; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; -using System.Globalization; - -using Game.MarketBoard; -using Game.Network.Structures; - /// /// Widget to display market board events. /// diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs index 322c0fa9c..95315dbd3 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs @@ -8,6 +8,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Components; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; +using Dalamud.Interface.Internal.DesignSystem; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Internal; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs index 97768e3c8..78d43662c 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs @@ -1,15 +1,14 @@ -namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps; - -using System.Globalization; +using System.Globalization; using System.Linq; -using Game.MarketBoard; -using Game.Network.Structures; - +using Dalamud.Game.MarketBoard; +using Dalamud.Game.Network.Structures; using ImGuiNET; +namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps; + /// -/// Tests the various market board events +/// Tests the various market board events. /// internal class MarketBoardAgingStep : IAgingStep { @@ -182,6 +181,7 @@ internal class MarketBoardAgingStep : IAgingStep return SelfTestStepResult.Fail; } } + break; case SubStep.Done: return SelfTestStepResult.Pass; diff --git a/Dalamud/Interface/Textures/GameIconLookup.cs b/Dalamud/Interface/Textures/GameIconLookup.cs index ccc999d56..db26b3142 100644 --- a/Dalamud/Interface/Textures/GameIconLookup.cs +++ b/Dalamud/Interface/Textures/GameIconLookup.cs @@ -5,7 +5,7 @@ namespace Dalamud.Interface.Textures; /// Represents a lookup for a game icon. public readonly record struct GameIconLookup { - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// The icon ID. /// Whether the HQ icon is requested, where HQ is in the context of items. /// Whether the high-resolution icon is requested. @@ -17,11 +17,7 @@ public readonly record struct GameIconLookup this.HiRes = hiRes; this.Language = language; } - - public static implicit operator GameIconLookup(int iconId) => new(checked((uint)iconId)); - - public static implicit operator GameIconLookup(uint iconId) => new(iconId); - + /// Gets the icon ID. public uint IconId { get; init; } @@ -39,6 +35,10 @@ public readonly record struct GameIconLookup /// public ClientLanguage? Language { get; init; } + public static implicit operator GameIconLookup(int iconId) => new(checked((uint)iconId)); + + public static implicit operator GameIconLookup(uint iconId) => new(iconId); + /// public override string ToString() { diff --git a/Dalamud/Interface/Textures/RawImageSpecification.cs b/Dalamud/Interface/Textures/RawImageSpecification.cs index 6f31cbbf7..478d28dc2 100644 --- a/Dalamud/Interface/Textures/RawImageSpecification.cs +++ b/Dalamud/Interface/Textures/RawImageSpecification.cs @@ -7,7 +7,7 @@ public record struct RawImageSpecification { private const string FormatNotSupportedMessage = $"{nameof(DxgiFormat)} is not supported."; - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// The width of the raw image. /// The height of the raw image. /// The DXGI format of the raw image. @@ -31,14 +31,14 @@ public record struct RawImageSpecification this.DxgiFormat = dxgiFormat; } - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// The source texture description. internal RawImageSpecification(in D3D11_TEXTURE2D_DESC desc) : this((int)desc.Width, (int)desc.Height, (int)desc.Format) { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the struct. /// The source texture description. /// The pitch of the raw image in bytes. internal RawImageSpecification(in D3D11_TEXTURE2D_DESC desc, uint pitch) diff --git a/Dalamud/IoC/Internal/ServiceContainer.cs b/Dalamud/IoC/Internal/ServiceContainer.cs index 493ac5942..673dba29b 100644 --- a/Dalamud/IoC/Internal/ServiceContainer.cs +++ b/Dalamud/IoC/Internal/ServiceContainer.cs @@ -135,7 +135,6 @@ internal class ServiceContainer : IServiceProvider, IServiceType /// /// Inject interfaces into public or static properties on the provided object. /// The properties have to be marked with the . - /// The properties can be marked with the to lock down versions. /// /// The object instance. /// Scoped objects to be injected. diff --git a/Dalamud/IoC/Internal/ServiceScope.cs b/Dalamud/IoC/Internal/ServiceScope.cs index 759819fe9..c21e73f34 100644 --- a/Dalamud/IoC/Internal/ServiceScope.cs +++ b/Dalamud/IoC/Internal/ServiceScope.cs @@ -27,7 +27,6 @@ internal interface IServiceScope : IDisposable /// /// Inject interfaces into public or static properties on the provided object. /// The properties have to be marked with the . - /// The properties can be marked with the to lock down versions. /// /// The object instance. /// Scoped objects to be injected. diff --git a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs index 4e2179be8..04b1aa48d 100644 --- a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs +++ b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs @@ -14,7 +14,6 @@ using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; using Dalamud.Interface.Internal; using Dalamud.Interface.Internal.DesignSystem; -using Dalamud.Interface.Internal.Notifications; using Dalamud.Interface.Utility; using Dalamud.Logging.Internal; using Dalamud.Plugin.Internal.Types; diff --git a/Dalamud/Plugin/Services/IMarketBoard.cs b/Dalamud/Plugin/Services/IMarketBoard.cs index 9126dfcc7..3fded6987 100644 --- a/Dalamud/Plugin/Services/IMarketBoard.cs +++ b/Dalamud/Plugin/Services/IMarketBoard.cs @@ -1,6 +1,6 @@ -namespace Dalamud.Plugin.Services; +using Dalamud.Game.Network.Structures; -using Game.Network.Structures; +namespace Dalamud.Plugin.Services; /// /// Provides access to market board related events as the client receives/sends them.