mirror of
https://github.com/brues-code/pfUI.git
synced 2026-09-22 15:46:56 +00:00
Brues
31ff2773b3
Replace the previous RunNextFrame conflict check with per-addon EventUtil.ContinueOnAddOnLoaded calls in modules/macrotweak.lua so macrotweak is disabled as soon as known conflicting addons load. Simplify variable naming and ensure the disabled flag is set correctly. In skins/blizzard/macro.lua replace separate SetHeight/SetWidth calls with a single SetSize(150,22) for MacroEditButton to tidy UI sizing.
66 lines
2.3 KiB
Lua
66 lines
2.3 KiB
Lua
pfUI:RegisterModule("macrotweak", function ()
|
|
local conflictAddons = { "Supermacro", "SuperCleveRoidMacros", "UltimaMacros" }
|
|
local disabled = false
|
|
|
|
for _, addon in pairs(conflictAddons) do
|
|
local name = addon
|
|
EventUtil.ContinueOnAddOnLoaded(name, function()
|
|
if not disabled then
|
|
DEFAULT_CHAT_FRAME:AddMessage("|cff33ffccpfUI|r: " .. name .. " found, macrotweak disabled.")
|
|
end
|
|
disabled = true
|
|
end)
|
|
end
|
|
|
|
-- do not write macro calls into chat input history
|
|
if ChatFrameEditBox._AddHistoryLine then
|
|
local userinput
|
|
ChatFrameEditBox._AddHistoryLine = ChatFrameEditBox.AddHistoryLine
|
|
ChatFrameEditBox.AddHistoryLine = function(self, text)
|
|
if disabled then return ChatFrameEditBox._AddHistoryLine(self, text) end
|
|
if not userinput and text and string.find(text, "^/run(.+)") then return end
|
|
if not userinput and string.find(text, "^/script(.+)") then return end
|
|
if not userinput and string.find(text, "^/cast(.+)") then return end
|
|
ChatFrameEditBox._AddHistoryLine(self, text)
|
|
end
|
|
|
|
local OnEnter = ChatFrameEditBox:GetScript("OnEnterPressed")
|
|
ChatFrameEditBox:SetScript("OnEnterPressed", function(a1,a2,a3,a4)
|
|
userinput = true
|
|
OnEnter(a1,a2,a3,a4)
|
|
userinput = nil
|
|
end)
|
|
end
|
|
|
|
-- make sure #showtooltip inside macros won't be sent
|
|
local hookSendChatMessage = SendChatMessage
|
|
function _G.SendChatMessage(msg, ...)
|
|
if disabled then return hookSendChatMessage(msg, unpack(arg)) end
|
|
if msg and string.find(msg, "^#showtooltip ") then return end
|
|
hookSendChatMessage(msg, unpack(arg))
|
|
end
|
|
|
|
-- add /use and /equip to the macro api:
|
|
-- https://wowwiki.fandom.com/wiki/Making_a_macro
|
|
-- supported arguments:
|
|
-- /use <itemname>
|
|
-- /use <inventory slot>
|
|
-- /use <bag> <slot>
|
|
pfUI.api.RegisterSlashCommand("PFUSE", { "/equip" , "/use", "/pfequip", "/pfuse" }, function (msg)
|
|
if not msg or msg == "" then return end
|
|
local bag, slot, _
|
|
if string.find(msg, "%d+%s+%d+") then
|
|
_, _, bag, slot = string.find(msg, "(%d+)%s+(%d+)")
|
|
elseif string.find(msg, "%d+") then
|
|
_, _, slot = string.find(msg, "(%d+)")
|
|
else
|
|
bag, slot = FindItem(msg)
|
|
end
|
|
|
|
if bag and slot then
|
|
UseContainerItem(bag, slot)
|
|
elseif not bag and slot then
|
|
UseInventoryItem(slot)
|
|
end
|
|
end)
|
|
end) |