"Added new functions to Environment.lua and updated _bastion.lua to include Locale and Load '@Locales/'"

CiscOH Bellic 2 years ago
parent 56e7ac706d
commit 962e63f821
  1. 29
      src/Environment/Environment.lua
  2. 6
      src/Locale/Locale.lua
  3. 3
      src/_bastion.lua

@ -7,13 +7,19 @@ local C_Spell = C_Spell or nil
local C_Item = C_Item or nil local C_Item = C_Item or nil
local C_Var = C_Var or nil local C_Var = C_Var or nil
local C_Timer = C_Timer or nil local C_Timer = C_Timer or nil
local C_Var = C_Var or nil local C_AddOns = C_AddOns
local Cvar = Cvar or nil local Cvar = Cvar or nil
local GetItemInfo = GetItemInfo or nil local GetItemInfo = GetItemInfo or nil
local GetSpellInfo = GetSpellInfo or nil local GetSpellInfo = GetSpellInfo or nil
local IsSpellInRange = IsSpellInRange or nil local IsSpellInRange = IsSpellInRange or nil
local GetCvar = GetCvar or nil local GetCvar = GetCvar or nil
local SetCvar = SetCvar or nil local SetCvar = SetCvar or nil
local GetMouseFocus = GetMouseFocus or nil
local GetMouseFoci = GetMouseFoci or nil
local GetBuildInfo = GetBuildInfo or nil
local LoadAddOn = LoadAddOn or nil
local IsAddOnLoaded = IsAddOnLoaded or nil
local buildNum = select(4, GetBuildInfo()) local buildNum = select(4, GetBuildInfo())
local buildName = "CLASSIC" local buildName = "CLASSIC"
@ -97,4 +103,25 @@ function Environment:IsSpellInRange(spellId, spellType, unit)
return nil return nil
end end
function Environment:GetMouseFocus()
if GetMouseFoci then return GetMouseFoci() end
if GetMouseFocus then return GetMouseFocus() end
Bastion:Debug("[GetMouseFocus] failed")
return nil
end
function Environment:LoadAddOn(name)
if C_AddOns and C_AddOns.LoadAddOn then return C_AddOns.LoadAddOn(name) end
if LoadAddOn then return LoadAddOn(name) end
Bastion:Debug("[LoadAddOn] failed")
return nil
end
function Environment:IsAddonLoaded(name)
if C_AddOns and C_AddOns.IsAddonLoaded then return C_AddOns.IsAddonLoaded(name) end
if IsAddOnLoaded then return IsAddOnLoaded(name) end
Bastion:Debug("[IsAddonLoaded] failed")
return nil
end
return Environment return Environment

@ -0,0 +1,6 @@
local Tinkr, Bastion = ...
local Locale = {}
Locale.__index = Locale
return Locale

@ -58,6 +58,9 @@ end
Bastion.Globals = {} Bastion.Globals = {}
---@type Locale
Bastion.Locale = Bastion.require("Locale")
Load("@Locales/")
---@type Environment ---@type Environment
Bastion.Environment = Bastion.require("Environment") Bastion.Environment = Bastion.require("Environment")
---@type ClassMagic ---@type ClassMagic

Loading…
Cancel
Save