From 727ac60cf077ef7e85dd614c6b39204d7702841b Mon Sep 17 00:00:00 2001 From: Christopher Rosell Date: Thu, 30 Jun 2011 20:15:17 +0200 Subject: [PATCH] Updated to latest Ace3 and added ability to reset icon in combat. --- Kungaloosh.toc | 10 +- config.lua | 123 ++-- kungaloosh.lua | 78 +- libs/AceAddon-3.0/AceAddon-3.0.lua | 658 +++++++++++++++++ libs/AceAddon-3.0/AceAddon-3.0.xml | 4 + libs/AceConfig-3.0/AceConfig-3.0.lua | 8 +- .../AceConfigDialog-3.0/AceConfigDialog-3.0.lua | 237 ++++--- .../AceConfigRegistry-3.0.lua | 7 +- libs/AceDB-3.0/AceDB-3.0.lua | 712 ------------------- libs/AceDB-3.0/AceDB-3.0.xml | 4 - libs/AceDBOptions-3.0/AceDBOptions-3.0.lua | 6 +- libs/AceEvent-3.0/AceEvent-3.0.lua | 126 ++++ libs/AceEvent-3.0/AceEvent-3.0.xml | 4 + libs/AceGUI-3.0/AceGUI-3.0.lua | 218 +++--- libs/AceGUI-3.0/AceGUI-3.0.xml | 32 +- .../widgets/AceGUIContainer-BlizOptionsGroup.lua | 133 ++++ .../widgets/AceGUIContainer-DropDownGroup.lua | 157 ++++ libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua | 300 ++++++++ .../widgets/AceGUIContainer-InlineGroup.lua | 102 +++ .../widgets/AceGUIContainer-ScrollFrame.lua | 203 ++++++ .../widgets/AceGUIContainer-SimpleGroup.lua | 69 ++ .../widgets/AceGUIContainer-TabGroup.lua | 365 ++++++++++ .../widgets/AceGUIContainer-TreeGroup.lua | 707 +++++++++++++++++++ libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua | 331 +++++++++ .../widgets/AceGUIWidget-BlizOptionsGroup.lua | 153 ---- libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua | 154 ++-- libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua | 376 +++++----- .../widgets/AceGUIWidget-ColorPicker.lua | 305 ++++---- .../widgets/AceGUIWidget-DropDown-Items.lua | 16 +- libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua | 56 +- .../widgets/AceGUIWidget-DropDownGroup.lua | 178 ----- libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua | 365 +++++----- libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua | 305 -------- libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua | 126 ++-- libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua | 197 +++--- .../widgets/AceGUIWidget-InlineGroup.lua | 138 ---- .../widgets/AceGUIWidget-InteractiveLabel.lua | 258 ++----- .../AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua | 354 +++++----- libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua | 232 +++--- .../widgets/AceGUIWidget-MultiLineEditBox.lua | 578 ++++++++------- .../widgets/AceGUIWidget-ScrollFrame.lua | 241 ------- .../widgets/AceGUIWidget-SimpleGroup.lua | 99 --- libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua | 451 ++++++------ libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua | 387 ---------- libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua | 746 -------------------- libs/AceGUI-3.0/widgets/AceGUIWidget-Window.lua | 328 --------- libs/AceTimer-3.0/.AceTimer-3.0.lua.swp | Bin 0 -> 16384 bytes libs/AceTimer-3.0/AceTimer-3.0.lua | 473 +++++++++++++ libs/AceTimer-3.0/AceTimer-3.0.xml | 4 + 49 files changed, 5707 insertions(+), 5407 deletions(-) mode change 100644 => 100755 Kungaloosh.toc mode change 100644 => 100755 config.lua mode change 100644 => 100755 kungaloosh.lua create mode 100755 libs/AceAddon-3.0/AceAddon-3.0.lua create mode 100755 libs/AceAddon-3.0/AceAddon-3.0.xml mode change 100644 => 100755 libs/AceConfig-3.0/AceConfig-3.0.lua mode change 100644 => 100755 libs/AceConfig-3.0/AceConfig-3.0.xml mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua mode change 100644 => 100755 libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml delete mode 100644 libs/AceDB-3.0/AceDB-3.0.lua delete mode 100644 libs/AceDB-3.0/AceDB-3.0.xml mode change 100644 => 100755 libs/AceDBOptions-3.0/AceDBOptions-3.0.lua mode change 100644 => 100755 libs/AceDBOptions-3.0/AceDBOptions-3.0.xml create mode 100755 libs/AceEvent-3.0/AceEvent-3.0.lua create mode 100755 libs/AceEvent-3.0/AceEvent-3.0.xml mode change 100644 => 100755 libs/AceGUI-3.0/AceGUI-3.0.lua mode change 100644 => 100755 libs/AceGUI-3.0/AceGUI-3.0.xml create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua create mode 100755 libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua mode change 100644 => 100755 libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua delete mode 100644 libs/AceGUI-3.0/widgets/AceGUIWidget-Window.lua create mode 100755 libs/AceTimer-3.0/.AceTimer-3.0.lua.swp create mode 100755 libs/AceTimer-3.0/AceTimer-3.0.lua create mode 100755 libs/AceTimer-3.0/AceTimer-3.0.xml mode change 100644 => 100755 libs/CallbackHandler-1.0/CallbackHandler-1.0.lua mode change 100644 => 100755 libs/CallbackHandler-1.0/CallbackHandler-1.0.xml mode change 100644 => 100755 libs/LibStub-1.0/LibStub-1.0.lua mode change 100644 => 100755 libs/LibStub-1.0/LibStub-1.0.xml mode change 100644 => 100755 libs/tekKonfigAboutPanel.lua mode change 100644 => 100755 locale/enGB.lua diff --git a/Kungaloosh.toc b/Kungaloosh.toc old mode 100644 new mode 100755 index 268f96f..f75ff4a --- a/Kungaloosh.toc +++ b/Kungaloosh.toc @@ -1,7 +1,7 @@ ## Interface: 40000 ## Title: Kungaloosh ## Notes: Automagic raid marking when tanking -## Version: 1.3 +## Version: 1.4 ## Author: Christopher Rosell ## X-Email: chrippa@gmail.com ## X-Category: Combat @@ -13,14 +13,16 @@ libs\LibStub-1.0\LibStub-1.0.xml libs\CallbackHandler-1.0\CallbackHandler-1.0.xml -libs\AceGUI-3.0\AceGUI-3.0.xml -libs\AceConfig-3.0\AceConfig-3.0.xml +libs\AceAddon-3.0\AceAddon-3.0.xml libs\AceEvent-3.0\AceEvent-3.0.xml +libs\AceConfig-3.0\AceConfig-3.0.xml libs\AceDB-3.0\AceDB-3.0.xml libs\AceDBOptions-3.0\AceDBOptions-3.0.xml +libs\AceGUI-3.0\AceGUI-3.0.xml +libs\AceTimer-3.0\AceTimer-3.0.xml libs\tekKonfigAboutPanel.lua locale\enGB.lua -config.lua kungaloosh.lua +config.lua diff --git a/config.lua b/config.lua old mode 100644 new mode 100755 index 4ce6c3b..ff39943 --- a/config.lua +++ b/config.lua @@ -1,5 +1,6 @@ -local addonname, addon = ... -local L = addon.L +local addonname, addontbl = ... +local addon = Kungaloosh +local L = addontbl.L local options = {} local UpdateIconLists @@ -13,13 +14,13 @@ local function setprofile(info, val) end options.general = { - type = 'group', + type = "group", name = addonname, args = { general = { - name = L['General'], - type = 'group', + name = L["General"], + type = "group", order = 1, inline = true, @@ -28,26 +29,26 @@ options.general = { name = function(info) for k,v in pairs(addon.db.profile.enabled_in) do if v == true then - return L['Kungaloosh will be automatically enabled when getting assigned as tank but can also be manually enabled with the slash command |cff00ff00/kl|r.'] + return L["Kungaloosh will be automatically enabled when getting assigned as tank but can also be manually enabled with the slash command |cff00ff00/kl|r."] end end - return L['Kungaloosh must be manually enabled with the slash command |cff00ff00/kl|r.'] + return L["Kungaloosh must be manually enabled with the slash command |cff00ff00/kl|r."] end, - type = 'description', + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, enabled_in = { - name = L['Enable when assigned as tank in a ...'], - desc = L['Enables the addon automatically if you\'re assigned as tank in a dungeon or raid'], - type = 'multiselect', + name = L["Enable when assigned as tank in a ..."], + desc = L["Enables the addon automatically if you\"re assigned as tank in a dungeon or raid"], + type = "multiselect", order = 3, - width = 'half', + width = "half", - values = { dungeon = L['Dungeon'], raid = L['Raid'] }, + values = { dungeon = L["Dungeon"], raid = L["Raid"] }, get = function(info, key) return addon.db.profile.enabled_in[key] end, set = function(info, key, val) addon.db.profile.enabled_in[key] = val end }, @@ -55,76 +56,92 @@ options.general = { }, threat = { - name = L['Threat'], - type = 'group', + name = L["Threat"], + type = "group", order = 2, inline = true, args = { desc = { name = function(info) - return L['Kungaloosh will place a raid target icon on the target when you have done |cffff0000%d|r or more threat to it.']:format(addon:GetMinThreat()) + return L["Kungaloosh will place a raid target icon on the target when you have done |cffff0000%d|r or more threat to it."]:format(addon:GetMinThreat()) end, - type = 'description', + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, dynamic_minthreat = { - name = L['Dynamic threat value'], - desc = L['Tries to guess a good threat value based on your level'], - type = 'toggle', + name = L["Dynamic threat value"], + desc = L["Tries to guess a good threat value based on your level"], + type = "toggle", order = 3, set = setprofile, get = getprofile }, minthreat = { - name = L['Manual threat value'], - desc = L['Threat value to have before placing a raid target icon'], - type = 'input', + name = L["Manual threat value"], + desc = L["Threat value to have before placing a raid target icon"], + type = "input", order = 4, set = function(info, val) setprofile(info, tonumber(val)) end, get = function(info) return tostring(getprofile(info)) end, disabled = function(info) return addon.db.profile.dynamic_minthreat end, - validate = function(info, value) if tonumber(value) then return true else return L['Invalid number'] end end + validate = function(info, value) if tonumber(value) then return true else return L["Invalid number"] end end } } }, icons = { - name = L['Icons'], - type = 'group', + name = L["Icons"], + type = "group", order = 3, inline = true, args = { desc = { - name = L['Here you can customize what icons to use and in what order they will be placed. Click on the icon to either add or remove it.'], - type = 'description', + name = L["Here you can customize what icons to use and in what order they will be placed. Click on the icon to either add or remove it."], + type = "description", order = 1 }, - sep = { order = 2, type = 'header', name = '' }, + sep = { order = 2, type = "header", name = "" }, enabled = { - name = L['Enabled'], - type = 'group', + name = L["Enabled"], + type = "group", order = 3, args = {} }, - disabled = { - name = L['Available'], - type = 'group', + disabled = { + name = L["Available"], + type = "group", order = 4, args = {} - } + }, + + icon_reuse_time = { + name = function(info) return L["Reuse icon from dead mob after %d seconds."]:format(getprofile(info)) end, + desc = L["When a mob dies the icon it had will not be reused for a certain amount of time."], + type = "range", + order = 5, + width = "double", + min = 1, + max = 1000, + softMin = 1, + softMax = 15, + step = 1, + + set = setprofile, + get = getprofile + }, }, }, } @@ -147,7 +164,7 @@ end function IconExecuteFunc(info) local state, icon = info[2], tonumber(info[3]) - if state == 'enabled' then + if state == "enabled" then for i,v in ipairs(addon.db.profile.raid_icons) do if v == icon then table.remove(addon.db.profile.raid_icons, i) @@ -162,13 +179,13 @@ end function CreateIconOptions(icon) return { - type = 'execute', - name = _G['RAID_TARGET_'..icon], + type = "execute", + name = _G["RAID_TARGET_"..icon], image = [[Interface\TargetingFrame\UI-RaidTargetingIcons]], imageCoords = { GetRaidTargetCoords(icon) }, imageWidth = 16, imageHeight = 16, - width = 'half', + width = "half", func = IconExecuteFunc } end @@ -201,30 +218,30 @@ function UpdateIconLists() end end - LibStub('AceConfigRegistry-3.0'):NotifyChange(addonname) + LibStub("AceConfigRegistry-3.0"):NotifyChange(addonname) end function addon:CreateConfig() - options.profiles = LibStub('AceDBOptions-3.0'):GetOptionsTable(self.db) + options.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db) - LibStub('AceConfig-3.0'):RegisterOptionsTable('Kungaloosh-General', options.general) - LibStub('AceConfig-3.0'):RegisterOptionsTable('Kungaloosh-Profiles', options.profiles) + LibStub("AceConfig-3.0"):RegisterOptionsTable("Kungaloosh-General", options.general) + LibStub("AceConfig-3.0"):RegisterOptionsTable("Kungaloosh-Profiles", options.profiles) - LibStub('AceConfigDialog-3.0'):AddToBlizOptions('Kungaloosh-General', addonname) - LibStub('AceConfigDialog-3.0'):AddToBlizOptions('Kungaloosh-Profiles', 'Profiles', addonname) + LibStub("AceConfigDialog-3.0"):AddToBlizOptions("Kungaloosh-General", addonname) + LibStub("AceConfigDialog-3.0"):AddToBlizOptions("Kungaloosh-Profiles", "Profiles", addonname) - LibStub('tekKonfig-AboutPanel').new(addonname, addonname) + LibStub("tekKonfig-AboutPanel").new(addonname, addonname) for i = 1,8 do iconopts[i] = CreateIconOptions(i) end - self.db.RegisterCallback(self, 'OnNewProfile', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileChanged', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileCopied', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileDeleted', UpdateIconLists) - self.db.RegisterCallback(self, 'OnProfileReset', UpdateIconLists) + self.db.RegisterCallback(self, "OnNewProfile", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileChanged", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileCopied", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileDeleted", UpdateIconLists) + self.db.RegisterCallback(self, "OnProfileReset", UpdateIconLists) UpdateIconLists() end diff --git a/kungaloosh.lua b/kungaloosh.lua old mode 100644 new mode 100755 index 63abdeb..f4b69f5 --- a/kungaloosh.lua +++ b/kungaloosh.lua @@ -1,27 +1,11 @@ -local addonname, addon = ... -local L = addon.L +local addonname, addontbl = ... +local addon = LibStub("AceAddon-3.0"):NewAddon(addonname, "AceEvent-3.0", "AceTimer-3.0") +local L = addontbl.L -local IsCataclysmClient = select(4, GetBuildInfo()) >= 40000 - -function addon:Initialize() - local events = CreateFrame"Frame" - events:SetScript("OnEvent", function(frame, e, ...) - if type(self[e]) == "function" then - self[e](self, ...) - end - end) - - function self:RegisterEvent(...) events:RegisterEvent(...) end - function self:UnregisterEvent(...) events:UnregisterEvent(...) end - - self:RegisterEvent"ADDON_LOADED" - self:RegisterEvent"PLAYER_ROLES_ASSIGNED" - self:RegisterEvent"PLAYER_ENTERING_WORLD" +function addon:OnInitialize() end -function addon:ADDON_LOADED(name) - if addonname ~= name then return end - +function addon:OnEnable() -- DB local defaults = { profile = { @@ -29,6 +13,7 @@ function addon:ADDON_LOADED(name) dynamic_minthreat = true, enabled_in = { dungeon = true, raid = false }, raid_icons = { 8, 7, 1, 2 }, + icon_reuse_time = 10 } } self.db = LibStub("AceDB-3.0"):New("KungalooshDB", defaults, true) @@ -36,6 +21,8 @@ function addon:ADDON_LOADED(name) self:CreateConfig() self:UnregisterEvent"ADDON_LOADED" + self:RegisterEvent"PLAYER_ROLES_ASSIGNED" + self:RegisterEvent"PLAYER_ENTERING_WORLD" self:EnableIfTank() end @@ -56,7 +43,7 @@ function addon:PLAYER_REGEN_ENABLED() self:ResetState() end -function addon:UNIT_THREAT_LIST_UPDATE(unit) +function addon:UNIT_THREAT_LIST_UPDATE(event, unit) if not unit then return end local guid = UnitGUID(unit) @@ -71,11 +58,13 @@ function addon:UNIT_THREAT_LIST_UPDATE(unit) end end -function addon:COMBAT_LOG_EVENT(timestamp, event, sguid, sname, sflags, dguid, dname, dflags) - if event == "UNIT_DIED" then +function addon:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, cevent, hidecaster, + sguid, sname, sflags, sflags2, + dguid, dname, dflags, dflags2) + if cevent == "UNIT_DIED" then local icon = self:GetRaidIconByGUID(dguid) if icon then - self.iconguids[icon] = nil + self:ScheduleTimer("ResetIcon", self.db.profile.icon_reuse_time, icon) end end end @@ -108,7 +97,9 @@ end function addon:RAID_TARGET_UPDATE() CheckUnit"player" + CheckUnit"focus" CheckUnit"target" + CheckUnit"targettarget" CheckUnit"pet" CheckUnit"pettarget" @@ -124,10 +115,16 @@ function addon:RAID_TARGET_UPDATE() end function addon:ResetState() + self:CancelAllTimers() + self.iconguids = self.iconguids or {} table.wipe(self.iconguids) end +function addon:ResetIcon(icon) + self.iconguids[icon] = nil +end + function addon:GetRaidIconByGUID(guid) for icon, iguid in pairs(self.iconguids) do if guid == iguid then @@ -151,29 +148,29 @@ end function addon:GetMinThreat() if self.db.profile.dynamic_minthreat then local level = UnitLevel"player" + local multiplier = (level > 80 and 3.0) or 1.2 - return (level * level) * 1.2 + return (level * level) * multiplier else return self.db.profile.minthreat end end function addon:EnableIfTank() - if self.db.profile.enabled_in.dungeon then - local istank - if IsCataclysmClient then - istank = UnitGroupRolesAssigned"player" == "TANK" - else - istank, _, _ = UnitGroupRolesAssigned"player" + local istank = (UnitGroupRolesAssigned"player" == "TANK") or (GetPartyAssignment("MAINTANK", "player") == 1) + + if istank then + local enable = false + + if self.db.profile.enabled_in.dungeon and not UnitInRaid"player" then + enable = true end - if istank then - return self:Enable(L["is now enabled since you are assigned as a tank"]) + if self.db.profile.enabled_in.raid and UnitInRaid"player" then + enable = true end - end - if self.db.profile.enabled_in.raid then - if GetPartyAssignment("MAINTANK", "player") == 1 then + if enable then return self:Enable(L["is now enabled since you are assigned as a tank"]) end end @@ -187,7 +184,7 @@ function addon:Enable(msg) self:RegisterEvent"PLAYER_REGEN_ENABLED" self:RegisterEvent"UNIT_THREAT_LIST_UPDATE" self:RegisterEvent"RAID_TARGET_UPDATE" - self:RegisterEvent"COMBAT_LOG_EVENT" + self:RegisterEvent"COMBAT_LOG_EVENT_UNFILTERED" self.enabled = true self:ResetState() @@ -201,7 +198,7 @@ function addon:Disable(msg) self:UnregisterEvent"PLAYER_REGEN_ENABLED" self:UnregisterEvent"UNIT_THREAT_LIST_UPDATE" self:UnregisterEvent"RAID_TARGET_UPDATE" - self:UnregisterEvent"COMBAT_LOG_EVENT" + self:UnregisterEvent"COMBAT_LOG_EVENT_UNFILTERED" self.enabled = false if msg then self:Print(msg) end @@ -219,7 +216,6 @@ function SlashCmdList.KUNGALOOSH() addon:Toggle() end -addon:Initialize() - _G["SLASH_KUNGALOOSH1"] = "/kungaloosh" _G["SLASH_KUNGALOOSH2"] = "/kl" +_G["Kungaloosh"] = addon diff --git a/libs/AceAddon-3.0/AceAddon-3.0.lua b/libs/AceAddon-3.0/AceAddon-3.0.lua new file mode 100755 index 0000000..ceb49e0 --- /dev/null +++ b/libs/AceAddon-3.0/AceAddon-3.0.lua @@ -0,0 +1,658 @@ +--- **AceAddon-3.0** provides a template for creating addon objects. +-- It'll provide you with a set of callback functions that allow you to simplify the loading +-- process of your addon.\\ +-- Callbacks provided are:\\ +-- * **OnInitialize**, which is called directly after the addon is fully loaded. +-- * **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present. +-- * **OnDisable**, which is only called when your addon is manually being disabled. +-- @usage +-- -- A small (but complete) addon, that doesn't do anything, +-- -- but shows usage of the callbacks. +-- local MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- +-- function MyAddon:OnInitialize() +-- -- do init tasks here, like loading the Saved Variables, +-- -- or setting up slash commands. +-- end +-- +-- function MyAddon:OnEnable() +-- -- Do more initialization here, that really enables the use of your addon. +-- -- Register Events, Hook functions, Create Frames, Get information from +-- -- the game that wasn't available in OnInitialize +-- end +-- +-- function MyAddon:OnDisable() +-- -- Unhook, Unregister Events, Hide frames that you created. +-- -- You would probably only use an OnDisable if you want to +-- -- build a "standby" mode, or be able to toggle modules on/off. +-- end +-- @class file +-- @name AceAddon-3.0.lua +-- @release $Id: AceAddon-3.0.lua 980 2010-10-27 14:20:11Z nevcairiel $ + +local MAJOR, MINOR = "AceAddon-3.0", 10 +local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR) + +if not AceAddon then return end -- No Upgrade needed. + +AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame +AceAddon.addons = AceAddon.addons or {} -- addons in general +AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon. +AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized +AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled +AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon + +-- Lua APIs +local tinsert, tconcat, tremove = table.insert, table.concat, table.remove +local fmt, tostring = string.format, tostring +local select, pairs, next, type, unpack = select, pairs, next, type, unpack +local loadstring, assert, error = loadstring, assert, error +local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget + +-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded +-- List them here for Mikk's FindGlobals script +-- GLOBALS: LibStub, IsLoggedIn, geterrorhandler + +--[[ + xpcall safecall implementation +]] +local xpcall = xpcall + +local function errorhandler(err) + return geterrorhandler()(err) +end + +local function CreateDispatcher(argCount) + local code = [[ + local xpcall, eh = ... + local method, ARGS + local function call() return method(ARGS) end + + local function dispatch(func, ...) + method = func + if not method then return end + ARGS = ... + return xpcall(call, eh) + end + + return dispatch + ]] + + local ARGS = {} + for i = 1, argCount do ARGS[i] = "arg"..i end + code = code:gsub("ARGS", tconcat(ARGS, ", ")) + return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler) +end + +local Dispatchers = setmetatable({}, {__index=function(self, argCount) + local dispatcher = CreateDispatcher(argCount) + rawset(self, argCount, dispatcher) + return dispatcher +end}) +Dispatchers[0] = function(func) + return xpcall(func, errorhandler) +end + +local function safecall(func, ...) + -- we check to see if the func is passed is actually a function here and don't error when it isn't + -- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not + -- present execution should continue without hinderance + if type(func) == "function" then + return Dispatchers[select('#', ...)](func, ...) + end +end + +-- local functions that will be implemented further down +local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype + +-- used in the addon metatable +local function addontostring( self ) return self.name end + +--- Create a new AceAddon-3.0 addon. +-- Any libraries you specified will be embeded, and the addon will be scheduled for +-- its OnInitialize and OnEnable callbacks. +-- The final addon object, with all libraries embeded, will be returned. +-- @paramsig [object ,]name[, lib, ...] +-- @param object Table to use as a base for the addon (optional) +-- @param name Name of the addon object to create +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create a simple addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceEvent-3.0") +-- +-- -- Create a Addon object based on the table of a frame +-- local MyFrame = CreateFrame("Frame") +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0") +function AceAddon:NewAddon(objectorname, ...) + local object,name + local i=1 + if type(objectorname)=="table" then + object=objectorname + name=... + i=2 + else + name=objectorname + end + if type(name)~="string" then + error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) + end + if self.addons[name] then + error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2) + end + + object = object or {} + object.name = name + + local addonmeta = {} + local oldmeta = getmetatable(object) + if oldmeta then + for k, v in pairs(oldmeta) do addonmeta[k] = v end + end + addonmeta.__tostring = addontostring + + setmetatable( object, addonmeta ) + self.addons[name] = object + object.modules = {} + object.orderedModules = {} + object.defaultModuleLibraries = {} + Embed( object ) -- embed NewModule, GetModule methods + self:EmbedLibraries(object, select(i,...)) + + -- add to queue of addons to be initialized upon ADDON_LOADED + tinsert(self.initializequeue, object) + return object +end + + +--- Get the addon object by its name from the internal AceAddon registry. +-- Throws an error if the addon object cannot be found (except if silent is set). +-- @param name unique name of the addon object +-- @param silent if true, the addon is optional, silently return nil if its not found +-- @usage +-- -- Get the Addon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +function AceAddon:GetAddon(name, silent) + if not silent and not self.addons[name] then + error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2) + end + return self.addons[name] +end + +-- - Embed a list of libraries into the specified addon. +-- This function will try to embed all of the listed libraries into the addon +-- and error if a single one fails. +-- +-- **Note:** This function is for internal use by :NewAddon/:NewModule +-- @paramsig addon, [lib, ...] +-- @param addon addon object to embed the libs in +-- @param lib List of libraries to embed into the addon +function AceAddon:EmbedLibraries(addon, ...) + for i=1,select("#", ... ) do + local libname = select(i, ...) + self:EmbedLibrary(addon, libname, false, 4) + end +end + +-- - Embed a library into the addon object. +-- This function will check if the specified library is registered with LibStub +-- and if it has a :Embed function to call. It'll error if any of those conditions +-- fails. +-- +-- **Note:** This function is for internal use by :EmbedLibraries +-- @paramsig addon, libname[, silent[, offset]] +-- @param addon addon object to embed the library in +-- @param libname name of the library to embed +-- @param silent marks an embed to fail silently if the library doesn't exist (optional) +-- @param offset will push the error messages back to said offset, defaults to 2 (optional) +function AceAddon:EmbedLibrary(addon, libname, silent, offset) + local lib = LibStub:GetLibrary(libname, true) + if not lib and not silent then + error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2) + elseif lib and type(lib.Embed) == "function" then + lib:Embed(addon) + tinsert(self.embeds[addon], libname) + return true + elseif lib then + error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2) + end +end + +--- Return the specified module from an addon object. +-- Throws an error if the addon object cannot be found (except if silent is set) +-- @name //addon//:GetModule +-- @paramsig name[, silent] +-- @param name unique name of the module +-- @param silent if true, the module is optional, silently return nil if its not found (optional) +-- @usage +-- -- Get the Addon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- -- Get the Module +-- MyModule = MyAddon:GetModule("MyModule") +function GetModule(self, name, silent) + if not self.modules[name] and not silent then + error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2) + end + return self.modules[name] +end + +local function IsModuleTrue(self) return true end + +--- Create a new module for the addon. +-- The new module can have its own embeded libraries and/or use a module prototype to be mixed into the module.\\ +-- A module has the same functionality as a real addon, it can have modules of its own, and has the same API as +-- an addon object. +-- @name //addon//:NewModule +-- @paramsig name[, prototype|lib[, lib, ...]] +-- @param name unique name of the module +-- @param prototype object to derive this module from, methods and values from this table will be mixed into the module (optional) +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create a module with some embeded libraries +-- MyModule = MyAddon:NewModule("MyModule", "AceEvent-3.0", "AceHook-3.0") +-- +-- -- Create a module with a prototype +-- local prototype = { OnEnable = function(self) print("OnEnable called!") end } +-- MyModule = MyAddon:NewModule("MyModule", prototype, "AceEvent-3.0", "AceHook-3.0") +function NewModule(self, name, prototype, ...) + if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end + if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end + + if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end + + -- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well. + -- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is. + local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name)) + + module.IsModule = IsModuleTrue + module:SetEnabledState(self.defaultModuleState) + module.moduleName = name + + if type(prototype) == "string" then + AceAddon:EmbedLibraries(module, prototype, ...) + else + AceAddon:EmbedLibraries(module, ...) + end + AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries)) + + if not prototype or type(prototype) == "string" then + prototype = self.defaultModulePrototype or nil + end + + if type(prototype) == "table" then + local mt = getmetatable(module) + mt.__index = prototype + setmetatable(module, mt) -- More of a Base class type feel. + end + + safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy. + self.modules[name] = module + tinsert(self.orderedModules, module) + + return module +end + +--- Returns the real name of the addon or module, without any prefix. +-- @name //addon//:GetName +-- @paramsig +-- @usage +-- print(MyAddon:GetName()) +-- -- prints "MyAddon" +function GetName(self) + return self.moduleName or self.name +end + +--- Enables the Addon, if possible, return true or false depending on success. +-- This internally calls AceAddon:EnableAddon(), thus dispatching a OnEnable callback +-- and enabling all modules of the addon (unless explicitly disabled).\\ +-- :Enable() also sets the internal `enableState` variable to true +-- @name //addon//:Enable +-- @paramsig +-- @usage +-- -- Enable MyModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Enable() +function Enable(self) + self:SetEnabledState(true) + return AceAddon:EnableAddon(self) +end + +--- Disables the Addon, if possible, return true or false depending on success. +-- This internally calls AceAddon:DisableAddon(), thus dispatching a OnDisable callback +-- and disabling all modules of the addon.\\ +-- :Disable() also sets the internal `enableState` variable to false +-- @name //addon//:Disable +-- @paramsig +-- @usage +-- -- Disable MyAddon +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:Disable() +function Disable(self) + self:SetEnabledState(false) + return AceAddon:DisableAddon(self) +end + +--- Enables the Module, if possible, return true or false depending on success. +-- Short-hand function that retrieves the module via `:GetModule` and calls `:Enable` on the module object. +-- @name //addon//:EnableModule +-- @paramsig name +-- @usage +-- -- Enable MyModule using :GetModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Enable() +-- +-- -- Enable MyModule using the short-hand +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:EnableModule("MyModule") +function EnableModule(self, name) + local module = self:GetModule( name ) + return module:Enable() +end + +--- Disables the Module, if possible, return true or false depending on success. +-- Short-hand function that retrieves the module via `:GetModule` and calls `:Disable` on the module object. +-- @name //addon//:DisableModule +-- @paramsig name +-- @usage +-- -- Disable MyModule using :GetModule +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyModule = MyAddon:GetModule("MyModule") +-- MyModule:Disable() +-- +-- -- Disable MyModule using the short-hand +-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon") +-- MyAddon:DisableModule("MyModule") +function DisableModule(self, name) + local module = self:GetModule( name ) + return module:Disable() +end + +--- Set the default libraries to be mixed into all modules created by this object. +-- Note that you can only change the default module libraries before any module is created. +-- @name //addon//:SetDefaultModuleLibraries +-- @paramsig lib[, lib, ...] +-- @param lib List of libraries to embed into the addon +-- @usage +-- -- Create the addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- -- Configure default libraries for modules (all modules need AceEvent-3.0) +-- MyAddon:SetDefaultModuleLibraries("AceEvent-3.0") +-- -- Create a module +-- MyModule = MyAddon:NewModule("MyModule") +function SetDefaultModuleLibraries(self, ...) + if next(self.modules) then + error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2) + end + self.defaultModuleLibraries = {...} +end + +--- Set the default state in which new modules are being created. +-- Note that you can only change the default state before any module is created. +-- @name //addon//:SetDefaultModuleState +-- @paramsig state +-- @param state Default state for new modules, true for enabled, false for disabled +-- @usage +-- -- Create the addon object +-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon") +-- -- Set the default state to "disabled" +-- MyAddon:SetDefaultModuleState(false) +-- -- Create a module and explicilty enable it +-- MyModule = MyAddon:NewModule("MyModule") +-- MyModule:Enable() +function SetDefaultModuleState(self, state) + if next(self.modules) then + error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2) + end + self.defaultModuleState = state +end + +--- Set the default prototype to use for new modules on creation. +-- Note that you can only change the default prototype before any module is created. +-- @name //addon//:SetDefaultModulePrototype +-- @paramsig prototype +-- @param prototype Default prototype for the new modules (table) +-- @usage +-- -- Define a prototype +-- local prototype = { OnEnable = function(self) print("OnEnable called!") end } +-- -- Set the default prototype +-- MyAddon:SetDefaultModulePrototype(prototype) +-- -- Create a module and explicitly Enable it +-- MyModule = MyAddon:NewModule("MyModule") +-- MyModule:Enable() +-- -- should print "OnEnable called!" now +-- @see NewModule +function SetDefaultModulePrototype(self, prototype) + if next(self.modules) then + error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2) + end + if type(prototype) ~= "table" then + error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2) + end + self.defaultModulePrototype = prototype +end + +--- Set the state of an addon or module +-- This should only be called before any enabling actually happend, e.g. in/before OnInitialize. +-- @name //addon//:SetEnabledState +-- @paramsig state +-- @param state the state of an addon or module (enabled=true, disabled=false) +function SetEnabledState(self, state) + self.enabledState = state +end + + +--- Return an iterator of all modules associated to the addon. +-- @name //addon//:IterateModules +-- @paramsig +-- @usage +-- -- Enable all modules +-- for name, module in MyAddon:IterateModules() do +-- module:Enable() +-- end +local function IterateModules(self) return pairs(self.modules) end + +-- Returns an iterator of all embeds in the addon +-- @name //addon//:IterateEmbeds +-- @paramsig +local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end + +--- Query the enabledState of an addon. +-- @name //addon//:IsEnabled +-- @paramsig +-- @usage +-- if MyAddon:IsEnabled() then +-- MyAddon:Disable() +-- end +local function IsEnabled(self) return self.enabledState end +local mixins = { + NewModule = NewModule, + GetModule = GetModule, + Enable = Enable, + Disable = Disable, + EnableModule = EnableModule, + DisableModule = DisableModule, + IsEnabled = IsEnabled, + SetDefaultModuleLibraries = SetDefaultModuleLibraries, + SetDefaultModuleState = SetDefaultModuleState, + SetDefaultModulePrototype = SetDefaultModulePrototype, + SetEnabledState = SetEnabledState, + IterateModules = IterateModules, + IterateEmbeds = IterateEmbeds, + GetName = GetName, +} +local function IsModule(self) return false end +local pmixins = { + defaultModuleState = true, + enabledState = true, + IsModule = IsModule, +} +-- Embed( target ) +-- target (object) - target object to embed aceaddon in +-- +-- this is a local function specifically since it's meant to be only called internally +function Embed(target, skipPMixins) + for k, v in pairs(mixins) do + target[k] = v + end + if not skipPMixins then + for k, v in pairs(pmixins) do + target[k] = target[k] or v + end + end +end + + +-- - Initialize the addon after creation. +-- This function is only used internally during the ADDON_LOADED event +-- It will call the **OnInitialize** function on the addon object (if present), +-- and the **OnEmbedInitialize** function on all embeded libraries. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- @param addon addon object to intialize +function AceAddon:InitializeAddon(addon) + safecall(addon.OnInitialize, addon) + + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedInitialize, lib, addon) end + end + + -- we don't call InitializeAddon on modules specifically, this is handled + -- from the event handler and only done _once_ +end + +-- - Enable the addon after creation. +-- Note: This function is only used internally during the PLAYER_LOGIN event, or during ADDON_LOADED, +-- if IsLoggedIn() already returns true at that point, e.g. for LoD Addons. +-- It will call the **OnEnable** function on the addon object (if present), +-- and the **OnEmbedEnable** function on all embeded libraries.\\ +-- This function does not toggle the enable state of the addon itself, and will return early if the addon is disabled. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- Use :Enable on the addon itself instead. +-- @param addon addon object to enable +function AceAddon:EnableAddon(addon) + if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end + if self.statuses[addon.name] or not addon.enabledState then return false end + + -- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable. + self.statuses[addon.name] = true + + safecall(addon.OnEnable, addon) + + -- make sure we're still enabled before continueing + if self.statuses[addon.name] then + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedEnable, lib, addon) end + end + + -- enable possible modules. + local modules = addon.orderedModules + for i = 1, #modules do + self:EnableAddon(modules[i]) + end + end + return self.statuses[addon.name] -- return true if we're disabled +end + +-- - Disable the addon +-- Note: This function is only used internally. +-- It will call the **OnDisable** function on the addon object (if present), +-- and the **OnEmbedDisable** function on all embeded libraries.\\ +-- This function does not toggle the enable state of the addon itself, and will return early if the addon is still enabled. +-- +-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. +-- Use :Disable on the addon itself instead. +-- @param addon addon object to enable +function AceAddon:DisableAddon(addon) + if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end + if not self.statuses[addon.name] then return false end + + -- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable. + self.statuses[addon.name] = false + + safecall( addon.OnDisable, addon ) + + -- make sure we're still disabling... + if not self.statuses[addon.name] then + local embeds = self.embeds[addon] + for i = 1, #embeds do + local lib = LibStub:GetLibrary(embeds[i], true) + if lib then safecall(lib.OnEmbedDisable, lib, addon) end + end + -- disable possible modules. + local modules = addon.orderedModules + for i = 1, #modules do + self:DisableAddon(modules[i]) + end + end + + return not self.statuses[addon.name] -- return true if we're disabled +end + +--- Get an iterator over all registered addons. +-- @usage +-- -- Print a list of all installed AceAddon's +-- for name, addon in AceAddon:IterateAddons() do +-- print("Addon: " .. name) +-- end +function AceAddon:IterateAddons() return pairs(self.addons) end + +--- Get an iterator over the internal status registry. +-- @usage +-- -- Print a list of all enabled addons +-- for name, status in AceAddon:IterateAddonStatus() do +-- if status then +-- print("EnabledAddon: " .. name) +-- end +-- end +function AceAddon:IterateAddonStatus() return pairs(self.statuses) end + +-- Following Iterators are deprecated, and their addon specific versions should be used +-- e.g. addon:IterateEmbeds() instead of :IterateEmbedsOnAddon(addon) +function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end +function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end + +-- Event Handling +local function onEvent(this, event, arg1) + if event == "ADDON_LOADED" or event == "PLAYER_LOGIN" then + -- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration + while(#AceAddon.initializequeue > 0) do + local addon = tremove(AceAddon.initializequeue, 1) + -- this might be an issue with recursion - TODO: validate + if event == "ADDON_LOADED" then addon.baseName = arg1 end + AceAddon:InitializeAddon(addon) + tinsert(AceAddon.enablequeue, addon) + end + + if IsLoggedIn() then + while(#AceAddon.enablequeue > 0) do + local addon = tremove(AceAddon.enablequeue, 1) + AceAddon:EnableAddon(addon) + end + end + end +end + +AceAddon.frame:RegisterEvent("ADDON_LOADED") +AceAddon.frame:RegisterEvent("PLAYER_LOGIN") +AceAddon.frame:SetScript("OnEvent", onEvent) + +-- upgrade embeded +for name, addon in pairs(AceAddon.addons) do + Embed(addon, true) +end + +-- 2010-10-27 nevcairiel - add new "orderedModules" table +if oldminor and oldminor < 10 then + for name, addon in pairs(AceAddon.addons) do + addon.orderedModules = {} + for module_name, module in pairs(addon.modules) do + tinsert(addon.orderedModules, module) + end + end +end diff --git a/libs/AceAddon-3.0/AceAddon-3.0.xml b/libs/AceAddon-3.0/AceAddon-3.0.xml new file mode 100755 index 0000000..17c568c --- /dev/null +++ b/libs/AceAddon-3.0/AceAddon-3.0.xml @@ -0,0 +1,4 @@ + +