Removed macrotweak

The mana spark modelled a tick clock that does not exist. Spending mana
restarted the sweep with a five-second span, then it cycled at two seconds
until the next spend -- so every cast reset the phase, and the spark drew a
period the server never runs. There is one regen timer for every power,
REGEN_TIME_FULL (2s), re-armed with `+=` in Player::RegenerateAll and never
touched by casting. The five-second rule is a separate countdown that
SetLastManaUse arms on any mana-costing cast; it changes what a tick pays,
never when ticks land. Inside the window the tick still fires and still pays
mp5 plus whatever share of spirit the player keeps.

That share is common and not computable here. The amounts are readable now
(C_Spell.GetSpellEffectInfo), and the talent, racial and buff sources could be
enumerated -- but the Casting Regen item ladder is equip auras that never
appear in the buff list, and m_modManaRegenInterrupt is never sent. A floor
that is wrong whenever the player wears such an item is worse than showing
what happens: the spark starts an FSR window dim and goes solid on the first
tick that lands inside it.

The sweep is a free-running phase lock on that one clock. Every positive mana
delta used to re-anchor it, and most are not the tick -- Illumination refunds,
Judgement of Wisdom, potions, a Mana Spring totem on its own 2s clock at
another phase -- so the spark snapped back to the edge mid-sweep several times
a cycle. A gain re-anchors only if it lands within 250ms of the predicted
boundary. Two rejected gains exactly one period apart are the real clock and
move the lock, which is how a wrong first lock heals. Rollover advances by
whole periods from the anchor instead of restarting from now, so frame timing
no longer accumulates into drift the lock then has to chase.

Even a correct tick used to hitch the spark: re-anchoring to arrival time
moved it by the jitter, 20-80ms, right at the wrap. Inside an 80ms band the
tick now confirms the sweep and leaves the anchor alone; only the excess is
pulled in. With no self-drift left there is nothing systematic in that band.

The rule is armed from UNIT_SPELLCAST_SUCCEEDED filtered through
C_Spell.GetSpellPowerCost, mirroring Spell::TakePower's condition, rather than
from a mana decrease -- Mana Burn lowers mana without arming the rule.
UNIT_SPELLCAST_CHANNEL_STOP re-arms it, since Unit::Update will not expire it
while the spending spell is still channeling.

The energy period no longer names a spell. Player::RegenerateAll sums
SPELL_AURA_MOD_ENERGY_REGEN_TIME and takes amount * agility / 10 off the timer
in milliseconds; everything in that sum is readable here. The player's own
spells carrying aura 217 come from C_SpellBook.GetPlayerSpellsByAura, passives
count while known (current rank only), anything else while it is up in the
buff list, and each amount is basePoints + baseDice from the effect data. So
Blade Rush is found without GetTalentInfo(2, 16) -- an ordinal into the talent
grid that does not fail when the tree changes but reads another talent's rank
(index 16 is Vigor one tab over) -- and a retune or a second source needs no
edit. The sum is cached and dropped on SPELLS_CHANGED and
PLAYER_AURAS_CHANGED, the two events its two halves move on, so a tick costs
no spellbook walk; agility stays live, it is one call.

The CHAT_MSG_SPELL_SELF_BUFF "You gain ... Energy from" filter is gone. The
phase lock rejects Relentless Strikes and Thistle Tea the same way it rejects
a paladin's refunds, it was English-only, and its ignore-the-next-gain logic
could eat a real tick if events reordered.

README.md

@@ -1,10 +1,13 @@
 # pfUI - ClassicAPI Edition
 
+[![Octo WoW](https://img.shields.io/badge/Octo%20WoW-1.18.1-brightgreen.svg)](https://octowow.st/)
 [![ClassicAPI](https://img.shields.io/badge/ClassicAPI-Required-purple.svg)](https://github.com/brues-code/ClassicAPI)
 [![Nampower](https://img.shields.io/badge/Nampower-Required-purple.svg)](https://github.com/brues-code/nampower)
 [![SuperWoW](https://img.shields.io/badge/SuperWoW-Optional-yellow.svg)](https://github.com/balakethelock/SuperWoW)
 [![UnitXP](https://img.shields.io/badge/UnitXP__SP3-Optional-yellow.svg)](https://github.com/brues-code/UnitXP_SP3)
 
+**A pfUI fork specifically optimized for ClassicAPI on [Octo WoW](https://octowow.st/)**
+
 This version includes significant performance improvements and DLL-enhanced features.
 
 ## Installation
@@ -15,7 +18,7 @@ This version includes significant performance improvements and DLL-enhanced feat
 
 ## DLL Enhancements
 
-Since pfUI 6.0.0 includes integrations with client-side DLLs for enhanced functionality:
+Since pfUI 6.0.0 includes integrations with client-side DLLs for enhanced functionality. These DLLs are permitted on Octo WoW:
 
 ### [ClassicAPI](https://github.com/brues-code/ClassicAPI)
 

api/api.lua

@@ -1333,32 +1333,6 @@ function pfUI.api.CreateBackdropShadow(f)
   f.backdrop_shadow:SetBackdropBorderColor(0, 0, 0, tonumber(pfUI_config.appearance.border.shadow_intensity))
 end
 
--- [ Set Castbar Shield ]
--- Colors a castbar for a cast that none of the player's own interrupts or
--- silences can stop. The bar and the icon's border both take the shield color,
--- so the state still reads on a bar configured without an icon. Not shielded
--- restores the normal cast/channel color and the configured border.
--- 'bar'        [frame]     the castbar statusbar
--- 'icon'       [frame]     the icon frame, or nil for a bar without one
--- 'shielded'   [bool]      whether the cast is uninterruptible
--- 'isChannel'  [bool]      selects the unshielded color
-function pfUI.api.SetCastbarShield(bar, icon, shielded, isChannel)
-  if shielded then
-    bar:SetStatusBarColor(pfUI.api.GetStringColor(C.appearance.castbar.shieldcolor))
-  else
-    bar:SetStatusBarColor(pfUI.api.GetStringColor(C.appearance.castbar[isChannel and "channelcolor" or "castbarcolor"]))
-  end
-
-  local iconborder = icon and icon.backdrop
-  if not iconborder then return end
-
-  if shielded then
-    iconborder:SetBackdropBorderColor(pfUI.api.GetStringColor(C.appearance.castbar.shieldcolor))
-  else
-    iconborder:SetBackdropBorderColor(pfUI.api.GetStringColor(C.appearance.border.color))
-  end
-end
-
 -- [ Bar Layout Options ] --
 -- 'barsize'  size of bar in number of buttons
 -- returns:   array of options as strings for pfUI.gui.bar

api/config.lua

@@ -156,8 +156,6 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("appearance", "castbar",     "castbarcolor",     ".7,.7,.9,.8")
   pfUI:UpdateConfig("appearance", "castbar",     "channelcolor",     ".9,.9,.7,.8")
   pfUI:UpdateConfig("appearance", "castbar",     "failcolor",        "1,.2,.2,.8")
-  pfUI:UpdateConfig("appearance", "castbar",     "shieldcolor",      ".8,.45,.45,.8")
-  pfUI:UpdateConfig("appearance", "castbar",     "fsrcolor",         ".9,.6,.2,.8")
   pfUI:UpdateConfig("appearance", "castbar",     "texture",          "Interface\\AddOns\\pfUI\\img\\bar")
   pfUI:UpdateConfig("appearance", "infight",     "screen",           "0")
   pfUI:UpdateConfig("appearance", "infight",     "aggro",            "0")
@@ -326,9 +324,6 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("unitframes", "player",      "showRest",                "0")
   pfUI:UpdateConfig("unitframes", "player",      "energy",                  "1")
   pfUI:UpdateConfig("unitframes", "player",      "manatick",                "0")
-  pfUI:UpdateConfig("unitframes", "player",      "showfsr",                 "1")
-  pfUI:UpdateConfig("unitframes", "player",      "fsrheight",               "4")
-  pfUI:UpdateConfig("unitframes", "player",      "fsrstyle",                "0")
   pfUI:UpdateConfig("unitframes", "player",      "display_haste",           "0")
   pfUI:UpdateConfig("unitframes", "player",      "display_haste_color",     "1,1,1,1")
   pfUI:UpdateConfig("unitframes", "player",      "display_spellpower",      "1")

modules/castbar.lua

@@ -86,7 +86,7 @@ pfUI:RegisterModule("castbar", function ()
 
   -- Stamp the bar with cast data and render text/icon/lag once. OnUpdate
   -- then animates the fill from this state without touching C_Spell.
-  local function StampBar(cb, name, tex, startMs, endMs, spellID, isChannel, delayMs, isTradeskill, rank, noInterrupt)
+  local function StampBar(cb, name, tex, startMs, endMs, spellID, isChannel, delayMs, isTradeskill, rank)
     cb.startTime = startMs
     cb.endTime = endMs
     cb.isChannel = isChannel
@@ -97,10 +97,7 @@ pfUI:RegisterModule("castbar", function ()
     cb:SetAlpha(1)
     cb.fadeout = nil
 
-    -- Shield an uninterruptible cast. Not on the player's own bar: the flag is
+    cb.bar:SetStatusBarColor(GetStringColor(C.appearance.castbar[isChannel and "channelcolor" or "castbarcolor"]))
-    -- measured against the reader's own interrupts and silences, so on your own
-    -- cast it answers a question nobody asked.
-    SetCastbarShield(cb.bar, cb.icon, noInterrupt and cb.unitstr ~= "player", isChannel)
 
     -- Rank: prefer the value the UNIT_SPELLCAST_* event delivered (arg5, passed
     -- through by RefreshBar). Only the retarget re-poll has no event in hand, so
@@ -155,10 +152,10 @@ pfUI:RegisterModule("castbar", function ()
       ClearBar(cb)
       return
     end
-    local name, _, tex, startMs, endMs, isTradeskill, _, noInterrupt, spellID, _, delayMs = C_Spell.UnitCastingInfo(query)
+    local name, _, tex, startMs, endMs, isTradeskill, _, _, spellID, _, delayMs = C_Spell.UnitCastingInfo(query)
     local isChan
     if not name then
-      name, _, tex, startMs, endMs, _, noInterrupt, spellID = C_Spell.UnitChannelInfo(query)
+      name, _, tex, startMs, endMs, _, _, spellID = C_Spell.UnitChannelInfo(query)
       isChan = true
     end
     -- Synthetic fallback for abilities the engine treats as instant-cast but
@@ -172,7 +169,7 @@ pfUI:RegisterModule("castbar", function ()
       end
     end
     if name and startMs and endMs then
-      StampBar(cb, name, tex, startMs, endMs, spellID, isChan, delayMs, isTradeskill, rank, noInterrupt)
+      StampBar(cb, name, tex, startMs, endMs, spellID, isChan, delayMs, isTradeskill, rank)
     else
       ClearBar(cb)
     end

modules/energytick.lua

@@ -89,13 +89,6 @@ pfUI:RegisterModule("energytick", function()
     return C.unitframes.player.pwidth ~= "-1" and C.unitframes.player.pwidth or C.unitframes.player.width
   end
 
-  local rawborder, default_border = GetBorderSize("unitframes")
-  local cbtexture = pfUI.media[C.appearance.castbar.texture]
-
-  -- style is read once: switching it in the GUI needs a /reload, same as the
-  -- other structural (not cosmetic) toggles in this file
-  local fsrOverlay = C.unitframes.player.fsrstyle == "1"
-
   -- was this gain the regen tick? if so, re-anchor the sweep on it
   local function lockTick(frame)
     local now, period = GetTime(), getAdjustedTickTimer()
@@ -206,21 +199,11 @@ pfUI:RegisterModule("energytick", function()
     end
     this.tick = GetTime() + 0.020  -- ~50 FPS
 
-    -- five-second rule drains to nothing. The display is cosmetic and can be
+    -- five-second rule drains to nothing
-    -- hidden on its own; the window itself (fsrEnd/fsrGain) keeps running
-    -- either way -- it still dims the sweep spark below.
     local remaining = this.fsrEnd and (this.fsrEnd - GetTime()) or 0
     if this.mode == "MANA" and remaining > 0 then
-      if C.unitframes.player.showfsr == "1" then
+      this.fsrbar:SetWidth(getBarWidth() * remaining / FIVE_SECOND_RULE)
-        if fsrOverlay then
+      this.fsrbar:Show()
-          this.fsrbar:SetWidth(getBarWidth() * remaining / FIVE_SECOND_RULE)
-        else
-          this.fsrbar:SetValue(remaining)
-        end
-        this.fsrbar:Show()
-      else
-        this.fsrbar:Hide()
-      end
     else
       this.fsrSpell, this.fsrEnd, this.fsrGain = nil, nil, nil
       this.fsrbar:Hide()
@@ -257,26 +240,10 @@ pfUI:RegisterModule("energytick", function()
     this.spark:SetPoint("LEFT", pos - ((C.unitframes.player.pheight + 5) / 2), 0)
   end)
 
-  if fsrOverlay then
+  energytick.fsrbar = energytick:CreateTexture(nil, "ARTWORK")
-    -- classic style: a translucent shade on top of the power bar's own fill
+  energytick.fsrbar:SetTexture(1, 1, 1, .15)
-    energytick.fsrbar = energytick:CreateTexture(nil, "ARTWORK")
+  energytick.fsrbar:SetPoint("TOPLEFT", 0, 0)
-    energytick.fsrbar:SetTexture(1, 1, 1, .15)
+  energytick.fsrbar:SetPoint("BOTTOMLEFT", 0, 0)
-    energytick.fsrbar:SetPoint("TOPLEFT", 0, 0)
-    energytick.fsrbar:SetPoint("BOTTOMLEFT", 0, 0)
-  else
-    -- a real bar below the power bar, not an overlay on top of it -- the same
-    -- treatment nameplate castbars get relative to the health bar, so the
-    -- window can't be mistaken for missing mana
-    energytick.fsrbar = CreateFrame("StatusBar", nil, pfUI.uf.player)
-    energytick.fsrbar:SetStatusBarTexture(cbtexture)
-    energytick.fsrbar:SetMinMaxValues(0, FIVE_SECOND_RULE)
-    energytick.fsrbar:SetPoint("TOPLEFT", pfUI.uf.player.power.bar, "BOTTOMLEFT", 0, -default_border * 2)
-    energytick.fsrbar:SetPoint("TOPRIGHT", pfUI.uf.player.power.bar, "BOTTOMRIGHT", 0, -default_border * 2)
-    energytick.fsrbar:SetHeight(tonumber(C.unitframes.player.fsrheight) or 4)
-    energytick.fsrbar:SetStatusBarColor(GetStringColor(C.appearance.castbar.fsrcolor))
-    CreateBackdrop(energytick.fsrbar, default_border)
-    CreateBackdropShadow(energytick.fsrbar)
-  end
   energytick.fsrbar:Hide()
 
   energytick.spark = energytick:CreateTexture(nil, "OVERLAY")
@@ -289,10 +256,6 @@ pfUI:RegisterModule("energytick", function()
   function pfUI.uf.player.UpdateConfig()
     energytick.spark:SetHeight(C.unitframes.player.pheight + 15)
     energytick.spark:SetWidth(C.unitframes.player.pheight + 5)
-    if not fsrOverlay then
-      energytick.fsrbar:SetHeight(tonumber(C.unitframes.player.fsrheight) or 4)
-      energytick.fsrbar:SetStatusBarColor(GetStringColor(C.appearance.castbar.fsrcolor))
-    end
     hookUpdateConfig(pfUI.uf.player)
   end
 end)

modules/gui.lua

@@ -2072,6 +2072,8 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(nil, T["Combopoint Width"], C.unitframes, "combowidth")
       CreateConfig(nil, T["Combopoint Height"], C.unitframes, "comboheight")
       CreateConfig(nil, T["Show Resting"], C.unitframes.player, "showRest", "checkbox")
+      CreateConfig(nil, T["Enable Energy Ticks"], C.unitframes.player, "energy", "checkbox")
+      CreateConfig(nil, T["Enable Mana Ticks"], C.unitframes.player, "manatick", "checkbox")
       CreateConfig(nil, T["Detect Enemy Buffs"], C.unitframes, "buffdetect", "checkbox", nil, nil, nil, nil)
       CreateConfig(nil, T["Raid Mark Icon Style"], C.unitframes, "blizzard_raidicons", "dropdown", function() return {"1:Original Blizzard", "0:pfUI Design"} end)
 
@@ -2318,15 +2320,6 @@ pfUI:RegisterModule("gui", function ()
         CreateConfig(U[c], T["Right Text Y Offset"], C.unitframes[c], "txtpowerrightoffy")
         CreateConfig(U[c], T["Power Bar Anchor"], C.unitframes[c], "panchor", "dropdown", pfUI.gui.dropdowns.uf_powerbar_position)
 
-        if c == "player" then
-          CreateConfig(nil, T["Energy/Mana Ticks"], nil, nil, "header")
-          CreateConfig(nil, T["Enable Energy Ticks"], C.unitframes[c], "energy", "checkbox")
-          CreateConfig(nil, T["Enable Mana Ticks"], C.unitframes[c], "manatick", "checkbox")
-          CreateConfig(nil, T["Show Five Second Rule"], C.unitframes[c], "showfsr", "checkbox")
-          CreateConfig(nil, T["Five Second Rule Style"], C.unitframes[c], "fsrstyle", "dropdown", function() return {"0:Separate Bar", "1:Overlay"} end)
-          CreateConfig(nil, T["Five Second Rule Height"], C.unitframes[c], "fsrheight")
-        end
-
         CreateConfig(U[c], T["Combat Text"], nil, nil, "header")
         CreateConfig(U[c], T["Show Combat Text"], C.unitframes[c], "hitindicator", "checkbox")
         CreateConfig(U[c], T["Combat Text Font"], C.unitframes[c], "hitindicatorfont", "dropdown", pfUI.gui.dropdowns.fonts)
@@ -2799,8 +2792,6 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(nil, T["Use Unit Fonts"], C.castbar, "use_unitfonts", "checkbox")
       CreateConfig(nil, T["Casting Color"], C.appearance.castbar, "castbarcolor", "color")
       CreateConfig(nil, T["Channeling Color"], C.appearance.castbar, "channelcolor", "color")
-      CreateConfig(nil, T["Uninterruptible Color"], C.appearance.castbar, "shieldcolor", "color")
-      CreateConfig(nil, T["Five Second Rule Color"], C.appearance.castbar, "fsrcolor", "color")
       CreateConfig(nil, T["Castbar Texture"], C.appearance.castbar, "texture", "dropdown", pfUI.gui.dropdowns.uf_bartexture)
       CreateConfig(nil, T["Disable Blizzard Castbar"], C.castbar.player, "hide_blizz", "checkbox")
     end)

modules/nameplates.lua

@@ -77,10 +77,10 @@ pfUI:RegisterModule("nameplates", function ()
   -- vs channel itself. Never called per frame.
   local function PollCastInfo(unit)
     if not unit then return nil end
-    local name, _, texture, startMs, endMs, _, _, noInterrupt, spellID = C_Spell.UnitCastingInfo(unit)
+    local name, _, texture, startMs, endMs, _, _, _, spellID = C_Spell.UnitCastingInfo(unit)
     local isChannel
     if not name then
-      name, _, texture, startMs, endMs, _, noInterrupt, spellID = C_Spell.UnitChannelInfo(unit)
+      name, _, texture, startMs, endMs, _, _, spellID = C_Spell.UnitChannelInfo(unit)
       isChannel = true
     end
     if not name or not startMs or not endMs then return nil end
@@ -92,7 +92,6 @@ pfUI:RegisterModule("nameplates", function ()
       endTime   = endMs / 1000,
       duration  = (endMs - startMs) / 1000,
       isChannel = isChannel,
-      noInterrupt = noInterrupt,
     }
   end
 
@@ -1752,7 +1751,7 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
       -- Relative 0..duration range to avoid float precision loss with large
       -- absolute timestamps.
       nameplate.castbar:SetMinMaxValues(0, duration)
-      SetCastbarShield(nameplate.castbar, nameplate.castbar.icon, castInfo.noInterrupt, isChannel)
+      nameplate.castbar:SetStatusBarColor(GetStringColor(C.appearance.castbar[(isChannel and "channelcolor" or "castbarcolor")]))
       if castInfo.icon then
         nameplate.castbar.icon.tex:SetTexture(castInfo.icon)
         nameplate.castbar.icon.tex:SetTexCoord(.1,.9,.1,.9)