Skip to content

Clean up init script, improve expansion level detection #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Snakybo merged 1 commit into from
Mar 10, 2026
Merged

Clean up init script, improve expansion level detection #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Clicked/BindingConfig/Pages/New.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ local function ImportActionbar()
binding.load.class.selected = 1
binding.load.class.single = select(2, UnitClass("player"))

if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
binding.load.specialization.selected = 1
binding.load.specialization.single = GetSpecialization()
elseif Addon.EXPANSION_LEVEL >= Addon.Expansion.CATA then
elseif Addon.EXPANSION >= Addon.Expansion.CATA then
binding.load.specialization.selected = 1
binding.load.specialization.single = GetPrimaryTalentTree()
end
Expand Down Expand Up @@ -380,7 +380,7 @@ function Addon.BindingConfig.NewPage:Redraw()

self:CreateTemplateButton(scrollFrame, ItemTemplate.IMPORT_SPELLBOOK, Addon.L["Automatically import from spellbook"])

if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
local label = AceGUI:Create("Label") --[[@as AceGUILabel]]
label:SetText(Addon.L["Import class abilities per specialization"])
label:SetRelativeWidth(0.79)
Expand Down
2 changes: 1 addition & 1 deletion Clicked/BindingConfig/Tabs/Action.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ function Addon.BindingConfig.BindingActionTab:RedrawTargetSpell()
return hasRank
end)

if Addon.EXPANSION_LEVEL <= Addon.Expansion.WOTLK and anyHasRank then
if Addon.EXPANSION <= Addon.Expansion.WOTLK and anyHasRank then
local function OnClick()
for _, binding in ipairs(self.bindings) do
if binding.actionType == Clicked2.ActionType.SPELL and not binding.action.spellMaxRank then
Expand Down
4 changes: 2 additions & 2 deletions Clicked/BindingConfig/Tabs/Target.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@ function Addon.BindingConfig.BindingTargetTab:DrawTargetUnit(container, index, c
Addon.TargetUnit.PARTY_5
}

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TBC then
if Addon.EXPANSION >= Addon.Expansion.TBC then
items[Addon.TargetUnit.FOCUS] = Addon.L["Focus"]
table.insert(order, 7, Addon.TargetUnit.FOCUS)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.CATA then
if Addon.EXPANSION >= Addon.Expansion.CATA then
items[Addon.TargetUnit.ARENA_1] = Addon.L["Arena %s"]:format("1")
items[Addon.TargetUnit.ARENA_2] = Addon.L["Arena %s"]:format("2")
items[Addon.TargetUnit.ARENA_3] = Addon.L["Arena %s"]:format("3")
Expand Down
2 changes: 1 addition & 1 deletion Clicked/Conditions/ConditionUtils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function Addon.Condition.Utils.GetRelevantSpecializationIds(classNames, specIndi

if #specIndices == 0 then
if #classNames == 1 and classNames[1] == select(2, UnitClass("player")) then
if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
specIndices[1] = GetSpecialization()
else
specIndices[1] = GetPrimaryTalentTree()
Expand Down
22 changes: 11 additions & 11 deletions Clicked/Conditions/LoadConditions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ local config = {
end
},
dependencies = { "class" },
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.CATA,
disabled = Addon.EXPANSION < Addon.Expansion.CATA,
init = function()
if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
local specIndex = GetSpecialization()
return Utils.CreateMultiselectLoadOption(specIndex == 5 and 1 or specIndex)
else
Expand All @@ -143,7 +143,7 @@ local config = {
testOnEvents = { "PLAYER_TALENT_UPDATE" },
--- @return integer
state = function()
if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
local specIndex = GetSpecialization()
return specIndex == 5 and 1 or specIndex
end
Expand Down Expand Up @@ -173,7 +173,7 @@ local config = {
}
end
},
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.MOP,
disabled = Addon.EXPANSION < Addon.Expansion.MOP,
init = function()
local role = GetSpecializationRole(GetSpecialization()) or "DAMAGER"
return Utils.CreateMultiselectLoadOption(role)
Expand All @@ -198,7 +198,7 @@ local config = {
--- @param class string[]
--- @param specialization integer[]
availableValues = function(class, specialization)
if Addon.EXPANSION_LEVEL >= Addon.Expansion.CATA then
if Addon.EXPANSION >= Addon.Expansion.CATA then
local specIds = Utils.GetRelevantSpecializationIds(class, specialization)
return Addon:GetLocalizedTalents(specIds)
else
Expand Down Expand Up @@ -254,7 +254,7 @@ local config = {
end
},
dependencies = { "class", "specialization" },
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.BFA,
disabled = Addon.EXPANSION < Addon.Expansion.BFA,
init = function()
return Utils.CreateTalentLoadOption("")
end,
Expand Down Expand Up @@ -315,7 +315,7 @@ local config = {
}, { true, false}
end
},
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.BFA,
disabled = Addon.EXPANSION < Addon.Expansion.BFA,
init = function()
return Utils.CreateLoadOption(true)
end,
Expand Down Expand Up @@ -349,15 +349,15 @@ local config = {
"RAID"
}

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TBC then
if Addon.EXPANSION >= Addon.Expansion.TBC then
items["PVP"] = Addon.L["Battleground"]
items["ARENA"] = Addon.L["Arena"]

table.insert(order, "PVP")
table.insert(order, "ARENA")
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
items["SCENARIO"] = Addon.L["Scenario"]
table.insert(order, 2, "SCENARIO")
end
Expand Down Expand Up @@ -448,7 +448,7 @@ local config = {
return Utils.CreateLoadOption("")
end,
unpack = Utils.UnpackSimpleLoadOption,
testOnEvents = Addon.EXPANSION_LEVEL > Addon.Expansion.CLASSIC and
testOnEvents = Addon.EXPANSION > Addon.Expansion.CLASSIC and
{ "PLAYER_TALENT_UPDATE", "PLAYER_LEVEL_CHANGED", "LEARNED_SPELL_IN_TAB", "TRAIT_CONFIG_CREATED", "TRAIT_CONFIG_UPDATED", "LEARNED_SPELL_IN_SKILL_LINE" } or
{ "PLAYER_TALENT_UPDATE", "PLAYER_LEVEL_CHANGED", "LEARNED_SPELL_IN_TAB", "TRAIT_CONFIG_CREATED", "TRAIT_CONFIG_UPDATED", "RUNE_UPDATED", "PLAYER_EQUIPMENT_CHANGED" },
--- @return integer
Expand Down Expand Up @@ -589,7 +589,7 @@ local config = {
return result
end
},
disabled = Addon.EXPANSION_LEVEL > Addon.Expansion.CLASSIC or C_Engraving == nil,
disabled = Addon.EXPANSION > Addon.Expansion.CLASSIC or C_Engraving == nil,
init = function()
return Utils.CreateLoadOption("")
end,
Expand Down
12 changes: 6 additions & 6 deletions Clicked/Conditions/MacroConditions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ local config = {
label = "Form / Stance",
negatable = true,
availableValues = function(class, specialization)
if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
local specIds = Utils.GetRelevantSpecializationIds(class, specialization)
return Addon:GetLocalizedForms(specIds)
else
Expand Down Expand Up @@ -158,7 +158,7 @@ local config = {
},
{
id = "flying",
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.TBC,
disabled = Addon.EXPANSION < Addon.Expansion.TBC,
drawer = {
type = "select",
label = "Flying",
Expand All @@ -176,7 +176,7 @@ local config = {
},
{
id = "dynamicFlying",
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.DF,
disabled = Addon.EXPANSION < Addon.Expansion.DF,
drawer = {
type = "select",
label = "Skyriding",
Expand All @@ -194,7 +194,7 @@ local config = {
},
{
id = "flyable",
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.TBC,
disabled = Addon.EXPANSION < Addon.Expansion.TBC,
drawer = {
type = "select",
label = "Flyable",
Expand All @@ -212,7 +212,7 @@ local config = {
},
{
id = "advancedFlyable",
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.DF,
disabled = Addon.EXPANSION < Addon.Expansion.DF,
drawer = {
type = "select",
label = "Advanced flyable",
Expand All @@ -230,7 +230,7 @@ local config = {
},
{
id = "bonusbar",
disabled = Addon.EXPANSION_LEVEL < Addon.Expansion.CATA,
disabled = Addon.EXPANSION < Addon.Expansion.CATA,
--- @type InputDrawerConfig
drawer = {
type = "input",
Expand Down
4 changes: 2 additions & 2 deletions Clicked/Config/Addon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function AddonOptions:CreateOptionsTable()
type = "toggle",
order = 101,
width = "full",
hidden = Addon.EXPANSION_LEVEL < Addon.Expansion.DF,
hidden = Addon.EXPANSION < Addon.Expansion.DF,
set = function (_, val)
if val then
LibDBIcon:AddButtonToCompartment(Addon.L["Clicked2"])
Expand Down Expand Up @@ -144,7 +144,7 @@ function AddonOptions:CreateOptionsTable()
order = 600,
width = "full",
hidden = function()
return Addon.EXPANSION_LEVEL < Addon.Expansion.TWW
return Addon.EXPANSION < Addon.Expansion.TWW
end,
set = function (_, val)
Addon.db.profile.options.disableInHouse = val
Expand Down
4 changes: 2 additions & 2 deletions Clicked/Config/SpellLibrary.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ local function GetSpells_Classic()
local function ParseSpellBookItem(type, id, tabName, tabIcon, specId)
if not IsPassiveSpell(id) then
if type == "SPELL" or type == "FUTURESPELL" or type == "PETACTION" then
local spell = Addon:GetSpellInfo(id, Addon.EXPANSION_LEVEL <= Addon.Expansion.WOTLK)
local spell = Addon:GetSpellInfo(id, Addon.EXPANSION <= Addon.Expansion.WOTLK)

if spell ~= nil then
--- @type SpellLibrarySpellResult
Expand Down Expand Up @@ -308,7 +308,7 @@ local function GetSpells()
return cached
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TWW then
if Addon.EXPANSION >= Addon.Expansion.TWW then
cached = GetSpells_TWW()
else
cached = GetSpells_Classic()
Expand Down
2 changes: 1 addition & 1 deletion Clicked/Core/AttributeHandler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--- @class Addon
local Addon = select(2, ...)

local hasTypeRelease = Addon.EXPANSION_LEVEL >= Addon.Expansion.DF or Addon.EXPANSION_LEVEL == Addon.Expansion.TBC
local hasTypeRelease = Addon.EXPANSION >= Addon.Expansion.DF or Addon.EXPANSION == Addon.Expansion.TBC

local frameCache = {}

Expand Down
14 changes: 7 additions & 7 deletions Clicked/Core/BindingProcessor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,20 +260,20 @@ local function ConstructAction(binding, target)
AppendNegatableStringCondition(binding.load.channeling, "channeling")
AppendNegatableStringCondition(binding.load.bar, "bar", true)

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TBC then
if Addon.EXPANSION >= Addon.Expansion.TBC then
AppendCondition(binding.load.flying, "flying")
AppendCondition(binding.load.flyable, "flyable")
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.CATA then
if Addon.EXPANSION >= Addon.Expansion.CATA then
AppendNegatableStringCondition(binding.load.bonusbar, "bonusbar")
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.DF then
if Addon.EXPANSION >= Addon.Expansion.DF then
AppendCondition(binding.load.advancedFlyable, "advflyable")
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TWW then
if Addon.EXPANSION >= Addon.Expansion.TWW then
AppendCondition(binding.load.dynamicFlying, "dynamicFlying")
end

Expand Down Expand Up @@ -918,7 +918,7 @@ function Addon:UpdateTalentCache(callback, immediate)

wipe(talentCache)

if Addon.EXPANSION_LEVEL >= Addon.Expansion.DF then
if Addon.EXPANSION >= Addon.Expansion.DF then
local configId = C_ClassTalents.GetActiveConfigID()
if configId == nil then
Addon:UpdateTalentCache()
Expand Down Expand Up @@ -973,7 +973,7 @@ function Addon:UpdateTalentCache(callback, immediate)
end
end
end
elseif Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
elseif Addon.EXPANSION >= Addon.Expansion.MOP then
for i = 1, MAX_NUM_TALENTS do
local info = C_SpecializationInfo.GetTalentInfo({
tier = math.ceil(i / MAX_NUM_TALENTS),
Expand Down Expand Up @@ -1106,7 +1106,7 @@ function Addon:UpdateBindingLoadState(binding, causes)
state.value = not Addon:IsNilOrEmpty(Addon:GetBindingValue(binding))
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TWW and Addon.db.profile.options.disableInHouse and ShouldPerformStateCheck("housing", { "HOUSE_EDITOR_MODE_CHANGED" }) then
if Addon.EXPANSION >= Addon.Expansion.TWW and Addon.db.profile.options.disableInHouse and ShouldPerformStateCheck("housing", { "HOUSE_EDITOR_MODE_CHANGED" }) then
state.housing = not C_HouseEditor.IsHouseEditorActive()
Clicked2:LogVerbose("Evaluated condition {condition} for binding {binding}: {value}", "housing", binding.uid, state.housing)
end
Expand Down
31 changes: 10 additions & 21 deletions Clicked/Core/Clicked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@ local LibDBIcon = LibStub("LibDBIcon-1.0")

--- @class Addon
local Addon = select(2, ...)
Addon.L = LibStub("AceLocale-3.0"):GetLocale("Clicked2") --[[@as table<string,string>]]

--- @class Clicked : AceAddon, AceEvent-3.0, LibLog-1.0.Logger
Clicked2 = LibStub("AceAddon-3.0"):NewAddon("Clicked2", "AceEvent-3.0", "LibLog-1.0")
Clicked2.VERSION = C_AddOns.GetAddOnMetadata("Clicked2", "Version")

--@debug@
if Clicked2.VERSION == "@project-version@" then
Clicked2.VERSION = "development"
end
--@end-debug@

local isPlayerInCombat = false
local isInitialized = false
Expand Down Expand Up @@ -143,7 +132,7 @@ local function PLAYER_ENTERING_WORLD()

isInitialized = true
playerFlagsCache = {
warMode = Addon.EXPANSION_LEVEL >= Addon.Expansion.BFA and C_PvP.IsWarModeDesired() or false
warMode = Addon.EXPANSION >= Addon.Expansion.BFA and C_PvP.IsWarModeDesired() or false
}

local isInitialLoadPending = false
Expand Down Expand Up @@ -333,41 +322,41 @@ local function UpdateEventHooks(self, method)
method(self, "PLAYER_REGEN_ENABLED", PLAYER_REGEN_ENABLED)
method(self, "PLAYER_ENTERING_WORLD", PLAYER_ENTERING_WORLD)

if Addon.EXPANSION_LEVEL == Addon.Expansion.CLASSIC then
if Addon.EXPANSION == Addon.Expansion.CLASSIC then
method(self, "RUNE_UPDATED", RUNE_UPDATED)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TBC then
if Addon.EXPANSION >= Addon.Expansion.TBC then
method(self, "PLAYER_FOCUS_CHANGED", PLAYER_FOCUS_CHANGED)
end

if Addon.EXPANSION_LEVEL <= Addon.Expansion.CATA then
if Addon.EXPANSION <= Addon.Expansion.CATA then
method(self, "CHARACTER_POINTS_CHANGED", CHARACTER_POINTS_CHANGED)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.WOTLK then
if Addon.EXPANSION >= Addon.Expansion.WOTLK then
method(self, "PLAYER_TALENT_UPDATE", PLAYER_TALENT_UPDATE)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.BFA then
if Addon.EXPANSION >= Addon.Expansion.BFA then
method(self, "PLAYER_FLAGS_CHANGED", PLAYER_FLAGS_CHANGED)
method(self, "PLAYER_PVP_TALENT_UPDATE", PLAYER_PVP_TALENT_UPDATE)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.DF then
if Addon.EXPANSION >= Addon.Expansion.DF then
method(self, "TRAIT_CONFIG_CREATED", TRAIT_CONFIG_CREATED)
method(self, "TRAIT_CONFIG_UPDATED", TRAIT_CONFIG_UPDATED)
end

method(self, "PLAYER_LEVEL_CHANGED", PLAYER_LEVEL_CHANGED)

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TWW or Addon.EXPANSION_LEVEL == Addon.Expansion.TBC then -- HACK: Anniversary follows the modern API
if Addon.EXPANSION >= Addon.Expansion.TWW or Addon.EXPANSION == Addon.Expansion.TBC then -- HACK: Anniversary follows the modern API
method(self, "LEARNED_SPELL_IN_SKILL_LINE", LEARNED_SPELL_IN_SKILL_LINE)
else
method(self, "LEARNED_SPELL_IN_TAB", LEARNED_SPELL_IN_TAB)
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.TWW then
if Addon.EXPANSION >= Addon.Expansion.TWW then
method(self, "HOUSE_EDITOR_MODE_CHANGED", HOUSE_EDITOR_MODE_CHANGED)
end

Expand Down Expand Up @@ -421,7 +410,7 @@ function Clicked2:OnEnable()
UpdateEventHooks(self, self.RegisterEvent)

-- self-cast warning
if not Addon.db.profile.options.ignoreSelfCastWarning and Addon.EXPANSION_LEVEL >= Addon.Expansion.DF then
if not Addon.db.profile.options.ignoreSelfCastWarning and Addon.EXPANSION >= Addon.Expansion.DF then
local selfCastModifier = GetModifiedClick("SELFCAST")

if selfCastModifier ~= "NONE" then
Expand Down
4 changes: 2 additions & 2 deletions Clicked/Core/CommandProcessor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ local function EnsureMacroFrameHandler()
end
]])

if Addon.EXPANSION_LEVEL >= Addon.Expansion.WOTLK then
if Addon.EXPANSION >= Addon.Expansion.WOTLK then
CreateStateDriverAttribute(macroFrameHandler, "vehicleui", "[vehicleui] enabled; disabled")
end

if Addon.EXPANSION_LEVEL >= Addon.Expansion.MOP then
if Addon.EXPANSION >= Addon.Expansion.MOP then
CreateStateDriverAttribute(macroFrameHandler, "petbattle", "[petbattle] enabled; disabled")
end

Expand Down
Loading