From 648b490a9490e87cce6627c98cfed1f96bae982c Mon Sep 17 00:00:00 2001 From: Frank <472730949@qq.com> Date: Fri, 28 Jun 2024 15:49:38 +0800 Subject: [PATCH] Fix some function namespace in Wrath version 3.4.3 --- Baggins-ItemOps.lua | 4 ++-- Baggins-Search.lua | 2 +- src/filters/ContainerType.lua | 2 +- src/filters/EquipLocation.lua | 2 +- src/filters/EquipmentSlot.lua | 2 +- src/filters/ItemBind.lua | 2 +- src/filters/ItemID.lua | 2 +- src/filters/ItemLevel.lua | 2 +- src/filters/ItemName.lua | 2 +- src/filters/ItemType.lua | 4 ++-- src/filters/Quality.lua | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Baggins-ItemOps.lua b/Baggins-ItemOps.lua index ff8c6d7..a090d8b 100644 --- a/Baggins-ItemOps.lua +++ b/Baggins-ItemOps.lua @@ -10,12 +10,12 @@ local Baggins = _G.Baggins local pairs, ipairs, next, select, format, wipe = _G.pairs, _G.ipairs, _G.next, _G.select, _G.format, _G.wipe local floor = _G.floor -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink local GetContainerItemInfo = _G.C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo local GetContainerNumFreeSlots = _G.C_Container and _G.C_Container.GetContainerNumFreeSlots or _G.GetContainerNumFreeSlots local GetContainerNumSlots = _G.C_Container and _G.C_Container.GetContainerNumSlots or _G.GetContainerNumSlots -local GetItemFamily = _G.C_Item.GetItemFamily +local GetItemFamily = _G.C_Item.GetItemFamily or _G.GetItemFamily local PickupContainerItem, SplitContainerItem, IsShiftKeyDown = _G.C_Container and _G.C_Container.PickupContainerItem or _G.PickupContainerItem, _G.SplitContainerItem, _G.IsShiftKeyDown local band = diff --git a/Baggins-Search.lua b/Baggins-Search.lua index 93539eb..b02c19e 100644 --- a/Baggins-Search.lua +++ b/Baggins-Search.lua @@ -44,7 +44,7 @@ local AddOn = _G[AddOnName] --luacheck: ignore 211 --local L = addonTable.L local Baggins = _G.Baggins -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo local GetDetailedItemLevelInfo = _G.C_Item.GetDetailedItemLevelInfo local strlen = _G.strlen local strfind = _G.strfind diff --git a/src/filters/ContainerType.lua b/src/filters/ContainerType.lua index 65ba3fc..1f2f99a 100644 --- a/src/filters/ContainerType.lua +++ b/src/filters/ContainerType.lua @@ -22,7 +22,7 @@ local GetAuctionItemSubClasses = _G.GetAuctionItemSubClasses local GetItemSubClassInfo = _G.GetItemSubClassInfo local ContainerIDToInventoryID = _G.C_Container and _G.C_Container.ContainerIDToInventoryID or _G.ContainerIDToInventoryID local GetInventoryItemLink = _G.GetInventoryItemLink -local GetItemInfoInstant = _G.GetItemInfoInstant +local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant or _G.GetItemInfoInstant local LE_ITEM_CLASS_CONTAINER = _G.LE_ITEM_CLASS_CONTAINER or _G.Enum.ItemClass.Container local NUM_BAG_SLOTS = _G.NUM_TOTAL_EQUIPPED_BAG_SLOTS or _G.NUM_BAG_SLOTS local NUM_BANKBAGSLOTS = _G.NUM_BANKBAGSLOTS diff --git a/src/filters/EquipLocation.lua b/src/filters/EquipLocation.lua index 10083d4..0b97188 100644 --- a/src/filters/EquipLocation.lua +++ b/src/filters/EquipLocation.lua @@ -11,7 +11,7 @@ local AddOn = _G[AddOnName] -- WoW API local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink -local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant +local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant or _G.GetItemInfoInstant -- Libs local LibStub = _G.LibStub diff --git a/src/filters/EquipmentSlot.lua b/src/filters/EquipmentSlot.lua index 6678d66..38433ca 100644 --- a/src/filters/EquipmentSlot.lua +++ b/src/filters/EquipmentSlot.lua @@ -13,7 +13,7 @@ local AddOn = _G[AddOnName] -- WoW API local GetContainerItemID = _G.C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID -local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant +local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant or _G.GetItemInfoInstant -- Libs local LibStub = _G.LibStub diff --git a/src/filters/ItemBind.lua b/src/filters/ItemBind.lua index cf3f18f..bad1f60 100644 --- a/src/filters/ItemBind.lua +++ b/src/filters/ItemBind.lua @@ -13,7 +13,7 @@ local AddOn = _G[AddOnName] --local BankButtonIDToInvSlotID = _G.BankButtonIDToInvSlotID local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink local GetContainerItemInfo = _G.C_Container and _G.C_Container.GetContainerItemInfo or _G.GetContainerItemInfo -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo local DoesItemExist = _G.C_Item and _G.C_Item.DoesItemExist local C_ItemIsBound = _G.C_Item and _G.C_Item.IsBound local ItemLocation = _G.ItemLocation diff --git a/src/filters/ItemID.lua b/src/filters/ItemID.lua index d48d3be..02085bc 100644 --- a/src/filters/ItemID.lua +++ b/src/filters/ItemID.lua @@ -16,7 +16,7 @@ local tonumber = _G.tonumber local wipe = _G.wipe -- WoW API -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo local GetContainerItemID = _G.C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID -- Libs diff --git a/src/filters/ItemLevel.lua b/src/filters/ItemLevel.lua index 0059d92..3f73abe 100644 --- a/src/filters/ItemLevel.lua +++ b/src/filters/ItemLevel.lua @@ -11,7 +11,7 @@ local AddOn = _G[AddOnName] -- WoW API local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo local UnitLevel = _G.UnitLevel -- Libs diff --git a/src/filters/ItemName.lua b/src/filters/ItemName.lua index d3f61e2..414ad00 100644 --- a/src/filters/ItemName.lua +++ b/src/filters/ItemName.lua @@ -13,7 +13,7 @@ local AddOn = _G[AddOnName] --- WoW API local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo -- Libs local LibStub = _G.LibStub diff --git a/src/filters/ItemType.lua b/src/filters/ItemType.lua index 5cdbbab..9776572 100644 --- a/src/filters/ItemType.lua +++ b/src/filters/ItemType.lua @@ -15,10 +15,10 @@ local tostring = _G.tostring local tonumber = _G.tonumber -- WoW API -local GetItemClassInfo = _G.C_Item.GetItemClassInfo +local GetItemClassInfo = _G.C_Item.GetItemClassInfo or _G.GetItemClassInfo local GetItemSubClassInfo = _G.C_Item.GetItemSubClassInfo local GetContainerItemID = _G.C_Container and _G.C_Container.GetContainerItemID or _G.GetContainerItemID -local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant +local GetItemInfoInstant = _G.C_Item.GetItemInfoInstant or _G.GetItemInfoInstant local GetAuctionItemSubClasses if AddOn:IsClassicWow() or AddOn:IsTBCWow() or AddOn:IsWrathWow() or AddOn:IsCataWow() then diff --git a/src/filters/Quality.lua b/src/filters/Quality.lua index 9e82d64..e3772d4 100644 --- a/src/filters/Quality.lua +++ b/src/filters/Quality.lua @@ -14,7 +14,7 @@ local pairs = _G.pairs -- WoW API local GetContainerItemLink = _G.C_Container and _G.C_Container.GetContainerItemLink or _G.GetContainerItemLink -local GetItemInfo = _G.C_Item.GetItemInfo +local GetItemInfo = _G.C_Item.GetItemInfo or _G.GetItemInfo -- Libs local LibStub = _G.LibStub