Skip to content

Commit a1f842d

Browse files
kodewdlekodewdle
committed
Merge branch 'main' into ptr
2 parents 6deca9c + f309445 commit a1f842d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+313
-269
lines changed

‎ElvUI/Classic/Modules/Skins/AddonManager.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ local hooksecurefunc = hooksecurefunc
77

88
local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
99

10-
local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
1110
local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
1211
local GetNumAddOns = C_AddOns and C_AddOns.GetNumAddOns
1312

@@ -52,10 +51,10 @@ function S:AddonList()
5251
if character == true then
5352
character = nil
5453
else
55-
checkall = GetAddOnEnableState(index)
54+
checkall = E:GetAddOnEnableState(index)
5655
end
5756

58-
local checkstate = GetAddOnEnableState(index, character)
57+
local checkstate = E:GetAddOnEnableState(index, character)
5958
local enabled = checkstate > 0
6059

6160
entryTitle:SetFontObject('ElvUIFontNormal')

‎ElvUI/Classic/Modules/Skins/AuctionHouse.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ local pairs = pairs
77
local unpack = unpack
88

99
local GetAuctionSellItemInfo = GetAuctionSellItemInfo
10-
local GetItemQualityColor = GetItemQualityColor
1110
local CreateFrame = CreateFrame
1211

12+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
13+
1314
function S:Blizzard_AuctionUI()
1415
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end
1516

‎ElvUI/Classic/Modules/Skins/Bags.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ local _G = _G
66
local select, unpack = select, unpack
77
local hooksecurefunc = hooksecurefunc
88

9-
local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
10-
local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
11-
local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
12-
local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
13-
local GetItemQualityColor = GetItemQualityColor
9+
local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
10+
local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
11+
local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
12+
local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
13+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
14+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
1415
local GetInventoryItemID = GetInventoryItemID
15-
local GetItemInfo = GetItemInfo
1616

1717
local BANK_CONTAINER = Enum.BagIndex.Bank
1818
local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM

‎ElvUI/Classic/Modules/Skins/Character.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ local hooksecurefunc = hooksecurefunc
99
local HasPetUI = HasPetUI
1010
local GetNumFactions = GetNumFactions
1111
local GetPetHappiness = GetPetHappiness
12-
local GetItemQualityColor = GetItemQualityColor
1312
local GetInventoryItemQuality = GetInventoryItemQuality
1413
local FauxScrollFrame_GetOffset = FauxScrollFrame_GetOffset
1514

15+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
16+
1617
local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
1718
local CHARACTERFRAME_SUBFRAMES = CHARACTERFRAME_SUBFRAMES
1819

‎ElvUI/Classic/Modules/Skins/Craft.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
33

44
local _G = _G
55
local unpack = unpack
6+
local hooksecurefunc = hooksecurefunc
67

7-
local GetItemInfo = GetItemInfo
88
local GetCraftNumReagents = GetCraftNumReagents
9-
local GetItemQualityColor = GetItemQualityColor
109
local GetCraftItemLink = GetCraftItemLink
1110
local GetCraftReagentInfo = GetCraftReagentInfo
1211
local GetCraftReagentItemLink = GetCraftReagentItemLink
13-
local hooksecurefunc = hooksecurefunc
12+
13+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
14+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
1415

1516
function S:SkinCraft()
1617
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.craft) then return end

‎ElvUI/Classic/Modules/Skins/Inspect.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
33

44
local _G = _G
55
local ipairs, unpack = ipairs, unpack
6+
local hooksecurefunc = hooksecurefunc
67

78
local GetInventoryItemID = GetInventoryItemID
8-
local GetItemQualityColor = GetItemQualityColor
9-
local GetItemInfo = GetItemInfo
10-
local hooksecurefunc = hooksecurefunc
9+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
10+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
1111

1212
local function Update_InspectPaperDollItemSlotButton(button)
1313
local unit = button.hasItem and _G.InspectFrame.unit

‎ElvUI/Classic/Modules/Skins/Loot.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ local _G = _G
66
local next = next
77
local unpack = unpack
88

9-
local GetItemInfo = GetItemInfo
109
local GetLootSlotInfo = GetLootSlotInfo
1110
local hooksecurefunc = hooksecurefunc
1211
local IsFishingLoot = IsFishingLoot
1312
local UnitIsDead = UnitIsDead
1413
local UnitIsFriend = UnitIsFriend
1514
local UnitName = UnitName
1615

16+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
17+
1718
local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
1819
local C_LootHistory_GetItem = C_LootHistory.GetItem
1920
local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS

‎ElvUI/Classic/Modules/Skins/Mail.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
33

44
local _G = _G
55
local unpack = unpack
6+
local hooksecurefunc = hooksecurefunc
67

78
local GetInboxHeaderInfo = GetInboxHeaderInfo
89
local GetInboxItemLink = GetInboxItemLink
910
local GetInboxNumItems = GetInboxNumItems
10-
local GetItemInfo = GetItemInfo
11-
local GetItemQualityColor = GetItemQualityColor
1211
local GetSendMailItem = GetSendMailItem
13-
local hooksecurefunc = hooksecurefunc
12+
13+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
14+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
1415

1516
local function MailFrameSkin()
1617
for i = 1, _G.ATTACHMENTS_MAX_SEND do

‎ElvUI/Classic/Modules/Skins/Merchant.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
33

44
local _G = _G
55
local unpack = unpack
6+
local hooksecurefunc = hooksecurefunc
67

78
local CreateFrame = CreateFrame
8-
local GetItemInfo = GetItemInfo
99
local GetMerchantNumItems = GetMerchantNumItems
1010
local GetBuybackItemInfo = GetBuybackItemInfo
1111
local GetNumBuybackItems = GetNumBuybackItems
12-
local GetItemQualityColor = GetItemQualityColor
13-
local hooksecurefunc = hooksecurefunc
12+
13+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
14+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
1415

1516
local MERCHANT_ITEMS_PER_PAGE = MERCHANT_ITEMS_PER_PAGE
1617

‎ElvUI/Classic/Modules/Skins/Quest.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ local S = E:GetModule('Skins')
33

44
local _G = _G
55
local unpack, gsub = unpack, gsub
6-
local pairs, next = pairs, next
7-
local strmatch = strmatch
6+
local pairs, next, strmatch = pairs, next, strmatch
7+
local hooksecurefunc = hooksecurefunc
88

99
local GetMoney = GetMoney
10-
local GetItemInfo = GetItemInfo
11-
local GetItemQualityColor = GetItemQualityColor
1210
local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
1311
local GetNumQuestLogEntries = GetNumQuestLogEntries
1412
local GetQuestItemLink = GetQuestItemLink
@@ -18,7 +16,9 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
1816
local GetQuestLogTitle = GetQuestLogTitle
1917
local GetQuestMoneyToGet = GetQuestMoneyToGet
2018
local IsQuestComplete = IsQuestComplete
21-
local hooksecurefunc = hooksecurefunc
19+
20+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
21+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
2222

2323
local MAX_NUM_ITEMS = MAX_NUM_ITEMS
2424
local MAX_NUM_QUESTS = MAX_NUM_QUESTS

0 commit comments

Comments
 (0)