TWW API Support

rgd87 · Jul 23, 2024 · 7f6a5b2 · 7f6a5b2
1 parent c5aa140
commit 7f6a5b2
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 61 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -245,6 +245,11 @@ globals = {
     "GetActiveTalentGroup",
     "GetTalentGroupRole",
 
+    "C_Spell",
+    "C_UnitAuras",
+    "C_AddOns",
+    "Settings",
+
     -- Disarm Blizz raid
     "PartyFrame",
     "UnregisterUnitWatch",

diff --git a/Aptechka-Mainline.toc b/Aptechka-Mainline.toc
@@ -1,4 +1,4 @@
-## Interface: 100200
+## Interface: 110000
 ## Title: Aptechka
 ## Notes: Raid Frames
 ## Version: @project-version@

diff --git a/Aptechka.lua b/Aptechka.lua
@@ -22,6 +22,8 @@ local UnitGetTotalHealAbsorbs = UnitGetTotalHealAbsorbs
 local UnitThreatSituation = UnitThreatSituation
 local UnitGroupRolesAssigned = UnitGroupRolesAssigned
 local UnitPhaseReason = UnitPhaseReason
+local GetSpellName = helpers.GetSpellName
+local GetSpellTexture = helpers.GetSpellTexture
 local GetSpecialization = GetSpecialization
 local GetSpecializationRole = GetSpecializationRole
 local GetActiveTalentGroup = GetActiveTalentGroup
@@ -802,7 +804,7 @@ function Aptechka:GenerateMergedConfig()
                 for additionalSpellID, enabled in pairs(opts.clones) do
                     -- if clone spell ID is at the same time a root ID of another spell
                     if config[category][additionalSpellID] then
-                        local spellName = GetSpellInfo(additionalSpellID)
+                        local spellName = GetSpellName(additionalSpellID)
                         if spellName then
                             print(string.format("[Aptechka] Conflicting spell IDs: %d (%s) already exists as root ID", additionalSpellID, spellName))
                         end
@@ -3201,20 +3203,7 @@ end
 ---------------------------
 -- Ordered
 ---------------------------
-local UnitAuraUniversal -- If available it's using slots API, otherwise just normal UnitAura
-if apiLevel <= 4 then
-    UnitAuraUniversal = UnitAura
-    ForEachAura = function(frame, unit, filter, batchSize, func)
-        for i=1,100 do
-            local name, icon, count, debuffType, duration, expirationTime, caster, isStealable, nameplateShowSelf, spellID, canApplyAura, isBossAura = UnitAura(unit, i, filter)
-            if not name then break end
-            func(frame, unit, i, nil, filter, name, icon, count, debuffType, duration, expirationTime, caster, isStealable, nameplateShowSelf, spellID, canApplyAura, isBossAura)
-        end
-    end
-else
-    UnitAuraUniversal = UnitAuraBySlot
-    -- ForEachAura = helpers.ForEachAura -- This one is using Slots API
-end
+local UnitAuraUniversal = C_UnitAuras.UnitAuraBySlot
 
 local BITMASK_DISEASE = helpers.BITMASK_DISEASE
 local BITMASK_POISON = helpers.BITMASK_POISON
@@ -3503,17 +3492,35 @@ function Aptechka.DispelTypePostUpdate(frame, unit)
 end
 function Aptechka.DummyFunction() end
 
-local handleBuffs = function(frame, unit, index, slot, filter, ...)
-    IndicatorAurasProc(frame, unit, index, slot, filter, ...)
-    BuffProc(frame, unit, index, slot, filter, ...)
+
+local function UnpackAuraData(auraData)
+    return
+        auraData.name,
+        auraData.icon,
+        auraData.charges,
+        auraData.dispelName,
+        auraData.duration,
+        auraData.expirationTime,
+        auraData.sourceUnit,
+        nil,
+        nil,
+        auraData.spellId
+end
+
+local handleBuffs = function(frame, unit, index, slot, filter, auraData)
+    local name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID = UnpackAuraData(auraData)
+
+    IndicatorAurasProc(frame, unit, index, slot, filter,    name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
+    BuffProc(frame, unit, index, slot, filter,    name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
 end
 
-local handleDebuffs = function(frame, unit, index, slot, filter, ...)
-    IndicatorAurasProc(frame, unit, index, slot, filter, ...)
-    DebuffProc(frame, unit, index, slot, filter, ...)
-    HighlightProc(frame, unit, index, slot, filter, ...)
-    DispelTypeProc(frame, unit, index, slot, filter, ...)
-    EffectListProc(frame, unit, index, slot, filter, ...)
+local handleDebuffs = function(frame, unit, index, slot, filter, auraData)
+    local name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID = UnpackAuraData(auraData)
+    IndicatorAurasProc(frame, unit, index, slot, filter,      name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
+    DebuffProc(frame, unit, index, slot, filter,      name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
+    HighlightProc(frame, unit, index, slot, filter,      name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
+    DispelTypeProc(frame, unit, index, slot, filter,      name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
+    EffectListProc(frame, unit, index, slot, filter,      name, icon, count, debuffType, duration, expirationTime, caster, _, _, spellID)
 end
 
 function Aptechka.FrameScanAuras(frame, unit)
@@ -3652,7 +3659,7 @@ function Aptechka.TestDebuffSlotsForUnit(frame, unit)
     local randomIDs = { 5211, 19577, 172, 408, 15286, 853, 980, 589, 118, 605 }
     for i=1,6 do
         local spellID = randomIDs[math.random(#randomIDs)]
-        local name, _, icon = GetSpellInfo(spellID)
+        local name, _, icon = GetSpellName(spellID)
         local duration = math.random(20)+5
         local hasCount = math.random(3) == 1
         local count = hasCount and math.random(18) or 0
@@ -3695,7 +3702,7 @@ function Aptechka.TestCastBar(frame, unit)
     local spellID = 172
     local srcGUID = UnitGUID("player")
     local castType = "CAST"
-    local name, _, icon = GetSpellInfo(spellID)
+    local name, _, icon = GetSpellName(spellID)
     local dstGUID = srcGUID
     local totalCasts = math.random(5)
     local duration = math.random(20)+5
@@ -3784,8 +3791,8 @@ function Aptechka:RemoveWidget(wname)
 end
 
 function Aptechka:OpenGUI()
-    if not IsAddOnLoaded("AptechkaOptions") then
-        LoadAddOn("AptechkaOptions")
+    if not C_AddOns.IsAddOnLoaded("AptechkaOptions") then
+        C_AddOns.LoadAddOn("AptechkaOptions")
     end
     AptechkaOptions.Open()
     -- InterfaceOptionsFrame_OpenToCategory("Aptechka")
@@ -3828,7 +3835,7 @@ function Aptechka:ListSpellsForWidget(widgetName)
                     local name
                     local icon
                     if type(spellID) == "number" then
-                        name = GetSpellInfo(spellID) or "<Unknown>"
+                        name = GetSpellName(spellID) or "<Unknown>"
                         icon = GetSpellTexture(spellID)
                     else
                         name = spellID
@@ -4187,7 +4194,7 @@ Aptechka.Commands = {
             local spellID = tonumber(args)
             if spellID then
                 Aptechka.db.global.customBlacklist[spellID] = true
-                local spellName = GetSpellInfo(spellID) or "<Unknown spell>"
+                local spellName = GetSpellName(spellID) or "<Unknown spell>"
                 print(string.format("%s (%d) added to debuff blacklist", spellName, spellID))
             end
         elseif cmd == "del" then
@@ -4196,18 +4203,18 @@ Aptechka.Commands = {
                 local val = nil
                 if defaultBlacklist[spellID] then val = false end -- if nil it'll fallback on __index
                 Aptechka.db.global.customBlacklist[spellID] = val
-                local spellName = GetSpellInfo(spellID) or "<Unknown spell>"
+                local spellName = GetSpellName(spellID) or "<Unknown spell>"
                 print(string.format("%s (%d) removed from debuff blacklist", spellName, spellID))
             end
         else
             print("Default blacklist:")
             for spellID in pairs(defaultBlacklist) do
-                local spellName = GetSpellInfo(spellID) or "<Unknown spell>"
+                local spellName = GetSpellName(spellID) or "<Unknown spell>"
                 print(string.format("    %s (%d)", spellName, spellID))
             end
             print("Custom blacklist:")
             for spellID in pairs(Aptechka.db.global.customBlacklist) do
-                local spellName = GetSpellInfo(spellID) or "<Unknown spell>"
+                local spellName = GetSpellName(spellID) or "<Unknown spell>"
                 print(string.format("    %s (%d)", spellName, spellID))
             end
         end
@@ -4444,10 +4451,41 @@ end
 Aptechka.UNIT_SPELLCAST_INTERRUPTED = Aptechka.UNIT_SPELLCAST_FAILED
 
 
+
+function Aptechka.InterfaceOptions_AddCategory(frame, addOn, position)
+	-- cancel is no longer a default option. May add menu extension for this.
+	frame.OnCommit = frame.okay;
+	frame.OnDefault = frame.default;
+	frame.OnRefresh = frame.refresh;
+
+	if frame.parent then
+		local category = Settings.GetCategory(frame.parent);
+		local subcategory, layout = Settings.RegisterCanvasLayoutSubcategory(category, frame, frame.name, frame.name);
+		subcategory.ID = frame.name;
+		return subcategory, category;
+	else
+		local category, layout = Settings.RegisterCanvasLayoutCategory(frame, frame.name, frame.name);
+		category.ID = frame.name;
+		Settings.RegisterAddOnCategory(category);
+		return category;
+	end
+end
+
+-- Deprecated. Use Settings.OpenToCategory().
+function Aptechka.InterfaceOptionsFrame_OpenToCategory(categoryIDOrFrame)
+	if type(categoryIDOrFrame) == "table" then
+		local categoryID = categoryIDOrFrame.name;
+		return Settings.OpenToCategory(categoryID);
+	else
+		return Settings.OpenToCategory(categoryIDOrFrame);
+	end
+end
+
+
 function Aptechka:CreateBlizzOptionsPanel()
     local f = CreateFrame('Frame', "AptechkaBlizzOptionsPanel", InterfaceOptionsFrame)
     f.name = "Aptechka"
-    InterfaceOptions_AddCategory(f);
+    Aptechka.InterfaceOptions_AddCategory(f);
 
     local content = CreateFrame("Frame", "$parentContent", f)
     content:SetPoint("TOPLEFT", 10, -10)
@@ -4542,7 +4580,7 @@ do
             local tooltip = self.tooltipPool:Acquire()
             tooltip:SetOwner(frame, "ANCHOR_NONE")
 
-            local name,_, texture = GetSpellInfo(spellID)
+            local name, _, texture = GetSpellName(spellID)
             tooltip.iconTexture:SetTexture(texture)
             tooltip:SetUnitAura(icon.unit, icon.index, icon.filter)
 

diff --git a/Aptechka.toc b/Aptechka.toc
@@ -1,4 +1,4 @@
-## Interface: 100200
+## Interface: 110000
 ## Title: Aptechka
 ## Notes: Raid Frames
 ## Version: @project-version@

diff --git a/Options/DebuffHighlight.lua b/Options/DebuffHighlight.lua
@@ -4,6 +4,7 @@ local L = Aptechka.L
 
 local defaultDebuffHighlights = AptechkaDefaultConfig.defaultDebuffHighlights
 
+local GetSpellName = Aptechka.util.GetSpellName
 local function IsSpellInList(list, id)
     for cat, spells in pairs(list) do
         for spellId, opts in pairs(spells) do
@@ -233,7 +234,7 @@ function AptechkaHybridScrollMixin:RefreshLayout()
                 button.categoryMiddle:Hide();
 
                 local spellId, prio, commentText = unpack(item)
-                local spellName, _, tex = GetSpellInfo(spellId)
+                local spellName, _, tex = GetSpellName(spellId)
                 button.spellId = spellId
                 icon:SetPoint("LEFT", 15, 0)
                 icon:SetTexture(tex);
@@ -279,7 +280,7 @@ function ns.CreateSpellDataPanel()
     spellID:SetRelativeWidth(0.13)
     spellID:SetCallback("OnTextChanged", function(self, event, value)
         local v = tonumber(value)
-        if v and v > 0 and GetSpellInfo(v) then
+        if v and v > 0 and GetSpellName(v) then
             self.parent.opts["spellID"] = v
             self.editbox:SetTextColor(1,1,1)
             self.parent.controls.save:SetDisabled(false)

diff --git a/Options/LoadHooks.lua b/Options/LoadHooks.lua
@@ -110,7 +110,7 @@ function f.Open()
             WIDGETCONFIG = widgetsFrame,
         }
 
-
+        treegroup.text = "123"
         treegroup:SetCallback("OnGroupSelected", function(self, event, group)
 
             if self.customPanel then

diff --git a/Options/SpellList.lua b/Options/SpellList.lua
@@ -5,7 +5,8 @@ local L = Aptechka.L
 local LSM = LibStub("LibSharedMedia-3.0")
 
 local newFeatureIcon = "|TInterface\\OptionsFrame\\UI-OptionsFrame-NewFeatureIcon:0:0:0:-1|t"
-
+local GetSpellName = Aptechka.util.GetSpellName
+local GetSpellTexture = Aptechka.util.GetSpellTexture
 local AceGUI = LibStub("AceGUI-3.0")
 local rootFrame
 local FORM_CACHE = {}
@@ -68,7 +69,7 @@ function ns.GenerateCategoryTree(self, settingsClass, category)
             if isTemplate or defaultSpellList[spellID] or customSpellList[spellID] then
                 local name
                 if type(spellID) == "number" then
-                    name = (GetSpellInfo(spellID) or "<Unknown>") or opts.name
+                    name = (GetSpellName(spellID) or "<Unknown>") or opts.name
                 else
                     name = spellID
                 end
@@ -220,18 +221,18 @@ local function form_save(form)
                 --invalid spell id string
                 return
             end
-            if not GetSpellInfo(spellID) then
+            if not GetSpellName(spellID) then
                 return -- spell doesn't exist
             end
 
             -- if not opts.name then
-                -- opts.name = GetSpellInfo(spellID)
+                -- opts.name = GetSpellName(spellID)
             -- end
             opts.spellID = nil
         end
 
         if not opts.name then
-            opts.name = GetSpellInfo(spellID)
+            opts.name = GetSpellName(spellID)
             if category == "traces" then
                 opts.name = opts.name.."Trace"
             end
@@ -449,7 +450,7 @@ local function form_spellID(form)
     spellID:SetRelativeWidth(0.2)
     spellID:SetCallback("OnTextChanged", function(self, event, value)
         local v = tonumber(value)
-        if v and v > 0 and GetSpellInfo(v) then
+        if v and v > 0 and GetSpellName(v) then
             self.parent.opts["spellID"] = v
             self.editbox:SetTextColor(1,1,1)
         else

diff --git a/Options/loader/AptechkaOptions-Mainline.toc b/Options/loader/AptechkaOptions-Mainline.toc
@@ -1,4 +1,4 @@
-## Interface: 100200
+## Interface: 110000
 ## Title: AptechkaOptions
 ## Notes: Options module for Aptechka
 ## Author: d87

diff --git a/Options/loader/AptechkaOptions.toc b/Options/loader/AptechkaOptions.toc
@@ -1,4 +1,4 @@
-## Interface: 100200
+## Interface: 110000
 ## Title: AptechkaOptions
 ## Notes: Options module for Aptechka
 ## Author: d87