From 8afafe71cfda258d96a70d674ca943dbe3657cab Mon Sep 17 00:00:00 2001 From: Brues <5278969+brues-code@users.noreply.github.com> Date: Thu, 29 Oct 2026 10:09:45 -0500 Subject: [PATCH] Drop RunMacroText fallback and dead actionbar spellslot branches ClassicAPI 1.18 provides RunMacroText natively; bump CAPI min to 1.18.0. spellslot/booktype/scanmacro were only ever cleared, never set. --- API_Check.lua | 2 +- modules/actionbar.lua | 12 ------------ pfUI.lua | 15 --------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/API_Check.lua b/API_Check.lua index d5faf931..26d8a851 100644 --- a/API_Check.lua +++ b/API_Check.lua @@ -13,7 +13,7 @@ do -- on. There pfUI does load, and will throw wherever it reaches for something -- the installed DLL doesn't have yet -- the popup names the cause so those -- errors aren't a mystery. - local PFUI_CLASSIC_API_MIN = 11710 -- (X*10000 + Y*100 + Z) + local PFUI_CLASSIC_API_MIN = 11800 -- (X*10000 + Y*100 + Z) local PFUI_CLASSIC_API_LATEST = PFUI_CLASSIC_API_MIN local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI" local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest" diff --git a/modules/actionbar.lua b/modules/actionbar.lua index 84591e5c..82e3fdc0 100644 --- a/modules/actionbar.lua +++ b/modules/actionbar.lua @@ -382,8 +382,6 @@ pfUI:RegisterModule("actionbar", function () end elseif self.spellID then GameTooltip:SetSpellByID(self.spellID) - elseif self.spellslot and self.booktype then - GameTooltip:SetSpell(self.spellslot, self.booktype) else GameTooltip:SetAction(self.id) end @@ -456,11 +454,6 @@ pfUI:RegisterModule("actionbar", function () id = self.bar == 1 and self.slot or sid-((self.bar)-1)*12 end - -- overwrite with spell macro texture where possible - if self.spellslot and self.booktype then - texture = GetSpellTexture(self.spellslot, self.booktype) - end - if not self.showempty and self.backdrop and not texture and grid == 0 then self.backdrop:Hide() self.hide = true @@ -590,9 +583,6 @@ pfUI:RegisterModule("actionbar", function () start, duration, enable = GetShapeshiftFormCooldown(button.id) elseif button.bar == 12 then start, duration, enable = GetPetActionCooldown(button.id) - elseif button.spellslot and button.booktype then - start, duration = GetSpellCooldown(button.spellslot, button.booktype) - enable = 1 else start, duration, enable = GetActionCooldown(button.id) end @@ -1150,8 +1140,6 @@ pfUI:RegisterModule("actionbar", function () f.count:SetJustifyH("RIGHT") f.count:SetJustifyV("BOTTOM") - f.scanmacro, f.spellslot, f.booktype = nil, nil, nil - -- range glow color f.rangeColor = GetStringColorObject(C.bars.rangecolor) diff --git a/pfUI.lua b/pfUI.lua index 643d49e6..2edd8564 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -497,19 +497,4 @@ function pfUI.SetupCVars() UIParentLoadAddOn("Blizzard_CombatText") end -if not RunMacroText then - local obj = setmetatable({ ["GetText"] = function(self) return self.text end }, { - __index = function(tab,key) - local value = function() return end - rawset(tab,key,value) - return value - end - }) - - function RunMacroText(text) - obj.text = text - ChatEdit_ParseText(obj, 1) - end -end - _G.PLAYER_BUFF_START_ID = -1