Update for TWW

kesava-wow · Jul 22, 2024 · a2f7afc · a2f7afc
1 parent d130e22
commit a2f7afc
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/Kui_Media/Kui_Media.toc b/Kui_Media/Kui_Media.toc
@@ -1,4 +1,4 @@
-## Interface: 100105
+## Interface: 100207, 110000, 110002
 ## Interface-Classic: 11501
 ## Interface-BCC: 20501
 ## Interface-Wrath: 30402

diff --git a/Kui_Nameplates/Kui_Nameplates.toc b/Kui_Nameplates/Kui_Nameplates.toc
@@ -1,4 +1,4 @@
-## Interface: 100105
+## Interface: 100207, 110000, 110002
 ## Interface-Classic: 11501
 ## Interface-BCC: 20501
 ## Interface-Wrath: 30402

diff --git a/Kui_Nameplates/elements/auras.lua b/Kui_Nameplates/elements/auras.lua
@@ -112,7 +112,14 @@ local addon = KuiNameplates
 local kui = LibStub('Kui-1.0')
 local ele = addon:NewElement('Auras',1)
 local AuraLib
-local UnitAura = _G['UnitAura']
+
+local UnitAura = function(unitToken, index, filter)
+    if C_UnitAuras and C_UnitAuras.GetAuraDataByIndex then
+        return AuraUtil.UnpackAuraData(C_UnitAuras.GetAuraDataByIndex(unitToken, index, filter))
+    elseif _G.UnitAura then
+        return _G.UnitAura(unitToken, index, filter) end
+    return nil
+end
 
 local strlower,tinsert,tsort,     pairs,ipairs =
       strlower,tinsert,table.sort,pairs,ipairs

diff --git a/Kui_Nameplates_Core/Kui_Nameplates_Core.toc b/Kui_Nameplates_Core/Kui_Nameplates_Core.toc
@@ -1,4 +1,4 @@
-## Interface: 100105
+## Interface: 100207, 110000, 110002
 ## Interface-Classic: 11501
 ## Interface-BCC: 20501
 ## Interface-Wrath: 30402

diff --git a/Kui_Nameplates_Core/hook.lua b/Kui_Nameplates_Core/hook.lua
@@ -17,6 +17,9 @@ if not core then
     return
 end
 
+local IsAddOnLoaded = C_AddOns and C_AddOns.IsAddOnLoaded or IsAddOnLoaded
+local LoadAddOn = C_AddOns and C_AddOns.LoadAddOn or LoadAddOn
+
 local plugin_fading
 -- messages ####################################################################
 function core:Create(f)
@@ -223,7 +226,13 @@ do
         opt:SetScript('OnShow',lod_OnShow)
         opt:SetScript('OnEvent',lod_OnEvent)
 
-        InterfaceOptions_AddCategory(opt)
+        if InterfaceOptions_AddCategory then
+            InterfaceOptions_AddCategory(opt)
+        else
+            local category, _ = Settings.RegisterCanvasLayoutCategory(opt, opt.name)
+            category.ID = opt.name
+            Settings.RegisterAddOnCategory(category)
+        end
     end
 end
 -- fade rules ##################################################################

diff --git a/Kui_Nameplates_Core_Config/Kui_Nameplates_Core_Config.toc b/Kui_Nameplates_Core_Config/Kui_Nameplates_Core_Config.toc
@@ -1,4 +1,4 @@
-## Interface: 100105
+## Interface: 100207, 110000, 110002
 ## Interface-Classic: 11501
 ## Interface-BCC: 20501
 ## Interface-Wrath: 30402

diff --git a/Kui_Nameplates_Core_Config/main.lua b/Kui_Nameplates_Core_Config/main.lua
@@ -13,6 +13,8 @@ local knp = KuiNameplates
 local core = KuiNameplatesCore --luacheck:globals KuiNameplatesCore
 local config -- set when layout is loaded
 
+local IsAddOnLoaded = C_AddOns and C_AddOns.IsAddOnLoaded or IsAddOnLoaded
+
 -- reuse category container created by core:Initialise
 local opt = KuiNameplatesCoreConfig --luacheck:globals KuiNameplatesCoreConfig
 assert(opt)
@@ -174,8 +176,12 @@ function command_func.config(...)
         opt:ShowPage(found)
     end
 
-    InterfaceOptionsFrame_OpenToCategory(opt.name)
-    InterfaceOptionsFrame_OpenToCategory(opt.name)
+    if InterfaceOptionsFrame_OpenToCategory then
+        InterfaceOptionsFrame_OpenToCategory(opt.name)
+        InterfaceOptionsFrame_OpenToCategory(opt.name)
+    else
+        Settings.OpenToCategory(opt.name)
+    end
 end
 function command_func.debug(arg,...)
     -- luacheck:globals KuiNameplatesPlayerAnchor