11.1.0 updates

Author: Tuller

OmniCC/OmniCC.toc

@@ -1,17 +1,16 @@
-## Interface: 110007, 110100, 40401, 11505
+## Interface: 110100, 110007, 40402, 40401, 11506
 ## Title: OmniCC
 ## Notes: Cooldown count for everything
-## Notes-koKR: 모든 것을 위한 쿨다운 카운트
 ## Notes-esMX: Contador de tiempo de reutilización
 ## Notes-esES: Contador de tiempo de reutilización
 ## Notes-ptBR: Contagem de tempo de recarga
 ## Notes-frFR: Compte à rebours du temps de recharge
 ## Notes-ruRU: Время восстановления способностей и т.п.
 ## Author: Tuller
+## Category: Combat
 ## Version: @project-version@
 ## SavedVariables: OmniCCDB, OmniCC4Config
 ## IconTexture: Interface/Icons/spell_nature_timestop
-## AddonCompartmentFunc: OmniCC_Launch
 embeds.xml
 localization\localization.xml
 main.lua

OmniCC/main.lua

@@ -1,100 +1,76 @@
 -- code to drive the addon
-local ADDON, Addon = ...
-local CONFIG_ADDON = ADDON .. '_Config'
-local L = LibStub('AceLocale-3.0'):GetLocale(ADDON)
-
-function Addon:OnLoad()
-    -- create and setup options frame and event loader
-    local frame = self:CreateHiddenFrame('Frame')
-
-    -- setup an event handler
-    frame:SetScript(
-        'OnEvent',
-        function(_, event, ...)
-            local func = self[event]
-            if type(func) == 'function' then
-                func(self, event, ...)
-            end
-        end
-    )
-
-    frame:RegisterEvent('ADDON_LOADED')
-    frame:RegisterEvent('PLAYER_ENTERING_WORLD')
-    frame:RegisterEvent('PLAYER_LOGIN')
-    frame:RegisterEvent('PLAYER_LOGOUT')
-
-    self.frame = frame
+local AddonName, Addon = ...
+local CONFIG_ADDON = AddonName .. '_Config'
+local L = LibStub('AceLocale-3.0'):GetLocale(AddonName)
+
+EventUtil.ContinueOnAddOnLoaded(AddonName, function(addonName)
+    Addon:InitializeDB()
+    Addon.Cooldown:SetupHooks()
+
+    -- setup addon compartment button
+	if AddonCompartmentFrame then
+		AddonCompartmentFrame:RegisterAddon{
+			text = C_AddOns.GetAddOnMetadata(addonName, "Title"),
+			icon = C_AddOns.GetAddOnMetadata(addonName, "IconTexture"),
+			func = function() Addon:ShowOptionsFrame() end,
+		}
+	end
 
     -- setup slash commands
-    _G[('SLASH_%s1'):format(ADDON)] = ('/%s'):format(ADDON:lower())
-    _G[('SLASH_%s2'):format(ADDON)] = '/occ'
-
-    SlashCmdList[ADDON] = function(cmd, ...)
+    SlashCmdList[AddonName] = function(cmd, ...)
         if cmd == 'version' then
-            print(L.Version:format(self.db.global.addonVersion))
+            print(L.Version:format(Addon.db.global.addonVersion))
         else
-            self:ShowOptionsFrame()
+            Addon:ShowOptionsFrame()
         end
     end
 
-    self.OnLoad= nil
-end
-
--- events
-function Addon:ADDON_LOADED(event, addonName)
-    if ADDON ~= addonName then
-        return
-    end
+    SLASH_OmniCC1 = '/omnicc'
+    SLASH_OmniCC2 = '/occ'
 
-    self.frame:UnregisterEvent(event)
+    -- watch for subsequent events
+    EventRegistry:RegisterFrameEventAndCallback("PLAYER_ENTERING_WORLD", Addon.PLAYER_ENTERING_WORLD, Addon)
 
-    self:InitializeDB()
-    self.Cooldown:SetupHooks()
-end
+    EventUtil.RegisterOnceFrameEventAndCallback("PLAYER_LOGIN", function()
+        if not Addon.db.global.disableBlizzardCooldownText then return end
 
-function Addon:PLAYER_ENTERING_WORLD()
-    self.Timer:ForActive('Update')
-end
-
-function Addon:PLAYER_LOGIN()
-    if not self.db.global.disableBlizzardCooldownText then return end
+        -- disable and preserve the user's blizzard cooldown count setting
+        Addon.countdownForCooldowns = GetCVar('countdownForCooldowns')
+        if Addon.countdownForCooldowns ~= '0' then
+            SetCVar('countdownForCooldowns', '0')
+        end
+    end)
 
-    -- disable and preserve the user's blizzard cooldown count setting
-    self.countdownForCooldowns = GetCVar('countdownForCooldowns')
-    if self.countdownForCooldowns ~= '0' then
-        SetCVar('countdownForCooldowns', '0')
-    end
-end
+    EventUtil.RegisterOnceFrameEventAndCallback("PLAYER_LOGOUT", function()
+        if not Addon.db.global.disableBlizzardCooldownText then return end
 
-function Addon:PLAYER_LOGOUT()
-    if not self.db.global.disableBlizzardCooldownText then return end
+        -- return the setting to whatever it was originally on logout
+        -- so that the user can uninstall omnicc and go back to what they had
+        local countdownForCooldowns = GetCVar('countdownForCooldowns')
+        if Addon.countdownForCooldowns ~= countdownForCooldowns then
+            SetCVar('countdownForCooldowns', Addon.countdownForCooldowns)
+        end
+    end)
+end)
 
-    -- return the setting to whatever it was originally on logout
-    -- so that the user can uninstall omnicc and go back to what they had
-    local countdownForCooldowns = GetCVar('countdownForCooldowns')
-    if self.countdownForCooldowns ~= countdownForCooldowns then
-        SetCVar('countdownForCooldowns', self.countdownForCooldowns)
-    end
+function Addon:PLAYER_ENTERING_WORLD()
+    self.Timer:ForActive('Update')
 end
 
 -- utility methods
 function Addon:ShowOptionsFrame()
-    if self:IsConfigAddonEnabled() and C_AddOns.LoadAddOn(CONFIG_ADDON) then
+    if C_AddOns.LoadAddOn(CONFIG_ADDON) then
         local dialog = LibStub('AceConfigDialog-3.0')
 
-        dialog:Open(ADDON)
-        dialog:SelectGroup(ADDON, "themes", DEFAULT)
+        dialog:Open(AddonName)
+        dialog:SelectGroup(AddonName, "themes", DEFAULT)
 
         return true
     end
 
     return false
 end
 
-function Addon:IsConfigAddonEnabled()
-    return C_AddOns.GetAddOnEnableState(CONFIG_ADDON, UnitName('player')) > 0
-end
-
 function Addon:CreateHiddenFrame(...)
     local f = CreateFrame(...)
 
@@ -121,8 +97,5 @@ function Addon:GetButtonIcon(frame)
     end
 end
 
-Addon:OnLoad()
-
 -- exports
-_G[ADDON] = Addon
-_G[ADDON .. '_Launch'] = function() Addon:ShowOptionsFrame() end
+_G[AddonName] = Addon

OmniCC_Config/OmniCC_Config.toc

@@ -1,4 +1,4 @@
-## Interface: 110007, 110100, 40401, 11505
+## Interface: 110100, 110007, 40402, 40401, 11506
 ## Title: OmniCC Config
 ## Title-ruRU: Конфигурация OmniCC
 ## Notes: OmniCC's configuration menu

changelog.md

@@ -1,5 +1,9 @@
 # OmniCC Changelog
 
+## 11.0.7
+
+* Update TOCs for 11.1.0, 4.4.2 and 1.15.6
+
 ## 11.0.6
 
 * Fix another nil value error