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

+2-3
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

+2-1
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

+6-6
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

+2-1
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

+4-3
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

+3-3
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

+2-1
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

+4-3
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

+4-3
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

+5-5
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

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ local S = E:GetModule('Skins')
33

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

7-
local GetItemInfo = GetItemInfo
88
local GetTradeSkillNumReagents = GetTradeSkillNumReagents
99
local GetTradeSkillInfo = GetTradeSkillInfo
10-
local GetItemQualityColor = GetItemQualityColor
1110
local GetTradeSkillItemLink = GetTradeSkillItemLink
1211
local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
1312
local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
14-
local hooksecurefunc = hooksecurefunc
13+
14+
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
15+
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
1516

1617
function S:Blizzard_TradeSkillUI()
1718
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end

‎ElvUI/Core/General/API.lua

+1-9
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ local GetSpecializationInfo = (E.Classic or E.Wrath) and LCS.GetSpecializationIn
4949

5050
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
5151

52-
local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
53-
local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
54-
5552
local C_TooltipInfo_GetUnit = C_TooltipInfo and C_TooltipInfo.GetUnit
5653
local C_TooltipInfo_GetHyperlink = C_TooltipInfo and C_TooltipInfo.GetHyperlink
5754
local C_TooltipInfo_GetInventoryItem = C_TooltipInfo and C_TooltipInfo.GetInventoryItem
@@ -443,12 +440,7 @@ do
443440
end
444441

445442
function E:Dump(object, inspect)
446-
if C_AddOns_GetAddOnEnableState then
447-
if C_AddOns_GetAddOnEnableState('Blizzard_DebugTools', E.myname) == 0 then
448-
E:Print('Blizzard_DebugTools is disabled.')
449-
return
450-
end
451-
elseif GetAddOnEnableState(E.myname, 'Blizzard_DebugTools') == 0 then
443+
if not E:IsAddOnEnabled('Blizzard_DebugTools') then
452444
E:Print('Blizzard_DebugTools is disabled.')
453445
return
454446
end

‎ElvUI/Core/General/Commands.lua

+49-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI)
22
local DT = E:GetModule('DataTexts')
33
local AB = E:GetModule('ActionBars')
44

5-
local type, pairs, select, tonumber = type, pairs, select, tonumber
5+
local type, pairs, tonumber = type, pairs, tonumber
66
local lower, wipe, next, print = strlower, wipe, next, print
77

88
local ReloadUI = ReloadUI
@@ -74,7 +74,18 @@ function E:DisplayCommands()
7474
print(L["EHELP_COMMANDS"])
7575
end
7676

77+
local BLIZZARD_DEPRECATED = {
78+
'Blizzard_Deprecated',
79+
'Blizzard_DeprecatedCurrencyScript',
80+
'Blizzard_DeprecatedGuildScript',
81+
'Blizzard_DeprecatedItemScript',
82+
'Blizzard_DeprecatedPvpScript',
83+
'Blizzard_DeprecatedSoundScript',
84+
'Blizzard_DeprecatedSpellScript',
85+
}
86+
7787
local BLIZZARD_ADDONS = {
88+
'Blizzard_AccountSaveUI',
7889
'Blizzard_AchievementUI',
7990
'Blizzard_AdventureMap',
8091
'Blizzard_AlliedRacesUI',
@@ -100,6 +111,7 @@ local BLIZZARD_ADDONS = {
100111
'Blizzard_Channels',
101112
'Blizzard_CharacterCreate',
102113
'Blizzard_CharacterCustomize',
114+
'Blizzard_ChatFrameUtil',
103115
'Blizzard_ChromieTimeUI',
104116
'Blizzard_ClassTalentUI',
105117
'Blizzard_ClassTrial',
@@ -121,10 +133,11 @@ local BLIZZARD_ADDONS = {
121133
'Blizzard_CUFProfiles',
122134
'Blizzard_DeathRecap',
123135
'Blizzard_DebugTools',
124-
'Blizzard_Deprecated',
136+
'Blizzard_Dispatcher',
125137
'Blizzard_EncounterJournal',
126138
'Blizzard_EventTrace',
127139
'Blizzard_ExpansionLandingPage',
140+
'Blizzard_ExpansionTrial',
128141
'Blizzard_FlightMap',
129142
'Blizzard_FrameEffects',
130143
'Blizzard_GarrisonTemplates',
@@ -133,7 +146,6 @@ local BLIZZARD_ADDONS = {
133146
'Blizzard_GMChatUI',
134147
'Blizzard_GuildBankUI',
135148
'Blizzard_GuildControlUI',
136-
'Blizzard_GuildUI',
137149
'Blizzard_HybridMinimap',
138150
'Blizzard_InspectUI',
139151
'Blizzard_IslandsPartyPoseUI',
@@ -146,6 +158,7 @@ local BLIZZARD_ADDONS = {
146158
'Blizzard_MacroUI',
147159
'Blizzard_MajorFactions',
148160
'Blizzard_MapCanvas',
161+
'Blizzard_MatchCelebrationPartyPoseUI',
149162
'Blizzard_MawBuffs',
150163
'Blizzard_MoneyReceipt',
151164
'Blizzard_MovePad',
@@ -156,10 +169,13 @@ local BLIZZARD_ADDONS = {
156169
'Blizzard_ObliterumUI',
157170
'Blizzard_OrderHallUI',
158171
'Blizzard_PartyPoseUI',
172+
'Blizzard_PerksProgram',
159173
'Blizzard_PetBattleUI',
174+
'Blizzard_PingUI',
160175
'Blizzard_PlayerChoice',
176+
'Blizzard_PlunderstormBasics',
177+
'Blizzard_PrivateAurasUI',
161178
'Blizzard_Professions',
162-
'Blizzard_ProfessionsCrafterOrders',
163179
'Blizzard_ProfessionsCustomerOrders',
164180
'Blizzard_ProfessionsTemplates',
165181
'Blizzard_PTRFeedback',
@@ -171,12 +187,15 @@ local BLIZZARD_ADDONS = {
171187
'Blizzard_RuneforgeUI',
172188
'Blizzard_ScrappingMachineUI',
173189
'Blizzard_SecureTransferUI',
190+
'Blizzard_SelectorUI',
191+
'Blizzard_Settings',
174192
'Blizzard_SharedMapDataProviders',
175193
'Blizzard_SharedTalentUI',
176-
'Blizzard_SocialUI',
194+
'Blizzard_SharedWidgetFrames',
177195
'Blizzard_Soulbinds',
178196
'Blizzard_StoreUI',
179197
'Blizzard_SubscriptionInterstitialUI',
198+
'Blizzard_Subtitles',
180199
'Blizzard_TalentUI',
181200
'Blizzard_TimeManager',
182201
'Blizzard_TokenUI',
@@ -189,18 +208,39 @@ local BLIZZARD_ADDONS = {
189208
'Blizzard_VoidStorageUI',
190209
'Blizzard_WarfrontsPartyPoseUI',
191210
'Blizzard_WeeklyRewards',
211+
'Blizzard_WeeklyRewardsUtil',
192212
'Blizzard_WorldMap',
193-
'Blizzard_WowTokenUI'
213+
'Blizzard_WowTokenUI',
194214
}
195215

196-
function E:EnableBlizzardAddOns()
197-
for _, addon in pairs(BLIZZARD_ADDONS) do
198-
local reason = select(5, GetAddOnInfo(addon))
216+
function E:DisableBlizzardDeprecated()
217+
for _, addon in pairs(BLIZZARD_DEPRECATED) do
218+
local enabled = E:IsAddOnEnabled(addon)
219+
if enabled then
220+
DisableAddOn(addon)
221+
E:Print('The following addon was disabled:', addon)
222+
end
223+
end
224+
end
225+
226+
do
227+
local function Enable(addon)
228+
local _, _, _, _, reason = GetAddOnInfo(addon)
199229
if reason == 'DISABLED' then
200230
EnableAddOn(addon)
201231
E:Print('The following addon was re-enabled:', addon)
202232
end
203233
end
234+
235+
function E:EnableBlizzardAddOns()
236+
for _, addon in pairs(BLIZZARD_ADDONS) do
237+
Enable(addon)
238+
end
239+
240+
for _, addon in pairs(BLIZZARD_DEPRECATED) do
241+
Enable(addon)
242+
end
243+
end
204244
end
205245

206246
function E:DBConvertProfile()

‎ElvUI/Core/General/Core.lua

-11
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
3232
local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
3333
local GetCVarBool = C_CVar.GetCVarBool
3434

35-
local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
36-
local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
37-
3835
local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
3936
local LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_INSTANCE
4037
local C_ChatInfo_SendAddonMessage = C_ChatInfo.SendAddonMessage
@@ -525,14 +522,6 @@ do
525522
end
526523
end
527524

528-
function E:IsAddOnEnabled(addon)
529-
if C_AddOns_GetAddOnEnableState then
530-
return C_AddOns_GetAddOnEnableState(addon, E.myname) == 2
531-
else
532-
return GetAddOnEnableState(E.myname, addon) == 2
533-
end
534-
end
535-
536525
function E:IsIncompatible(module, addons)
537526
for _, addon in ipairs(addons) do
538527
local incompatible

0 commit comments

Comments
 (0)