Fix spell cooldown bars in 11.x

GetSpellCooldown used to return 1 for "has duration", but the new native version returns true. Fun.

Additionally, it looks like the events triggering UpdateCustomBarEvent() are passing a nil argument that the mod thought was supposed to be the affected unit. So I also fixed that, though I don't know if that's an 11.x thing or not.

https://www.wowace.com/projects/ice-hud/issues/363

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
 
       # we first have to clone the AddOn project, this is a required step
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # gets git history for changelogs
 

.pkgmeta

@@ -10,6 +10,9 @@ externals:
     libs/AceEvent-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0
         tag: latest
+    libs/AceSerializer-3.0:
+        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceSerializer-3.0
+        tag: latest
     libs/AceTimer-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
         tag: latest

IceCastBar.lua

@@ -30,9 +30,15 @@ end
 
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
-	GetSpellInfo = function(id)
+	GetSpellInfo = function(spellID)
-		local info = C_Spell.GetSpellInfo
+		if not spellID then
-		return info.name, nil, info.iconID
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
 	end
 end
 

IceCore.lua

@@ -19,6 +19,20 @@ end
 
 local DogTag = LibStub("LibDogTag-3.0", true)
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

IceHUD.lua

@@ -53,6 +53,20 @@ else
 	end
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName
@@ -93,8 +107,6 @@ IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "Riv
 	"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
 IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
 
-IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
-
 --@debug@
 IceHUD.optionsLoaded = true
 --@end-debug@
@@ -787,227 +799,6 @@ function IceHUD:GetIsInLFGGroup()
 	return IsInLFGGroup
 end
 
-local BLACKLISTED_UNIT_MENU_OPTIONS = {}
-if UnitPopupButtons then
-	BLACKLISTED_UNIT_MENU_OPTIONS = {
-		SET_FOCUS = "ICEHUD_SET_FOCUS",
-		CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
-		LOCK_FOCUS_FRAME = true,
-		UNLOCK_FOCUS_FRAME = true,
-	}
-	if select(2, UnitClass("player")) ~= "WARLOCK" then
-		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = "ICEHUD_PET_DISMISS"
-	end
-
-	UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
-		text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-		dist = 0,
-	}
-
-	UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
-		text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-		dist = 0,
-	}
-
-	UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
-		text = L["Use your Dismiss Pet spell to dismiss a pet"],
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
-		dist = 0,
-	}
-elseif UnitPopupSetFocusButtonMixin then
-	IceHUDUnitPopupSetFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupSetFocusButtonMixin:GetText()
-		return L["Type %s to set focus"]:format(SLASH_FOCUS1)
-	end
-	function IceHUDUnitPopupSetFocusButtonMixin:OnClick()
-	end
-
-	IceHUDUnitPopupClearFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupClearFocusButtonMixin:GetText()
-		return L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1)
-	end
-	function IceHUDUnitPopupClearFocusButtonMixin:OnClick()
-	end
-
-	IceHUDUnitPopupPetDismissButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupPetDismissButtonMixin:GetText()
-		return L["Use your Dismiss Pet spell to dismiss a pet"]
-	end
-	function IceHUDUnitPopupPetDismissButtonMixin:CanShow()
-		return UnitPopupPetDismissButtonMixin:CanShow()
-	end
-	function IceHUDUnitPopupPetDismissButtonMixin:OnClick()
-	end
-
-	BLACKLISTED_UNIT_MENU_OPTIONS[SET_FOCUS] = IceHUDUnitPopupSetFocusButtonMixin
-	BLACKLISTED_UNIT_MENU_OPTIONS[CLEAR_FOCUS] = IceHUDUnitPopupClearFocusButtonMixin
-	BLACKLISTED_UNIT_MENU_OPTIONS[LOCK_FOCUS_FRAME] = true
-	BLACKLISTED_UNIT_MENU_OPTIONS[UNLOCK_FOCUS_FRAME] = true
-
-	if select(2, UnitClass("player")) ~= "WARLOCK" then
-		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = IceHUDUnitPopupPetDismissButtonMixin
-	end
-end
-
-local munged_unit_menus = {}
-local function munge_unit_menu(menu)
-	local result = munged_unit_menus[menu]
-	if result then
-		return result
-	end
-
-	if not UnitPopupMenus then
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local data = UnitPopupMenus[menu]
-	if not data then
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local found = false
-	if data.GetMenuButtons then
-		local btns = data.GetMenuButtons()
-		for i=1, #btns do
-			if btns[i].IsMenu() then
-				local subbtns = btns[i].GetMenuButtons()
-				for j=1, #subbtns do
-					if BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()] then
-						found = true
-						break
-					end
-				end
-			else
-				if BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()] then
-					found = true
-					break
-				end
-			end
-
-			if found then
-				break
-			end
-		end
-	else
-		for _, v in ipairs(data) do
-			if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
-				found = true
-				break
-			end
-		end
-	end
-
-	if not found then
-		-- nothing to remove or add, we're all fine here.
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local new_data = {}
-	if data.GetMenuButtons then
-		local new_buttons_list = {}
-		local btns = data.GetMenuButtons()
-		for i=1, #btns do
-			if btns[i].IsMenu() then
-				local subbtns = btns[i].GetMenuButtons()
-				for j=1, #subbtns do
-					if subbtns[j] then
-						local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
-						if not blacklisted then
-							new_buttons_list[#new_buttons_list+1] = subbtns[j]
-						elseif blacklisted ~= true then
-							new_buttons_list[#new_buttons_list+1] = blacklisted
-						end
-					end
-				end
-			else
-				local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()]
-				if not blacklisted then
-					new_buttons_list[#new_buttons_list+1] = btns[i]
-				elseif blacklisted ~= true then
-					new_buttons_list[#new_buttons_list+1] = blacklisted
-				end
-			end
-		end
-
-		new_data = data
-		function new_data:GetMenuButtons()
-			return new_buttons_list
-		end
-	else
-		for _, v in ipairs(data) do
-			local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
-			if not blacklisted then
-				new_data[#new_data+1] = v
-			elseif blacklisted ~= true then
-				new_data[#new_data+1] = blacklisted
-			end
-		end
-	end
-	local new_menu_name = "ICEHUD_" .. menu
-
-	UnitPopupMenus[new_menu_name] = new_data
-	munged_unit_menus[menu] = new_menu_name
-	return new_menu_name
-end
-IceHUD.MungeUnitMenu = munge_unit_menu
-
-local function figure_unit_menu(unit)
-	if unit == "focus" then
-		return "FOCUS"
-	end
-
-	if UnitIsUnit(unit, "player") then
-		return "SELF"
-	end
-
-	if UnitIsUnit(unit, "vehicle") then
-		-- NOTE: vehicle check must come before pet check for accuracy's sake because
-		-- a vehicle may also be considered your pet
-		return "VEHICLE"
-	end
-
-	if UnitIsUnit(unit, "pet") then
-		return "PET"
-	end
-
-	if not UnitIsPlayer(unit) then
-		return "TARGET"
-	end
-
-	local id = UnitInRaid(unit)
-	if id then
-		return "RAID_PLAYER", id
-	end
-
-	if UnitInParty(unit) then
-		return "PARTY"
-	end
-
-	return "PLAYER"
-end
-
-if UnitPopupFrames then
-	UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
-end
-
-IceHUD.DropdownUnit = nil
-UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
-	if not IceHUD.DropdownUnit then
-		return
-	end
-
-	local menu, id = figure_unit_menu(IceHUD.DropdownUnit)
-	if menu then
-		menu = IceHUD.MungeUnitMenu(menu)
-		UnitPopup_ShowMenu(IceHUD_UnitFrame_DropDown, menu, IceHUD.DropdownUnit, nil, id)
-	end
-end, "MENU", nil)
-
 function IceHUD:OutOfCombatWrapper(func)
 	return function(...)
 		return IceHUD:RunOnLeaveCombat(func, ...)

IceHUD.toc

@@ -1,6 +1,6 @@
-## Interface: 100207
+## Interface: 110000
-## Interface-Retail: 100207
+## Interface-Retail: 110000
-## Interface-Classic: 11502
+## Interface-Classic: 11503
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
 ## Interface-Cata: 40400

IceHUD_Options/IceHUD_Options.toc

@@ -1,6 +1,6 @@
-## Interface: 100207
+## Interface: 110000
-## Interface-Retail: 100207
+## Interface-Retail: 110000
-## Interface-Classic: 11502
+## Interface-Classic: 11503
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
 ## Interface-Cata: 40400

IceHUD_Options/Options.lua

@@ -790,26 +790,6 @@ function IceHUD_Options:GenerateModuleOptions(firstLoad)
 	end
 end
 
-function IceHUD_Options:OnLoad()
-	self:GenerateModuleOptions(true)
-	self.options.args.colors.args = IceHUD.IceCore:GetColorOptions()
-	self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
-	--@debug@
-	IceHUD_Options:SetupProfileImportButtons()
-	--@end-debug@
-
-	-- Add dual-spec support
-	if IceHUD.db ~= nil and LibDualSpec then
-		LibDualSpec:EnhanceOptions(IceHUD_Options.options.args.profiles, IceHUD.db)
-	end
-
-	LibStub("AceConfig-3.0"):RegisterOptionsTable("IceHUD", options, "icehudcl")
-end
-
-if IceHUD and IceHUD.IceCore then
-	IceHUD_Options:OnLoad()
-end
-
 function IceHUD_Options:SetupProfileImportButtons()
 	if AceSerializer then
 		AceSerializer:Embed(self)
@@ -833,24 +813,6 @@ function IceHUD_Options:SetupProfileImportButtons()
 				editbox:DisableButton(true)
 				frame:AddChild(editbox)
 			end,
-			hidden =
-				-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
-			disabled =
-				-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
 			order = 98.1
 		}
 
@@ -883,25 +845,25 @@ function IceHUD_Options:SetupProfileImportButtons()
 				editbox:DisableButton(true)
 				frame:AddChild(editbox)
 			end,
-			hidden =
-				-- hello, snooper! this feature is really rough, so enable it at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
-			disabled =
-				-- hello, snooper! this feature is really rough, so enable it at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
 			order = 98.2
 		}
 	end
 end
+
+function IceHUD_Options:OnLoad()
+	self:GenerateModuleOptions(true)
+	self.options.args.colors.args = IceHUD.IceCore:GetColorOptions()
+	self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
+	self:SetupProfileImportButtons()
+
+	-- Add dual-spec support
+	if IceHUD.db ~= nil and LibDualSpec then
+		LibDualSpec:EnhanceOptions(IceHUD_Options.options.args.profiles, IceHUD.db)
+	end
+
+	LibStub("AceConfig-3.0"):RegisterOptionsTable("IceHUD", options, "icehudcl")
+end
+
+if IceHUD and IceHUD.IceCore then
+	IceHUD_Options:OnLoad()
+end

IceStackCounter.lua

@@ -3,6 +3,21 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
 local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
 
+local GetSpellCharges = GetSpellCharges
+if not GetSpellCharges and C_Spell then
+	GetSpellCharges = function(spellID)
+		local spellChargeInfo = C_Spell.GetSpellCharges(spellID)
+		if spellChargeInfo then
+			return spellChargeInfo.currentCharges, spellChargeInfo.maxCharges, spellChargeInfo.cooldownStartTime, spellChargeInfo.cooldownDuration, spellChargeInfo.chargeModRate
+		end
+	end
+end
+
+local GetSpellCount = GetSpellCount
+if not GetSpellCount and C_Spell then
+	GetSpellCount = C_Spell.GetSpellCastCount
+end
+
 -- OVERRIDE
 function IceStackCounter_GetOptions(frame, opts)
 	opts["customHeader"] = {

changelog.md

@@ -1,5 +1,23 @@
 # Changelog
 
+v1.15.3:
+
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
+
+v1.15.2:
+
+- Re-enable right-click context menus on 11.x.
+- Update TOC for Classic-era
+
+v1.15.1:
+
+- Fix error opening options.
+
+v1.15.0:
+
+- Support The War Within/11.0
+- Add support for exporting and importing profiles through text.
+
 v1.14.42:
 
 - Fix Vengeance module in Cataclysm Classic

embeds.xml

@@ -7,6 +7,7 @@
 	<Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>
 	<Include file="libs\AceConfig-3.0\AceConfig-3.0.xml"/>
 	<Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
+	<Include file="libs\AceSerializer-3.0\AceSerializer-3.0.xml"/>
 	<Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
 	<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
 	<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>

modules/CastBar.lua

@@ -13,6 +13,16 @@ if not IsSpellInRange and C_Spell then
 	IsSpellInRange = C_Spell.IsSpellInRange
 end
 
+local GetSpellCooldown = GetSpellCooldown
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
 CastBar.prototype.spellCastSent = nil
 
 -- Constructor --

modules/ComboPoints.lua

@@ -3,6 +3,20 @@ local ComboPoints = IceCore_CreateClass(IceElement)
 
 local IceHUD = _G.IceHUD
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

modules/CustomBar.lua

@@ -20,7 +20,7 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
-		local info = C_Spell.GetSpellInfo
+		local info = C_Spell.GetSpellInfo(id)
 		return info.name, nil, info.iconID
 	end
 end

modules/CustomCDBar.lua

@@ -30,16 +30,31 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
-		local info = C_Spell.GetSpellInfo
+		local info = C_Spell.GetSpellInfo(id)
 		return info.name, nil, info.iconID
 	end
 end
 
+local GetSpellCooldown = GetSpellCooldown
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
 local GetItemInfo = GetItemInfo
 if not GetItemInfo and C_Item then
 	GetItemInfo = C_Item.GetItemInfo
 end
 
+local IsUsableSpell = IsUsableSpell
+if not IsUsableSpell and C_Spell then
+	IsUsableSpell = C_Spell.IsSpellUsable
+end
+
 IceCustomCDBar.prototype.cooldownDuration = 0
 IceCustomCDBar.prototype.cooldownEndTime = 0
 IceCustomCDBar.prototype.coolingDown = false
@@ -622,9 +637,9 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 	local localRemaining = nil
 	local localStart, localDuration, hasCooldown = GetSpellCooldown(buffName)
 
-	if (hasCooldown == 1) then
+	if hasCooldown then
 		-- the item has a potential cooldown
-		if (localDuration <= 1.5) then
+		if localDuration <= 1.5 then
 			return nil, nil
 		end
 
@@ -719,7 +734,7 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
 end
 
 function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
-	if unit ~= self.unit then
+	if unit and unit ~= self.unit then
 		return
 	end
 	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then

modules/CustomCounterBar.lua

@@ -10,7 +10,7 @@ local DefaultAuraIcon = "Interface\\Icons\\Spell_Frost_Frost"
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
-		local info = C_Spell.GetSpellInfo
+		local info = C_Spell.GetSpellInfo(id)
 		return info.name, nil, info.iconID
 	end
 end

modules/GlobalCoolDown.lua

@@ -9,11 +9,21 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
-		local info = C_Spell.GetSpellInfo
+		local info = C_Spell.GetSpellInfo(id)
 		return info.name, nil, info.iconID, info.castTime
 	end
 end
 
+local GetSpellCooldown = GetSpellCooldown
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
 -- Constructor --
 function GlobalCoolDown.prototype:init()
 	GlobalCoolDown.super.prototype.init(self, "GlobalCoolDown")

modules/PlayerHealth.lua

@@ -922,13 +922,6 @@ function PlayerHealth.prototype:CreateBackground(redraw)
 		end
 	end
 
-	if not self.frame.button.menu then
-		self.frame.button.menu = function(this, unit)
-			IceHUD.DropdownUnit = unit
-			ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-		end
-	end
-
 	self:EnableClickTargeting(self.moduleSettings.allowMouseInteraction)
 end
 
@@ -962,7 +955,7 @@ function PlayerHealth.prototype:EnableClickTargeting(bEnable)
 		self.frame.button:EnableMouse(true)
 		self.frame.button:RegisterForClicks("AnyUp")
 		self.frame.button:SetAttribute("type1", "target")
-		self.frame.button:SetAttribute("type2", "menu")
+		self.frame.button:SetAttribute("type2", "togglemenu")
 		self.frame.button:SetAttribute("unit", self.unit)
 
 		-- set up click casting

modules/Resolve.lua

@@ -4,6 +4,20 @@ local Resolve = IceCore_CreateClass(IceUnitBar)
 local RESOLVE_SPELL_ID = 158300
 local RESOLVE_MAX = 240
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

modules/RollTheBones.lua

@@ -26,11 +26,37 @@ if Enum and Enum.PowerType then
   SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName
 end
 
+local UnitBuff = UnitBuff
+if not UnitBuff and C_UnitAuras and AuraUtil then
+  UnitBuff = function(unitToken, index, filter)
+    local auraData = C_UnitAuras.GetBuffDataByIndex(unitToken, index, filter)
+    if not auraData then
+      return nil
+    end
+
+    return AuraUtil.UnpackAuraData(auraData)
+  end
+end
+
 -- Constructor --
 function RollTheBones.prototype:init()
   RollTheBones.super.prototype.init(self, "RollTheBones", "player")

modules/SliceAndDice.lua

@@ -53,6 +53,18 @@ if Enum and Enum.PowerType then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local UnitBuff = UnitBuff
+if not UnitBuff and C_UnitAuras and AuraUtil then
+  UnitBuff = function(unitToken, index, filter)
+    local auraData = C_UnitAuras.GetBuffDataByIndex(unitToken, index, filter)
+    if not auraData then
+      return nil
+    end
+
+    return AuraUtil.UnpackAuraData(auraData)
+  end
+end
+
 -- Constructor --
 function SliceAndDice.prototype:init()
 	SliceAndDice.super.prototype.init(self, "SliceAndDice", "player")

modules/Stagger.lua

@@ -23,11 +23,37 @@ if STAGGER_STATES then
 	STAGGER_RED_TRANSITION = STAGGER_STATES.RED.threshold
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName
 end
 
+local UnitDebuff = UnitDebuff
+if not UnitDebuff and C_UnitAuras and AuraUtil then
+	UnitDebuff = function(unitToken, index, filter)
+		local auraData = C_UnitAuras.GetDebuffDataByIndex(unitToken, index, filter)
+		if not auraData then
+			return nil
+		end
+
+		return AuraUtil.UnpackAuraData(auraData)
+	end
+end
+
 StaggerBar.prototype.StaggerDuration = 0
 StaggerBar.prototype.StaggerEndTime = 0
 

modules/TargetCC.lua

@@ -12,6 +12,20 @@ if GetNumGroupMembers then
 	GetNumRaidMembers = GetNumGroupMembers
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

modules/TargetHealth.lua

@@ -3,6 +3,11 @@ IceTargetHealth = IceCore_CreateClass(IceUnitBar)
 
 local IceHUD = _G.IceHUD
 
+local IsAddOnLoaded = IsAddOnLoaded
+if not IsAddOnLoaded and C_AddOns then
+	IsAddOnLoaded = C_AddOns.IsAddOnLoaded
+end
+
 IceTargetHealth.prototype.color = nil
 IceTargetHealth.prototype.determineColor = true
 IceTargetHealth.prototype.registerEvents = true
@@ -708,13 +713,6 @@ function IceTargetHealth.prototype:CreateBackground(redraw)
 				self.frame.button:SetPoint("BOTTOMRIGHT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth() / 1.5, 0)
 			end
 		end
-
-		if not self.frame.button.menu then
-			self.frame.button.menu = function(this, unit)
-				IceHUD.DropdownUnit = unit
-				ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-			end
-		end
 	end
 end
 
@@ -728,7 +726,7 @@ function IceTargetHealth.prototype:EnableClickTargeting(bEnable)
 		self.frame.button:EnableMouse(true)
 		self.frame.button:RegisterForClicks("AnyUp")
 		self.frame.button:SetAttribute("type1", "target")
-		self.frame.button:SetAttribute("type2", "menu")
+		self.frame.button:SetAttribute("type2", "togglemenu")
 		self.frame.button:SetAttribute("unit", self.unit)
 
 		-- set up click casting

modules/TargetInfo.lua

@@ -1150,7 +1150,7 @@ do 	-- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
 			self.frame:SetScript("OnLeave", function(frame) self:OnLeave(frame) end)
 
 			self.frame:SetAttribute("type1", "target")
-			self.frame:SetAttribute("type2", "menu")
+			self.frame:SetAttribute("type2", "togglemenu")
 
 			-- set up click casting
 			ClickCastFrames = ClickCastFrames or {}
@@ -1173,13 +1173,6 @@ do 	-- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
 
 		self.frame:SetAttribute("unit", self.unit)
 
-		if not self.frame.menu then
-			self.frame.menu = function(this, unit)
-				IceHUD.DropdownUnit = unit
-				ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-			end
-		end
-
 
 		-- create a fancy highlight frame for mouse over
 		if (not self.frame.highLight) then

modules/TargetInvuln.lua

@@ -12,6 +12,20 @@ if GetNumGroupMembers then
 	GetNumRaidMembers = GetNumGroupMembers
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

modules/TargetOfTarget.lua

@@ -4,6 +4,18 @@ local DogTag = nil
 
 local TargetOfTarget = IceCore_CreateClass(IceElement)
 
+local UnitDebuff = UnitDebuff
+if not UnitDebuff and C_UnitAuras and AuraUtil then
+	UnitDebuff = function(unitToken, index, filter)
+		local auraData = C_UnitAuras.GetDebuffDataByIndex(unitToken, index, filter)
+		if not auraData then
+			return nil
+		end
+
+		return AuraUtil.UnpackAuraData(auraData)
+	end
+end
+
 TargetOfTarget.prototype.stackedDebuffs = nil
 TargetOfTarget.prototype.buffSize = nil
 TargetOfTarget.prototype.height = nil

modules/Vengeance.lua

@@ -3,6 +3,20 @@ local Vengeance = IceCore_CreateClass(IceUnitBar)
 
 local VENGEANCE_SPELL_ID = 93098
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 local GetSpellName = GetSpellInfo
 if C_Spell and C_Spell.GetSpellName then
 	GetSpellName = C_Spell.GetSpellName

this_version.md

@@ -1,200 +1,19 @@
 # Changelog
 
-v1.14.42:
+v1.15.3:
 
-- Fix Vengeance module in Cataclysm Classic
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
 
-v1.14.41:
+v1.15.2:
 
-- Fix swapped DK runes in Cataclysm Classic
+- Re-enable right-click context menus on 11.x.
-- Possible fix for castbar flashing sometimes when set to "Never"
+- Update TOC for Classic-era
-- Fix IceHUD Vigor bar not showing up for some types of dragons such as the Algarian Stormrider
 
-v1.14.40:
+v1.15.1:
 
-- Update TOC for Dragonflight to 10.2.7
+- Fix error opening options.
 
-v1.14.39:
+v1.15.0:
 
-- Support Cataclysm Classic 4.4.0
+- Support The War Within/11.0
-
+- Add support for exporting and importing profiles through text.
-v1.14.38:
-
-- Update TOCs
-
-v1.14.37:
-
-- Update LibRangeCheck version to address taint issues (wowace ticket #353)
-
-v1.14.36:
-
-- Really fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
-
-v1.14.35:
-
-- Fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
-
-v1.14.34:
-
-- Fix Vigor showing up sometimes when it shouldn't.
-
-v1.14.33:
-
-- Update TOC for Dragonflight to 10.2.5
-
-v1.14.32:
-
-- Enable GlobalCoolDown module in Classic Era 1.15.0+
-- Enable tracking target buffs/debuffs in Classic Era 1.15.0+
-
-v1.14.31:
-
-- Fix nil concatenation error (wowace ticket #351)
-
-v1.14.30:
-
-- Update Classic-era TOC for 1.15.0
-- Enable TargetCastBar module on Classic-era 1.15+
-
-v1.14.29:
-
-- Fix Stagger bar error for 10.2.0 (wowace ticket #348)
-
-v1.14.28:
-
-- Update TOC for Dragonflight to 10.2.0
-
-v1.14.27:
-
-- Update TOC for Dragonflight to 10.1.7
-
-v1.14.26:
-
-- Update TOC for classic-era to 1.14.4
-
-v1.14.25:
-
-- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
-- Added ability to adjust strata globally.
-
-v1.14.24:
-
-- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.
-
-v1.14.23:
-
-- Update Dragonflight TOC for 10.1.5
-
-v1.14.22:
-
-- Fixed reported issue with a Lua error on Wrath Classic clients. https://www.wowace.com/projects/ice-hud/issues/344
-- Fixed Vigor module not working when riding Grotto Netherwing Drake (and theoretically all future Dragonriding mount types).
-- Updated TOC for Wrath-Classic.
-
-v1.14.21:
-
-- Increased maximum scale/zoom to 400%, by request.
-- Fixed TargetCC/FocusCC modules on Wrath Classic.
-- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
-- Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
-- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
-
-v1.14.20:
-
-- Added Winding Slitherdrake as recognized for the Dragonriding Vigor module
-
-v1.14.19:
-
-- Updated TOCs for 10.1.0
-- Added addon icon for 10.1.0 clients
-- Fixed Dragonriding Vigor charges not showing up in 10.1.0
-- Fixed Vigor not always updating correctly when loading into the game or a new zone
-
-v1.14.18:
-
-- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
-- Added option (enabled by default) to hide mod during cataloging.
-- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
-- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
-
-v1.14.17:
-
-- Updated TOCs for 10.0.7
-
-v1.14.16:
-
-- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
-- Fixed a reported error when playing Darkmoon Faire games.
-- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
-
-v1.14.15:
-
-- Updated TOCs for 10.0.5
-
-v1.14.14:
-
-- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
-
-v1.14.13:
-
-- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)
-
-v1.14.12:
-
-- Added a module for showing Dragonriding Vigor points.
-
-v1.14.11:
-
-- Packaged a new version of LibDogTag-Unit to fix the Guild roster resetting its scroll position every 20 seconds.
-
-v1.14.10:
-
-- Fix an error in TargetTargetHealth/Mana and CustomHealth when Low Threshold Color was checked and Scale by Health % was un-checked.
-
-v1.14.9:
-
-- Fix Low Threshold to be usable even when Color By Health/Mana % is disabled. (ticket #334)
-
-v1.14.8:
-
-- Fix Color By Health % to work with Low Threshold Color option. Previously, if Low Threshold was set, the color was always either MaxHealth/MaxMana or MinHealth/MinMana, it would never be colored by health %. Now if both are set, it will scale by health % until it reaches the low threshold, at which point it will switch to the Min color.
-- Fix Low Threshold color and flashing to work at the same percentage. Previously these were slightly different such that it would start flashing at 40% but not turn to the Min color until 39.9999%, for example.
-
-v1.14.7:
-
-- Add option to scale absorb bar by the unit's maximum health.
-
-v1.14.6:
-
-- Add ability for buff/debuff watchers to only display when the specified buff/debuff is missing. This also adds the ability to require that the given unit exists. So if you had Unit set to Target, Display mode set to Missing, and Only if unit exists checked, you'd show the bar if you have a target and they don't have the given buff/debuff.
-- Don't flash the castbar for instant-cast spells that the player didn't cast (such as internal quest spells).
-- Add DruidEnergy module (disabled by default). This module will show the player's Energy level if they're a Druid and currently shapeshifted to a non-energy-using form (eligible forms are configurable by the user).
-
-v1.14.5:
-
-- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
-- Add "@" after the number when the Combo Points module is in Numeric mode, "Show Charged points" is enabled, and the current combo point is charged.
-- Fix Charged point support in the ComboPointsBar module.
-
-v1.14.4:
-
-- Update TOC for 10.0.2
-
-v1.14.3:
-
-- Add Spell ID support for aura tracking.
-- Add Evoker support.
-- Add Empowered Casting (hold-to-cast levels) support.
-
-v1.14.2:
-
-- Fix CC and Invuln modules not showing immediately when they should.
-
-v1.14.1:
-
-- Fix Hide Party feature on pre-10.0 clients.
-
-v1.14.0:
-
-- 10.0 compatibility
-- Renamed Anima Charged combo points to Charged, and removed specific references to Kyrian.