Specifically disable pfUI mouseover hooks when unit attribute exists

Revert "Drop redundant pfUI mouseover frame hooks; pfUI sets native mouseover"
This reverts commit c5bc69560e.
2026-09-16 03:38:00 +00:00 · 2026-08-02 15:11:46 -05:00 · 2026-08-02 15:07:35 -05:00 · 2026-08-01 20:21:37 -05:00 · 2026-07-30 20:41:23 -05:00 · 2026-07-30 20:35:39 -05:00
25 changed files with 1324 additions and 1456 deletions
@@ -52,13 +52,13 @@ end
 -- C_UnitAuras
 --------------------------------------------------------------------------------

-- Scan a unit's auras (indexFn = C_UnitAuras.GetBuffDataByIndex or
-- GetDebuffDataByIndex) for one matching the dispel type. Vanilla descriptors
-- hold 32 helpful / 16 harmful slots; cap as a backstop.
-local function scanDispel(indexFn, unit, dispelType, wantAny)
+-- Scan one aura range of `unit` (filter = "HELPFUL" or "HARMFUL") for an aura
+-- matching the dispel type. The filtered index self-terminates at the end of the
+-- range (nil); 48 is a backstop over vanilla's 32 helpful / 16 harmful slots.
+local function scanDispel(unit, filter, dispelType, wantAny)
    local i = 1
    while i <= 48 do
-        local data = indexFn(unit, i)
+        local data = C_UnitAuras.GetAuraDataByIndex(unit, i, filter)
        if not data then return false end
        local dn = data.dispelName
        if dn and dn ~= "" and (wantAny or dn == dispelType) then
@@ -76,10 +76,29 @@ end
 --               false -> scan debuffs (defensive cleanse, default)
 function API.UnitHasDispelType(unit, dispelType, helpful)
    if not unit or not UnitExists(unit) then return false end
-    local indexFn = helpful and C_UnitAuras.GetBuffDataByIndex
-        or C_UnitAuras.GetDebuffDataByIndex
+    local filter = helpful and "HELPFUL" or "HARMFUL"
    local wantAny = (dispelType == nil or dispelType == "any")
-    return scanDispel(indexFn, unit, dispelType, wantAny)
+    return scanDispel(unit, filter, dispelType, wantAny)
+end
+
+-- First matching aura on `unit` by spellID, or nil. With no filter it walks the
+-- whole aura array (helpful then harmful), so it finds a debuff even when it has
+-- overflowed into an NPC's buff slots -- no 16+32 slot scan, no UnitIsPlayer
+-- gate. filter ("HELPFUL"/"HARMFUL") restricts the search. Returns the modern
+-- AuraData (spellId, name, applications, duration, expirationTime, dispelName, ...).
+function API.GetUnitAuraBySpellID(unit, spellID, filter)
+    if not unit or not spellID then return nil end
+    return C_UnitAuras.GetUnitAuraBySpellID(unit, spellID, filter)
+end
+
+-- First matching aura on `unit` by spell NAME, or nil. Same whole-array search as
+-- GetUnitAuraBySpellID; the name is case-sensitive and locale-resolved, so pass it
+-- in the client's locale (what C_Spell.GetSpellName returns). filter
+-- ("HELPFUL"/"HARMFUL") restricts the search. Prefer the by-ID variant for
+-- portability where a spellID is known.
+function API.GetAuraDataBySpellName(unit, spellName, filter)
+    if not unit or not spellName or spellName == "" then return nil end
+    return C_UnitAuras.GetAuraDataBySpellName(unit, spellName, filter)
 end

 --------------------------------------------------------------------------------
@@ -155,6 +174,76 @@ function API.GetItemSetInfo(setID)
    return C_Item.GetItemSetInfo(setID)
 end

+--------------------------------------------------------------------------------
+-- Equipment Set
+--------------------------------------------------------------------------------
+
+-- True if the saved equipment set named `name` is currently equipped -- every
+-- resolvable item in its target slot (a missing bank-stored piece doesn't
+-- disqualify, matching C_EquipmentSet.GetEquipmentSetInfo's isEquipped). Name is
+-- an exact, case-sensitive match per GetEquipmentSetID. Returns false for an
+-- unknown name or a client without the EquipmentSet API. Powers [equipset]/
+-- [noequipset]; the swap side is the reclaimed /equipset command.
+function API.IsEquipmentSetEquipped(name)
+    if not name or name == "" then return false end
+    local setID = C_EquipmentSet.GetEquipmentSetID(name)
+    if not setID then return false end
+    local _, _, _, isEquipped = C_EquipmentSet.GetEquipmentSetInfo(setID)
+    return isEquipped and true or false
+end
+
+--------------------------------------------------------------------------------
+-- Weapon Enchant
+--------------------------------------------------------------------------------
+
+-- Temporary weapon-enchant state for a slot: "mh" (main), "oh" (off), or
+-- "ranged". Returns hasEnchant, expirationMs, charges, enchantID. The enchantID
+-- comes from ClassicAPI's modern C_Item.GetWeaponEnchantInfo 12-tuple (the
+-- vanilla global omits it), so [mhenchant] can tell WHICH imbue is applied, not
+-- just that one exists. Falls back to the vanilla 6-tuple global (enchantID nil,
+-- no ranged slot) when the C_Item version is unavailable.
+function API.GetWeaponEnchant(slot)
+    local hasM, mExp, mChg, mID, hasO, oExp, oChg, oID, hasR, rExp, rChg, rID =
+        C_Item.GetWeaponEnchantInfo()
+    if slot == "oh" then
+        return hasO, oExp, oChg, oID
+    elseif slot == "ranged" then
+        return hasR, rExp, rChg, rID
+    end
+    return hasM, mExp, mChg, mID
+end
+
+-- Localized name of an item-enchant ID (poison/oil/sharpening stone/permanent),
+-- read straight from SpellItemEnchantment.dbc via ClassicAPI -- or nil for an
+-- unknown id / a client without C_Item.GetEnchantInfo. Lets [mhenchant:Name]
+-- resolve the applied enchant's name without scraping the weapon tooltip.
+function API.GetEnchantName(enchantID)
+    if not enchantID or enchantID == 0 then return nil end
+    local info = C_Item.GetEnchantInfo(enchantID)
+    return info and info.name or nil
+end
+
+--------------------------------------------------------------------------------
+-- Loss Of Control
+--------------------------------------------------------------------------------
+
+-- Locked spell-school mask from an active SCHOOL_INTERRUPT (Counterspell / Kick /
+-- Pummel / Earth Shock lockout) on the player, or 0 when not kicked. Read from
+-- C_LossOfControl, which synthesizes the lockout from the server's own
+-- SMSG_SPELL_COOLDOWN packet -- a state no debuff scan can see. Also returns the
+-- seconds remaining (nil if ClassicAPI didn't observe the applying cast). Returns
+-- 0 for a client without C_LossOfControl. Player-only (vanilla LoC is local-only).
+function API.GetSchoolLockout()
+    local n = C_LossOfControl.GetActiveLossOfControlDataCount() or 0
+    for i = 1, n do
+        local d = C_LossOfControl.GetActiveLossOfControlData(i)
+        if d and d.locType == "SCHOOL_INTERRUPT" then
+            return d.lockoutSchool or 0, d.timeRemaining
+        end
+    end
+    return 0, nil
+end
+
 --------------------------------------------------------------------------------
 -- Spell
 --------------------------------------------------------------------------------
@@ -168,6 +257,67 @@ function API.GetSpellMechanicByID(spellID)
    return C_Spell.GetSpellMechanicByID(spellID)
 end

+-- Per-effect SpellMechanic ids (Spell.dbc EffectMechanic[3]) as {m1, m2, m3},
+-- or nil for an invalid spell / 0 for an effect with no mechanic. Complements
+-- GetSpellMechanicByID, which only reads the spell-level Mechanic field: vanilla
+-- stores some mechanics on an effect instead (e.g. Rake's bleed is effect-level,
+-- so GetSpellMechanicByID returns 0 but this returns {0,15,0}). Nil-guarded so an
+-- older ClassicAPI build without the function degrades gracefully.
+function API.GetSpellEffectMechanics(spellID)
+    return C_Spell.GetSpellEffectMechanics(spellID)
+end
+
+-- Flat spell-damage bonus (spell power) for a magic school, as a number.
+-- school is 1-based: 1=Physical, 2=Holy, 3=Fire, 4=Nature, 5=Frost, 6=Shadow,
+-- 7=Arcane. Reads the same client field nampower's GetSpellPower does -- exact,
+-- with gear/enchants/buffs/talents/set bonuses baked in.
+function API.GetSpellBonusDamage(school)
+    return GetSpellBonusDamage(school)
+end
+
+-- Flat healing bonus (+healing), as a number. Vanilla has no healing-done field,
+-- so ClassicAPI derives it from gear/enchant/buff MOD_HEALING_DONE plus
+-- stat-conversion talents (e.g. Spiritual Guidance) -- exact, not a holy-damage
+-- proxy.
+function API.GetSpellBonusHealing()
+    return GetSpellBonusHealing()
+end
+
+--------------------------------------------------------------------------------
+-- Unit Health
+--------------------------------------------------------------------------------
+
+-- Health deficit (max - current) for `unit` in one call. Falls back to
+-- UnitHealthMax - UnitHealth without ClassicAPI.
+API.UnitHealthMissing = UnitHealthMissing or function(unit)
+    return (UnitHealthMax(unit) or 0) - (UnitHealth(unit) or 0)
+end
+
+--------------------------------------------------------------------------------
+-- Unit Power
+--------------------------------------------------------------------------------
+
+-- Current power for a specific Enum.PowerType (0=Mana, 1=Rage, 2=Focus,
+-- 3=Energy, 4=Happiness), or the unit's primary power when powerType is omitted.
+-- Display-divided (rage reads 0..100). Falls back to UnitMana without ClassicAPI.
+API.UnitPower = UnitPower or function(unit, powerType)
+    return UnitMana(unit)
+end
+
+API.UnitPowerMax = UnitPowerMax or function(unit, powerType)
+    return UnitManaMax(unit)
+end
+
+-- Power deficit (max - current) for the type / primary power, in one call.
+API.UnitPowerMissing = UnitPowerMissing or function(unit, powerType)
+    return (UnitManaMax(unit) or 0) - (UnitMana(unit) or 0)
+end
+
+-- Unit's primary power type as an integer (0=Mana .. 4=Happiness).
+function API.UnitPowerType(unit)
+    return UnitPowerType(unit)
+end
+
 --------------------------------------------------------------------------------
 -- State
 --------------------------------------------------------------------------------
@@ -182,6 +332,29 @@ function API.IsSwimming()
    return IsSwimming() and true or false
 end

+-- True if the player is currently mounted.
+function API.IsMounted()
+    return IsMounted() and true or false
+end
+
+-- True if the player is under a WMO roof (building, cave, instance interior).
+-- Live engine geometry query, not zone-based; nil (-> false) pre-world.
+function API.IsIndoors()
+    return IsIndoors() and true or false
+end
+
+-- True if the player is outdoors (open sky / not inside a WMO interior).
+-- Exact complement of IsIndoors for a resolvable player.
+function API.IsOutdoors()
+    return IsOutdoors() and true or false
+end
+
+-- Player's stand state: 0 = standing, non-zero = sitting/sleeping/kneeling/etc.
+-- (see UnitStandState). Player-only.
+function API.GetPlayerStandState()
+    return UnitStandState("player") or 0
+end
+
 --------------------------------------------------------------------------------
 -- Cursor
 --------------------------------------------------------------------------------
@@ -32,6 +32,35 @@ CleveRoids.lastRakeCast = CleveRoids.lastRakeCast or {
    timestamp = 0
 }

+-- Family membership without hardcoded rank lists. C_Spell.GetSpellName resolves
+-- ANY spellID from the client's Spell.dbc -- every rank (so no enumeration or
+-- spellbook scan) and TWoW's custom spells alike -- so "is this spellID a Rip?"
+-- is just a name match against one seed rank. seedNameCache memoizes the seed's
+-- localized name (locale-safe: derived from the ID, not a hardcoded string; a
+-- seed absent from the DBC, e.g. a TWoW spell on a stock client, resolves to nil
+-- and the set simply never matches -- which is correct, that spell can't be cast).
+local seedNameCache = {}
+local function SeedName(seedID)
+    local n = seedNameCache[seedID]
+    if n == nil then
+        n = C_Spell.GetSpellName(seedID) or false
+        seedNameCache[seedID] = n
+    end
+    return n or nil
+end
+
+-- Stand-in for a hardcoded {spellID=true,...} rank set: t[spellID] is true iff
+-- spellID is any rank of the family seeded by seedID. Same read shape as the old
+-- tables, so every membership consumer (`X and X[id]`) keeps working unchanged.
+-- Only valid for membership tests -- these are not iterable (pairs() sees empty).
+local function RankSet(seedID)
+    return setmetatable({}, { __index = function(_, spellID)
+        if type(spellID) ~= "number" then return nil end
+        local name = SeedName(seedID)
+        return (name and C_Spell.GetSpellName(spellID) == name) and true or nil
+    end })
+end
+
 -- Define spells that scale with combo points by SPELL ID and their duration formulas
 -- Duration = base + (combo_points - 1) * increment
 CleveRoids.ComboScalingSpellsByID = {
@@ -70,32 +99,9 @@ CleveRoids.FerociousBiteSpellIDs = {
    [31018] = true,  -- Rank 6
 }

-- Rip spell IDs (for Carnage talent - refreshed when Carnage procs)
-CleveRoids.RipSpellIDs = {
-    [1079] = true,   -- Rank 1
-    [9492] = true,   -- Rank 2
-    [9493] = true,   -- Rank 3
-    [9752] = true,   -- Rank 4
-    [9894] = true,   -- Rank 5
-    [9896] = true,   -- Rank 6
-}
-
-- Rake spell IDs (for Carnage talent - refreshed when Carnage procs)
-CleveRoids.RakeSpellIDs = {
-    [1822] = true,   -- Rank 1
-    [1823] = true,   -- Rank 2
-    [1824] = true,   -- Rank 3
-    [9904] = true,   -- Rank 4
-}
-
-- Pounce Bleed spell IDs (for immunity detection - bleed portion of Pounce)
-- Note: Pounce (cast) TRIGGERS a separate Pounce Bleed spell with different IDs
-- Cast IDs: 9005, 9823, 9827 → Trigger Bleed IDs: 9007, 9824, 9826
-CleveRoids.PounceBleedSpellIDs = {
-    [9007] = true,   -- Rank 1 (triggered by Pounce 9005)
-    [9824] = true,   -- Rank 2 (triggered by Pounce 9823)
-    [9826] = true,   -- Rank 3 (triggered by Pounce 9827)
-}
+-- Rip / Rake families (for Carnage talent). Seeded by Rank 1; matches every rank.
+CleveRoids.RipSpellIDs = RankSet(1079)
+CleveRoids.RakeSpellIDs = RankSet(1822)

 -- Combined table for all bleed spells that need immunity detection
 -- Used when checking if a cast bleed failed to apply (indicates bleed immunity)
@@ -132,14 +138,9 @@ CleveRoids.PounceToBleedMapping = {
 -- When Molten Blast hits, it refreshes Flame Shock duration on the target
 -- Detection: Monitor combat log for Molten Blast damage, then refresh Flame Shock
 -- =============================================================================
-CleveRoids.MoltenBlastSpellIDs = {
-    [36916] = true,  -- Rank 1
-    [36917] = true,  -- Rank 2
-    [36918] = true,  -- Rank 3
-    [36919] = true,  -- Rank 4
-    [36920] = true,  -- Rank 5
-    [36921] = true,  -- Rank 6
-}
+-- TWoW custom; seed resolves on the TWoW client (nil/never-matches on stock,
+-- where Molten Blast can't be cast anyway).
+CleveRoids.MoltenBlastSpellIDs = RankSet(36916)

 CleveRoids.FlameShockSpellIDs = {
    [8050] = true,   -- Rank 1
@@ -154,12 +155,7 @@ CleveRoids.FlameShockSpellIDs = {
 -- WARLOCK: Conflagrate → Immolate Duration Reduction
 -- When Conflagrate is cast, it reduces Immolate duration by 3 seconds
 -- =============================================================================
-CleveRoids.ConflagrateSpellIDs = {
-    [17962] = true,  -- Rank 1
-    [18930] = true,  -- Rank 2
-    [18931] = true,  -- Rank 3
-    [18932] = true,  -- Rank 4
-}
+CleveRoids.ConflagrateSpellIDs = RankSet(17962)

 CleveRoids.ImmolateSpellIDs = {
    [348] = true,    -- Rank 1
@@ -177,11 +173,8 @@ CleveRoids.ImmolateSpellIDs = {
 -- Channeled spell that accelerates DoT tick rate by 30% while channeling
 -- Complex tracking: debuff expires 30% faster while Dark Harvest is active
 -- =============================================================================
-CleveRoids.DarkHarvestSpellIDs = {
-    [52550] = true,  -- Rank 1
-    [52551] = true,  -- Rank 2
-    [52552] = true,  -- Rank 3
-}
+-- TWoW custom (see MoltenBlast note).
+CleveRoids.DarkHarvestSpellIDs = RankSet(52550)

 -- =============================================================================
 -- DRUID: Rake Debuff Cap Boss Whitelist
@@ -489,7 +482,7 @@ function CleveRoids.TrackComboPointCastByID(spellID, targetGUID)
            end
        else
            -- Second, check if name-based tracking has recent data for this spell
-            local spellName = GetSpellRecField(spellID, "name")
+            local spellName = C_Spell.GetSpellName(spellID)
            if spellName then
                -- Remove rank info for comparison
                local baseName = CleveRoids.StripRank(spellName)
@@ -548,26 +541,6 @@ function CleveRoids.TrackComboPointCastByID(spellID, targetGUID)
    return duration
 end

-- API function to get last tracked combo points for a spell
-function CleveRoids.GetLastComboPointsForSpell(spellName)
-    if CleveRoids.ComboPointTracking[spellName] then
-        return CleveRoids.ComboPointTracking[spellName].combo_points
-    elseif CleveRoids.spell_tracking[spellName] then
-        return CleveRoids.spell_tracking[spellName].last_combo_points
-    end
-    return nil
-end
-
-- API function to get last calculated duration for a spell
-function CleveRoids.GetLastDurationForSpell(spellName)
-    if CleveRoids.ComboPointTracking[spellName] then
-        return CleveRoids.ComboPointTracking[spellName].duration
-    elseif CleveRoids.spell_tracking[spellName] then
-        return CleveRoids.spell_tracking[spellName].last_duration
-    end
-    return nil
-end
-
 -- Utility function to display current combo tracking info
 function CleveRoids.ShowComboTracking()
    CleveRoids.Print("=== Combo Point Tracking ===")
@@ -683,7 +656,7 @@ if _G.UseAction then
        local spellName = nil

        if actionType == "SPELL" and actionID then
-            spellName = GetSpellRecField(actionID, "name")
+            spellName = C_Spell.GetSpellName(actionID)
        end

        if currentCP and currentCP > 0 then
@@ -2,9 +2,10 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

 local Extension = CleveRoids.RegisterExtension("Compatibility_pfUI")
-Extension.RegisterEvent("ADDON_LOADED", "ADDON_LOADED")
-Extension.RegisterEvent("PLAYER_LOGIN", "PLAYER_LOGIN")
 Extension.Debug = false
+-- pfUI-loaded and player-login handlers are wired via ClassicAPI's EventUtil at
+-- the bottom of the file (ContinueOnAddOnLoaded fires immediately if pfUI already
+-- loaded, so no separate "we missed pfUI's ADDON_LOADED" fallback is needed).

 -- Track pfUI state
 Extension.pfUILoaded = false
@@ -99,7 +100,7 @@ local function GetCarnageOverride(effect)
    end

    for spellID, override in pairs(CleveRoids.carnageDurationOverrides) do
-        local spellName = GetSpellRecField(spellID, "name")
+        local spellName = C_Spell.GetSpellName(spellID)
        if spellName then
            local baseName = CleveRoids.StripRank(spellName)
            if baseName == effect and override.timestamp and (GetTime() - override.timestamp) < 5 then
@@ -209,7 +210,7 @@ function Extension.HookPfUILibdebuff()
                    for spellID, rec in pairs(CleveRoids.libdebuff.objects[unitGUID]) do
                        if rec and rec.start and rec.duration then
                            -- Get spell name for this ID
-                            local spellName = GetSpellRecField(spellID, "name")
+                            local spellName = C_Spell.GetSpellName(spellID)
                            if spellName then
                                local baseName = CleveRoids.StripRank(spellName)
                                if baseName == effect then
@@ -380,7 +381,7 @@ function Extension.SyncComboDurationToPfUI(guid, spellID, duration)
    end

    -- Get spell name from spell ID
-    local spellName = GetSpellRecField(spellID, "name")
+    local spellName = C_Spell.GetSpellName(spellID)
    if not spellName then
        if CleveRoids.debug then
            DEFAULT_CHAT_FRAME:AddMessage("|cffff0000[pfUI Sync]|r Could not find spell name for ID " .. spellID)
@@ -726,23 +727,22 @@ function Extension.OnLoad()
    SLASH_PFUICD1 = "/pfuicd"
 end

-function Extension.ADDON_LOADED()
-    -- Check if pfUI just loaded AND the global actually exists
-    -- (another addon could be named "pfUI" without being the real UI framework)
-    if arg1 == "pfUI" and pfUI then
-        Extension.pfUILoaded = true
-        -- pfUI modules load after ADDON_LOADED, so schedule a check
-        if CleveRoids.ScheduleTimer then
-            CleveRoids.ScheduleTimer(function()
-                Extension.SetupCompatibility()
-            end, 0.5)
-        end
+-- Fires once pfUI has loaded (immediately if it loaded before us, via EventUtil).
+function Extension.OnPfUILoaded()
+    -- Guard: only the real pfUI framework sets this global (another addon could be
+    -- named "pfUI" without being the UI framework).
+    if not pfUI then return end
+    Extension.pfUILoaded = true
+    -- pfUI's submodules initialize after its ADDON_LOADED, so defer the setup.
+    if CleveRoids.ScheduleTimer then
+        CleveRoids.ScheduleTimer(function()
+            Extension.SetupCompatibility()
+        end, 0.5)
    end
 end

-function Extension.PLAYER_LOGIN()
-    -- If pfUI loaded before SCRM (alphabetical order), ADDON_LOADED for pfUI was missed.
-    -- Re-run InitPfUIIntegration here to ensure lib.objects is linked correctly.
+function Extension.OnPlayerLogin()
+    -- Ensure lib.objects is linked correctly (InitPfUIIntegration is idempotent).
    if pfUI and not CleveRoids.hasPfUI76 then
        local lib = CleveRoids.libdebuff
        if lib and lib.InitPfUIIntegration then
@@ -797,4 +797,10 @@ if not CleveRoids.ScheduleTimer then
    end
 end

+-- Wire handlers via ClassicAPI EventUtil (fires immediately if the event already
+-- happened, so load order relative to pfUI no longer matters). Registered here,
+-- after the handlers are defined, since ContinueOnAddOnLoaded may fire inline.
+EventUtil.ContinueOnAddOnLoaded("pfUI", Extension.OnPfUILoaded)
+EventUtil.ContinueOnPlayerLogin(Extension.OnPlayerLogin)
+
 _G["CleveRoids"] = CleveRoids
@@ -63,10 +63,24 @@ SlashCmdList.EQSLOT13 = CleveRoids.DoEquipTrinket1
 SLASH_EQSLOT141 = "/equip14"
 SlashCmdList.EQSLOT14 = CleveRoids.DoEquipTrinket2

+-- Reclaim ClassicAPI's /equipset (command name EQUIP_SET) so it supports
+-- conditionals. ClassicAPI registers the localized aliases against EQUIP_SET;
+-- swapping the handler keeps every alias and adds the conditional engine.
+if SlashCmdList.EQUIP_SET then
+    SlashCmdList.EQUIP_SET = CleveRoids.DoEquipSet
+else
+    SLASH_EQUIPSET1 = "/equipset"
+    SlashCmdList.EQUIPSET = CleveRoids.DoEquipSet
+end
+
 SLASH_UNSHIFT1 = "/unshift"

 SlashCmdList.UNSHIFT = CleveRoids.DoUnshift

+SLASH_CANCELFORM1 = "/cancelform"
+
+SlashCmdList.CANCELFORM = CleveRoids.DoCancelForm
+
 SLASH_UNQUEUE1 = "/unqueue"
 SlashCmdList.UNQUEUE = SpellStopCasting

@@ -209,8 +209,8 @@ local function InjectCustomSpells()
    local count = 0
    for spellID, data in pairs(CleveRoids.CustomCursiveSpells) do
        -- Get texture from GetSpellRecField + GetSpellIconTexture
-        local name = GetSpellRecField(spellID, "name")
-        local rank = GetSpellRecField(spellID, "rank")
+        local name = C_Spell.GetSpellName(spellID)
+        local rank = C_Spell.GetSpellSubtext(spellID)
        local texture = CleveRoids.libdebuff and CleveRoids.libdebuff:GetCachedIcon(spellID)
        if texture then
            -- Always update/add (in case Cursive reloaded and cleared them)
@@ -524,8 +524,8 @@ CleveRoids.HandleConsoleCommand = function(msg)
                return
            end

-            local name = GetSpellRecField(spellID, "name")
-            local rank = GetSpellRecField(spellID, "rank")
+            local name = C_Spell.GetSpellName(spellID)
+            local rank = C_Spell.GetSpellSubtext(spellID)
            local texture = CleveRoids.libdebuff and CleveRoids.libdebuff:GetCachedIcon(spellID)
            if not name then
                DEFAULT_CHAT_FRAME:AddMessage("|cffff0000Error:|r Spell ID " .. spellID .. " not found.")
@@ -1391,12 +1391,6 @@ end
 -- Extension Entry Points
 -- ============================================================================

-function Extension.OnAddonLoaded()
-    if arg1 == "Blizzard_MacroUI" then
-        InstallHooks()
-    end
-end
-
 function Extension.OnLoad()
    -- Skip if macro checker is disabled
    if CleveRoidMacros and CleveRoidMacros.macrocheck == 0 then return end
@@ -1404,13 +1398,9 @@ function Extension.OnLoad()
    -- Skip if SuperMacro is loaded (detected at load time)
    if SuperMacroFrame ~= nil then return end

-    -- Listen for macro UI loading
-    Extension.RegisterEvent("ADDON_LOADED", "OnAddonLoaded")
-
-    -- If MacroFrame already exists (unlikely but safe), hook immediately
-    if MacroFrame and MacroFrameText then
-        InstallHooks()
-    end
+    -- Install once Blizzard's macro UI is available (fires immediately if already
+    -- loaded), replacing the ADDON_LOADED listener + manual "already loaded" check.
+    EventUtil.ContinueOnAddOnLoaded("Blizzard_MacroUI", InstallHooks)
 end

 _G["CleveRoids"] = CleveRoids
@@ -133,12 +133,6 @@ function Extension.OnMacroFrameLoad()
    end
 end

-function Extension.OnAddonLoaded()
-    if arg1 == "Blizzard_MacroUI" then
-        Extension.OnMacroFrameLoad()
-    end
-end
-
 function Extension.OnLoad()
    -- Schedule messages to show after UI is ready
    local function ShowMessages()
@@ -178,16 +172,11 @@ function Extension.OnLoad()
        end
    end

-    -- Listen for macro UI loading
-    Extension.RegisterEvent("ADDON_LOADED", "OnAddonLoaded")
+    -- Hook the macro UI once available (fires immediately if already loaded).
+    EventUtil.ContinueOnAddOnLoaded("Blizzard_MacroUI", Extension.OnMacroFrameLoad)

-    -- Also try to hook MacroFrame_SaveMacro if it already exists
-    if MacroFrame_SaveMacro then
-        Extension.OnMacroFrameLoad()
-    end
-
-    -- Register PLAYER_LOGIN to show status messages
-    Extension.RegisterEvent("PLAYER_LOGIN", "OnPlayerLogin")
+    -- Status messages on login (currently disabled inside OnPlayerLogin).
+    EventUtil.ContinueOnPlayerLogin(Extension.OnPlayerLogin)

    -- Store the message function for later
    Extension.ShowMessages = ShowMessages
@@ -6,7 +6,6 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

 local Extension = CleveRoids.RegisterExtension("CT_RaidAssist")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnter()
 	local tempOptions = CT_RAMenu_Options["temp"]
@@ -48,15 +47,14 @@ function Extension.OnLeave()
    CleveRoids.ClearMouseoverFrom("native")
 end

-function Extension.OnLoad()
-    if arg1 ~= "CT_RaidAssist" then
-        return
-    end
+function Extension.OnLoad() end

+function Extension.OnAddOnLoad()
+	if not CT_RA_MemberFrame_OnEnter then return end
    Extension.Hook("CT_RA_MemberFrame_OnEnter", "OnEnter")
    Extension.HookMethod(_G["GameTooltip"], "Hide", "OnLeave")
    Extension.HookMethod(_G["GameTooltip"], "FadeOut", "OnLeave")

 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("CT_RaidAssist", Extension.OnAddOnLoad)
@@ -6,7 +6,6 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

 local Extension = CleveRoids.RegisterExtension("CT_UnitFrames")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.SetHook(widget)
    local hookedOnEnter = widget:GetScript("OnEnter")
@@ -24,8 +23,10 @@ function Extension.SetHook(widget)
    end)
 end

-function Extension.OnLoad()
-    if arg1 ~= "CT_UnitFrames" or not CT_AssistFrame then
+function Extension.OnLoad() end
+
+function Extension.OnAddOnLoad()
+    if not CT_AssistFrame then
        return
    end
    CleveRoids.Print("CT_UnitFrames module loaded.")
@@ -36,4 +37,4 @@ function Extension.OnLoad()
    Extension.SetHook(CT_AssistFrame_Drag)
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("CT_UnitFrames", Extension.OnAddOnLoad)
@@ -9,7 +9,6 @@ local CleveRoids = _G.CleveRoids or {}
 CleveRoids.Hooks = CleveRoids.Hooks or {}

 local Extension = CleveRoids.RegisterExtension("CursiveMouseover")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 local hooked = false

@@ -66,21 +65,13 @@ local function HookCursiveUI()
 end

 function Extension.OnLoad()
-    -- Try to hook when Cursive loads
-    if arg1 == "Cursive" then
-        -- Delay slightly to ensure Cursive.ui is initialized
-        local frame = CreateFrame("Frame")
-        frame:SetScript("OnUpdate", function()
-            if HookCursiveUI() then
-                this:Hide()
-            end
-        end)
-    end
+    -- Delay slightly to ensure Cursive.ui is initialized
+    local frame = CreateFrame("Frame")
+    frame:SetScript("OnUpdate", function()
+        if HookCursiveUI() then
+            this:Hide()
+        end
+    end)
 end

-- Also try to hook immediately in case Cursive is already loaded
-if Cursive and Cursive.ui then
-    HookCursiveUI()
-end
-
-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("Cursive", Extension.OnLoad)
@@ -6,7 +6,6 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

 local Extension = CleveRoids.RegisterExtension("DiscordUnitFrames")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnterFrame()
    CleveRoids.SetMouseoverFrom("duf", this.unit)
@@ -26,11 +25,10 @@ function Extension.OnLeaveElement()
    CleveRoids.ClearMouseoverFrom("native")
 end

-function Extension.OnLoad()
-    if arg1 ~= "DiscordUnitFrames" then
-        return
-    end
+function Extension.OnLoad() end

+function Extension.OnAddOnLoad()
+    if not DUF_UnitFrame_OnEnter then return end
    CleveRoids.ClearHooks()
    Extension.Hook("DUF_UnitFrame_OnEnter", "OnEnterFrame")
    Extension.Hook("DUF_UnitFrame_OnLeave", "OnLeaveFrame")
@@ -39,4 +37,4 @@ function Extension.OnLoad()
    Extension.Hook("DUF_Element_OnLeave", "OnLeaveElement")
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("DiscordUnitFrames", Extension.OnAddOnLoad)
@@ -8,7 +8,6 @@ local CleveRoids = _G.CleveRoids or {}
 CleveRoids.Hooks = CleveRoids.Hooks or {}

 local Extension = CleveRoids.RegisterExtension("Grid")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnter(unit)
    CleveRoids.SetMouseoverFrom("grid", unit)
@@ -19,11 +18,10 @@ function Extension.OnLeave()
    CleveRoids.ClearMouseoverFrom("native")
 end

-function Extension.OnLoad()
-    if arg1 ~= "Grid" then
-        return
-    end
+function Extension.OnLoad() end

+function Extension.OnAddOnLoad()
+	if not GridFrame then return end
    CleveRoids.Hooks.Grid = { CreateFrames = GridFrame.frameClass.prototype.CreateFrames}
    GridFrame.frameClass.prototype.CreateFrames = CleveRoids.GrdCreateFrames
 end
@@ -111,4 +109,4 @@ function CleveRoids:GrdCreateFrames()
 	ClickCastFrames[self.frame] = true
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("Grid", Extension.OnAddOnLoad)
@@ -8,7 +8,6 @@ local CleveRoids = _G.CleveRoids or {}
 local CreateFrames = nil

 local Extension = CleveRoids.RegisterExtension("NotGrid")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnter()
    CleveRoids.SetMouseoverFrom("ngrid", this.unit)
@@ -39,7 +38,9 @@ function CleveRoids:NotGrid_CreateFrames()
    end
 end

-function Extension.OnLoad()
+function Extension.OnLoad() end
+
+function Extension.OnAddOnLoad()
    -- NotGrid loads before CleveRoids, so if NotGrid is enabled, then it's global will exist.
    if not NotGrid then
        return
@@ -48,7 +49,6 @@ function Extension.OnLoad()
    CreateFrames = NotGrid.CreateFrames
    NotGrid.CreateFrames = CleveRoids.NotGrid_CreateFrames

-    Extension.UnregisterEvent("ADDON_LOADED", "Onload")
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("NotGrid", Extension.OnAddOnLoad)
@@ -8,7 +8,6 @@ local CleveRoids = _G.CleveRoids or {}
 CleveRoids.Hooks = CleveRoids.Hooks or {}

 local Extension = CleveRoids.RegisterExtension("PerfectRaid")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnter(unit)
    CleveRoids.SetMouseoverFrom("praid", unit)
@@ -19,11 +18,10 @@ function Extension.OnLeave()
    CleveRoids.ClearMouseoverFrom("native")
 end

-function Extension.OnLoad()
-    if arg1 ~= "PerfectRaid" then
-        return
-    end
+function Extension.OnLoad() end

+function Extension.OnAddOnLoad()
+    if not PerfectRaid then return end
    CleveRoids.Hooks.PerfectRaid = { CreateFrame = PerfectRaid.CreateFrame }
    PerfectRaid.CreateFrame = CleveRoids.PerfectRaidCreateFrame
 end
@@ -134,4 +132,4 @@ function CleveRoids.PerfectRaidCreateFrame(self, num)
 --]]
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("PerfectRaid", Extension.OnAddOnLoad)
@@ -4,7 +4,6 @@ local CleveRoids = _G.CleveRoids or {}
 CleveRoids.Hooks = CleveRoids.Hooks or {}

 local Extension = CleveRoids.RegisterExtension("ag_UnitFrames")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension.OnEnter(unit)
    CleveRoids.SetMouseoverFrom("aguf", unit)
@@ -23,7 +22,6 @@ function Extension.OnLoad()
    CleveRoids.Hooks.ag_UnitFrames = { OnEnter = aUF.classes.aUFunit.prototype.OnEnter, OnLeave = aUF.classes.aUFunit.prototype.OnLeave}
    aUF.classes.aUFunit.prototype.OnEnter = CleveRoids.aUFOnEnter
    aUF.classes.aUFunit.prototype.OnLeave = CleveRoids.aUFOnLeave
-    Extension.UnregisterEvent("ADDON_LOADED", "Onload")
 end

 -- Taken from ag_UnitClass.lua
@@ -41,4 +39,4 @@ function CleveRoids:aUFOnLeave()
 end


-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("ag_UnitFrames", Extension.OnLoad)
@@ -8,6 +8,9 @@
  - Resolving a real UnitID when .unit isn't set
  - Properly hooking party group[0] (your own party slot) with a safe closure and defaulting to "player"
 ]]
+
+if pfPlayer and pfPlayer.GetAttribute and pfPlayer:GetAttribute('unit') == 'player' then return end
+
 local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

@@ -6,7 +6,6 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}

 local Extension = CleveRoids.RegisterExtension("sRaidFrames")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")

 function Extension:OnEnter(frame)
    CleveRoids.SetMouseoverFrom("sraid", frame.unit)
@@ -17,14 +16,13 @@ function Extension.OnLeave()
    CleveRoids.ClearMouseoverFrom("native")
 end

-function Extension.OnLoad()
-    if arg1 ~= "sRaidFrames" then
-        return
-    end
+function Extension.OnLoad() end

+function Extension.OnAddOnLoad()
+    if not sRaidFrames then return end
    Extension.HookMethod(sRaidFrames, "UnitTooltip", "OnEnter")
    Extension.HookMethod(_G["GameTooltip"], "Hide", "OnLeave")
    Extension.HookMethod(_G["GameTooltip"], "FadeOut", "OnLeave")
 end

-_G["CleveRoids"] = CleveRoids
+EventUtil.ContinueOnAddOnLoaded("sRaidFrames", Extension.OnAddOnLoad)
@@ -122,7 +122,7 @@ local function CreateIconButton(parent, index, iconTable)
        GameTooltip:SetOwner(btn, "ANCHOR_BOTTOMLEFT")
        local spellName
        if data.spellId then
-            spellName = GetSpellRecField and GetSpellRecField(data.spellId, "name") or ("Spell " .. data.spellId)
+            spellName = C_Spell.GetSpellName(data.spellId) or ("Spell " .. data.spellId)
        else
            spellName = data.displayName
        end
@@ -649,7 +649,7 @@ local function InjectTestTargetData()
    for i = 1, table.getn(TEST_TARGET_SPELL_IDS) do
        local spellId = TEST_TARGET_SPELL_IDS[i]
        local dur = targetDurations[i] or 60
-        local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") or ("TestSpell" .. spellId)
+        local spellName = C_Spell.GetSpellName(spellId) or ("TestSpell" .. spellId)
        if not CleveRoids.AllCasterAuraTracking[targetGuid][spellName] then
            CleveRoids.AllCasterAuraTracking[targetGuid][spellName] = {}
        end
@@ -58,11 +58,7 @@ function CleveRoids.IndexSpells()
            bookType = CleveRoids.bookTypes[book]
            spells[bookType] = {}
        else
-            local cost, reagent = CleveRoids.GetSpellCost(i, bookType)
-            -- Fallback for known reagent spells if tooltip scan failed
-            if (not reagent or reagent == "") and CleveRoids.ReagentBySpell then
-                reagent = CleveRoids.ReagentBySpell[spellName]
-            end
+            local cost, reagent, reagentId = CleveRoids.GetSpellCost(i, bookType, spellId)
            if not spells[bookType][spellName] then
                spells[bookType][spellName] = {
                    spellSlot = i,
@@ -71,7 +67,7 @@ function CleveRoids.IndexSpells()
                    bookType = bookType,
                    texture = texture,
                    cost = cost,
-                    reagent = reagent,
+                    reagentId = reagentId,
                }
            end
            if spellRank and not spells[bookType][spellName][spellRank] then
@@ -83,7 +79,7 @@ function CleveRoids.IndexSpells()
                    bookType = bookType,
                    texture = texture,
                    cost = cost,
-                    reagent = reagent
+                    reagentId = reagentId,
                }
                spells[bookType][spellName].highest = spells[bookType][spellName][spellRank]
            end
@@ -94,6 +90,13 @@ function CleveRoids.IndexSpells()

            if reagent then
                CleveRoids.countedItemTypes[reagent] = true
+            elseif reagentId and Item then
+                Item:CreateFromItemID(reagentId):ContinueOnItemLoad(function()
+                    local loadedName = C_Item.GetItemNameByID(reagentId)
+                    if loadedName and loadedName ~= "" then
+                        CleveRoids.countedItemTypes[loadedName] = true
+                    end
+                end)
            end
        end
    end
@@ -153,56 +156,28 @@ end

 -- Lightweight equipment-only indexing for combat situations
 -- Updates existing cache rather than rebuilding it
-function CleveRoids.IndexEquippedItems()
-    local items = CleveRoids.Items or {}
-
-    for inventoryID = 0, 19 do
-        local link = GetInventoryItemLink("player", inventoryID)
-        if link then
-            local _, _, itemID = string.find(link, "item:(%d+)")
-            local name, link, _, _, itemType, itemSubType, _, _, texture = GetItemInfo(itemID)
-            if name then
-                local count = GetInventoryItemCount("player", inventoryID)
-                if not items[name] then
-                    items[name] = {
-                        inventoryID = inventoryID,
-                        id = itemID,
-                        name = name,
-                        count = count,
-                        texture = texture,
-                        link = link,
-                    }
-                    items[itemID] = name
-                    local lowerName = string.lower(name)
-                    if lowerName ~= name then
-                        items[lowerName] = name
-                    end
-                else
-                    -- Update existing entry with current equipment state
-                    items[name].inventoryID = inventoryID
-                    items[name].count = count
-                end
-            end
-        else
-            -- Slot is now empty - clear inventoryID from any item that was there
-            -- This is handled lazily by GetItem() fallback, so we skip expensive iteration
-        end
-    end
-
-    CleveRoids.lastGetItem = nil
-    CleveRoids.Items = items
-end
-
 -- PERFORMANCE: Index a single equipment slot instead of all 20
-- Use when we know exactly which slot changed (e.g., from EquipBagItem)
-function CleveRoids.IndexEquipSlot(inventoryID)
+-- Use when we know exactly which slot changed (e.g., from EquipBagItem or
+-- PLAYER_EQUIPMENT_CHANGED). hasCurrent is the event's arg2 (does the slot now
+-- hold an item); pass false to skip the API probe on a slot we know is empty.
+function CleveRoids.IndexEquipSlot(inventoryID, hasCurrent)
    if not inventoryID then return end

    local items = CleveRoids.Items or {}
-    local link = GetInventoryItemLink("player", inventoryID)

-    if link then
-        local _, _, itemID = string.find(link, "item:(%d+)")
+    -- Clear any stale inventoryID still pointing at this slot: the item that was
+    -- here is now unequipped or swapped out (its real location comes from the
+    -- paired BAG_UPDATE rebuild). Equip changes are user-paced, so this table
+    -- scan is off the hot path.
+    for _, entry in pairs(items) do
+        if type(entry) == "table" and entry.inventoryID == inventoryID then
+            entry.inventoryID = nil
+        end
+    end
+
+    -- hasCurrent == false (arg2) => slot is now empty, nothing to add.
+    local itemID = hasCurrent ~= false and GetInventoryItemID("player", inventoryID)
+    if itemID then
        local name, itemLink, _, _, itemType, itemSubType, _, _, texture = GetItemInfo(itemID)
        if name then
            local count = GetInventoryItemCount("player", inventoryID)
@@ -265,21 +240,17 @@ function CleveRoids.IndexItems()

    -- PERFORMANCE: Local function references
    local GetContainerNumSlots = GetContainerNumSlots
-    local GetContainerItemLink = GetContainerItemLink
    local GetContainerItemInfo = GetContainerItemInfo
-    local GetInventoryItemLink = GetInventoryItemLink
    local GetInventoryItemCount = GetInventoryItemCount

    -- Scan bags (reverse order to prefer first stack)
    for bagID = 0, NUM_BAG_SLOTS do
        local numSlots = GetContainerNumSlots(bagID)
        for slot = numSlots, 1, -1 do
-            local link = GetContainerItemLink(bagID, slot)
-            if link then
-                local _, _, itemID = string_find(link, "item:(%d+)")
-
-                -- PERFORMANCE: Try to extract name from link first to check for duplicates
-                local _, _, linkName = string_find(link, "%[(.+)%]")
+            local itemID = C_Container.GetContainerItemID(bagID, slot)
+            if itemID then
+                -- Decorated name for the duplicate fast-path (no link string built)
+                local linkName = C_Item.GetItemName({ bagID = bagID, slotIndex = slot })
                local existing = linkName and items[linkName]

                if existing then
@@ -317,13 +288,11 @@ function CleveRoids.IndexItems()
    end

    -- Scan equipped items
-    for inventoryID = 0, 19 do
-        local link = GetInventoryItemLink("player", inventoryID)
-        if link then
-            local _, _, itemID = string_find(link, "item:(%d+)")
-
-            -- PERFORMANCE: Try to extract name from link first
-            local _, _, linkName = string_find(link, "%[(.+)%]")
+    for inventoryID = 1, 19 do
+        local itemID = GetInventoryItemID("player", inventoryID)
+        if itemID then
+            -- Decorated name for the duplicate fast-path (no link string built)
+            local linkName = C_Item.GetItemName({ equipmentSlotIndex = inventoryID })
            local existing = linkName and items[linkName]

            if existing then
@@ -383,9 +352,9 @@ function CleveRoids.GetActionButtonInfo(slot)
    if not actionType then return end

    if actionType == "spell" and id then
-        local rank = GetSpellRecField(id, "rank")
+        local rank = C_Spell.GetSpellSubtext(id)
        if rank == "" then rank = nil end
-        return "SPELL", id, GetSpellRecField(id, "name"), rank
+        return "SPELL", id, C_Spell.GetSpellName(id), rank
    elseif actionType == "item" and id then
        local item = CleveRoids.GetItem(id)
        return "ITEM", id, (item and item.name)
@@ -477,10 +446,8 @@ local function makeInventoryItem(inventoryID, link, Items)
    if not link then link = GetInventoryItemLink("player", inventoryID) end
    if not link then return end

-    local _, _, itemID = string_find(link, "item:(%d+)")
-    itemID = itemID and tonumber(itemID) or nil
-
-    local name = itemID and GetItemInfo(itemID) or nil
+    local itemID = GetInventoryItemID("player", inventoryID)
+    local name = C_Item.GetItemName({ equipmentSlotIndex = inventoryID })
    local texture = GetInventoryItemTexture("player", inventoryID)
    local count = GetInventoryItemCount("player", inventoryID)

@@ -509,14 +476,12 @@ local function makeBagItem(bagID, slot, link, Items)
    end
    if not link then return end

-    local _, _, itemID = string_find(link, "item:(%d+)")
-    itemID = itemID and tonumber(itemID) or nil
+    local itemID = C_Container.GetContainerItemID(bagID, slot)

-    local name, _, _, _, _, _, _, _, texture = GetItemInfo(itemID)
+    local name = C_Item.GetItemName({bagID = bagID, slotIndex = slot})
    local count = 0
-    local tex, itemCount = GetContainerItemInfo(bagID, slot)
+    local texture, itemCount = GetContainerItemInfo(bagID, slot)
    if itemCount then count = itemCount end
-    if not texture then texture = tex end

    local it = {
        bagID = bagID,
@@ -574,9 +539,7 @@ function CleveRoids.GetItem(text)
    for inv = 1, 19 do
        local link = GetInventoryItemLink("player", inv)
        if link then
-            local _, _, itemID = string_find(link, "item:(%d+)")
-            itemID = itemID and tonumber(itemID) or nil
-
+            local itemID = GetInventoryItemID("player", inv)
            if qid and itemID and qid == itemID then
                return makeInventoryItem(inv, link, Items)
            elseif qname then
@@ -595,9 +558,7 @@ function CleveRoids.GetItem(text)
        for slot = 1, slots do
            local link = GetContainerItemLink(bag, slot)
            if link then
-                local _, _, itemID = string_find(link, "item:(%d+)")
-                itemID = itemID and tonumber(itemID) or nil
-
+                local itemID =  C_Container.GetContainerItemID(bag, slot)
                if qid and itemID and qid == itemID then
                    return makeBagItem(bag, slot, link, Items)
                elseif qname then
@@ -720,18 +681,16 @@ function CleveRoids.FindItemQuick(text)
    if cached then
        -- Validate: check if item is actually at the cached location
        if cached.inventoryID then
-            local link = GetInventoryItemLink("player", cached.inventoryID)
-            if link then
-                local nm = GetNameFromLink(link)
+            if qid then
+                if GetInventoryItemID("player", cached.inventoryID) == qid then
+                    cached._validated = true
+                    return cached  -- Cache is valid
+                end
+            else
+                local nm = C_Item.GetItemName({ equipmentSlotIndex = cached.inventoryID })
                if nm and qname and string_lower(nm) == qname then
                    cached._validated = true
                    return cached  -- Cache is valid
-                elseif qid then
-                    local _, _, itemID = string_find(link, "item:(%d+)")
-                    if itemID and tonumber(itemID) == qid then
-                        cached._validated = true
-                        return cached  -- Cache is valid
-                    end
                end
            end
            -- Cache is stale - item not at cached equipped slot, invalidate
@@ -740,18 +699,16 @@ function CleveRoids.FindItemQuick(text)
                Items[string_lower(cached.name)] = nil
            end
        elseif cached.bagID and cached.slot then
-            local link = GetContainerItemLink(cached.bagID, cached.slot)
-            if link then
-                local nm = GetNameFromLink(link)
+            if qid then
+                if C_Container.GetContainerItemID(cached.bagID, cached.slot) == qid then
+                    cached._validated = true
+                    return cached  -- Cache is valid
+                end
+            else
+                local nm = C_Item.GetItemName({ bagID = cached.bagID, slotIndex = cached.slot })
                if nm and qname and string_lower(nm) == qname then
                    cached._validated = true
                    return cached  -- Cache is valid
-                elseif qid then
-                    local _, _, itemID = string_find(link, "item:(%d+)")
-                    if itemID and tonumber(itemID) == qid then
-                        cached._validated = true
-                        return cached  -- Cache is valid
-                    end
                end
            end
            -- Cache is stale - item not at cached bag slot, invalidate
@@ -767,20 +724,17 @@ function CleveRoids.FindItemQuick(text)
    for inv = 1, 19 do
        local link = GetInventoryItemLink("player", inv)
        if link then
-            local _, _, itemID = string_find(link, "item:(%d+)")
-            if itemID then
-                itemID = tonumber(itemID)
-                -- ID match: fast path
-                if qid and qid == itemID then
+            local itemID = GetInventoryItemID("player", inv)
+            -- ID match: fast path
+            if qid and qid == itemID then
+                return makeInventoryItem(inv, link, Items)
+            end
+            -- Name match: extract name from link (faster than GetItemInfo)
+            if qname then
+                local nm = GetNameFromLink(link)
+                if nm and string_lower(nm) == qname then
                    return makeInventoryItem(inv, link, Items)
                end
-                -- Name match: extract name from link (faster than GetItemInfo)
-                if qname then
-                    local nm = GetNameFromLink(link)
-                    if nm and string_lower(nm) == qname then
-                        return makeInventoryItem(inv, link, Items)
-                    end
-                end
            end
        end
    end
@@ -791,20 +745,17 @@ function CleveRoids.FindItemQuick(text)
        for slot = 1, slots do
            local link = GetContainerItemLink(bag, slot)
            if link then
-                local _, _, itemID = string_find(link, "item:(%d+)")
-                if itemID then
-                    itemID = tonumber(itemID)
-                    -- ID match: fast path
-                    if qid and qid == itemID then
+                local itemID = C_Container.GetContainerItemID(bag, slot)
+                -- ID match: fast path
+                if qid and qid == itemID then
+                    return makeBagItem(bag, slot, link, Items)
+                end
+                -- Name match: extract name from link (faster than GetItemInfo)
+                if qname then
+                    local nm = GetNameFromLink(link)
+                    if nm and string_lower(nm) == qname then
                        return makeBagItem(bag, slot, link, Items)
                    end
-                    -- Name match: extract name from link (faster than GetItemInfo)
-                    if qname then
-                        local nm = GetNameFromLink(link)
-                        if nm and string_lower(nm) == qname then
-                            return makeBagItem(bag, slot, link, Items)
-                        end
-                    end
                end
            end
        end
@@ -818,25 +769,19 @@ end
 function CleveRoids.IsItemEquipped(text, inventoryId)
    if not text or not inventoryId then return false end

-    local link = GetInventoryItemLink("player", inventoryId)
-    if not link then return false end
-
-    local _, _, currentID = string_find(link, "item:(%d+)")
+    local currentID = GetInventoryItemID("player", inventoryId)
    if not currentID then return false end

    -- Check by ID (fast path)
    local textId = tonumber(text)
-    if textId and textId == tonumber(currentID) then
+    if textId and textId == currentID then
        return true
    end

-    -- Check by name - extract from link instead of GetItemInfo for performance
-    local currentName = GetNameFromLink(link)
-    if currentName then
-        local textLower = string_lower(text)
-        if string_lower(currentName) == textLower then
-            return true
-        end
+    -- Check by name (decorated, so suffixed gear still matches)
+    local currentName = C_Item.GetItemName({ equipmentSlotIndex = inventoryId })
+    if currentName and string_lower(currentName) == string_lower(text) then
+        return true
    end

    return false
@@ -651,6 +651,8 @@ local function validateConditional(conditional, args, action)
        combo = true,
        hp = true, myhp = true, rawhp = true, myrawhp = true,
        power = true, mypower = true, rawpower = true, myrawpower = true,
+        mana = true, mymana = true, rage = true, myrage = true,
+        energy = true, myenergy = true,
        hplost = true, myhplost = true,
        powerlost = true, mypowerlost = true,
        stat = true,
@@ -678,6 +680,8 @@ local function validateConditional(conditional, args, action)
    -- Check operator syntax for numeric comparisons
    if args and type(args) == "string" then
        local hasHpOrPower = safeStringFind(baseCond, "hp") or safeStringFind(baseCond, "power") or
+                            safeStringFind(baseCond, "mana") or safeStringFind(baseCond, "energy") or
+                            safeStringFind(baseCond, "rage") or
                            safeStringFind(baseCond, "combo") or baseCond == "stat"
        if hasHpOrPower then
            local hasOperator = safeStringFind(args, "[<>=~]+")
@@ -71,7 +71,6 @@

    Spell Miss Events (v2.31+):
    - SPELL_MISS_SELF / SPELL_MISS_OTHER - Spell miss/resist/immune/dodge/etc.
-    - GetSpellPower([mode]) - Player mod damage done for all 7 schools

    Aura Event State Parameter (v2.32+):
    - Buff/debuff events include 7th `state` parameter (0=added, 1=removed, 2=modified)
@@ -364,9 +363,8 @@ API.VERSION_REQUIREMENTS = {
    ["AuraDurationEvents"]      = { 2, 30, 0 },
    ["GetPlayerAuraDuration"]   = { 2, 30, 0, "GetPlayerAuraDuration" },

-    -- v2.31+ - Spell miss events and spell power query
+    -- v2.31+ - Spell miss events
    ["SpellMissEvents"]         = { 2, 31, 0 },  -- SPELL_MISS_SELF/OTHER events
-    ["GetSpellPower"]           = { 2, 31, 0, "GetSpellPower" },

    -- v2.32+ - Aura event state parameter and stack removal fix
    ["AuraEventState"]          = { 2, 32, 0 },
@@ -575,9 +573,8 @@ local function InitializeFeatures()
    f.hasAuraDurationEvents = API.HasFeature("AuraDurationEvents")
    f.hasGetPlayerAuraDuration = API.HasFeature("GetPlayerAuraDuration")

-    -- v2.31+ Spell miss events and spell power
+    -- v2.31+ Spell miss events
    f.hasSpellMissEvents = API.HasFeature("SpellMissEvents")
-    f.hasGetSpellPower = API.HasFeature("GetSpellPower")

    -- v2.32+ Aura event state parameter
    f.hasAuraEventState = API.HasFeature("AuraEventState")
@@ -3387,15 +3384,6 @@ API.MISS_INFO = {
 -- SPELL POWER QUERY (v2.31+)
 --------------------------------------------------------------------------------

-- Get spell power for all 7 damage schools (v2.31+)
-- mode: optional mode parameter passed to GetSpellPower
-- Returns: physical, holy, fire, nature, frost, shadow, arcane (or nil if unavailable)
-function API.GetSpellPower(mode)
-    if not API.features.hasGetSpellPower or not _G.GetSpellPower then
-        return nil, nil, nil, nil, nil, nil, nil
-    end
-    return _G.GetSpellPower(mode)
-end

 -- Get duration of a spell in milliseconds (v2.38+)
 -- For channeling spells: returns the channel duration.
@@ -3504,32 +3492,5 @@ function API.GetUnitMaxHealth(unitToken)
    return UnitHealthMax(unitToken)
 end

-- powerType: nil=current, 0=mana, 1=rage, 2=focus, 3=energy
-- GetUnitField uses power1-power4 fields
-local POWER_FIELDS = { [0] = "power1", [1] = "power2", [2] = "power3", [3] = "power4" }
-local MAX_POWER_FIELDS = { [0] = "maxPower1", [1] = "maxPower2", [2] = "maxPower3", [3] = "maxPower4" }
-
-function API.GetUnitPower(unitToken, powerType)
-    if API.features.hasGetUnitField and GetUnitField and powerType then
-        local field = POWER_FIELDS[powerType]
-        if field then
-            local val = GetUnitField(unitToken, field)
-            if val then return val end
-        end
-    end
-    return UnitMana(unitToken)
-end
-
-function API.GetUnitMaxPower(unitToken, powerType)
-    if API.features.hasGetUnitField and GetUnitField and powerType then
-        local field = MAX_POWER_FIELDS[powerType]
-        if field then
-            local val = GetUnitField(unitToken, field)
-            if val then return val end
-        end
-    end
-    return UnitManaMax(unitToken)
-end
-
 -- Expose API globally for other addons
 _G.CleveRoidsNampowerAPI = API
@@ -49,16 +49,15 @@ API references are line numbers into `C:\Git\ClassicAPI\docs\API.md`.
  - class-aware `[dispellable]` (only types this character can actually remove).
  - optional name filtering on the type keywords (e.g. `[magic:Polymorph]`).

-### 2. `C_Item.GetWeaponEnchantInfo()` — temp-enchant IDs
- **API:** `API.md:7159` — returns 12-tuple including `enchantID` for main/off/ranged.
- **Unlocks:** detect *which* temp enchant (poison/oil/sharpening stone) is
-  applied to a weapon, not just that one exists.
- **Naming:** `[poison]` is now taken by the target dispel-type conditional
-  (slice 1 above). Use weapon-specific keywords for this — e.g.
-  `[mhenchant:<id>]` / `[ohenchant:<id>]` (or `[mhpoison:<id>]`/`[ohpoison:<id>]`),
-  not a bare `[poison]`.
- Vanilla's global only reports presence; this is a genuinely new capability
-  (rogue/shaman/enhance).
+### 2. ~~`C_Item.GetWeaponEnchantInfo()` — temp-enchant IDs~~ — DONE
+- Shipped as `[mhenchant]` / `[ohenchant]` (+ `no` variants). Matches the applied
+  temp enchant by SpellItemEnchantment ID *or* localized name — the name path
+  resolves via `C_Item.GetEnchantInfo(id).name` (the ID→name table this doc
+  assumed we lacked), so no tooltip scan. Wrappers `ClassicAPI.GetWeaponEnchant`
+  / `GetEnchantName`; `ValidateWeaponImbue` now reads through the former.
+- Bare = any temp enchant; OR-lists supported (`[mhenchant:2823/Deadly_Poison]`).
+- Follow-up (optional): route `[mhimbue:Name]`'s match through `GetEnchantName`
+  too, retiring the green-text tooltip scan in `CheckWeaponImbueByName`.

 ### 3. `GetUnitSpeed(unit)` + `IsFalling()` / `IsSwimming()`
 - **API:** `API.md:8312`, `API.md:7629`.