API 11

LLib

@@ -1 +1 @@
-Subproject commit 93fac6efb01a1272192d929fd863328271512ea4
+Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c

Workshoppa/GameData/GameStrings.cs

@@ -4,8 +4,8 @@ using System.Text.RegularExpressions;
 using Dalamud.Plugin.Services;
 using LLib;
 using Lumina.Excel;
-using Lumina.Excel.CustomSheets;
+using Lumina.Excel.Sheets;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Text.ReadOnly;
 
 namespace Workshoppa.GameData;
 
@@ -38,7 +38,16 @@ internal sealed class GameStrings
 
     [Sheet("custom/001/CmnDefCompanyManufactory_00150")]
     [SuppressMessage("Performance", "CA1812")]
-    private sealed class WorkshopDialogue : QuestDialogueText
+    private readonly struct WorkshopDialogue(ExcelPage page, uint offset, uint row)
+        : IQuestDialogueText, IExcelRow<WorkshopDialogue>
     {
+        public uint RowId => row;
+
+        public ReadOnlySeString Key => page.ReadString(offset, offset);
+        public ReadOnlySeString Value => page.ReadString(offset + 4, offset);
+
+        static WorkshopDialogue IExcelRow<WorkshopDialogue>.Create(ExcelPage page, uint offset,
+            uint row) =>
+            new(page, offset, row);
     }
 }

Workshoppa/GameData/RecipeTree.cs

@@ -2,18 +2,20 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Workshoppa.GameData;
 
 internal sealed class RecipeTree
 {
     private readonly IDataManager _dataManager;
+    private readonly IPluginLog _pluginLog;
     private readonly IReadOnlyList<uint> _shopItemsOnly;
 
-    public RecipeTree(IDataManager dataManager)
+    public RecipeTree(IDataManager dataManager, IPluginLog pluginLog)
     {
         _dataManager = dataManager;
+        _pluginLog = pluginLog;
 
         // probably incomplete, e.g. different housing districts have different shop types
         var shopVendorIds = new uint[]
@@ -29,9 +31,10 @@ internal sealed class RecipeTree
             262211, // Z'ranmaia, upper decks
         };
 
-        _shopItemsOnly = _dataManager.GetExcelSheet<GilShopItem>()!
+        _shopItemsOnly = _dataManager.GetSubrowExcelSheet<GilShopItem>()
+            .Flatten()
             .Where(x => shopVendorIds.Contains(x.RowId))
-            .Select(x => x.Item.Row)
+            .Select(x => x.Item.RowId)
             .Where(x => x > 0)
             .Distinct()
             .ToList()
@@ -62,6 +65,9 @@ internal sealed class RecipeTree
                 AmountCrafted = x.First().AmountCrafted,
             })
             .ToList();
+        _pluginLog.Verbose("Complete craft list:");
+        foreach (var item in completeList)
+            _pluginLog.Verbose($"  {item.TotalQuantity}x {item.Name}");
 
         // if a recipe has a specific amount crafted, divide the gathered amount by it
         foreach (var ingredient in completeList.Where(x => x is { AmountCrafted: > 1 }))
@@ -84,11 +90,18 @@ internal sealed class RecipeTree
         List<RecipeInfo> sortedList = new List<RecipeInfo>();
         while (sortedList.Count < completeList.Count)
         {
+            _pluginLog.Verbose("Sort round");
             var canBeCrafted = completeList.Where(x =>
                     !sortedList.Contains(x) && x.DependsOn.All(y => sortedList.Any(z => y == z.ItemId)))
                 .ToList();
+            foreach (var item in canBeCrafted)
+                _pluginLog.Verbose($"  can craft: {item.TotalQuantity}x {item.Name}");
             if (canBeCrafted.Count == 0)
+            {
+                foreach (var item in completeList.Where(x => !sortedList.Contains(x)))
+                    _pluginLog.Warning($"  can't craft: {item.TotalQuantity}x {item.Name} → ({string.Join(", ", item.DependsOn.Where(y => sortedList.All(z => y != z.ItemId)))})");
                 throw new InvalidOperationException("Unable to sort items");
+            }
 
             sortedList.AddRange(canBeCrafted.OrderBy(x => x.Name));
         }
@@ -107,33 +120,34 @@ internal sealed class RecipeTree
             if (recipe == null)
                 continue;
 
-            foreach (var ingredient in recipe.UnkData5.Take(8))
+            for (int i = 0; i < 8; ++ i)
             {
-                if (ingredient == null || ingredient.ItemIngredient == 0)
+                var ingredient = recipe.Value.Ingredient[i];
+                if (!ingredient.IsValid || ingredient.RowId == 0)
                     continue;
 
-                Item? item = _dataManager.GetExcelSheet<Item>()!.GetRow((uint)ingredient.ItemIngredient);
+                Item item = ingredient.Value;
-                if (item == null)
+                if (!IsValidItem(item.RowId))
                     continue;
 
-                Recipe? ingredientRecipe = GetFirstRecipeForItem((uint)ingredient.ItemIngredient);
+                Recipe? ingredientRecipe = GetFirstRecipeForItem(ingredient.RowId);
 
                 //_pluginLog.Information($"Adding {item.Name}");
                 ingredients.Add(new RecipeInfo
                 {
-                    ItemId = (uint)ingredient.ItemIngredient,
+                    ItemId = ingredient.RowId,
-                    Name = item.Name,
+                    Name = item.Name.ToString(),
-                    TotalQuantity = material.TotalQuantity * ingredient.AmountIngredient,
+                    TotalQuantity = material.TotalQuantity * recipe.Value.AmountIngredient[i],
                     Type =
-                        _shopItemsOnly.Contains((uint)ingredient.ItemIngredient) ? Ingredient.EType.ShopItem :
+                        _shopItemsOnly.Contains(ingredient.RowId) ? Ingredient.EType.ShopItem :
                         ingredientRecipe != null ? Ingredient.EType.Craftable :
-                        GetGatheringItem((uint)ingredient.ItemIngredient) != null ? Ingredient.EType.Gatherable :
+                        GetGatheringItem(ingredient.RowId) != null ? Ingredient.EType.Gatherable :
-                        GetVentureItem((uint)ingredient.ItemIngredient) != null ? Ingredient.EType.Gatherable :
+                        GetVentureItem(ingredient.RowId) != null ? Ingredient.EType.Gatherable :
                         Ingredient.EType.Other,
 
                     AmountCrafted = ingredientRecipe?.AmountResult ?? 1,
-                    DependsOn = ingredientRecipe?.UnkData5.Take(8).Where(x => x != null && x.ItemIngredient != 0)
+                    DependsOn = ingredientRecipe?.Ingredient.Where(x => x.IsValid && IsValidItem(x.RowId))
-                                    .Select(x => (uint)x.ItemIngredient)
+                                    .Select(x => x.RowId)
                                     .ToList()
                                 ?? new(),
                 });
@@ -157,9 +171,9 @@ internal sealed class RecipeTree
                 Name = x.Ingredient.Name,
                 TotalQuantity = x.Ingredient.TotalQuantity,
                 Type = _shopItemsOnly.Contains(x.Ingredient.ItemId) ? Ingredient.EType.ShopItem : x.Ingredient.Type,
-                AmountCrafted = x.Recipe!.AmountResult,
+                AmountCrafted = x.Recipe!.Value.AmountResult,
-                DependsOn = x.Recipe.UnkData5.Take(8).Where(y => y != null && y.ItemIngredient != 0)
+                DependsOn = x.Recipe.Value.Ingredient.Where(y => y.IsValid && IsValidItem(y.RowId))
-                    .Select(y => (uint)y.ItemIngredient)
+                    .Select(y => y.RowId)
                     .ToList(),
             })
             .ToList();
@@ -167,18 +181,23 @@ internal sealed class RecipeTree
 
     private Recipe? GetFirstRecipeForItem(uint itemId)
     {
-        return _dataManager.GetExcelSheet<Recipe>()!.FirstOrDefault(x => x.RowId > 0 && x.ItemResult.Row == itemId);
+        return _dataManager.GetExcelSheet<Recipe>().FirstOrDefault(x => x.RowId > 0 && x.ItemResult.RowId == itemId);
     }
 
     private GatheringItem? GetGatheringItem(uint itemId)
     {
-        return _dataManager.GetExcelSheet<GatheringItem>()!.FirstOrDefault(x => x.RowId > 0 && (uint)x.Item == itemId);
+        return _dataManager.GetExcelSheet<GatheringItem>().FirstOrDefault(x => x.RowId > 0 && x.Item.RowId == itemId);
     }
 
     private RetainerTaskNormal? GetVentureItem(uint itemId)
     {
-        return _dataManager.GetExcelSheet<RetainerTaskNormal>()!
+        return _dataManager.GetExcelSheet<RetainerTaskNormal>()
-            .FirstOrDefault(x => x.RowId > 0 && x.Item.Row == itemId);
+            .FirstOrDefault(x => x.RowId > 0 && x.Item.RowId == itemId);
+    }
+
+    private static bool IsValidItem(uint itemId)
+    {
+        return itemId > 19 && itemId != uint.MaxValue;
     }
 
     private sealed class RecipeInfo : Ingredient

Workshoppa/GameData/Shops/ItemForSale.cs

@@ -1,10 +0,0 @@
-namespace Workshoppa.GameData.Shops;
-
-internal sealed class ItemForSale
-{
-    public required int Position { get; init; }
-    public required uint ItemId { get; init; }
-    public required string? ItemName { get; init; }
-    public required uint Price { get; init; }
-    public required uint OwnedItems { get; init; }
-}

Workshoppa/GameData/Shops/PurchaseState.cs

@@ -1,19 +0,0 @@
-using System;
-
-namespace Workshoppa.GameData.Shops;
-
-internal sealed class PurchaseState
-{
-    public PurchaseState(int desiredItems, int ownedItems)
-    {
-        DesiredItems = desiredItems;
-        OwnedItems = ownedItems;
-    }
-
-    public int DesiredItems { get; }
-    public int OwnedItems { get; set; }
-    public int ItemsLeftToBuy => Math.Max(0, DesiredItems - OwnedItems);
-    public bool IsComplete => ItemsLeftToBuy == 0;
-    public bool IsAwaitingYesNo { get; set; }
-    public DateTime NextStep { get; set; } = DateTime.MinValue;
-}

Workshoppa/GameData/WorkshopCache.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Workshoppa.GameData;
 
@@ -15,41 +16,45 @@ internal sealed class WorkshopCache
         {
             try
             {
-                Dictionary<ushort, Item> itemMapping = dataManager.GetExcelSheet<CompanyCraftSupplyItem>()!
+                Dictionary<uint, Item> itemMapping = dataManager.GetExcelSheet<CompanyCraftSupplyItem>()
                     .Where(x => x.RowId > 0)
-                    .ToDictionary(x => (ushort)x.RowId, x => x.Item.Value!);
+                    .ToDictionary(x => x.RowId, x => x.Item.Value);
 
-                Crafts = dataManager.GetExcelSheet<CompanyCraftSequence>()!
+                Crafts = dataManager.GetExcelSheet<CompanyCraftSequence>()
                     .Where(x => x.RowId > 0)
                     .Select(x => new WorkshopCraft
                     {
                         WorkshopItemId = x.RowId,
-                        ResultItem = x.ResultItem.Row,
+                        ResultItem = x.ResultItem.RowId,
-                        Name = x.ResultItem.Value!.Name.ToString(),
+                        Name = x.ResultItem.Value.Name.ToString(),
-                        IconId = x.ResultItem.Value!.Icon,
+                        IconId = x.ResultItem.Value.Icon,
-                        Category = (WorkshopCraftCategory)x.CompanyCraftDraftCategory.Row,
+                        Category = (WorkshopCraftCategory)x.CompanyCraftDraftCategory.RowId,
-                        Type = x.CompanyCraftType.Row,
+                        Type = x.CompanyCraftType.RowId,
-                        Phases = x.CompanyCraftPart.Where(part => part.Row != 0)
+                        Phases = x.CompanyCraftPart.Where(part => part.RowId != 0)
                             .SelectMany(part =>
-                                part.Value!.CompanyCraftProcess
+                                part.Value.CompanyCraftProcess
-                                    .Where(y => y.Value!.UnkData0.Any(z => z.SupplyItem > 0))
+                                    .Select(y => new WorkshopCraftPhase
-                                    .Select(y => (Type: part.Value!.CompanyCraftType.Value, Process: y)))
-                            .Select(y => new WorkshopCraftPhase
-                            {
-                                Name = y.Type!.Name.ToString(),
-                                Items = y.Process.Value!.UnkData0
-                                    .Where(item => item.SupplyItem > 0)
-                                    .Select(item => new WorkshopCraftItem
                                     {
-                                        ItemId = itemMapping[item.SupplyItem].RowId,
+                                        Name = part.Value.CompanyCraftType.Value.Name.ToString(),
-                                        Name = itemMapping[item.SupplyItem].Name.ToString(),
+                                        Items = Enumerable.Range(0, y.Value.SupplyItem.Count)
-                                        IconId = itemMapping[item.SupplyItem].Icon,
+                                            .Select(i => new
-                                        SetQuantity = item.SetQuantity,
+                                            {
-                                        SetsRequired = item.SetsRequired,
+                                                SupplyItem = y.Value.SupplyItem[i],
-                                    })
+                                                SetsRequired = y.Value.SetsRequired[i],
-                                    .ToList()
+                                                SetQuantity = y.Value.SetQuantity[i],
-                                    .AsReadOnly(),
+                                            })
-                            })
+                                            .Where(item => item.SupplyItem.RowId > 0)
+                                            .Select(item => new WorkshopCraftItem
+                                            {
+                                                ItemId = itemMapping[item.SupplyItem.RowId].RowId,
+                                                Name = itemMapping[item.SupplyItem.RowId].Name.ToString(),
+                                                IconId = itemMapping[item.SupplyItem.RowId].Icon,
+                                                SetQuantity = item.SetQuantity,
+                                                SetsRequired = item.SetsRequired,
+                                            })
+                                            .ToList()
+                                            .AsReadOnly(),
+                                    }))
                             .ToList()
                             .AsReadOnly(),
                     })

Workshoppa/Windows/CeruleumTankWindow.cs

@@ -5,10 +5,9 @@ using Dalamud.Interface.Components;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using ImGuiNET;
-using LLib;
 using LLib.GameUI;
+using LLib.Shop.Model;
 using Workshoppa.External;
-using Workshoppa.GameData.Shops;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
 namespace Workshoppa.Windows;
@@ -17,7 +16,6 @@ internal sealed class CeruleumTankWindow : ShopWindow
 {
     private const int CeruleumTankItemId = 10155;
 
-    private readonly WorkshopPlugin _plugin;
     private readonly IPluginLog _pluginLog;
     private readonly Configuration _configuration;
     private readonly IChatGui _chatGui;
@@ -26,28 +24,31 @@ internal sealed class CeruleumTankWindow : ShopWindow
     private int _buyStackCount;
     private bool _buyPartialStacks = true;
 
-    public CeruleumTankWindow(WorkshopPlugin plugin, IPluginLog pluginLog, IGameGui gameGui,
+    public CeruleumTankWindow(
-        IAddonLifecycle addonLifecycle, Configuration configuration, ExternalPluginHandler externalPluginHandler,
+        IPluginLog pluginLog,
+        IGameGui gameGui,
+        IAddonLifecycle addonLifecycle,
+        Configuration configuration,
+        ExternalPluginHandler externalPluginHandler,
         IChatGui chatGui)
-        : base("Ceruleum Tanks###WorkshoppaCeruleumTankWindow", "FreeCompanyCreditShop", plugin, pluginLog, gameGui,
+        : base("Ceruleum Tanks###WorkshoppaCeruleumTankWindow", "FreeCompanyCreditShop", pluginLog, gameGui,
             addonLifecycle, externalPluginHandler)
     {
-        _plugin = plugin;
         _pluginLog = pluginLog;
         _chatGui = chatGui;
         _configuration = configuration;
     }
 
-    protected override bool Enabled => _configuration.EnableCeruleumTankCalculator;
+    public override bool IsEnabled => _configuration.EnableCeruleumTankCalculator;
 
-    protected override unsafe void UpdateShopStock(AtkUnitBase* addon)
+    public override unsafe void UpdateShopStock(AtkUnitBase* addon)
     {
         if (addon->AtkValuesCount != 170)
         {
             _pluginLog.Error(
                 $"Unexpected amount of atkvalues for FreeCompanyCreditShop addon ({addon->AtkValuesCount})");
             _companyCredits = 0;
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
@@ -57,11 +58,11 @@ internal sealed class CeruleumTankWindow : ShopWindow
         uint itemCount = atkValues[9].UInt;
         if (itemCount == 0)
         {
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
-        ItemForSale = Enumerable.Range(0, (int)itemCount)
+        Shop.ItemForSale = Enumerable.Range(0, (int)itemCount)
             .Select(i => new ItemForSale
             {
                 Position = i,
@@ -73,18 +74,18 @@ internal sealed class CeruleumTankWindow : ShopWindow
             .FirstOrDefault(x => x.ItemId == CeruleumTankItemId);
     }
 
-    protected override int GetCurrencyCount() => _companyCredits;
+    public override int GetCurrencyCount() => _companyCredits;
 
     public override void Draw()
     {
-        if (ItemForSale == null)
+        if (Shop.ItemForSale == null)
         {
             IsOpen = false;
             return;
         }
 
-        int ceruleumTanks = GetItemCount(CeruleumTankItemId);
+        int ceruleumTanks = Shop.GetItemCount(CeruleumTankItemId);
-        int freeInventorySlots = _plugin.CountFreeInventorySlots();
+        int freeInventorySlots = Shop.CountFreeInventorySlots();
 
         ImGui.Text("Inventory");
         ImGui.Indent();
@@ -94,7 +95,7 @@ internal sealed class CeruleumTankWindow : ShopWindow
 
         ImGui.Separator();
 
-        if (PurchaseState == null)
+        if (Shop.PurchaseState == null)
         {
             ImGui.SetNextItemWidth(100);
             ImGui.InputInt("Stacks to Buy", ref _buyStackCount);
@@ -108,27 +109,27 @@ internal sealed class CeruleumTankWindow : ShopWindow
         if (_buyPartialStacks && ceruleumTanks % 999 > 0)
             missingItems += (999 - ceruleumTanks % 999);
 
-        if (PurchaseState != null)
+        if (Shop.PurchaseState != null)
         {
-            HandleNextPurchaseStep();
+            Shop.HandleNextPurchaseStep();
-            if (PurchaseState != null)
+            if (Shop.PurchaseState != null)
             {
-                ImGui.Text($"Buying {FormatStackCount(PurchaseState.ItemsLeftToBuy)}...");
+                ImGui.Text($"Buying {FormatStackCount(Shop.PurchaseState.ItemsLeftToBuy)}...");
                 if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Times, "Cancel Auto-Buy"))
-                    CancelAutoPurchase();
+                    Shop.CancelAutoPurchase();
             }
         }
         else
         {
-            int toPurchase = Math.Min(GetMaxItemsToPurchase(), missingItems);
+            int toPurchase = Math.Min(Shop.GetMaxItemsToPurchase(), missingItems);
             if (toPurchase > 0)
             {
                 ImGui.Spacing();
                 if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.DollarSign,
-                        $"Auto-Buy {FormatStackCount(toPurchase)} for {ItemForSale.Price * toPurchase:N0} CC"))
+                        $"Auto-Buy {FormatStackCount(toPurchase)} for {Shop.ItemForSale.Price * toPurchase:N0} CC"))
                 {
-                    StartAutoPurchase(toPurchase);
+                    Shop.StartAutoPurchase(toPurchase);
-                    HandleNextPurchaseStep();
+                    Shop.HandleNextPurchaseStep();
                 }
             }
         }
@@ -144,12 +145,12 @@ internal sealed class CeruleumTankWindow : ShopWindow
         return $"{fullStacks:N0} {stacks}";
     }
 
-    protected override unsafe void FirePurchaseCallback(AtkUnitBase* addonShop, int buyNow)
+    public override unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow)
     {
         var buyItem = stackalloc AtkValue[]
         {
             new() { Type = ValueType.Int, Int = 0 },
-            new() { Type = ValueType.UInt, UInt = (uint)ItemForSale!.Position },
+            new() { Type = ValueType.UInt, UInt = (uint)Shop.ItemForSale!.Position },
             new() { Type = ValueType.UInt, UInt = (uint)buyNow },
         };
         addonShop->FireCallback(3, buyItem);
@@ -163,9 +164,9 @@ internal sealed class CeruleumTankWindow : ShopWindow
             return false;
         }
 
-        int freeInventorySlots = _plugin.CountFreeInventorySlots();
+        int freeInventorySlots = Shop.CountFreeInventorySlots();
         stackCount = Math.Min(freeInventorySlots, stackCount);
-        missingQuantity = Math.Min(GetMaxItemsToPurchase(), stackCount * 999);
+        missingQuantity = Math.Min(Shop.GetMaxItemsToPurchase(), stackCount * 999);
         return true;
     }
 
@@ -177,25 +178,25 @@ internal sealed class CeruleumTankWindow : ShopWindow
             return false;
         }
 
-        int freeInventorySlots = _plugin.CountFreeInventorySlots();
+        int freeInventorySlots = Shop.CountFreeInventorySlots();
-        int partialStacks = _plugin.CountInventorySlotsWithCondition(CeruleumTankItemId, q => q < 999);
+        int partialStacks = Shop.CountInventorySlotsWithCondition(CeruleumTankItemId, q => q < 999);
-        int fullStacks = _plugin.CountInventorySlotsWithCondition(CeruleumTankItemId, q => q == 999);
+        int fullStacks = Shop.CountInventorySlotsWithCondition(CeruleumTankItemId, q => q == 999);
 
         int tanks = Math.Min((fullStacks + partialStacks + freeInventorySlots) * 999,
             Math.Max(stackCount * 999, (fullStacks + partialStacks) * 999));
         _pluginLog.Information("T: " + tanks);
-        int owned = GetItemCount(CeruleumTankItemId);
+        int owned = Shop.GetItemCount(CeruleumTankItemId);
         if (tanks <= owned)
             missingQuantity = 0;
         else
-            missingQuantity = Math.Min(GetMaxItemsToPurchase(), tanks - owned);
+            missingQuantity = Math.Min(Shop.GetMaxItemsToPurchase(), tanks - owned);
 
         return true;
     }
 
     public void StartPurchase(int quantity)
     {
-        if (!IsOpen || ItemForSale == null)
+        if (!IsOpen || Shop.ItemForSale == null)
         {
             _chatGui.PrintError("Could not start purchase, shop window is not open.");
             return;
@@ -208,7 +209,7 @@ internal sealed class CeruleumTankWindow : ShopWindow
         }
 
         _chatGui.Print($"Starting purchase of {FormatStackCount(quantity)} ceruleum tanks.");
-        StartAutoPurchase(quantity);
+        Shop.StartAutoPurchase(quantity);
-        HandleNextPurchaseStep();
+        Shop.HandleNextPurchaseStep();
     }
 }

Workshoppa/Windows/MainWindow.cs

@@ -70,7 +70,7 @@ internal sealed class MainWindow : LWindow, IPersistableWindowConfig
     public ButtonState State { get; set; } = ButtonState.None;
 
     private bool IsDiscipleOfHand =>
-        _clientState.LocalPlayer != null && _clientState.LocalPlayer.ClassJob.Id is >= 8 and <= 15;
+        _clientState.LocalPlayer != null && _clientState.LocalPlayer.ClassJob.RowId is >= 8 and <= 15;
 
     public WindowConfig WindowConfig => _configuration.MainWindowConfig;
 

Workshoppa/Windows/RepairKitWindow.cs

@@ -8,8 +8,8 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using ImGuiNET;
 using LLib.GameUI;
+using LLib.Shop.Model;
 using Workshoppa.External;
-using Workshoppa.GameData.Shops;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
 namespace Workshoppa.Windows;
@@ -21,29 +21,32 @@ internal sealed class RepairKitWindow : ShopWindow
     private readonly IPluginLog _pluginLog;
     private readonly Configuration _configuration;
 
-    public RepairKitWindow(WorkshopPlugin plugin, IPluginLog pluginLog,
+    public RepairKitWindow(
-        IGameGui gameGui, IAddonLifecycle addonLifecycle, Configuration configuration,
+        IPluginLog pluginLog,
+        IGameGui gameGui,
+        IAddonLifecycle addonLifecycle,
+        Configuration configuration,
         ExternalPluginHandler externalPluginHandler)
-        : base("Repair Kits###WorkshoppaRepairKitWindow", "Shop", plugin, pluginLog, gameGui, addonLifecycle, externalPluginHandler)
+        : base("Repair Kits###WorkshoppaRepairKitWindow", "Shop", pluginLog, gameGui, addonLifecycle, externalPluginHandler)
     {
         _pluginLog = pluginLog;
         _configuration = configuration;
     }
 
-    protected override bool Enabled => _configuration.EnableRepairKitCalculator;
+    public override bool IsEnabled => _configuration.EnableRepairKitCalculator;
 
-    protected override unsafe void UpdateShopStock(AtkUnitBase* addon)
+    public override unsafe void UpdateShopStock(AtkUnitBase* addon)
     {
         if (GetDarkMatterClusterCount() == 0)
         {
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
         if (addon->AtkValuesCount != 625)
         {
             _pluginLog.Error($"Unexpected amount of atkvalues for Shop addon ({addon->AtkValuesCount})");
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
@@ -52,18 +55,18 @@ internal sealed class RepairKitWindow : ShopWindow
         // Check if on 'Current Stock' tab?
         if (atkValues[0].UInt != 0)
         {
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
         uint itemCount = atkValues[2].UInt;
         if (itemCount == 0)
         {
-            ItemForSale = null;
+            Shop.ItemForSale = null;
             return;
         }
 
-        ItemForSale = Enumerable.Range(0, (int)itemCount)
+        Shop.ItemForSale = Enumerable.Range(0, (int)itemCount)
             .Select(i => new ItemForSale
             {
                 Position = i,
@@ -75,14 +78,14 @@ internal sealed class RepairKitWindow : ShopWindow
             .FirstOrDefault(x => x.ItemId == DarkMatterCluster6ItemId);
     }
 
-    private int GetDarkMatterClusterCount() => GetItemCount(10335);
+    private int GetDarkMatterClusterCount() => Shop.GetItemCount(10335);
 
-    protected override int GetCurrencyCount() => GetItemCount(1);
+    public override int GetCurrencyCount() => Shop.GetItemCount(1);
 
     public override void Draw()
     {
         int darkMatterClusters = GetDarkMatterClusterCount();
-        if (ItemForSale == null || darkMatterClusters == 0)
+        if (Shop.ItemForSale == null || darkMatterClusters == 0)
         {
             IsOpen = false;
             return;
@@ -91,43 +94,43 @@ internal sealed class RepairKitWindow : ShopWindow
         ImGui.Text("Inventory");
         ImGui.Indent();
         ImGui.Text($"Dark Matter Clusters: {darkMatterClusters:N0}");
-        ImGui.Text($"Grade 6 Dark Matter: {ItemForSale.OwnedItems:N0}");
+        ImGui.Text($"Grade 6 Dark Matter: {Shop.ItemForSale.OwnedItems:N0}");
         ImGui.Unindent();
 
-        int missingItems = Math.Max(0, darkMatterClusters * 5 - (int)ItemForSale.OwnedItems);
+        int missingItems = Math.Max(0, darkMatterClusters * 5 - (int)Shop.ItemForSale.OwnedItems);
         ImGui.TextColored(missingItems == 0 ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed,
             $"Missing Grade 6 Dark Matter: {missingItems:N0}");
 
-        if (PurchaseState != null)
+        if (Shop.PurchaseState != null)
         {
-            HandleNextPurchaseStep();
+            Shop.HandleNextPurchaseStep();
-            if (PurchaseState != null)
+            if (Shop.PurchaseState != null)
             {
                 if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Times, "Cancel Auto-Buy"))
-                    CancelAutoPurchase();
+                    Shop.CancelAutoPurchase();
             }
         }
         else
         {
-            int toPurchase = Math.Min(GetMaxItemsToPurchase(), missingItems);
+            int toPurchase = Math.Min(Shop.GetMaxItemsToPurchase(), missingItems);
             if (toPurchase > 0)
             {
                 if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.DollarSign,
-                        $"Auto-Buy missing Dark Matter for {ItemForSale.Price * toPurchase:N0}{SeIconChar.Gil.ToIconString()}"))
+                        $"Auto-Buy missing Dark Matter for {Shop.ItemForSale.Price * toPurchase:N0}{SeIconChar.Gil.ToIconString()}"))
                 {
-                    StartAutoPurchase(toPurchase);
+                    Shop.StartAutoPurchase(toPurchase);
-                    HandleNextPurchaseStep();
+                    Shop.HandleNextPurchaseStep();
                 }
             }
         }
     }
 
-    protected override unsafe void FirePurchaseCallback(AtkUnitBase* addonShop, int buyNow)
+    public override unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow)
     {
         var buyItem = stackalloc AtkValue[]
         {
             new() { Type = ValueType.Int, Int = 0 },
-            new() { Type = ValueType.Int, Int = ItemForSale!.Position },
+            new() { Type = ValueType.Int, Int = Shop.ItemForSale!.Position },
             new() { Type = ValueType.Int, Int = buyNow },
             new() { Type = 0, Int = 0 }
         };

Workshoppa/Windows/ShopWindow.cs

@@ -1,198 +1,49 @@
 using System;
 using System.Numerics;
-using Dalamud.Game.Addon.Lifecycle;
-using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Plugin.Services;
-using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using ImGuiNET;
-using LLib.GameUI;
 using LLib.ImGui;
+using LLib.Shop;
 using Workshoppa.External;
-using Workshoppa.GameData.Shops;
 
 namespace Workshoppa.Windows;
 
-internal abstract class ShopWindow : LWindow, IDisposable
+internal abstract class ShopWindow : LWindow, IShopWindow, IDisposable
 {
-    private readonly string _addonName;
-    private readonly WorkshopPlugin _plugin;
-    private readonly IPluginLog _pluginLog;
-    private readonly IGameGui _gameGui;
-    private readonly IAddonLifecycle _addonLifecycle;
     private readonly ExternalPluginHandler _externalPluginHandler;
 
-    protected ItemForSale? ItemForSale;
+    protected ShopWindow(
-    protected PurchaseState? PurchaseState;
+        string windowName,
-
+        string addonName,
-    protected ShopWindow(string name, string addonName, WorkshopPlugin plugin, IPluginLog pluginLog,
+        IPluginLog pluginLog,
-        IGameGui gameGui, IAddonLifecycle addonLifecycle, ExternalPluginHandler externalPluginHandler)
+        IGameGui gameGui,
-        : base(name)
+        IAddonLifecycle addonLifecycle,
+        ExternalPluginHandler externalPluginHandler)
+        : base(windowName)
     {
-        _addonName = addonName;
-        _plugin = plugin;
-        _pluginLog = pluginLog;
-        _gameGui = gameGui;
-        _addonLifecycle = addonLifecycle;
         _externalPluginHandler = externalPluginHandler;
+        Shop = new RegularShopBase(this, addonName, pluginLog, gameGui, addonLifecycle);
 
         Position = new Vector2(100, 100);
         PositionCondition = ImGuiCond.Always;
         Flags = ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoCollapse;
-
-        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, _addonName, ShopPostSetup);
-        _addonLifecycle.RegisterListener(AddonEvent.PreFinalize, _addonName, ShopPreFinalize);
-        _addonLifecycle.RegisterListener(AddonEvent.PostUpdate, _addonName, ShopPostUpdate);
     }
 
-    public bool AutoBuyEnabled => PurchaseState != null;
+    public void Dispose() => Shop.Dispose();
-
-    protected abstract bool Enabled { get; }
 
+    public bool AutoBuyEnabled => Shop.AutoBuyEnabled;
     public bool IsAwaitingYesNo
     {
-        get => PurchaseState?.IsAwaitingYesNo ?? false;
+        get { return Shop.IsAwaitingYesNo; }
-        set => PurchaseState!.IsAwaitingYesNo = value;
+        set { Shop.IsAwaitingYesNo = value; }
     }
 
-    private unsafe void ShopPostSetup(AddonEvent type, AddonArgs args)
+    protected RegularShopBase Shop { get; }
-    {
+    public abstract bool IsEnabled { get; }
-        if (!Enabled)
+    public abstract int GetCurrencyCount();
-        {
+    public abstract unsafe void UpdateShopStock(AtkUnitBase* addon);
-            ItemForSale = null;
+    public abstract unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow);
-            IsOpen = false;
+    public void SaveExternalPluginState() => _externalPluginHandler.Save();
-            return;
+    public void RestoreExternalPluginState() => _externalPluginHandler.Restore();
-        }
-
-        UpdateShopStock((AtkUnitBase*)args.Addon);
-        PostUpdateShopStock();
-        if (ItemForSale != null)
-            IsOpen = true;
-    }
-
-    private void ShopPreFinalize(AddonEvent type, AddonArgs args)
-    {
-        PurchaseState = null;
-        _externalPluginHandler.Restore();
-
-        IsOpen = false;
-    }
-
-    private unsafe void ShopPostUpdate(AddonEvent type, AddonArgs args)
-    {
-        if (!Enabled)
-        {
-            ItemForSale = null;
-            IsOpen = false;
-            return;
-        }
-
-        UpdateShopStock((AtkUnitBase*)args.Addon);
-        PostUpdateShopStock();
-        if (ItemForSale != null)
-        {
-            AtkUnitBase* addon = (AtkUnitBase*)args.Addon;
-            short x = 0, y = 0;
-            addon->GetPosition(&x, &y);
-
-            short width = 0, height = 0;
-            addon->GetSize(&width, &height, true);
-            x += width;
-
-            if ((short)Position!.Value.X != x || (short)Position!.Value.Y != y)
-                Position = new Vector2(x, y);
-
-            IsOpen = true;
-        }
-        else
-            IsOpen = false;
-    }
-
-    protected abstract unsafe void UpdateShopStock(AtkUnitBase* addon);
-
-    private void PostUpdateShopStock()
-    {
-        if (ItemForSale != null && PurchaseState != null)
-        {
-            int ownedItems = (int)ItemForSale.OwnedItems;
-            if (PurchaseState.OwnedItems != ownedItems)
-            {
-                PurchaseState.OwnedItems = ownedItems;
-                PurchaseState.NextStep = DateTime.Now.AddSeconds(0.25);
-            }
-        }
-    }
-
-    protected unsafe int GetItemCount(uint itemId)
-    {
-        InventoryManager* inventoryManager = InventoryManager.Instance();
-        return inventoryManager->GetInventoryItemCount(itemId, checkEquipped: false, checkArmory: false);
-    }
-
-    protected abstract int GetCurrencyCount();
-
-    protected int GetMaxItemsToPurchase()
-    {
-        if (ItemForSale == null)
-            return 0;
-
-        int currency = GetCurrencyCount();
-        return (int)(currency / ItemForSale!.Price);
-    }
-
-    protected void CancelAutoPurchase()
-    {
-        PurchaseState = null;
-        _externalPluginHandler.Restore();
-    }
-
-    protected void StartAutoPurchase(int toPurchase)
-    {
-        PurchaseState = new((int)ItemForSale!.OwnedItems + toPurchase, (int)ItemForSale.OwnedItems);
-        _externalPluginHandler.Save();
-    }
-
-    protected unsafe void HandleNextPurchaseStep()
-    {
-        if (ItemForSale == null || PurchaseState == null)
-            return;
-
-        int maxStackSize = _plugin.DetermineMaxStackSize(ItemForSale.ItemId);
-        if (maxStackSize == 0 && !_plugin.HasFreeInventorySlot())
-        {
-            _pluginLog.Warning($"No free inventory slots, can't buy more {ItemForSale.ItemName}");
-            PurchaseState = null;
-            _externalPluginHandler.Restore();
-        }
-        else if (!PurchaseState.IsComplete)
-        {
-            if (PurchaseState.NextStep <= DateTime.Now &&
-                _gameGui.TryGetAddonByName(_addonName, out AtkUnitBase* addonShop))
-            {
-                int buyNow = Math.Min(PurchaseState.ItemsLeftToBuy, maxStackSize);
-                _pluginLog.Information($"Buying {buyNow}x {ItemForSale.ItemName}");
-
-                FirePurchaseCallback(addonShop, buyNow);
-
-                PurchaseState.NextStep = DateTime.MaxValue;
-                PurchaseState.IsAwaitingYesNo = true;
-            }
-        }
-        else
-        {
-            _pluginLog.Information(
-                $"Stopping item purchase (desired = {PurchaseState.DesiredItems}, owned = {PurchaseState.OwnedItems})");
-            PurchaseState = null;
-            _externalPluginHandler.Restore();
-        }
-    }
-
-    protected abstract unsafe void FirePurchaseCallback(AtkUnitBase* addonShop, int buyNow);
-
-    public void Dispose()
-    {
-        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, _addonName, ShopPostSetup);
-        _addonLifecycle.UnregisterListener(AddonEvent.PreFinalize, _addonName, ShopPreFinalize);
-        _addonLifecycle.UnregisterListener(AddonEvent.PostUpdate, _addonName, ShopPostUpdate);
-    }
 }

Workshoppa/WorkshopPlugin.GameFunctions.cs

@@ -225,81 +225,4 @@ partial class WorkshopPlugin
 
         return false;
     }
-
-    public bool HasFreeInventorySlot() => CountFreeInventorySlots() > 0;
-
-    public unsafe int CountFreeInventorySlots()
-    {
-        var inventoryManger = InventoryManager.Instance();
-        if (inventoryManger == null)
-            return 0;
-
-        int count = 0;
-        for (InventoryType t = InventoryType.Inventory1; t <= InventoryType.Inventory4; ++t)
-        {
-            var container = inventoryManger->GetInventoryContainer(t);
-            for (int i = 0; i < container->Size; ++i)
-            {
-                var item = container->GetInventorySlot(i);
-                if (item == null || item->ItemId == 0)
-                    ++count;
-            }
-        }
-
-        return count;
-    }
-
-    public unsafe int CountInventorySlotsWithCondition(uint itemId, Predicate<int> predicate)
-    {
-        ArgumentNullException.ThrowIfNull(predicate);
-
-        var inventoryManager = InventoryManager.Instance();
-        if (inventoryManager == null)
-            return 0;
-
-        int count = 0;
-        for (InventoryType t = InventoryType.Inventory1; t <= InventoryType.Inventory4; ++t)
-        {
-            var container = inventoryManager->GetInventoryContainer(t);
-            for (int i = 0; i < container->Size; ++i)
-            {
-                var item = container->GetInventorySlot(i);
-                if (item == null || item->ItemId == 0)
-                    continue;
-
-                if (item->ItemId == itemId && predicate((int)item->Quantity))
-                    ++count;
-            }
-        }
-
-        return count;
-    }
-
-    public unsafe int DetermineMaxStackSize(uint itemId)
-    {
-        var inventoryManger = InventoryManager.Instance();
-        if (inventoryManger == null)
-            return 0;
-
-        int max = 0;
-        for (InventoryType t = InventoryType.Inventory1; t <= InventoryType.Inventory4; ++t)
-        {
-            var container = inventoryManger->GetInventoryContainer(t);
-            for (int i = 0; i < container->Size; ++i)
-            {
-                var item = container->GetInventorySlot(i);
-                if (item == null || item->ItemId == 0)
-                    return 99;
-
-                if (item->ItemId == itemId)
-                {
-                    max += (999 - (int)item->Quantity);
-                    if (max >= 99)
-                        break;
-                }
-            }
-        }
-
-        return Math.Min(99, max);
-    }
 }

Workshoppa/WorkshopPlugin.cs

@@ -72,14 +72,14 @@ public sealed partial class WorkshopPlugin : IDalamudPlugin
         _gameStrings = new(dataManager, _pluginLog);
 
         _mainWindow = new(this, _pluginInterface, _clientState, _configuration, _workshopCache,
-            new IconCache(textureProvider), _chatGui, new RecipeTree(dataManager), _pluginLog);
+            new IconCache(textureProvider), _chatGui, new RecipeTree(dataManager, _pluginLog), _pluginLog);
         _windowSystem.AddWindow(_mainWindow);
         _configWindow = new(_pluginInterface, _configuration);
         _windowSystem.AddWindow(_configWindow);
-        _repairKitWindow = new(this, _pluginLog, _gameGui, addonLifecycle, _configuration,
+        _repairKitWindow = new(_pluginLog, _gameGui, addonLifecycle, _configuration,
             _externalPluginHandler);
         _windowSystem.AddWindow(_repairKitWindow);
-        _ceruleumTankWindow = new(this, _pluginLog, _gameGui, addonLifecycle, _configuration,
+        _ceruleumTankWindow = new(_pluginLog, _gameGui, addonLifecycle, _configuration,
             _externalPluginHandler, _chatGui);
         _windowSystem.AddWindow(_ceruleumTankWindow);
 

Workshoppa/Workshoppa.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Dalamud.NET.Sdk/9.0.2">
+<Project Sdk="Dalamud.NET.Sdk/11.0.0">
     <PropertyGroup>
-        <Version>6.0</Version>
+        <Version>7.0</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 

Workshoppa/packages.lock.json

@@ -4,9 +4,9 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.13, )",
+        "requested": "[11.0.0, )",
-        "resolved": "2.1.13",
+        "resolved": "11.0.0",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
@@ -79,7 +79,7 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
+          "DalamudPackager": "[11.0.0, )"
         }
       }
     }