From 82b9d96335ed7a2d430a275cc1de1ed26112dbc4 Mon Sep 17 00:00:00 2001 From: Zeffuro Date: Sun, 11 Jan 2026 06:06:59 +0100 Subject: [PATCH] Don't subscribe to atkarray --- AetherBags/Addons/AddonInventoryWindow.cs | 2 +- AetherBags/Addons/InventoryAddonBase.cs | 2 ++ AetherBags/Inventory/State/InventoryStateBase.cs | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/AetherBags/Addons/AddonInventoryWindow.cs b/AetherBags/Addons/AddonInventoryWindow.cs index 5053139..b0b6934 100644 --- a/AetherBags/Addons/AddonInventoryWindow.cs +++ b/AetherBags/Addons/AddonInventoryWindow.cs @@ -79,7 +79,7 @@ public unsafe class AddonInventoryWindow : InventoryAddonBase LayoutContent(); - addon->SubscribeAtkArrayData(1, (int)NumberArrayType.Inventory); + //addon->SubscribeAtkArrayData(1, (int)NumberArrayType.Inventory); System.LootedItemsTracker.OnLootedItemsChanged += OnLootedItemsChanged; diff --git a/AetherBags/Addons/InventoryAddonBase.cs b/AetherBags/Addons/InventoryAddonBase.cs index 71f9ed6..444e92d 100644 --- a/AetherBags/Addons/InventoryAddonBase.cs +++ b/AetherBags/Addons/InventoryAddonBase.cs @@ -425,6 +425,7 @@ public abstract unsafe class InventoryAddonBase : NativeAddon, IInventoryWindow } } + /* protected override void OnRequestedUpdate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData) { _requestedUpdateCount++; @@ -438,6 +439,7 @@ public abstract unsafe class InventoryAddonBase : NativeAddon, IInventoryWindow InventoryState.RefreshFromGame(); RefreshCategoriesCore(autosize: true); } + */ protected override void OnSetup(AtkUnitBase* addon) { diff --git a/AetherBags/Inventory/State/InventoryStateBase.cs b/AetherBags/Inventory/State/InventoryStateBase.cs index 813fe26..c4d9cc1 100644 --- a/AetherBags/Inventory/State/InventoryStateBase.cs +++ b/AetherBags/Inventory/State/InventoryStateBase.cs @@ -69,7 +69,13 @@ public abstract class InventoryStateBase bool allaganCategoriesEnabled = config.Categories.AllaganToolsCategoriesEnabled && categoriesEnabled; bool bisCategoriesEnabled = config.Categories.BisBuddyEnabled && categoriesEnabled; // TODO: Cache this when config changes - var userCategories = config.Categories.UserCategories.Where(c => c.Enabled).ToList(); + UserCategoriesSortedScratch.Clear(); + foreach (var cat in config.Categories. UserCategories) + { + if (cat.Enabled) + UserCategoriesSortedScratch.Add(cat); + } + var userCategories = UserCategoriesSortedScratch; if (userCategoriesEnabled && userCategories.Count > 0) {