Cleanup uses of removed functions

Nevcairiel · Aug 16, 2024 · 3ff5a92 · 3ff5a92
1 parent a0cd5d8
commit 3ff5a92
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 23 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -65,7 +65,6 @@ read_globals = {
 	"GetRuneCooldown",
 	"GetSpecialization",
 	"GetSpecializationInfoByID",
-	"GetSpellInfo",
 	"GetText",
 	"GetTime",
 	"GetTotemInfo",
@@ -80,7 +79,6 @@ read_globals = {
 	"IsResting",
 	"IsShiftKeyDown",
 	"IsSpellKnown",
-	"IsUsableSpell",
 	"IsXPUserDisabled",
 	"UnitAffectingCombat",
 	"UnitBattlePetType",
@@ -104,7 +102,6 @@ read_globals = {
 	"UnitHealth",
 	"UnitHealthMax",
 	"UnitInParty",
-	"UnitInPhase",
 	"UnitInRaid",
 	"UnitInRange",
 	"UnitIsBattlePetCompanion",
@@ -146,7 +143,6 @@ read_globals = {
 	"ArenaEnemyPrepFramesContainer",
 	"ArenaEnemyMatchFramesContainer",
 	"BuffFrame",
-	"CastingBarFrame",
 	"ComboFrame",
 	"CompactPartyFrame",
 	"CompactRaidFrameContainer",
@@ -165,13 +161,10 @@ read_globals = {
 	"PetFrame",
 	"PlayerCastingBarFrame",
 	"PlayerFrame",
-	"PlayerFrameAlternateManaBar",
 	"PlayerPowerBarAlt",
-	"PriestBarFrame",
 	"RuneFrame",
 	"TargetFrame",
 	"TargetFrameToT",
-	"TemporaryEnchantFrame",
 	"UIParent",
 	"WarlockPowerFrame",
 
@@ -197,7 +190,6 @@ read_globals = {
 	"DebuffTypeColor",
 	"Enum",
 	"PowerBarColor",
-	"ADDITIONAL_POWER_BAR_INDEX",
 	"ALTERNATE_POWER_INDEX",
 	"CLASS_ICON_TCOORDS",
 	"CLASS_SORT_ORDER",
@@ -209,7 +201,6 @@ read_globals = {
 	"MAX_RAID_MEMBERS",
 	"MAX_TOTEMS",
 	"MEMBERS_PER_RAID_GROUP",
-	"PALADINPOWERBAR_SHOW_LEVEL",
 	"PET_TYPE_SUFFIX",
 	"RAID_CLASS_COLORS",
 	"READY_CHECK_NOT_READY_TEXTURE",

diff --git a/ShadowedUnitFrames.lua b/ShadowedUnitFrames.lua
@@ -708,7 +708,7 @@ end
 local active_hiddens = {}
 function ShadowUF:HideBlizzardFrames()
 	if( self.db.profile.hidden.cast and not active_hiddens.cast ) then
-		hideBlizzardFrames(true, PlayerCastingBarFrame or CastingBarFrame, PetCastingBarFrame)
+		hideBlizzardFrames(true, PlayerCastingBarFrame, PetCastingBarFrame)
 	end
 
 	if( self.db.profile.hidden.party and not active_hiddens.party ) then
@@ -767,12 +767,11 @@ function ShadowUF:HideBlizzardFrames()
 	end
 
 	if( self.db.profile.hidden.buffs and not active_hiddens.buffs ) then
-		hideBlizzardFrames(false, BuffFrame, TemporaryEnchantFrame or DebuffFrame)
+		hideBlizzardFrames(false, BuffFrame, DebuffFrame)
 	end
 
 	if( self.db.profile.hidden.player and not active_hiddens.player ) then
-		-- alternate bar renamed in 10.1.5
-		hideBlizzardFrames(false, PlayerFrame, PlayerFrameAlternateManaBar or AlternatePowerBar)
+		hideBlizzardFrames(false, PlayerFrame, AlternatePowerBar)
 
 		-- We keep these in case someone is still using the default auras, otherwise it messes up vehicle stuff
 		PlayerFrame:RegisterEvent("PLAYER_ENTERING_WORLD")

diff --git a/modules/auraindicators.lua b/modules/auraindicators.lua
@@ -3,7 +3,7 @@ ShadowUF:RegisterModule(Indicators, "auraIndicators", ShadowUF.L["Aura indicator
 
 Indicators.auraFilters = {"boss", "curable"}
 
-local GetSpellTexture = C_Spell and  C_Spell.GetSpellTexture or function(id) return (select(3, GetSpellInfo(id))) end
+local GetSpellTexture = C_Spell.GetSpellTexture
 
 Indicators.auraConfig = setmetatable({}, {
 	__index = function(tbl, index)

diff --git a/modules/druid.lua b/modules/druid.lua
@@ -22,7 +22,7 @@ function Druid:OnLayoutApplied(frame)
 end
 
 function Druid:PowerChanged(frame)
-	local visible = UnitPowerType(frame.unit) ~= ADDITIONAL_POWER_BAR_INDEX and not frame.inVehicle
+	local visible = UnitPowerType(frame.unit) ~= Enum.PowerType.Mana and not frame.inVehicle
 	local type = visible and "RegisterUnitEvent" or "UnregisterSingleEvent"
 
 	frame[type](frame, "UNIT_POWER_FREQUENT", self, "Update")

diff --git a/modules/holypower.lua b/modules/holypower.lua
@@ -1,7 +1,7 @@
 if( not ShadowUF.ComboPoints ) then return end
 
 local HolyPower = setmetatable({}, {__index = ShadowUF.ComboPoints})
-ShadowUF:RegisterModule(HolyPower, "holyPower", ShadowUF.L["Holy Power"], nil, "PALADIN", nil, PALADINPOWERBAR_SHOW_LEVEL)
+ShadowUF:RegisterModule(HolyPower, "holyPower", ShadowUF.L["Holy Power"], nil, "PALADIN")
 local holyConfig = {max = 5, key = "holyPower", colorKey = "HOLYPOWER", powerType = Enum.PowerType.HolyPower, eventType = "HOLY_POWER", icon = "Interface\\AddOns\\ShadowedUnitFrames\\media\\textures\\combo"}
 
 function HolyPower:OnEnable(frame)

diff --git a/modules/priest.lua b/modules/priest.lua
@@ -22,7 +22,7 @@ function Priest:OnLayoutApplied(frame)
 end
 
 function Priest:PowerChanged(frame)
-	local visible = UnitPowerType(frame.unit) ~= ADDITIONAL_POWER_BAR_INDEX and not frame.inVehicle
+	local visible = UnitPowerType(frame.unit) ~= Enum.PowerType.Mana and not frame.inVehicle
 	local type = visible and "RegisterUnitEvent" or "UnregisterSingleEvent"
 
 	frame[type](frame, "UNIT_POWER_FREQUENT", self, "Update")

diff --git a/modules/range.lua b/modules/range.lua
@@ -1,5 +1,5 @@
-local GetSpellName = C_Spell and C_Spell.GetSpellName or GetSpellInfo
-local IsSpellUsable = C_Spell and C_Spell.IsSpellUsable or IsUsableSpell
+local GetSpellName = C_Spell.GetSpellName
+local IsSpellUsable = C_Spell.IsSpellUsable
 local Range = {
 	friendly = {
 		["PRIEST"] = {

diff --git a/modules/shaman.lua b/modules/shaman.lua
@@ -22,7 +22,7 @@ function Shaman:OnLayoutApplied(frame)
 end
 
 function Shaman:PowerChanged(frame)
-	local visible = UnitPowerType(frame.unit) ~= ADDITIONAL_POWER_BAR_INDEX and not frame.inVehicle
+	local visible = UnitPowerType(frame.unit) ~= Enum.PowerType.Mana and not frame.inVehicle
 	local type = visible and "RegisterUnitEvent" or "UnregisterSingleEvent"
 
 	frame[type](frame, "UNIT_POWER_FREQUENT", self, "Update")

diff --git a/modules/tags.lua b/modules/tags.lua
@@ -1,4 +1,4 @@
-local GetSpellName = C_Spell and C_Spell.GetSpellName or GetSpellInfo
+local GetSpellName = C_Spell.GetSpellName
 
 local Tags = {afkStatus = {}, offlineStatus = {}, customEvents = {}, powerMap = {}, moduleKey = "tags"}
 local tagPool, functionPool, temp, regFontStrings, powerMap = {}, {}, {}, {}, Tags.powerMap

diff --git a/options/config.lua b/options/config.lua
@@ -6,8 +6,8 @@ local L = ShadowUF.L
 
 ShadowUF.Config = Config
 
-local GetSpellName = C_Spell and C_Spell.GetSpellName or GetSpellInfo
-local GetSpellTexture = C_Spell and  C_Spell.GetSpellTexture or function(id) return (select(3, GetSpellInfo(id))) end
+local GetSpellName = C_Spell.GetSpellName
+local GetSpellTexture = C_Spell.GetSpellTexture
 
 --[[
 	The part that makes configuration a pain when you actually try is it gets unwieldly when you're adding special code to deal with