From 6dfc18ee6a187138036ee2d51ba2257741c1e568 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 22 Sep 2024 23:02:22 +0200 Subject: [PATCH] Clean up --- Shop/IShopWindow.cs | 17 +++++++++++++++++ Shop/Model/ItemForSale.cs | 2 +- Shop/Model/PurchaseState.cs | 2 +- Shop/RegularShopBase.cs | 17 +++-------------- 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 Shop/IShopWindow.cs diff --git a/Shop/IShopWindow.cs b/Shop/IShopWindow.cs new file mode 100644 index 0000000..2fce493 --- /dev/null +++ b/Shop/IShopWindow.cs @@ -0,0 +1,17 @@ +using System.Numerics; +using FFXIVClientStructs.FFXIV.Component.GUI; + +namespace LLib.Shop; + +public interface IShopWindow +{ + public bool IsEnabled { get; } + public bool IsOpen { get; set; } + public Vector2? Position { get; set; } + + public int GetCurrencyCount(); + public unsafe void UpdateShopStock(AtkUnitBase* addon); + public unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow); + public void SaveExternalPluginState(); + public void RestoreExternalPluginState(); +} diff --git a/Shop/Model/ItemForSale.cs b/Shop/Model/ItemForSale.cs index 29da147..f650b11 100644 --- a/Shop/Model/ItemForSale.cs +++ b/Shop/Model/ItemForSale.cs @@ -1,4 +1,4 @@ -namespace Workshoppa.GameData.Shops; +namespace LLib.Shop.Model; public sealed class ItemForSale { diff --git a/Shop/Model/PurchaseState.cs b/Shop/Model/PurchaseState.cs index 43e2552..383d436 100644 --- a/Shop/Model/PurchaseState.cs +++ b/Shop/Model/PurchaseState.cs @@ -1,6 +1,6 @@ using System; -namespace Workshoppa.GameData.Shops; +namespace LLib.Shop.Model; public sealed class PurchaseState { diff --git a/Shop/RegularShopBase.cs b/Shop/RegularShopBase.cs index 8c73c05..dc3fee4 100644 --- a/Shop/RegularShopBase.cs +++ b/Shop/RegularShopBase.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics.CodeAnalysis; using System.Numerics; using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; @@ -6,23 +7,11 @@ using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Component.GUI; using LLib.GameUI; -using Workshoppa.GameData.Shops; +using LLib.Shop.Model; namespace LLib.Shop; -public interface IShopWindow -{ - public bool IsEnabled { get; } - public bool IsOpen { get; set; } - public Vector2? Position { get; set; } - - public int GetCurrencyCount(); - public unsafe void UpdateShopStock(AtkUnitBase* addon); - public unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow); - public void SaveExternalPluginState(); - public void RestoreExternalPluginState(); -} - +[SuppressMessage("ReSharper", "ClassCanBeSealed.Global")] public class RegularShopBase { private readonly IShopWindow _parentWindow;