Rework addon loading to properly load on ADDON_LOADED

insteaad of immediately
This commit is contained in:
2024-12-12 16:13:36 +01:00
parent ce03160faa
commit 34a8024ce4
7 changed files with 801 additions and 736 deletions

8
DeathReporter.lua Normal file
View File

@@ -0,0 +1,8 @@
local addonname, data = ...
---@cast data HeimdallData
---@cast addonname string
data.DeathReporter = {}
function data.DeathReporter.Init()
end

View File

@@ -1,5 +1,6 @@
local _, data = ... local addonname, data = ...
---@cast data HeimdallData ---@cast data HeimdallData
---@cast addonname string
if not data.dumpTable then if not data.dumpTable then
---@param table table ---@param table table

View File

@@ -1,9 +1,12 @@
local _, data = ... local addonname, data = ...
---@cast data HeimdallData ---@cast data HeimdallData
---@cast addonname string
local function init()
---@class Heimdall_Data ---@class Heimdall_Data
---@field who { data: table<string, Player> } ---@field who { data: table<string, Player> }
if not Heimdall_Data then Heimdall_Data = {} end if not Heimdall_Data then Heimdall_Data = {} end
if not Heimdall_Data.config then Heimdall_Data.config = {} end
-- We don't care about these persisting -- We don't care about these persisting
-- Actually we don't want some of them to persist -- Actually we don't want some of them to persist
@@ -19,6 +22,11 @@ if not Heimdall_Data then Heimdall_Data = {} end
---@field dumpTable fun(table: any, depth?: number): nil ---@field dumpTable fun(table: any, depth?: number): nil
---@field utf8len fun(input: string): number ---@field utf8len fun(input: string): number
---@field padString fun(input: string, targetLength: number, left?: boolean): string ---@field padString fun(input: string, targetLength: number, left?: boolean): string
---@field GetOrDefault fun(table: table<any, any>, keys: string[], default: any): any
---@field Whoer { Init: fun() }
---@field Messenger { Init: fun() }
---@field Spotter { Init: fun() }
---@field DeathReporter { Init: fun() }
--- Config --- --- Config ---
---@class HeimdallConfig ---@class HeimdallConfig
@@ -58,6 +66,27 @@ if not Heimdall_Data then Heimdall_Data = {} end
---@field whoTicker number? ---@field whoTicker number?
---@field ignored table<string, boolean> ---@field ignored table<string, boolean>
data.GetOrDefault = function(table, keys, default)
local value = default
if not table then return value end
if not keys then return value end
local traverse = table
for i = 1, #keys do
local key = keys[i]
if traverse[key] then
traverse = traverse[key]
else
break
end
if i == #keys then
value = traverse
end
end
return value
end
data.messenger = { data.messenger = {
queue = {} queue = {}
} }
@@ -67,50 +96,55 @@ data.who = {
data.config = { data.config = {
spotter = { spotter = {
enabled = true, enabled = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "enabled" }, true),
everyone = false, everyone = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "everyone" }, false),
hostile = true, hostile = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "hostile" }, true),
alliance = false, alliance = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "alliance" }, false),
stinky = false, stinky = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "stinky" }, false),
notifyChannel = "Foobar", notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "notifyChannel" }, "Foobar"),
zoneOverride = nil, zoneOverride = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "zoneOverride" }, nil),
throttleTime = 1 throttleTime = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "throttleTime" }, 1)
}, },
who = { who = {
enabled = true, enabled = data.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, true),
ignored = {}, ignored = data.GetOrDefault(Heimdall_Data, { "config", "who", "ignored" }, {}),
notifyChannel = "Foobar", notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "who", "notifyChannel" }, "Foobar"),
ttl = 10, ttl = data.GetOrDefault(Heimdall_Data, { "config", "who", "ttl" }, 10),
doWhisper = true, doWhisper = data.GetOrDefault(Heimdall_Data, { "config", "who", "doWhisper" }, true),
zoneNotifyFor = { zoneNotifyFor = data.GetOrDefault(Heimdall_Data, { "config", "who", "zoneNotifyFor" }, {
["Orgrimmar"] = true, ["Orgrimmar"] = true,
["Thunder Bluff"] = true, ["Thunder Bluff"] = true,
["Undercity"] = true, ["Undercity"] = true,
["Durotar"] = true, ["Durotar"] = true,
["Echo Isles"] = true, ["Echo Isles"] = true,
["Valley of Trials"] = true, ["Valley of Trials"] = true,
} }),
}, },
messenger = { messenger = {
enabled = true enabled = data.GetOrDefault(Heimdall_Data, { "config", "messenger", "enabled" }, true),
}, },
whisperNotify = { whisperNotify = data.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, {
"Extazyk", -- "Extazyk",
"Smokefire", -- "Smokefire",
"Smokemantra", -- "Smokemantra",
"Хихихантер", -- "Хихихантер",
"Муркот", -- "Муркот",
"Растафаркрай", -- "Растафаркрай",
"Frosstmorn", -- "Frosstmorn",
"Pulsjkee", -- "Pulsjkee",
"Paskoo", -- "Paskoo",
"Totleta", "Totleta",
"Healleta", "Healleta",
"Deathleta", "Deathleta",
"Shootleta", "Shootleta",
"Stableta" "Stableta"
}),
} }
} --/run Heimdall_Data = {config = {who = {enabled = false}}}
--/dump Heimdall_Data
print("138 " .. tostring(Heimdall_Data.config.who.enabled))
print("139 " .. tostring(data.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, true)))
print("140 " .. tostring(data.config.who.enabled))
data.raceMap = { data.raceMap = {
["Orc"] = "Horde", ["Orc"] = "Horde",
@@ -136,7 +170,6 @@ data.raceMap = {
["Mag'har Orc"] = "Horde" ["Mag'har Orc"] = "Horde"
} }
---@type table<string, string>
data.classColors = { data.classColors = {
["Warrior"] = "C69B6D", ["Warrior"] = "C69B6D",
["Paladin"] = "F48CBA", ["Paladin"] = "F48CBA",
@@ -196,3 +229,17 @@ data.padString = function(input, targetLength, left)
end end
return input return input
end end
data.Whoer.Init()
data.Messenger.Init()
data.Spotter.Init()
data.DeathReporter.Init()
end
local loadedFrame = CreateFrame("Frame")
loadedFrame:RegisterEvent("ADDON_LOADED")
loadedFrame:SetScript("OnEvent", function(self, event, addonName)
if addonName == addonname then
init()
end
end)

View File

@@ -5,9 +5,9 @@
## SavedVariables: Heimdall_Data ## SavedVariables: Heimdall_Data
#core #core
Heimdall.lua
CLEUParser.lua CLEUParser.lua
DumpTable.lua
Spotter.lua Spotter.lua
Whoer.lua Whoer.lua
Messenger.lua Messenger.lua
DumpTable.lua Heimdall.lua

View File

@@ -1,6 +1,9 @@
local _, data = ... local addonname, data = ...
---@cast data HeimdallData ---@cast data HeimdallData
---@cast addonname string
data.Messenger = {}
function data.Messenger.Init()
if not data.config.messenger.enabled then return end if not data.config.messenger.enabled then return end
---@class Message ---@class Message
@@ -89,3 +92,4 @@ end
-- message = "TEST" -- message = "TEST"
-- }) -- })
--end) --end)
end

View File

@@ -1,8 +1,10 @@
local _, data = ... local addonname, data = ...
---@cast data HeimdallData ---@cast data HeimdallData
---@cast addonname string
data.Spotter = {}
function data.Spotter.Init()
if not data.config.spotter.enabled then return end if not data.config.spotter.enabled then return end
local function FormatHP(hp) local function FormatHP(hp)
if hp > 1e9 then if hp > 1e9 then
return string.format("%.1fB", hp / 1e9) return string.format("%.1fB", hp / 1e9)
@@ -103,3 +105,4 @@ frame:SetScript("OnEvent", function(self, event, unit)
print(string.format("Error notifying %s: %s", tostring(unit), tostring(err))) print(string.format("Error notifying %s: %s", tostring(unit), tostring(err)))
end end
end) end)
end

View File

@@ -1,12 +1,12 @@
local _, data = ... local addonname, data = ...
---@cast data HeimdallData ---@cast data HeimdallData
---@cast addonname string
data.Whoer = {}
function data.Whoer.Init()
if not data.config.who.enabled then return end if not data.config.who.enabled then return end
if not Heimdall_Data.who then Heimdall_Data.who = {} end if not Heimdall_Data.who then Heimdall_Data.who = {} end
if not Heimdall_Data.who.data then Heimdall_Data.who.data = {} end if not Heimdall_Data.who.data then Heimdall_Data.who.data = {} end
print(Heimdall_Data)
print(Heimdall_Data.who)
print(Heimdall_Data.who.data)
---@type table<string, Player> ---@type table<string, Player>
local players = {} local players = {}
@@ -56,7 +56,8 @@ Player = {
end, end,
---@return string ---@return string
NotifyMessage = function(self) NotifyMessage = function(self)
local text = string.format("%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d", local text = string.format(
"%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
self.name, self.name,
self.class, self.class,
self.guild, self.guild,
@@ -400,3 +401,4 @@ whoQueryChannelFrame:SetScript("OnEvent", function(self, event, msg, sender, ...
end end
end end
end) end)
end