Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions Core/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,29 @@
-- --
-- ================================================================================ --

-------------------------------------------------------------------------------------------------------------
-- API Compatibility Layer for cross-version support (Classic, TBC, Wrath, Cata, Retail)
-------------------------------------------------------------------------------------------------------------

local function GetAddOnMetadataCompat(name, field)
if C_AddOns and C_AddOns.GetAddOnMetadata then
return C_AddOns.GetAddOnMetadata(name, field)
elseif GetAddOnMetadata then
return GetAddOnMetadata(name, field)
end
return nil
end

local function IsAddOnLoadedCompat(name)
if C_AddOns and C_AddOns.IsAddOnLoaded then
return C_AddOns.IsAddOnLoaded(name)
elseif IsAddOnLoaded then
return IsAddOnLoaded(name)
end
return false
end

-------------------------------------------------------------------------------------------------------------
-- The global private table for EMA.
EMAPrivate = {}
EMAPrivate.Core = {}
Expand Down Expand Up @@ -39,7 +62,7 @@ EMA.moduleIcon = "Interface\\Addons\\EMA\\Media\\NewsIcon.tga"
EMA.pofileIcon = "Interface\\Addons\\EMA\\Media\\SettingsIcon.tga"
-- order
EMA.moduleOrder = 1
local version = C_AddOns.GetAddOnMetadata("EMA", "version")
local version = GetAddOnMetadataCompat("EMA", "version")

-- Load libraries.
local AceGUI = LibStub("AceGUI-3.0")
Expand All @@ -64,7 +87,7 @@ EMAPrivate.SettingsFrame.Widget:AddChild( EMAPrivate.SettingsFrame.WidgetTree )


function EMA:OnEnable()
local Jamba = C_AddOns.IsAddOnLoaded("Jamba")
local Jamba = IsAddOnLoadedCompat("Jamba")
if Jamba == true then
StaticPopup_Show( "CAN_NOT_RUN_JAMBA_AND_EMA" )
end
Expand Down Expand Up @@ -299,7 +322,7 @@ end

--Ema Alpha
local function isEmaAlphaBuild()
local EMAVersion = GetAddOnMetadata("EMA", "version")
local EMAVersion = GetAddOnMetadataCompat("EMA", "version")
-- EMA Alpha Build
local Alpha = EMAVersion:find( "Alpha" )
if Alpha then
Expand Down Expand Up @@ -860,3 +883,5 @@ EMAPrivate.Core.isEmaBetaBuild = isEmaBetaBuild
EMAPrivate.Core.isEmaAlphaBuild = isEmaAlphaBuild
EMAPrivate.Core.SendSettingsAllModules = EMA.SendSettingsAllModules
EMAPrivate.Core.RefreshSettingsAllModules = EMA.RefreshSettingsAllModules
EMAPrivate.Core.GetAddOnMetadata = GetAddOnMetadataCompat
EMAPrivate.Core.IsAddOnLoaded = IsAddOnLoadedCompat
6 changes: 3 additions & 3 deletions Modules/DisplayTeam.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local EMAHelperSettings = LibStub:GetLibrary( "EMAHelperSettings-1.0" )
local LibBagUtils = LibStub:GetLibrary( "LibBagUtils-1.0" )
local LibButtonGlow = LibStub:GetLibrary( "LibButtonGlow-1.0" )
EMA.SharedMedia = LibStub( "LibSharedMedia-3.0" )
local TrufiGCD = C_AddOns.IsAddOnLoaded( "TrufiGCD" )
local TrufiGCD = EMAPrivate.Core.IsAddOnLoaded( "TrufiGCD" )
TrufiGCDGlSave = TrufiGCDGlSave


Expand Down Expand Up @@ -3260,7 +3260,7 @@ function EMA:UpdateSpellStatus( unitTarget, spellID )
local GCDFrame = characterStatusBar["GCDFrame"]
local GCDFrameText = characterStatusBar["GCDFrameText"]
--EMA:Print("testUpdate", unitTarget )
if C_AddOns.IsAddOnLoaded( "TrufiGCD" ) == true then
if EMAPrivate.Core.IsAddOnLoaded( "TrufiGCD" ) == true then
local i, _ = TrGCDPlayerDetect(unitTarget)
--EMA:Print("test", unitTarget, i )
if i > 0 and i <= 5 then
Expand All @@ -3277,7 +3277,7 @@ function EMA:SetTrGCOpt()
if EMA.db.showTeamList == false and EMA.db.showGCDFrame == false then
return
end
if C_AddOns.IsAddOnLoaded( "TrufiGCD" ) == true then
if EMAPrivate.Core.IsAddOnLoaded( "TrufiGCD" ) == true then
local TimeGcd = 1.6
for i=1,5 do
-- enable
Expand Down
2 changes: 1 addition & 1 deletion Modules/Quest-Classic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1956,7 +1956,7 @@ function EMA:CreateEMAMiniQuestLogFrame()
frame:EnableMouse( true )
frame:SetMovable( true )
frame:ClearAllPoints()
if IsAddOnLoaded("ElvUI" ) == true then
if EMAPrivate.Core.IsAddOnLoaded("ElvUI" ) == true then
frame:SetPoint("BOTTOMLEFT", QuestLogFrame, "BOTTOMLEFT", 40, -80)
else
local _, _, _, tocversion = GetBuildInfo()
Expand Down