Update for C_Item deprecations (and others)

Nevcairiel · Jul 3, 2024 · 18506fc · 18506fc
1 parent 372bfb2
commit 18506fc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -46,9 +46,6 @@ read_globals = {
 	"DepositReagentBank",
 	"GetBankSlotCost",
 	"GetBuildInfo",
-	"GetItemIcon",
-	"GetItemInfo",
-	"GetItemInfoInstant",
 	"GetNumBankSlots",
 	"GetReagentBankCost",
 	"GetRealmName",

diff --git a/Bag.lua b/Bag.lua
@@ -294,7 +294,7 @@ function BagMixin:UpdateSlotInfo()
 	if link then
 		self.hasItem = link
 
-		SetItemButtonTexture(self, texture or GetItemIcon(link))
+		SetItemButtonTexture(self, texture or C_Item.GetItemIconByID(link))
 		SetItemButtonTextureVertexColor(self, 1, 1, 1)
 	else
 		self.hasItem = nil

diff --git a/Item.lua b/Item.lua
@@ -394,7 +394,7 @@ function InventorianItemMixin:GetInfo()
 	if self:IsCached() then
 		icon, count, locked, quality, readable, lootable, link = ItemCache:GetItemInfo(player, self.bag, self.slot)
 		if link then
-			itemID = GetItemInfoInstant(link)
+			itemID = C_Item.GetItemInfoInstant(link)
 		end
 	else
 		-- LibItemCache doesn't provide noValue or itemID, so fallback to base API
@@ -412,12 +412,12 @@ function InventorianItemMixin:GetInfo()
 			isBound = info.isBound
 		end
 		if link and (not quality or quality < 0) then
-			quality = select(3, GetItemInfo(link))
+			quality = C_Item.GetItemQualityByID(link)
 		end
 	end
 
 	if not icon and (itemID or link) then
-		self.itemID = itemID or GetItemInfoInstant(link)
+		self.itemID = itemID or C_Item.GetItemInfoInstant(link)
 		if self:IsCached() then
 			self:RegisterEvent("ITEM_DATA_LOAD_RESULT")
 			C_Item.RequestLoadItemDataByID(self.itemID)

diff --git a/libs/LibItemCache-1.1/Core.lua b/libs/LibItemCache-1.1/Core.lua
@@ -15,7 +15,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
 This file is part of LibItemCache.
 --]]
 
-local Lib = LibStub:NewLibrary('LibItemCache-1.1', 30)
+local Lib = LibStub:NewLibrary('LibItemCache-1.1', 31)
 if not Lib then
 	return
 end
@@ -237,7 +237,7 @@ function Lib:GetItemQuality(link)
 	if link:find('battlepet') then
 		return tonumber(link:match('%d+:%d+:(%d+)'))
 	else
-		return select(3, GetItemInfo(link))
+		return C_Item.GetItemQualityByID(link)
 	end
 end
 
@@ -250,8 +250,8 @@ function Lib:GetItemCounts(player, id)
 	else
 		local vault, guild = select(4, Cache('GetItemCounts', realm, name, id))
 		local id, equip = tonumber(id), 0
-		local total = GetItemCount(id, true)
-		local bags = GetItemCount(id)
+		local total = C_Item.GetItemCount(id, true, false, true)
+		local bags = C_Item.GetItemCount(id)
 
 		for i = 1, INVSLOT_LAST_EQUIPPED do
 			if GetInventoryItemID('player', i) == id then
@@ -280,16 +280,16 @@ function Lib:RestorePetLink(partial)
 	local id, _, quality = strsplit(':', partial)
 	local name, icon = C_PetJournal.GetPetInfoBySpeciesID(id)
 
-	local color = select(4, GetItemQualityColor(quality))
+	local color = select(4, C_Item.GetItemQualityColor(quality))
 	local link = PetLinkFormat:format(color, partial, name)
 
 	return link, icon, tonumber(quality)
 end
 
 function Lib:RestoreItemLink(partial)
 	local partial = 'item:' .. partial
-	local _, link, quality = GetItemInfo(partial)
-	return link or partial, GetItemIcon(link), quality
+	local _, link, quality = C_Item.GetItemInfo(partial)
+	return link or partial, C_Item.GetItemIconByID(link), quality
 end
 
 

diff --git a/libs/LibItemSearch-1.0.lua b/libs/LibItemSearch-1.0.lua
@@ -17,7 +17,7 @@
 		<op>				:=  : | = | == | != | ~= | < | > | <= | >=
 --]]
 
-local Lib = LibStub:NewLibrary('LibItemSearch-Inventorian-1.0', 4)
+local Lib = LibStub:NewLibrary('LibItemSearch-Inventorian-1.0', 5)
 if not Lib then
   return
 else
@@ -207,7 +207,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, item, _, search)
-		local name = GetItemInfo(item)
+		local name = C_Item.GetItemInfo(item)
 		return match(search, name)
 	end
 }
@@ -224,7 +224,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, item, _, search)
-		local type, subType, _, equipSlot = select(6, GetItemInfo(item))
+		local type, subType, _, equipSlot = select(6, C_Item.GetItemInfo(item))
 		return match(search, type, subType, _G[equipSlot])
 	end
 }
@@ -250,7 +250,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, link, operator, num)
-		local quality = select(3, GetItemInfo(link))
+		local quality = select(3, C_Item.GetItemInfo(link))
 		return compare(operator, quality, num)
 	end,
 }
@@ -267,7 +267,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, link, operator, num)
-		local lvl = select(4, GetItemInfo(link))
+		local lvl = select(4, C_Item.GetItemInfo(link))
 		if lvl then
 			return compare(operator, lvl, num)
 		end
@@ -285,7 +285,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, link, operator, num)
-		local lvl = select(5, GetItemInfo(link))
+		local lvl = select(5, C_Item.GetItemInfo(link))
 		if lvl then
 			return compare(operator, lvl, num)
 		end
@@ -312,7 +312,7 @@ Lib:RegisterTypedSearch{
 	end,
 
 	findItem = function(self, link, operator, num)
-		local isCrafting = select(17, GetItemInfo(link))
+		local isCrafting = select(17, C_Item.GetItemInfo(link))
 		return isCrafting
 	end,
 }
@@ -381,7 +381,7 @@ Lib:RegisterTypedSearch{
 		['bop'] = ITEM_BIND_ON_PICKUP,
 		['bou'] = ITEM_BIND_ON_USE,
 		['quest'] = ITEM_BIND_QUEST,
-		[GetItemClassInfo(Enum.ItemClass.Questitem):lower()] = ITEM_BIND_QUEST,
+		[C_Item.GetItemClassInfo(Enum.ItemClass.Questitem):lower()] = ITEM_BIND_QUEST,
 		['boa'] = ITEM_BIND_TO_BNETACCOUNT,
 		['unique'] = ITEM_UNIQUE,
 		[ITEM_UNIQUE:lower()] = ITEM_UNIQUE,
@@ -478,7 +478,7 @@ local function ES_TrySetName(setName, search, exactMatch)
 end
 
 --Addon Support: ItemRack
-if IsAddOnLoaded('ItemRack') then
+if C_AddOns.IsAddOnLoaded('ItemRack') then
 	function ES_FindSets(setList, search, exactMatch)
 		for setName, _ in pairs(ItemRackUser.Sets) do
 			if ES_TrySetName(setName, search, exactMatch) then
@@ -513,7 +513,7 @@ if IsAddOnLoaded('ItemRack') then
 	end
 
 --Addon Support: Wardrobe
-elseif IsAddOnLoaded('Wardrobe') then
+elseif C_AddOns.IsAddOnLoaded('Wardrobe') then
 	function ES_FindSets(setList, search, exactMatch)
 		for _, waOutfit in ipairs(Wardrobe.CurrentConfig.Outfit) do
 			if ES_TrySetName(waOutfit.OutfitName, search, exactMatch) then
@@ -580,7 +580,7 @@ Lib:RegisterTypedSearch{
 
 	findItem = function(self, itemLink, _, search)
 		--this is an item-set search and we know that the only items that can possibly match will be *equippable* items, so we'll short-circuit the response for non-equippable items to speed up searches.
-		if not IsEquippableItem(itemLink) then return false end
+		if not C_Item.IsEquippableItem(itemLink) then return false end
 
 		--default to matching *all* equipment sets if no set name has been provided yet
 		if search == '' then search = '*' end