From 07687e1b03688fb9cfea0cd00368f0916230dbf6 Mon Sep 17 00:00:00 2001 From: robin Date: Tue, 25 May 2021 15:29:35 +0200 Subject: [PATCH] Add disable-checks for BCC --- module_bank.lua | 11 ++++++++--- module_currency.lua | 16 +++++++++++----- module_guildbank.lua | 3 ++- module_void.lua | 1 + moduls.lua | 16 ++++++++++++---- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/module_bank.lua b/module_bank.lua index a55a1e2..8c427cb 100644 --- a/module_bank.lua +++ b/module_bank.lua @@ -167,14 +167,19 @@ function modul:Delete(id, typ) self['db'][id] = nil end end -local skipClassic = { - ['PLAYERREAGENTBANKSLOTS_CHANGED'] = true +local skip = { + [WOW_PROJECT_CLASSIC] = { + ['PLAYERREAGENTBANKSLOTS_CHANGED'] = true + }, + [WOW_PROJECT_BURNING_CRUSADE_CLASSIC] = { + ['PLAYERREAGENTBANKSLOTS_CHANGED'] = true + } } function modul:Enable() self['status'] = true local list = {} for event,func in pairs(events) do - if(not child:IsClassic() or (child:IsClassic() and not skipClassic[event])) then + if(not skip[WOW_PROJECT_ID] or not skip[WOW_PROJECT_ID][event]) then list[#list+1] = event end end diff --git a/module_currency.lua b/module_currency.lua index bfb1121..6b09c97 100644 --- a/module_currency.lua +++ b/module_currency.lua @@ -129,7 +129,7 @@ function events:CURRENCY_DISPLAY_UPDATE(event) if(playerID) then modul['db'][playerID] = modul['db'][playerID] or {} local tab = modul['db'][playerID] - for index=1, GetCurrencyListSize() do + for index = 1, GetCurrencyListSize() do local curInfo if(C_CurrencyInfo and C_CurrencyInfo.GetCurrencyListInfo) then curInfo = GetCurrencyListInfo(index) @@ -167,15 +167,20 @@ function modul:Delete(id, typ) self['db'][id] = nil end end -local skipClassic = { - ['CURRENCY_DISPLAY_UPDATE'] = true +local skip = { + [WOW_PROJECT_CLASSIC] = { + ['CURRENCY_DISPLAY_UPDATE'] = true + }, + [WOW_PROJECT_BURNING_CRUSADE_CLASSIC] = { + ['CURRENCY_DISPLAY_UPDATE'] = true + } } function modul:Enable() - if(not child:IsClassic()) then + if(child:IsRetail()) then self.status = true local list = {} for event, func in pairs(events) do - if(not child:IsClassic() or (child:IsClassic() and not skipClassic[event])) then + if(not skip[WOW_PROJECT_ID] or not skip[WOW_PROJECT_ID][event]) then list[#list+1] = event end end @@ -200,6 +205,7 @@ function modul:Disable() end end child:IgnoreClassic(modulname) +child:IgnoreBCC(modulname) local init = { Setup = function(self) modul.db, modul.status = child:RegisterModul(modul, modulname) diff --git a/module_guildbank.lua b/module_guildbank.lua index e6bf253..d9b010c 100644 --- a/module_guildbank.lua +++ b/module_guildbank.lua @@ -177,7 +177,7 @@ function modul:Delete(id, typ) end end function modul:Enable() - if(not child:IsClassic()) then + if(child:IsRetail()) then self.status = true local list = {} for event, func in pairs(events) do @@ -207,6 +207,7 @@ function modul:Disable() end end child:IgnoreClassic(modulname) +child:IgnoreBCC(modulname) local init = { Setup = function(self) db = child['db'] diff --git a/module_void.lua b/module_void.lua index e1bb6b8..b86be90 100644 --- a/module_void.lua +++ b/module_void.lua @@ -124,6 +124,7 @@ function modul:Disable() end end child:IgnoreClassic(modulname) +child:IgnoreBCC(modulname) local init = { Setup = function(self) db = child['db'] diff --git a/moduls.lua b/moduls.lua index 1cd9a37..e32eabc 100644 --- a/moduls.lua +++ b/moduls.lua @@ -4,7 +4,10 @@ local child = addon[childName] child['moduls'] = {} local moduls = child['moduls'] local db -local skipClassic = {} +local skip = { + [WOW_PROJECT_CLASSIC] = {}, + [WOW_PROJECT_BURNING_CRUSADE_CLASSIC] = {} +} function child:GetModul(modName) for k,modul in pairs(moduls) do if(modul.name==modName) then @@ -13,12 +16,17 @@ function child:GetModul(modName) end end function child:IgnoreClassic(ign) - skipClassic[ign] = true + skip[WOW_PROJECT_CLASSIC][ign] = true +end +function child:IgnoreBCC(ign) + skip[WOW_PROJECT_BURNING_CRUSADE_CLASSIC][ign] = true end function child:RegisterModul(modul, namespace) moduls[#moduls+1] = modul - if(not skipClassic[namespace] or not child:IsClassic()) then + if(not skip[WOW_PROJECT_ID] or not skip[WOW_PROJECT_ID][namespace]) then child:AddToConfig(namespace) + else + child['db'][namespace.."Toggle"] = nil end return self:GetNamespace(namespace), child['db'][namespace.."Toggle"] end @@ -27,7 +35,7 @@ function child:output(b) for _, modul in pairs(moduls) do if(type(modul.Output)=='function') then if(child['db'][format('%sTooltip', modul.name)]) then - input,sum = modul.Output(input,sum,b) + input, sum = modul.Output(input,sum,b) end end end