Initial work on Beta. DO NOT DOWNLOAD ME YET!!!!

tukui-org · Apr 22, 2024 · 1465858 · 1465858
1 parent cd745ba
commit 1465858
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 42 deletions.
diff --git a/ElvUI/Core/General/API.lua b/ElvUI/Core/General/API.lua
@@ -904,7 +904,8 @@ function E:LoadAPI()
 	E:RegisterEvent('PLAYER_REGEN_DISABLED')
 	E:RegisterEvent('UI_SCALE_CHANGED', 'PixelScaleChanged')
 
-	E:SetupGameMenu()
+	-- FIX ME 11.0
+	--E:SetupGameMenu()
 
 	if E.Retail then
 		for _, mountID in next, C_MountJournal_GetMountIDs() do

diff --git a/ElvUI/Core/Modules/Bags/Bags.lua b/ElvUI/Core/Modules/Bags/Bags.lua
@@ -110,12 +110,12 @@ local BAG_FILTER_IGNORE = BAG_FILTER_IGNORE
 local SELL_ALL_JUNK_ITEMS = SELL_ALL_JUNK_ITEMS_EXCLUDE_FLAG
 
 local BagSlotFlags = Enum.BagSlotFlags
-local FILTER_FLAG_TRADE_GOODS = (BagSlotFlags and BagSlotFlags.PriorityTradeGoods) or LE_BAG_FILTER_FLAG_TRADE_GOODS
-local FILTER_FLAG_CONSUMABLES = (BagSlotFlags and BagSlotFlags.PriorityConsumables) or LE_BAG_FILTER_FLAG_CONSUMABLES
-local FILTER_FLAG_EQUIPMENT = (BagSlotFlags and BagSlotFlags.PriorityEquipment) or LE_BAG_FILTER_FLAG_EQUIPMENT
+local FILTER_FLAG_TRADE_GOODS = (BagSlotFlags and BagSlotFlags.ClassProfessionGoods) or LE_BAG_FILTER_FLAG_TRADE_GOODS
+local FILTER_FLAG_CONSUMABLES = (BagSlotFlags and BagSlotFlags.ClassConsumables) or LE_BAG_FILTER_FLAG_CONSUMABLES
+local FILTER_FLAG_EQUIPMENT = (BagSlotFlags and BagSlotFlags.ClassEquipment) or LE_BAG_FILTER_FLAG_EQUIPMENT
 local FILTER_FLAG_IGNORE = (BagSlotFlags and BagSlotFlags.DisableAutoSort) or LE_BAG_FILTER_FLAG_IGNORE_CLEANUP
-local FILTER_FLAG_JUNK = (BagSlotFlags and BagSlotFlags.PriorityJunk) or LE_BAG_FILTER_FLAG_JUNK
-local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.PriorityQuestItems) or 32 -- didnt exist
+local FILTER_FLAG_JUNK = (BagSlotFlags and BagSlotFlags.ClassJunk) or LE_BAG_FILTER_FLAG_JUNK
+local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.ClassQuestItems) or 32 -- didnt exist
 local FILTER_FLAG_JUNKSELL = (BagSlotFlags and BagSlotFlags.ExcludeJunkSell) or 64 -- didnt exist
 
 local READY_TEX = [[Interface\RaidFrame\ReadyCheck-Ready]]

diff --git a/ElvUI/Core/Modules/Bags/Sort.lua b/ElvUI/Core/Modules/Bags/Sort.lua
@@ -24,11 +24,11 @@ local BANK_CONTAINER = Enum.BagIndex.Bank
 local REAGENT_CONTAINER = E.Retail and Enum.BagIndex.ReagentBag or math.huge
 
 local BagSlotFlags = Enum.BagSlotFlags
-local FILTER_FLAG_TRADE_GOODS = LE_BAG_FILTER_FLAG_TRADE_GOODS or BagSlotFlags.PriorityTradeGoods
-local FILTER_FLAG_CONSUMABLES = LE_BAG_FILTER_FLAG_CONSUMABLES or BagSlotFlags.PriorityConsumables
-local FILTER_FLAG_EQUIPMENT = LE_BAG_FILTER_FLAG_EQUIPMENT or BagSlotFlags.PriorityEquipment
-local FILTER_FLAG_JUNK = LE_BAG_FILTER_FLAG_JUNK or BagSlotFlags.PriorityJunk
-local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.PriorityQuestItems) or 32 -- didnt exist
+local FILTER_FLAG_TRADE_GOODS = LE_BAG_FILTER_FLAG_TRADE_GOODS or BagSlotFlags.ClassProfessionGoods
+local FILTER_FLAG_CONSUMABLES = LE_BAG_FILTER_FLAG_CONSUMABLES or BagSlotFlags.ClassConsumables
+local FILTER_FLAG_EQUIPMENT = LE_BAG_FILTER_FLAG_EQUIPMENT or BagSlotFlags.ClassEquipment
+local FILTER_FLAG_JUNK = LE_BAG_FILTER_FLAG_JUNK or BagSlotFlags.ClassJunk
+local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.ClassQuestItems) or 32 -- didnt exist
 
 local ItemClass_Armor = Enum.ItemClass.Armor
 local ItemClass_Weapon = Enum.ItemClass.Weapon

diff --git a/ElvUI/Core/Modules/DataBars/Reputation.lua b/ElvUI/Core/Modules/DataBars/Reputation.lua
@@ -7,7 +7,7 @@ local ipairs = ipairs
 local huge = math.huge
 
 local GameTooltip = GameTooltip
-local GetWatchedFactionInfo = GetWatchedFactionInfo
+local GetWatchedFactionInfo = C_Reputation and C_Reputation.GetWatchedFactionData or GetWatchedFactionInfo
 local ToggleCharacter = ToggleCharacter
 
 local GetFriendshipReputation = GetFriendshipReputation or C_GossipInfo.GetFriendshipReputation

diff --git a/ElvUI/Core/Modules/Tooltip/Tooltip.lua b/ElvUI/Core/Modules/Tooltip/Tooltip.lua
@@ -21,7 +21,7 @@ local GetCraftReagentItemLink = GetCraftReagentItemLink
 local GetCraftSelectionIndex = GetCraftSelectionIndex
 local GetCreatureDifficultyColor = GetCreatureDifficultyColor
 local GetGuildInfo = GetGuildInfo
-local GetItemCount = GetItemCount
+local GetItemCount = C_Item and C_Item.GetItemCount or GetItemCount
 local GetMouseFocus = GetMouseFocus
 local GetNumGroupMembers = GetNumGroupMembers
 local GetRelativeDifficultyColor = GetRelativeDifficultyColor

diff --git a/ElvUI/Core/Modules/UnitFrames/Elements/AuraBars.lua b/ElvUI/Core/Modules/UnitFrames/Elements/AuraBars.lua
@@ -8,7 +8,7 @@ local unpack = unpack
 local strfind = strfind
 
 local CreateFrame = CreateFrame
-local GetSpellInfo = GetSpellInfo
+local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
 
 local DebuffColors = E.Libs.Dispel:GetDebuffTypeColor()
 

diff --git a/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua b/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua
@@ -7,16 +7,16 @@ local hooksecurefunc = hooksecurefunc
 local InCombatLockdown = InCombatLockdown
 
 local headers = {
-	_G.ObjectiveTrackerBlocksFrame.QuestHeader,
-	_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
-	_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
-	_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
-	_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
-	_G.ObjectiveTrackerBlocksFrame.MonthlyActivitiesHeader,
-	_G.ObjectiveTrackerBlocksFrame.AdventureHeader,
-	_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
-	_G.WORLD_QUEST_TRACKER_MODULE.Header,
-	_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader
+	--_G.ObjectiveTrackerBlocksFrame.QuestHeader,
+	--_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
+	--_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
+	--_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
+	--_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
+	--_G.ObjectiveTrackerBlocksFrame.MonthlyActivitiesHeader,
+	--_G.ObjectiveTrackerBlocksFrame.AdventureHeader,
+	--_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
+	--_G.WORLD_QUEST_TRACKER_MODULE.Header,
+	--_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader
 }
 
 local function SkinOjectiveTrackerHeaders(header)
@@ -213,7 +213,7 @@ local function UpdateMinimizeButton(button, collapsed)
 	end
 end
 
-function S:ObjectiveTrackerFrame()
+function S:Blizzard_OptjectiveTracker()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.objectiveTracker) then return end
 
 	local minimize = _G.ObjectiveTrackerFrame.HeaderMenu.MinimizeButton
@@ -260,4 +260,4 @@ function S:ObjectiveTrackerFrame()
 	end
 end
 
-S:AddCallback('ObjectiveTrackerFrame')
+S:AddCallbackForAddon('Blizzard_OptjectiveTracker')
diff --git a/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua b/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua
@@ -66,10 +66,10 @@ local setmetatable = setmetatable
 local CheckInteractDistance = CheckInteractDistance
 local GetInventoryItemLink = GetInventoryItemLink
 local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
-local GetNumSpellTabs = GetNumSpellTabs
-local GetSpellBookItemName = GetSpellBookItemName
-local GetSpellInfo = GetSpellInfo
-local GetSpellTabInfo = GetSpellTabInfo
+local GetNumSpellTabs = (C_SpellBook and C_SpellBook.GetNumSpellBookSkillLines) or GetNumSpellTabs
+local GetSpellBookItemName = (C_SpellBook and C_SpellBook.GetSpellBookItemName) or GetSpellBookItemName
+local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
+local GetSpellTabInfo = (C_SpellBook and C_SpellBook.GetSpellBookSkillLineInfo) or GetSpellTabInfo
 local GetTime = GetTime
 local InCombatLockdown = InCombatLockdown
 local IsItemInRange = IsItemInRange
@@ -661,12 +661,13 @@ local function findSpellIdx(spellName, sid)
     return nil
   end
 
-  for i = 1, getNumSpells() do
-    local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
-    if sid == id or (spellName == name and not MatchSpellByID[id]) then
-      return i
-    end
-  end
+    -- FIX ME 11.0
+  --for i = 1, getNumSpells() do
+    --local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
+    --if sid == id or (spellName == name and not MatchSpellByID[id]) then
+      --return i
+    --end
+  --end
 
   return nil
 end

diff --git a/ElvUI_Libraries/Core/oUF/elements/auras.lua b/ElvUI_Libraries/Core/oUF/elements/auras.lua
@@ -84,7 +84,7 @@ local tinsert = tinsert
 local UnitIsUnit = UnitIsUnit
 local CreateFrame = CreateFrame
 local GameTooltip = GameTooltip
-local GetSpellInfo = GetSpellInfo
+local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
 local floor, min = math.floor, math.min
 -- end block
 

diff --git a/ElvUI_Libraries/Core/oUF_Plugins/oUF_RaidDebuffs.lua b/ElvUI_Libraries/Core/oUF_Plugins/oUF_RaidDebuffs.lua
@@ -19,7 +19,7 @@ local type, pairs, wipe = type, pairs, wipe
 
 local UnitCanAttack = UnitCanAttack
 local UnitIsCharmed = UnitIsCharmed
-local GetSpellInfo = GetSpellInfo
+local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
 local GetTime = GetTime
 
 local debuff_data = {}

diff --git a/ElvUI_Libraries/Core/oUF_Plugins/oUF_Swing.lua b/ElvUI_Libraries/Core/oUF_Plugins/oUF_Swing.lua
@@ -45,7 +45,7 @@ local CreateFrame = CreateFrame
 local GetTime = GetTime
 
 local UnitGUID = UnitGUID
-local GetSpellInfo = GetSpellInfo
+local GetSpellInfo = C_Spell.GetSpellInfo or GetSpellInfo
 local UnitCastingInfo = UnitCastingInfo
 local UnitRangedDamage = UnitRangedDamage
 local UnitAttackSpeed = UnitAttackSpeed

diff --git a/ElvUI_Libraries/Core/oUF_Plugins/oUF_Trinkets.lua b/ElvUI_Libraries/Core/oUF_Plugins/oUF_Trinkets.lua
@@ -2,6 +2,8 @@ local _, ns = ...
 local oUF = ns.oUF or oUF
 assert(oUF, 'oUF not loaded')
 
+local GetSpellInfo = (C_Spell and C_Spell.GetSpellInfo) or GetSpellInfo
+
 local factions = {
 	Horde = [[Interface\Icons\INV_Jewelry_Necklace_38]],
 	Alliance = [[Interface\Icons\INV_Jewelry_Necklace_37]],

diff --git a/ElvUI_Options/Core/Filters.lua b/ElvUI_Options/Core/Filters.lua
@@ -13,7 +13,7 @@ local strlower = strlower
 local strmatch = strmatch
 local tonumber = tonumber
 local tostring = tostring
-local GetSpellInfo = GetSpellInfo
+local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
 local GetSpellSubtext = GetSpellSubtext
 
 local quickSearchText, selectedSpell, selectedFilter, filterList, spellList = '', nil, nil, {}, {}

diff --git a/ElvUI_Options/Core/StyleFilters.lua b/ElvUI_Options/Core/StyleFilters.lua
@@ -14,8 +14,8 @@ local GetClassInfo = GetClassInfo
 local GetDifficultyInfo = GetDifficultyInfo
 local GetInstanceInfo = GetInstanceInfo
 local GetRealZoneText = GetRealZoneText
-local GetSpellInfo = GetSpellInfo
-local GetSpellTexture = GetSpellTexture
+local GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
+local GetSpellTexture = C_Spell and C_Spell.GetSpellTexture or GetSpellInfo
 local tIndexOf = tIndexOf
 
 local C_Map_GetMapInfo = C_Map.GetMapInfo