fix compatibility with pfui macrotweak

Compatibility/pfUI.lua

@@ -2,9 +2,15 @@ local _G = _G or getfenv(0)
 local CleveRoids = _G.CleveRoids or {}
 
 local Extension = CleveRoids.RegisterExtension("Compatibility_pfUI")
-Extension.RegisterEvent("ADDON_LOADED", "OnLoad")
+Extension.RegisterEvent("ADDON_LOADED", "ADDON_LOADED")
+Extension.RegisterEvent("PLAYER_LOGIN", "PLAYER_LOGIN")
 Extension.Debug = false
 
+-- Track pfUI state
+Extension.pfUILoaded = false
+Extension.macrotweakLoaded = false
+Extension.slashCommandsOverridden = false
+
 function Extension.RunMacro(name)
     CleveRoids.ExecuteMacroByName(name)
 end
@@ -28,10 +34,131 @@ function Extension.FocusNameHook()
     return target
 end
 
+-- Check if pfUI's macrotweak module is loaded
+function Extension.IsPfUIMacrotweakLoaded()
+    if not pfUI then return false end
+
+    -- pfUI loads modules and stores them in pfUI.modules
+    if pfUI.modules and pfUI.modules.macrotweak then
+        return true
+    end
+
+    -- Also check if the slash commands exist with pfUI's pattern
+    if SlashCmdList.PFUSE or SlashCmdList.PFEQUIP then
+        return true
+    end
+
+    return false
+end
+
+-- Override pfUI's /use and /equip with CleveRoids versions
+function Extension.OverridePfUISlashCommands()
+    if Extension.slashCommandsOverridden then return end
+
+    -- Save pfUI's original handlers as fallbacks
+    if SlashCmdList.PFUSE then
+        CleveRoids.Hooks.PFUI_USE = SlashCmdList.PFUSE
+    end
+    if SlashCmdList.PFEQUIP then
+        CleveRoids.Hooks.PFUI_EQUIP = SlashCmdList.PFEQUIP
+    end
+
+    -- Override with CleveRoids' conditional-aware handlers
+    SlashCmdList.USE = CleveRoids.DoUse
+    SlashCmdList.EQUIP = CleveRoids.DoUse
+    SlashCmdList.PFUSE = CleveRoids.DoUse
+    SlashCmdList.PFEQUIP = CleveRoids.DoUse
+    SlashCmdList.SMEQUIP = CleveRoids.DoUse
+
+    Extension.slashCommandsOverridden = true
+
+    Extension.DLOG("Overrode /use and /equip commands for conditional support")
+end
+
+-- Check and handle SendChatMessage hook compatibility
+function Extension.HandleSendChatMessageHook()
+    -- Check if SendChatMessage has already been hooked by something else
+    local currentHook = _G.SendChatMessage
+    local originalSendChat = CleveRoids.Hooks.SendChatMessage
+
+    if not originalSendChat then return end
+
+    -- If pfUI already hooked SendChatMessage, we need to chain properly
+    if currentHook and currentHook ~= originalSendChat then
+        -- pfUI's hook is in place, let it handle #showtooltip filtering
+        -- Our hook is redundant, so we can skip it
+        Extension.DLOG("pfUI's SendChatMessage hook detected, using pfUI's filtering")
+    end
+end
+
+-- Main compatibility check and setup
+function Extension.SetupCompatibility()
+    Extension.pfUILoaded = (pfUI ~= nil)
+    Extension.macrotweakLoaded = Extension.IsPfUIMacrotweakLoaded()
+
+    if Extension.pfUILoaded then
+        Extension.DLOG("pfUI detected")
+
+        if Extension.macrotweakLoaded then
+            Extension.DLOG("pfUI macrotweak module detected")
+
+            -- Override slash commands to ensure CleveRoids' conditional support works
+            Extension.OverridePfUISlashCommands()
+
+            -- Handle SendChatMessage hook
+            Extension.HandleSendChatMessageHook()
+        end
+    end
+end
+
 function Extension.OnLoad()
     Extension.DLOG("Extension pfUI Loaded.")
     Extension.HookMethod(CleveRoids, "GetFocusName", "FocusNameHook", true)
-    Extension.UnregisterEvent("ADDON_LOADED", "Onload")
+
+    -- Initial compatibility check
+    Extension.SetupCompatibility()
+end
+
+function Extension.ADDON_LOADED()
+    -- Check if pfUI just loaded
+    if arg1 == "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
+    end
+end
+
+function Extension.PLAYER_LOGIN()
+    -- Final check after everything is loaded
+    Extension.SetupCompatibility()
+end
+
+-- Utility: Schedule a delayed function call (if not already defined)
+if not CleveRoids.ScheduleTimer then
+    local timerFrame = CreateFrame("Frame")
+    local timers = {}
+
+    timerFrame:SetScript("OnUpdate", function()
+        local time = GetTime()
+        for i = table.getn(timers), 1, -1 do
+            local timer = timers[i]
+            if time >= timer.time then
+                timer.func()
+                table.remove(timers, i)
+            end
+        end
+    end)
+
+    CleveRoids.ScheduleTimer = function(func, delay)
+        table.insert(timers, {
+            func = func,
+            time = GetTime() + delay
+        })
+    end
 end
 
 _G["CleveRoids"] = CleveRoids

Console.lua

@@ -40,9 +40,10 @@ SlashCmdList.USE = CleveRoids.DoUse
 SLASH_EQUIP1 = "/equip"
 
 SlashCmdList.EQUIP = CleveRoids.DoUse
--- take back supermacro and pfUI /equip
+-- take back supermacro and pfUI /equip and /use
 SlashCmdList.SMEQUIP = CleveRoids.DoUse
 SlashCmdList.PFEQUIP = CleveRoids.DoUse
+SlashCmdList.PFUSE = CleveRoids.DoUse
 
 SLASH_EQUIPMH1 = "/equipmh"
 SlashCmdList.EQUIPMH = CleveRoids.DoEquipMainhand

Core.lua

@@ -2388,7 +2388,7 @@ function GetActionTexture(slot)
     if actions and (actions.active or actions.tooltip) then
         -- Prioritize active action, fall back to tooltip
         local a = actions.active or actions.tooltip
-
+        
         -- NEW: For slot-based actions, always fetch current equipment texture
         local slotId = tonumber(a.action)
         if slotId and slotId >= 1 and slotId <= 19 then
@@ -2399,7 +2399,7 @@ function GetActionTexture(slot)
             -- No item equipped in that slot, return unknown texture
             return CleveRoids.unknownTexture
         end
-
+        
         local proxySlot = (actions.active and actions.active.spell) and CleveRoids.GetProxyActionSlot(actions.active.spell.name)
         if proxySlot and CleveRoids.Hooks.GetActionTexture(proxySlot) ~= actions.active.spell.texture then
             return CleveRoids.Hooks.GetActionTexture(proxySlot)
@@ -2831,7 +2831,7 @@ end
 
 function CleveRoids.Frame:UNIT_INVENTORY_CHANGED()
     if arg1 ~= "player" then return end
-
+    
     -- Equipment changes need immediate response, bypass BAG_UPDATE throttle
     local now = GetTime()
     CleveRoids.lastItemIndexTime = now
@@ -2841,7 +2841,7 @@ function CleveRoids.Frame:UNIT_INVENTORY_CHANGED()
     CleveRoids.Actions = {}
     CleveRoids.Macros = {}
     CleveRoids.IndexActionBars()
-
+    
     if CleveRoidMacros.realtime == 0 then
         CleveRoids.QueueActionUpdate()
     end
@@ -2958,9 +2958,13 @@ end
 
 CleveRoids.Hooks.SendChatMessage = SendChatMessage
 function SendChatMessage(msg, ...)
+    -- Filter out #showtooltip lines
+    -- pfUI's macrotweak also does this, but our pattern is more specific
     if msg and string.find(msg, "^#showtooltip") then
         return
     end
+    
+    -- Call the original (or pfUI's hook if it's in the chain)
     CleveRoids.Hooks.SendChatMessage(msg, unpack(arg))
 end