More DragonFlight Fixes! (#830)

* Added reagent bag free space counter to regular free space. General data fixes. * Fix for bank bag offset. * Reagent bag free space breakout and labeling * Item Button fixes for reagent bags.
AdiAddons · Nov 28, 2022 · bd25cbb · bd25cbb
1 parent 5bca2bc
commit bd25cbb
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 52 deletions.
diff --git a/core/DefaultFilters.lua b/core/DefaultFilters.lua
@@ -25,10 +25,11 @@ function addon:SetupDefaultFilters()
  -- Globals: GetEquipmentSetLocations
  --<GLOBALS
  local _G = _G
- local BANK_CONTAINER = _G.BANK_CONTAINER
+ local BANK_CONTAINER = _G.BANK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Bank ) or -1
  local BANK_CONTAINER_INVENTORY_OFFSET = _G.BANK_CONTAINER_INVENTORY_OFFSET
  local EquipmentManager_UnpackLocation = _G.EquipmentManager_UnpackLocation
  local format = _G.format
+ local GetContainerItemQuestInfo = C_Container and _G.C_Container.GetContainerItemQuestInfo or _G.GetContainerItemQuestInfo
  local GetEquipmentSetInfo = _G.C_EquipmentSet.GetEquipmentSetInfo
  local GetItemIDs = _G.C_EquipmentSet.GetItemIDs
  local GetEquipmentSetIDs = _G.C_EquipmentSet.GetEquipmentSetIDs
@@ -40,16 +41,16 @@ function addon:SetupDefaultFilters()
  local L = addon.L
 
  -- Make some strings local to speed things
- local CONSUMMABLE = GetItemClassInfo(Enum.ItemClass.Consumable)
- local GEM = GetItemClassInfo(Enum.ItemClass.Gem)
- local GLYPH = GetItemClassInfo(Enum.ItemClass.Glyph)
- local JUNK = GetItemSubClassInfo(Enum.ItemClass.Miscellaneous, 0)
- local MISCELLANEOUS = GetItemClassInfo(Enum.ItemClass.Miscellaneous)
- local QUEST = GetItemClassInfo(Enum.ItemClass.Questitem)
- local RECIPE = GetItemClassInfo(Enum.ItemClass.Recipe)
- local TRADE_GOODS = GetItemClassInfo(Enum.ItemClass.Tradegoods)
- local WEAPON = GetItemClassInfo(Enum.ItemClass.Weapon)
- local ARMOR = GetItemClassInfo(Enum.ItemClass.Armor)
+ local CONSUMMABLE = GetItemClassInfo(_G.Enum.ItemClass.Consumable)
+ local GEM = GetItemClassInfo(_G.Enum.ItemClass.Gem)
+ local GLYPH = GetItemClassInfo(_G.Enum.ItemClass.Glyph)
+ local JUNK = GetItemSubClassInfo(_G.Enum.ItemClass.Miscellaneous, 0)
+ local MISCELLANEOUS = GetItemClassInfo(_G.Enum.ItemClass.Miscellaneous)
+ local QUEST = GetItemClassInfo(_G.Enum.ItemClass.Questitem)
+ local RECIPE = GetItemClassInfo(_G.Enum.ItemClass.Recipe)
+ local TRADE_GOODS = GetItemClassInfo(_G.Enum.ItemClass.Tradegoods)
+ local WEAPON = GetItemClassInfo(_G.Enum.ItemClass.Weapon)
+ local ARMOR = GetItemClassInfo(_G.Enum.ItemClass.Armor)
  local JEWELRY = L['Jewelry']
  local EQUIPMENT = L['Equipment']
  local AMMUNITION = L['Ammunition']

diff --git a/core/Hooks.lua b/core/Hooks.lua
@@ -24,11 +24,14 @@ local L = addon.L
 
 --<GLOBALS
 local _G = _G
-local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER
+local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Backpack ) or 0
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 local ContainerFrame_GenerateFrame = _G.ContainerFrame_GenerateFrame
 local ContainerFrame_GetOpenFrame = _G.ContainerFrame_GetOpenFrame
-local GetContainerNumSlots = C_Container and C_Container.GetContainerNumSlots or GetContainerNumSlots
+local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
 local NUM_BAG_SLOTS = _G.NUM_BAG_SLOTS
+local NUM_REAGENTBAG_SLOTS = _G.NUM_REAGENTBAG_SLOTS
+local NUM_TOTAL_EQUIPPED_BAG_SLOTS = _G.NUM_TOTAL_EQUIPPED_BAG_SLOTS
 local NUM_BANKBAGSLOTS = _G.NUM_BANKBAGSLOTS
 local NUM_CONTAINER_FRAMES = _G.NUM_CONTAINER_FRAMES
 local pairs = _G.pairs

diff --git a/modules/BankSwitcher.lua b/modules/BankSwitcher.lua
@@ -25,7 +25,7 @@ local L = addon.L
 --<GLOBALS
 local _G = _G
 local GameTooltip = _G.GameTooltip
-local UseContainerItem = C_Container and C_Container.UseContainerItem or UseContainerItem
+local UseContainerItem = C_Container and _G.C_Container.UseContainerItem or _G.UseContainerItem
 --GLOBALS>
 
 local mod = addon:NewModule('BankSwitcher', 'ABEvent-1.0')

diff --git a/modules/DataSource.lua b/modules/DataSource.lua
@@ -25,10 +25,11 @@ local L = addon.L
 --<GLOBALS
 local _G = _G
 local format = _G.format
-local GetContainerNumFreeSlots = C_Container and C_Container.GetContainerNumFreeSlots or GetContainerNumFreeSlots
-local GetContainerNumSlots = C_Container and C_Container.GetContainerNumSlots or GetContainerNumSlots
+local GetContainerNumFreeSlots = C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots
+local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
 local ipairs = _G.ipairs
 local pairs = _G.pairs
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 local strjoin = _G.strjoin
 local tconcat = _G.table.concat
 local tinsert = _G.tinsert
@@ -101,6 +102,7 @@ local FAMILY_ORDER = {
  0x00100, -- Keyring
  0x00200, -- Gem Bag
  0x00400, -- Mining Bag
+ 0x00800, -- Reagent Bag
  0x08000, -- Tackle Box
  0x10000, -- Refrigerator
 }

diff --git a/modules/FilterOverride.lua b/modules/FilterOverride.lua
@@ -54,8 +54,8 @@ local wipe = _G.wipe
 local BuildSectionKey = addon.BuildSectionKey
 local SplitSectionKey = addon.SplitSectionKey
 
-local JUNK, FREE_SPACE = GetItemSubClassInfo(Enum.ItemClass.Miscellaneous, 0), L["Free space"]
-local JUNK_KEY, FREE_SPACE_KEY = BuildSectionKey(JUNK, JUNK), BuildSectionKey(FREE_SPACE, FREE_SPACE)
+local JUNK, FREE_SPACE, REAGENT_FREE_SPACE = GetItemSubClassInfo(_G.Enum.ItemClass.Miscellaneous, 0), L["Free space"], L["Reagent Free space"]
+local JUNK_KEY, FREE_SPACE_KEY, REAGENT_FREE_SPACE_KEY = BuildSectionKey(JUNK, JUNK), BuildSectionKey(FREE_SPACE, FREE_SPACE), BuildSectionKey(REAGENT_FREE_SPACE, REAGENT_FREE_SPACE)
 
 local mod = addon:RegisterFilter("FilterOverride", 95, "ABEvent-1.0")
 mod.uiName = L['Manual filtering']
@@ -448,7 +448,7 @@ do
  local itemKey = mod.db.profile.overrides[itemId]
  for i, key in ipairs(sections) do
  local _, _, name, category, title = container:GetSectionInfo(key)
- if name ~= FREE_SPACE then
+ if name ~= FREE_SPACE or REAGENT_FREE_SPACE then
  -- Add an radio button for each section
  wipe(info)
  info.text = title

diff --git a/modules/Junk.lua b/modules/Junk.lua
@@ -43,11 +43,11 @@ local select = _G.select
 local setmetatable = _G.setmetatable
 local tonumber = _G.tonumber
 local type = _G.type
-local UseContainerItem = C_Container and C_Container.UseContainerItem or UseContainerItem
+local UseContainerItem = C_Container and _G.C_Container.UseContainerItem or _G.UseContainerItem
 local wipe = _G.wipe
 --GLOBALS>
 
-local JUNK = GetItemSubClassInfo(Enum.ItemClass.Miscellaneous, 0)
+local JUNK = GetItemSubClassInfo(_G.Enum.ItemClass.Miscellaneous, 0)
 local JUNK_KEY = addon.BuildSectionKey(JUNK, JUNK)
 
 local mod = addon:RegisterFilter("Junk", 85, "ABEvent-1.0", "AceHook-3.0")

diff --git a/modules/NewItemTracking.lua b/modules/NewItemTracking.lua
@@ -24,12 +24,14 @@ local L = addon.L
 
 --<GLOBALS
 local _G = _G
-local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER
+local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Backpack ) or 0
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 local CreateFrame = _G.CreateFrame
-local GetContainerNumSlots = C_Container and C_Container.GetContainerNumSlots or GetContainerNumSlots
+local GetContainerItemInfo = C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo
+local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
+local IsBattlePayItem = C_Container and _G.C_Container.IsBattlePayItem or _G.IsBattlePayItem
 local GetInventoryItemID = _G.GetInventoryItemID
 local GetInventoryItemLink = _G.GetInventoryItemLink
-local IsBattlePayItem = C_Container and C_Container.IsBattlePayItem or IsBattlePayItem
 
 local ITEM_QUALITY_POOR
 

diff --git a/widgets/BagSlots.lua b/widgets/BagSlots.lua
@@ -24,33 +24,35 @@ local L = addon.L
 
 --<GLOBALS
 local _G = _G
-local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER
+local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Backpack ) or 0
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 local band = _G.bit.band
 local BankFrame = _G.BankFrame
 local BANK_BAG = _G.BANK_BAG
 local BANK_BAG_PURCHASE = _G.BANK_BAG_PURCHASE
-local BANK_CONTAINER = _G.BANK_CONTAINER
+local BANK_CONTAINER = _G.BANK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Bank ) or -1
 local ClearCursor = _G.ClearCursor
-local ContainerIDToInventoryID = C_Container and C_Container.ContainerIDToInventoryID or ContainerIDToInventoryID
+local ContainerIDToInventoryID = C_Container and _G.C_Container.ContainerIDToInventoryID or _G.ContainerIDToInventoryID
 local COSTS_LABEL = _G.COSTS_LABEL
 local CreateFrame = _G.CreateFrame
 local CursorHasItem = _G.CursorHasItem
 local CursorUpdate = _G.CursorUpdate
 local GameTooltip = _G.GameTooltip
 local GetBankSlotCost = _G.GetBankSlotCost
 local GetCoinTextureString = _G.GetCoinTextureString
-local GetContainerItemID = C_Container and C_Container.GetContainerItemID or GetContainerItemID
-local GetContainerItemInfo = C_Container and C_Container.GetContainerItemInfo or GetContainerItemInfo
-local GetContainerNumFreeSlots = C_Container and C_Container.GetContainerNumFreeSlots or GetContainerNumFreeSlots
-local GetContainerNumSlots = C_Container and C_Container.GetContainerNumSlots or GetContainerNumSlots
+local GetContainerItemID = C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID
+local GetContainerItemInfo = C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo
+local GetContainerNumFreeSlots = C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots
+local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
 local geterrorhandler = _G.geterrorhandler
 local GetInventoryItemTexture = _G.GetInventoryItemTexture
 local GetItemInfo = _G.GetItemInfo
 local GetNumBankSlots = _G.GetNumBankSlots
 local ipairs = _G.ipairs
 local IsInventoryItemLocked = _G.IsInventoryItemLocked
 local next = _G.next
-local NUM_BAG_SLOTS = _G.NUM_BAG_SLOTS
+local NUM_REAGENTBAG_SLOTS = _G.NUM_REAGENTBAG_SLOTS
+local NUM_TOTAL_EQUIPPED_BAG_SLOTS = _G.NUM_TOTAL_EQUIPPED_BAG_SLOTS
 local NUM_BANKGENERIC_SLOTS = _G.NUM_BANKGENERIC_SLOTS
 local pairs = _G.pairs
 local pcall = _G.pcall
@@ -362,7 +364,12 @@ end
 
 function bankButtonProto:UpdateStatus()
  local numSlots = GetNumBankSlots()
- local bankSlot = self.bag - NUM_BAG_SLOTS
+ local bankSlot
+ if addon.isRetail then
+ bankSlot = self.bag - NUM_TOTAL_EQUIPPED_BAG_SLOTS
+ else 
+ bankSlot = self.bag - NUM_BAG_SLOTS
+ end
  self.toPurchase = nil
  if bankSlot <= numSlots then
  SetItemButtonTextureVertexColor(self, 1, 1, 1)
@@ -460,13 +467,27 @@ function addon:CreateBagSlotPanel(container, name, bags, isBank)
  local x = BAG_INSET
  local height = 0
  for i, bag in ipairs(bags) do
- if bag ~= BACKPACK_CONTAINER and bag ~= BANK_CONTAINER and bag ~= REAGENTBANK_CONTAINER then
+ if bag ~= BACKPACK_CONTAINER and bag ~= BANK_CONTAINER and bag ~= REAGENTBANK_CONTAINER and bag ~= bag ~= REAGENTBAG_CONTAINER then
  local button = buttonClass:Create(bag)
  button:SetParent(self)
  button:SetPoint("TOPLEFT", x, -TOP_PADDING)
  button:Show()
  x = x + ITEM_SIZE + ITEM_SPACING
  tinsert(self.buttons, button)
+ elseif bag == REAGENTBAG_CONTAINER then
+ local titleReagent = self:CreateFontString(nil, "OVERLAY")
+ self.TitleReagent = titleReagent
+ titleReagent:SetFontObject(addon.bagFont)
+ titleReagent:SetText(L["Reagent"])
+ titleReagent:SetJustifyH("RIGHT")
+ titleReagent:SetPoint("TOPRIGHT", -BAG_INSET, -BAG_INSET)
+
+ local button = buttonClass:Create(bag)
+ button:SetParent(self)
+ button:SetPoint("TOPLEFT", x + ITEM_SIZE, -TOP_PADDING)
+ button:Show()
+ x = x + ITEM_SIZE + ITEM_SPACING + ITEM_SIZE
+ tinsert(self.buttons, button)
  end
  end
 

diff --git a/widgets/ContainerFrame.lua b/widgets/ContainerFrame.lua
@@ -25,17 +25,19 @@ local L = addon.L
 --<GLOBALS
 local _G = _G
 local assert = _G.assert
-local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER
+local BACKPACK_CONTAINER = _G.BACKPACK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Backpack ) or 0
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 local band = _G.bit.band
-local BANK_CONTAINER = _G.BANK_CONTAINER
+local BANK_CONTAINER = _G.BANK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Bank ) or -1
 local ceil = _G.ceil
 local CreateFrame = _G.CreateFrame
 local format = _G.format
-local GetContainerFreeSlots = C_Container and C_Container.GetContainerFreeSlots or GetContainerFreeSlots
-local GetContainerItemID = C_Container and C_Container.GetContainerItemID or GetContainerItemID
-local GetContainerItemLink = C_Container and C_Container.GetContainerItemLink or GetContainerItemLink
-local GetContainerNumFreeSlots = C_Container and C_Container.GetContainerNumFreeSlots or GetContainerNumFreeSlots
-local GetContainerNumSlots = C_Container and C_Container.GetContainerNumSlots or GetContainerNumSlots
+local GetContainerFreeSlots = C_Container and _G.C_Container.GetContainerFreeSlots or _G.GetContainerFreeSlots
+local GetContainerItemID = C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID
+local GetContainerItemInfo = C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo
+local GetContainerItemLink = C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink
+local GetContainerNumFreeSlots = C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots
+local GetContainerNumSlots = C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots
 local GetCursorInfo = _G.GetCursorInfo
 local GetItemInfo = _G.GetItemInfo
 local GetItemGUID = _G.C_Item.GetItemGUID
@@ -45,6 +47,8 @@ local max = _G.max
 local min = _G.min
 local next = _G.next
 local NUM_BAG_SLOTS = _G.NUM_BAG_SLOTS
+local NUM_REAGENTBAG_SLOTS = _G.NUM_REAGENTBAG_SLOTS
+local NUM_TOTAL_EQUIPPED_BAG_SLOTS = _G.NUM_TOTAL_EQUIPPED_BAG_SLOTS
 local pairs = _G.pairs
 local PlaySound = _G.PlaySound
 local select = _G.select
@@ -343,7 +347,12 @@ function containerProto:CreateDepositButton()
  REAGENTBANK_DEPOSIT,
  L["auto-deposit"],
  "autoDeposit",
- DepositReagentBank,
+ function()
+ DepositReagentBank()
+ for bag in pairs(self:GetBagIds()) do
+ self:UpdateContent(bag)
+ end
+ end,
  L["You can block auto-deposit ponctually by pressing a modified key while talking to the banker."]
  )
 
@@ -645,6 +654,9 @@ function containerProto:UpdateContent(bag)
  local content = self.content[bag]
  local newSize = self:GetBagIds()[bag] and GetContainerNumSlots(bag) or 0
  local _, bagFamily = GetContainerNumFreeSlots(bag)
+ if bag == REAGENTBAG_CONTAINER then
+ bagFamily = 2048
+ end
  content.family = bagFamily
  for slot = 1, newSize do
  local itemId = GetContainerItemID(bag, slot)
@@ -777,6 +789,12 @@ local function FilterByBag(slotData)
  name = REAGENT_BANK
  elseif bag <= NUM_BAG_SLOTS then
  name = format(L["Bag #%d"], bag)
+ elseif addon.isRetail then
+ if bag == REAGENTBAG_CONTAINER then
+ name = format(L["Reagent Bag"])
+ else
+ name = format(L["Bank bag #%d"], bag - NUM_BAG_SLOTS)
+ end
  else
  name = format(L["Bank bag #%d"], bag - NUM_BAG_SLOTS)
  end
@@ -788,8 +806,11 @@ local function FilterByBag(slotData)
  end
 end
 
-local MISCELLANEOUS = GetItemClassInfo(Enum.ItemClass.Miscellaneous)
+local MISCELLANEOUS = GetItemClassInfo(_G.Enum.ItemClass.Miscellaneous)
 local FREE_SPACE = L["Free space"]
+-- TODO(lobato): Label the Reagent freespace.
+local FREE_SPACE_REAGENT = L["Reagent Free space"]
+
 function containerProto:FilterSlot(slotData)
  if self.BagSlotPanel:IsShown() then
  return FilterByBag(slotData)

diff --git a/widgets/ItemButton.lua b/widgets/ItemButton.lua
@@ -24,21 +24,24 @@ local addonName, addon = ...
 --<GLOBALS
 local _G = _G
 local BankButtonIDToInvSlotID = _G.BankButtonIDToInvSlotID
-local BANK_CONTAINER = _G.BANK_CONTAINER
+local BANK_CONTAINER = BANK_CONTAINER or ( Enum.BagIndex and Enum.BagIndex.Bank ) or -1
 local ContainerFrame_UpdateCooldown = _G.ContainerFrame_UpdateCooldown
 local format = _G.format
-local GetContainerItemID = C_Container and C_Container.GetContainerItemID or GetContainerItemID
-local GetContainerItemInfo = C_Container and C_Container.GetContainerItemInfo or GetContainerItemInfo
-local GetContainerItemLink = C_Container and C_Container.GetContainerItemLink or GetContainerItemLink
-local GetContainerNumFreeSlots = C_Container and C_Container.GetContainerNumFreeSlots or GetContainerNumFreeSlots
+local GetContainerItemID = C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID
+local GetContainerItemInfo = C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo
+local GetContainerItemLink = C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink
+local GetContainerItemQuestInfo = C_Container and _G.C_Container.GetContainerItemQuestInfo or _G.GetContainerItemQuestInfo
+local GetContainerNumFreeSlots = C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots
 local GetItemInfo = _G.GetItemInfo
 local GetItemQualityColor = _G.GetItemQualityColor
 local hooksecurefunc = _G.hooksecurefunc
-local IsBattlePayItem = C_Container and C_Container.IsBattlePayItem or IsBattlePayItem
+local IsBattlePayItem = C_Container and _G.C_Container.IsBattlePayItem or _G.IsBattlePayItem
+local IsContainerItemAnUpgrade = _G.IsContainerItemAnUpgrade
 local IsInventoryItemLocked = _G.IsInventoryItemLocked
-local SplitContainerItem = C_Container and C_Container.SplitContainerItem or SplitContainerItem
+local SplitContainerItem = C_Container and _G.C_Container.SplitContainerItem or _G.SplitContainerItem
 local ITEM_QUALITY_COMMON
 local ITEM_QUALITY_POOR
+local REAGENTBAG_CONTAINER = ( Enum.BagIndex and Enum.BagIndex.REAGENTBAG_CONTAINER ) or 5
 
 if addon.isRetail then
  ITEM_QUALITY_COMMON = _G.Enum.ItemQuality.Common
@@ -301,7 +304,14 @@ function buttonProto:FullUpdate()
  self.itemLink = GetContainerItemLink(bag, slot)
  self.hasItem = not not self.itemId
  self.texture = addon:GetContainerItemTexture(bag, slot)
- self.bagFamily = select(2, GetContainerNumFreeSlots(bag))
+
+ -- TODO(lobato): Test if this is still needed
+ if self.bag == REAGENTBAG_CONTAINER then
+ self.bagFamily = 2048
+ else
+ self.bagFamily = select(2, GetContainerNumFreeSlots(bag))
+ end
+
  self:Update()
 end
 
@@ -402,6 +412,7 @@ if addon.isRetail then
  local PawnIsContainerItemAnUpgrade = _G.PawnIsContainerItemAnUpgrade
  local itemIsUpgrade = PawnIsContainerItemAnUpgrade and PawnIsContainerItemAnUpgrade(self.bag, self.slot)
  self.UpgradeIcon:SetShown(itemIsUpgrade or false)
+ self.UpgradeIcon:SetPoint("TOPLEFT", 0, -16)
  end
 end
 

diff --git a/widgets/Section.lua b/widgets/Section.lua
@@ -57,7 +57,8 @@ local HEADER_SIZE = addon.HEADER_SIZE
 --------------------------------------------------------------------------------
 
 local categoryOrder = {
- [L["Free space"]] = -100
+ [L["Free space"]] = -100,
+ [L["Reagent Free space"]] = -101
 }
 
 function addon:SetCategoryOrder(name, order)