Skip to content

Commit 1465858

Browse files
MerathilisMerathilis
committed
Initial work on Beta. DO NOT DOWNLOAD ME YET!!!!
1 parent cd745ba commit 1465858

File tree

14 files changed

+46
-42
lines changed

14 files changed

+46
-42
lines changed

‎ElvUI/Core/General/API.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,8 @@ function E:LoadAPI()
904904
E:RegisterEvent('PLAYER_REGEN_DISABLED')
905905
E:RegisterEvent('UI_SCALE_CHANGED', 'PixelScaleChanged')
906906

907-
E:SetupGameMenu()
907+
-- FIX ME 11.0
908+
--E:SetupGameMenu()
908909

909910
if E.Retail then
910911
for _, mountID in next, C_MountJournal_GetMountIDs() do

‎ElvUI/Core/Modules/Bags/Bags.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ local BAG_FILTER_IGNORE = BAG_FILTER_IGNORE
110110
local SELL_ALL_JUNK_ITEMS = SELL_ALL_JUNK_ITEMS_EXCLUDE_FLAG
111111

112112
local BagSlotFlags = Enum.BagSlotFlags
113-
local FILTER_FLAG_TRADE_GOODS = (BagSlotFlags and BagSlotFlags.PriorityTradeGoods) or LE_BAG_FILTER_FLAG_TRADE_GOODS
114-
local FILTER_FLAG_CONSUMABLES = (BagSlotFlags and BagSlotFlags.PriorityConsumables) or LE_BAG_FILTER_FLAG_CONSUMABLES
115-
local FILTER_FLAG_EQUIPMENT = (BagSlotFlags and BagSlotFlags.PriorityEquipment) or LE_BAG_FILTER_FLAG_EQUIPMENT
113+
local FILTER_FLAG_TRADE_GOODS = (BagSlotFlags and BagSlotFlags.ClassProfessionGoods) or LE_BAG_FILTER_FLAG_TRADE_GOODS
114+
local FILTER_FLAG_CONSUMABLES = (BagSlotFlags and BagSlotFlags.ClassConsumables) or LE_BAG_FILTER_FLAG_CONSUMABLES
115+
local FILTER_FLAG_EQUIPMENT = (BagSlotFlags and BagSlotFlags.ClassEquipment) or LE_BAG_FILTER_FLAG_EQUIPMENT
116116
local FILTER_FLAG_IGNORE = (BagSlotFlags and BagSlotFlags.DisableAutoSort) or LE_BAG_FILTER_FLAG_IGNORE_CLEANUP
117-
local FILTER_FLAG_JUNK = (BagSlotFlags and BagSlotFlags.PriorityJunk) or LE_BAG_FILTER_FLAG_JUNK
118-
local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.PriorityQuestItems) or 32 -- didnt exist
117+
local FILTER_FLAG_JUNK = (BagSlotFlags and BagSlotFlags.ClassJunk) or LE_BAG_FILTER_FLAG_JUNK
118+
local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.ClassQuestItems) or 32 -- didnt exist
119119
local FILTER_FLAG_JUNKSELL = (BagSlotFlags and BagSlotFlags.ExcludeJunkSell) or 64 -- didnt exist
120120

121121
local READY_TEX = [[Interface\RaidFrame\ReadyCheck-Ready]]

‎ElvUI/Core/Modules/Bags/Sort.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ local BANK_CONTAINER = Enum.BagIndex.Bank
2424
local REAGENT_CONTAINER = E.Retail and Enum.BagIndex.ReagentBag or math.huge
2525

2626
local BagSlotFlags = Enum.BagSlotFlags
27-
local FILTER_FLAG_TRADE_GOODS = LE_BAG_FILTER_FLAG_TRADE_GOODS or BagSlotFlags.PriorityTradeGoods
28-
local FILTER_FLAG_CONSUMABLES = LE_BAG_FILTER_FLAG_CONSUMABLES or BagSlotFlags.PriorityConsumables
29-
local FILTER_FLAG_EQUIPMENT = LE_BAG_FILTER_FLAG_EQUIPMENT or BagSlotFlags.PriorityEquipment
30-
local FILTER_FLAG_JUNK = LE_BAG_FILTER_FLAG_JUNK or BagSlotFlags.PriorityJunk
31-
local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.PriorityQuestItems) or 32 -- didnt exist
27+
local FILTER_FLAG_TRADE_GOODS = LE_BAG_FILTER_FLAG_TRADE_GOODS or BagSlotFlags.ClassProfessionGoods
28+
local FILTER_FLAG_CONSUMABLES = LE_BAG_FILTER_FLAG_CONSUMABLES or BagSlotFlags.ClassConsumables
29+
local FILTER_FLAG_EQUIPMENT = LE_BAG_FILTER_FLAG_EQUIPMENT or BagSlotFlags.ClassEquipment
30+
local FILTER_FLAG_JUNK = LE_BAG_FILTER_FLAG_JUNK or BagSlotFlags.ClassJunk
31+
local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.ClassQuestItems) or 32 -- didnt exist
3232

3333
local ItemClass_Armor = Enum.ItemClass.Armor
3434
local ItemClass_Weapon = Enum.ItemClass.Weapon

‎ElvUI/Core/Modules/DataBars/Reputation.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local ipairs = ipairs
77
local huge = math.huge
88

99
local GameTooltip = GameTooltip
10-
local GetWatchedFactionInfo = GetWatchedFactionInfo
10+
local GetWatchedFactionInfo = C_Reputation and C_Reputation.GetWatchedFactionData or GetWatchedFactionInfo
1111
local ToggleCharacter = ToggleCharacter
1212

1313
local GetFriendshipReputation = GetFriendshipReputation or C_GossipInfo.GetFriendshipReputation

‎ElvUI/Core/Modules/Tooltip/Tooltip.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ local GetCraftReagentItemLink = GetCraftReagentItemLink
2121
local GetCraftSelectionIndex = GetCraftSelectionIndex
2222
local GetCreatureDifficultyColor = GetCreatureDifficultyColor
2323
local GetGuildInfo = GetGuildInfo
24-
local GetItemCount = GetItemCount
24+
local GetItemCount = C_Item and C_Item.GetItemCount or GetItemCount
2525
local GetMouseFocus = GetMouseFocus
2626
local GetNumGroupMembers = GetNumGroupMembers
2727
local GetRelativeDifficultyColor = GetRelativeDifficultyColor

‎ElvUI/Core/Modules/UnitFrames/Elements/AuraBars.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local unpack = unpack
88
local strfind = strfind
99

1010
local CreateFrame = CreateFrame
11-
local GetSpellInfo = GetSpellInfo
11+
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
1212

1313
local DebuffColors = E.Libs.Dispel:GetDebuffTypeColor()
1414

‎ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ local hooksecurefunc = hooksecurefunc
77
local InCombatLockdown = InCombatLockdown
88

99
local headers = {
10-
_G.ObjectiveTrackerBlocksFrame.QuestHeader,
11-
_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
12-
_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
13-
_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
14-
_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
15-
_G.ObjectiveTrackerBlocksFrame.MonthlyActivitiesHeader,
16-
_G.ObjectiveTrackerBlocksFrame.AdventureHeader,
17-
_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
18-
_G.WORLD_QUEST_TRACKER_MODULE.Header,
19-
_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader
10+
--_G.ObjectiveTrackerBlocksFrame.QuestHeader,
11+
--_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
12+
--_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
13+
--_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
14+
--_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
15+
--_G.ObjectiveTrackerBlocksFrame.MonthlyActivitiesHeader,
16+
--_G.ObjectiveTrackerBlocksFrame.AdventureHeader,
17+
--_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
18+
--_G.WORLD_QUEST_TRACKER_MODULE.Header,
19+
--_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader
2020
}
2121

2222
local function SkinOjectiveTrackerHeaders(header)
@@ -213,7 +213,7 @@ local function UpdateMinimizeButton(button, collapsed)
213213
end
214214
end
215215

216-
function S:ObjectiveTrackerFrame()
216+
function S:Blizzard_OptjectiveTracker()
217217
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.objectiveTracker) then return end
218218

219219
local minimize = _G.ObjectiveTrackerFrame.HeaderMenu.MinimizeButton
@@ -260,4 +260,4 @@ function S:ObjectiveTrackerFrame()
260260
end
261261
end
262262

263-
S:AddCallback('ObjectiveTrackerFrame')
263+
S:AddCallbackForAddon('Blizzard_OptjectiveTracker')

‎ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua

+11-10
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ local setmetatable = setmetatable
6666
local CheckInteractDistance = CheckInteractDistance
6767
local GetInventoryItemLink = GetInventoryItemLink
6868
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
69-
local GetNumSpellTabs = GetNumSpellTabs
70-
local GetSpellBookItemName = GetSpellBookItemName
71-
local GetSpellInfo = GetSpellInfo
72-
local GetSpellTabInfo = GetSpellTabInfo
69+
local GetNumSpellTabs = (C_SpellBook and C_SpellBook.GetNumSpellBookSkillLines) or GetNumSpellTabs
70+
local GetSpellBookItemName = (C_SpellBook and C_SpellBook.GetSpellBookItemName) or GetSpellBookItemName
71+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
72+
local GetSpellTabInfo = (C_SpellBook and C_SpellBook.GetSpellBookSkillLineInfo) or GetSpellTabInfo
7373
local GetTime = GetTime
7474
local InCombatLockdown = InCombatLockdown
7575
local IsItemInRange = IsItemInRange
@@ -661,12 +661,13 @@ local function findSpellIdx(spellName, sid)
661661
return nil
662662
end
663663

664-
for i = 1, getNumSpells() do
665-
local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
666-
if sid == id or (spellName == name and not MatchSpellByID[id]) then
667-
return i
668-
end
669-
end
664+
-- FIX ME 11.0
665+
--for i = 1, getNumSpells() do
666+
--local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
667+
--if sid == id or (spellName == name and not MatchSpellByID[id]) then
668+
--return i
669+
--end
670+
--end
670671

671672
return nil
672673
end

‎ElvUI_Libraries/Core/oUF/elements/auras.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ local tinsert = tinsert
8484
local UnitIsUnit = UnitIsUnit
8585
local CreateFrame = CreateFrame
8686
local GameTooltip = GameTooltip
87-
local GetSpellInfo = GetSpellInfo
87+
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
8888
local floor, min = math.floor, math.min
8989
-- end block
9090

‎ElvUI_Libraries/Core/oUF_Plugins/oUF_RaidDebuffs.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ local type, pairs, wipe = type, pairs, wipe
1919

2020
local UnitCanAttack = UnitCanAttack
2121
local UnitIsCharmed = UnitIsCharmed
22-
local GetSpellInfo = GetSpellInfo
22+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
2323
local GetTime = GetTime
2424

2525
local debuff_data = {}

‎ElvUI_Libraries/Core/oUF_Plugins/oUF_Swing.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ local CreateFrame = CreateFrame
4545
local GetTime = GetTime
4646

4747
local UnitGUID = UnitGUID
48-
local GetSpellInfo = GetSpellInfo
48+
local GetSpellInfo = C_Spell.GetSpellInfo or GetSpellInfo
4949
local UnitCastingInfo = UnitCastingInfo
5050
local UnitRangedDamage = UnitRangedDamage
5151
local UnitAttackSpeed = UnitAttackSpeed

‎ElvUI_Libraries/Core/oUF_Plugins/oUF_Trinkets.lua

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ local _, ns = ...
22
local oUF = ns.oUF or oUF
33
assert(oUF, 'oUF not loaded')
44

5+
local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
6+
57
local factions = {
68
Horde = [[Interface\Icons\INV_Jewelry_Necklace_38]],
79
Alliance = [[Interface\Icons\INV_Jewelry_Necklace_37]],

‎ElvUI_Options/Core/Filters.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ local strlower = strlower
1313
local strmatch = strmatch
1414
local tonumber = tonumber
1515
local tostring = tostring
16-
local GetSpellInfo = GetSpellInfo
16+
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
1717
local GetSpellSubtext = GetSpellSubtext
1818

1919
local quickSearchText, selectedSpell, selectedFilter, filterList, spellList = '', nil, nil, {}, {}

‎ElvUI_Options/Core/StyleFilters.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ local GetClassInfo = GetClassInfo
1414
local GetDifficultyInfo = GetDifficultyInfo
1515
local GetInstanceInfo = GetInstanceInfo
1616
local GetRealZoneText = GetRealZoneText
17-
local GetSpellInfo = GetSpellInfo
18-
local GetSpellTexture = GetSpellTexture
17+
local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
18+
local GetSpellTexture = C_Spell and C_Spell.GetSpellTexture or GetSpellInfo
1919
local tIndexOf = tIndexOf
2020

2121
local C_Map_GetMapInfo = C_Map.GetMapInfo

0 commit comments

Comments
 (0)