Merge branch 'main' into classic-beta

tukui-org · Apr 20, 2024 · ce0778a · ce0778a
2 parents 201ab0b + f309445
commit ce0778a
Show file tree

Hide file tree

Showing 51 changed files with 308 additions and 264 deletions.
diff --git a/ElvUI/Cata/Modules/Skins/AddonManager.lua b/ElvUI/Cata/Modules/Skins/AddonManager.lua
@@ -9,7 +9,6 @@ local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
 local GetNumAddOns = GetNumAddOns
 local GetAddOnInfo = GetAddOnInfo
-local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
 
 function S:AddonList()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end
@@ -52,10 +51,10 @@ function S:AddonList()
 				if character == true then
 					character = nil
 				else
-					checkall = GetAddOnEnableState(nil, index)
+					checkall = E:GetAddOnEnableState(nil, index)
 				end
 
-				local checkstate = GetAddOnEnableState(character, index)
+				local checkstate = E:GetAddOnEnableState(character, index)
 				local enabled = checkstate > 0
 
 				entryTitle:SetFontObject('ElvUIFontNormal')

diff --git a/ElvUI/Cata/Modules/Skins/Alerts.lua b/ElvUI/Cata/Modules/Skins/Alerts.lua
@@ -3,11 +3,12 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
-local hooksecurefunc = hooksecurefunc
 
 local function forceAlpha(self, alpha, forced)
 	if alpha ~= 1 and forced ~= true then

diff --git a/ElvUI/Cata/Modules/Skins/AuctionHouse.lua b/ElvUI/Cata/Modules/Skins/AuctionHouse.lua
@@ -6,9 +6,9 @@ local next = next
 local pairs = pairs
 local unpack = unpack
 
-local GetAuctionSellItemInfo = GetAuctionSellItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local CreateFrame = CreateFrame
+local GetAuctionSellItemInfo = GetAuctionSellItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_AuctionUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end

diff --git a/ElvUI/Cata/Modules/Skins/Bags.lua b/ElvUI/Cata/Modules/Skins/Bags.lua
@@ -6,13 +6,13 @@ local _G = _G
 local select, unpack = select, unpack
 local hooksecurefunc = hooksecurefunc
 
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
-local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
-local GetItemQualityColor = GetItemQualityColor
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
+local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetInventoryItemID = GetInventoryItemID
-local GetItemInfo = GetItemInfo
 
 local BANK_CONTAINER = Enum.BagIndex.Bank
 local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM

diff --git a/ElvUI/Cata/Modules/Skins/Inspect.lua b/ElvUI/Cata/Modules/Skins/Inspect.lua
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local ipairs, unpack = ipairs, unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInventoryItemID = GetInventoryItemID
-local GetItemQualityColor = GetItemQualityColor
-local GetItemInfo = GetItemInfo
-local hooksecurefunc = hooksecurefunc
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 
 local MAX_ARENA_TEAMS = MAX_ARENA_TEAMS
 

diff --git a/ElvUI/Cata/Modules/Skins/Loot.lua b/ElvUI/Cata/Modules/Skins/Loot.lua
@@ -6,14 +6,15 @@ local _G = _G
 local next = next
 local unpack = unpack
 
-local GetItemInfo = GetItemInfo
 local GetLootSlotInfo = GetLootSlotInfo
 local hooksecurefunc = hooksecurefunc
 local IsFishingLoot = IsFishingLoot
 local UnitIsDead = UnitIsDead
 local UnitIsFriend = UnitIsFriend
 local UnitName = UnitName
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
 local C_LootHistory_GetItem = C_LootHistory.GetItem
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS

diff --git a/ElvUI/Cata/Modules/Skins/Mail.lua b/ElvUI/Cata/Modules/Skins/Mail.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInboxHeaderInfo = GetInboxHeaderInfo
 local GetInboxItemLink = GetInboxItemLink
 local GetInboxNumItems = GetInboxNumItems
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetSendMailItem = GetSendMailItem
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function MailFrameSkin()
 	for i = 1, _G.ATTACHMENTS_MAX_SEND do

diff --git a/ElvUI/Cata/Modules/Skins/Merchant.lua b/ElvUI/Cata/Modules/Skins/Merchant.lua
@@ -3,13 +3,13 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetBuybackItemInfo = GetBuybackItemInfo
 local GetNumBuybackItems = GetNumBuybackItems
 local GetMerchantNumItems = GetMerchantNumItems
-local hooksecurefunc = hooksecurefunc
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function merchantItemPoint()
 	S:HandlePointXY(_G.MerchantItem1, 6, -40)

diff --git a/ElvUI/Cata/Modules/Skins/Quest.lua b/ElvUI/Cata/Modules/Skins/Quest.lua
@@ -4,10 +4,9 @@ local S = E:GetModule('Skins')
 local _G = _G
 local gsub, strmatch, unpack = gsub, strmatch, unpack
 local next, pairs = next, pairs
+local hooksecurefunc = hooksecurefunc
 
 local GetMoney = GetMoney
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
 local GetNumQuestLogEntries = GetNumQuestLogEntries
 local GetQuestItemLink = GetQuestItemLink
@@ -17,11 +16,12 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
 local GetQuestLogTitle = GetQuestLogTitle
 local GetQuestMoneyToGet = GetQuestMoneyToGet
 local IsQuestComplete = IsQuestComplete
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MAX_NUM_ITEMS = MAX_NUM_ITEMS
 local MAX_NUM_QUESTS = MAX_NUM_QUESTS
 local MAX_REQUIRED_ITEMS = MAX_REQUIRED_ITEMS
-local hooksecurefunc = hooksecurefunc
 
 local function UpdateGreetingFrame()
 	local i = 1

diff --git a/ElvUI/Cata/Modules/Skins/TradeSkill.lua b/ElvUI/Cata/Modules/Skins/TradeSkill.lua
@@ -5,13 +5,13 @@ local _G = _G
 local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetTradeSkillNumReagents = GetTradeSkillNumReagents
 local GetTradeSkillInfo = GetTradeSkillInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetTradeSkillItemLink = GetTradeSkillItemLink
 local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
 local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_TradeSkillUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end

diff --git a/ElvUI/Classic/Modules/Skins/AddonManager.lua b/ElvUI/Classic/Modules/Skins/AddonManager.lua
@@ -7,7 +7,6 @@ local hooksecurefunc = hooksecurefunc
 
 local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
-local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
 local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
 local GetNumAddOns = C_AddOns and C_AddOns.GetNumAddOns
 
@@ -52,10 +51,10 @@ function S:AddonList()
 				if character == true then
 					character = nil
 				else
-					checkall = GetAddOnEnableState(index)
+					checkall = E:GetAddOnEnableState(index)
 				end
 
-				local checkstate = GetAddOnEnableState(index, character)
+				local checkstate = E:GetAddOnEnableState(index, character)
 				local enabled = checkstate > 0
 
 				entryTitle:SetFontObject('ElvUIFontNormal')

diff --git a/ElvUI/Classic/Modules/Skins/AuctionHouse.lua b/ElvUI/Classic/Modules/Skins/AuctionHouse.lua
@@ -7,9 +7,10 @@ local pairs = pairs
 local unpack = unpack
 
 local GetAuctionSellItemInfo = GetAuctionSellItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local CreateFrame = CreateFrame
 
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 function S:Blizzard_AuctionUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end
 

diff --git a/ElvUI/Classic/Modules/Skins/Bags.lua b/ElvUI/Classic/Modules/Skins/Bags.lua
@@ -6,13 +6,13 @@ local _G = _G
 local select, unpack = select, unpack
 local hooksecurefunc = hooksecurefunc
 
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
-local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
-local GetItemQualityColor = GetItemQualityColor
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
+local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetInventoryItemID = GetInventoryItemID
-local GetItemInfo = GetItemInfo
 
 local BANK_CONTAINER = Enum.BagIndex.Bank
 local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM

diff --git a/ElvUI/Classic/Modules/Skins/Character.lua b/ElvUI/Classic/Modules/Skins/Character.lua
@@ -9,10 +9,11 @@ local hooksecurefunc = hooksecurefunc
 local HasPetUI = HasPetUI
 local GetNumFactions = GetNumFactions
 local GetPetHappiness = GetPetHappiness
-local GetItemQualityColor = GetItemQualityColor
 local GetInventoryItemQuality = GetInventoryItemQuality
 local FauxScrollFrame_GetOffset = FauxScrollFrame_GetOffset
 
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
 local CHARACTERFRAME_SUBFRAMES = CHARACTERFRAME_SUBFRAMES
 

diff --git a/ElvUI/Classic/Modules/Skins/Craft.lua b/ElvUI/Classic/Modules/Skins/Craft.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetCraftNumReagents = GetCraftNumReagents
-local GetItemQualityColor = GetItemQualityColor
 local GetCraftItemLink = GetCraftItemLink
 local GetCraftReagentInfo = GetCraftReagentInfo
 local GetCraftReagentItemLink = GetCraftReagentItemLink
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:SkinCraft()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.craft) then return end

diff --git a/ElvUI/Classic/Modules/Skins/Inspect.lua b/ElvUI/Classic/Modules/Skins/Inspect.lua
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local ipairs, unpack = ipairs, unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInventoryItemID = GetInventoryItemID
-local GetItemQualityColor = GetItemQualityColor
-local GetItemInfo = GetItemInfo
-local hooksecurefunc = hooksecurefunc
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function Update_InspectPaperDollItemSlotButton(button)
 	local unit = button.hasItem and _G.InspectFrame.unit

diff --git a/ElvUI/Classic/Modules/Skins/Loot.lua b/ElvUI/Classic/Modules/Skins/Loot.lua
@@ -6,14 +6,15 @@ local _G = _G
 local next = next
 local unpack = unpack
 
-local GetItemInfo = GetItemInfo
 local GetLootSlotInfo = GetLootSlotInfo
 local hooksecurefunc = hooksecurefunc
 local IsFishingLoot = IsFishingLoot
 local UnitIsDead = UnitIsDead
 local UnitIsFriend = UnitIsFriend
 local UnitName = UnitName
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
 local C_LootHistory_GetItem = C_LootHistory.GetItem
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS

diff --git a/ElvUI/Classic/Modules/Skins/Mail.lua b/ElvUI/Classic/Modules/Skins/Mail.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInboxHeaderInfo = GetInboxHeaderInfo
 local GetInboxItemLink = GetInboxItemLink
 local GetInboxNumItems = GetInboxNumItems
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetSendMailItem = GetSendMailItem
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function MailFrameSkin()
 	for i = 1, _G.ATTACHMENTS_MAX_SEND do

diff --git a/ElvUI/Classic/Modules/Skins/Merchant.lua b/ElvUI/Classic/Modules/Skins/Merchant.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
 local GetMerchantNumItems = GetMerchantNumItems
 local GetBuybackItemInfo = GetBuybackItemInfo
 local GetNumBuybackItems = GetNumBuybackItems
-local GetItemQualityColor = GetItemQualityColor
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MERCHANT_ITEMS_PER_PAGE = MERCHANT_ITEMS_PER_PAGE
 

diff --git a/ElvUI/Classic/Modules/Skins/Quest.lua b/ElvUI/Classic/Modules/Skins/Quest.lua
@@ -3,12 +3,10 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack, gsub = unpack, gsub
-local pairs, next = pairs, next
-local strmatch = strmatch
+local pairs, next, strmatch = pairs, next, strmatch
+local hooksecurefunc = hooksecurefunc
 
 local GetMoney = GetMoney
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
 local GetNumQuestLogEntries = GetNumQuestLogEntries
 local GetQuestItemLink = GetQuestItemLink
@@ -18,7 +16,9 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
 local GetQuestLogTitle = GetQuestLogTitle
 local GetQuestMoneyToGet = GetQuestMoneyToGet
 local IsQuestComplete = IsQuestComplete
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MAX_NUM_ITEMS = MAX_NUM_ITEMS
 local MAX_NUM_QUESTS = MAX_NUM_QUESTS

diff --git a/ElvUI/Classic/Modules/Skins/TradeSkill.lua b/ElvUI/Classic/Modules/Skins/TradeSkill.lua
@@ -3,15 +3,16 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack, select = unpack, select
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetTradeSkillNumReagents = GetTradeSkillNumReagents
 local GetTradeSkillInfo = GetTradeSkillInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetTradeSkillItemLink = GetTradeSkillItemLink
 local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
 local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_TradeSkillUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end