Fix 11.1.5 issue, update retail TOC

When a spell is overridden by another, our cooldown bar stops being able to track it. Normally this is fine if the spell completely changes as you probably don't expect a cd bar for Backstab to track Gloomblade.

But when the overridden spell shares the same name as the base spell, such as Fire Breath for Evokers with the Font of Magic talent, you very much would expect the bar to track both.

With this fix, tracking the base spell will show the cd for the overridden version as well.

.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

IceHUD.lua

@@ -107,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@
@@ -801,230 +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
--- todo: update for new UnitPopup_OpenMenu() API
-if UnitPopup_ShowMenu then
-	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)
-end
-
 function IceHUD:OutOfCombatWrapper(func)
 	return function(...)
 		return IceHUD:RunOnLeaveCombat(func, ...)

IceHUD.toc

@@ -1,9 +1,9 @@
-## Interface: 100207
-## Interface-Retail: 100207
-## Interface-Classic: 11502
+## Interface: 110105
+## Interface-Retail: 110105
+## Interface-Classic: 11507
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
-## Interface-Cata: 40400
+## Interface-Cata: 40402
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
@@ -22,6 +22,18 @@
 ## X-Curse-Project-ID: 5394
 ## X-WoWI-ID: 8149
 ## X-Wago-ID: 5bGolJN0
+## Category-enUS: Unit Frames
+## Category-deDE: Einheitenfenster
+## Category-esES: Marcos de unidades
+## Category-esMX: Marcos de unidades
+## Category-frFR: Portraits d'unités
+## Category-itIT: Riquadri delle unità
+## Category-koKR: 개체창
+## Category-ptBR: Quadros de unidade
+## Category-ruRU: Рамки юнитов
+## Category-zhCN: 单位框体
+## Category-zhTW: 單位框架
+## Group: IceHUD
 
 #@no-lib-strip@
 # Libraries

IceHUD_Options/IceHUD_Options.toc

@@ -1,9 +1,9 @@
-## Interface: 100207
-## Interface-Retail: 100207
-## Interface-Classic: 11502
+## Interface: 110105
+## Interface-Retail: 110105
+## Interface-Classic: 11507
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
-## Interface-Cata: 40400
+## Interface-Cata: 40402
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@
@@ -12,6 +12,18 @@
 ## Dependencies: IceHUD
 ## LoadOnDemand: 1
 ## IconTexture: Interface\Icons\Spell_Frost_Frost
+## Category-enUS: Unit Frames
+## Category-deDE: Einheitenfenster
+## Category-esES: Marcos de unidades
+## Category-esMX: Marcos de unidades
+## Category-frFR: Portraits d'unités
+## Category-itIT: Riquadri delle unità
+## Category-koKR: 개체창
+## Category-ptBR: Quadros de unidade
+## Category-ruRU: Рамки юнитов
+## Category-zhCN: 单位框体
+## Category-zhTW: 單位框架
+## Group: IceHUD
 
 Json.lua
 JsonDecode.lua

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
 		}
 
@@ -868,10 +830,11 @@ function IceHUD_Options:SetupProfileImportButtons()
 					if err ~= nil then
 						print("failed to import profile: "..err)
 					else
-						print("importing profile")
+						-- print("importing profile")
 						IceHUD:PreProfileChanged()
 						IceHUD:populateDefaults(newTable, IceHUD.IceCore.defaults.profile)
 						IceHUD.db.profile = IceHUD.deepcopy(newTable)
+						IceHUD.db.profiles[IceHUD.db:GetCurrentProfile()] = IceHUD.db.profile
 						IceHUD:PostProfileChanged()
 					end
 					AceGUI:Release(widget)
@@ -883,25 +846,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

changelog.md

@@ -1,5 +1,71 @@
 # Changelog
 
+v1.15.14:
+
+- Support WoW 11.1.5
+- Update TWW TOC to 11.1.5
+
+v1.15.13:
+
+- Update TOCs
+
+v1.15.12:
+
+- Update TOCs
+
+v1.15.11:
+
+- Fix imported profiles not saving across reloads
+
+v1.15.10:
+
+- Fix Chi not updating properly when the player's maximum amount of Chi points changes (e.g. via Ascension talent).
+- Update TOCs
+
+v1.15.9:
+
+- Update Cataclysm Classic TOC to 4.4.1
+- Update Classic-era TOC to 1.15.4
+- Update TWW TOC to 11.0.5
+
+v1.15.8:
+
+- Fix reported error with custom cooldown bars set to "when ready" mode due to deprecation in 11.x (wowace issue #368)
+
+v1.15.7:
+
+- Fix cooldown display for overridden spells (such as Evoker spells where Font of Magic replaces the base spell with an override with the same name).
+
+v1.15.6:
+
+- Package new version of LibDogTag-Unit to fix an error with some units on 11.0.2
+
+v1.15.5:
+
+- Fix error when using an invalid spell with a custom bar on 11.x
+
+v1.15.4:
+
+- Update TOC for TWW
+
+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
@@ -87,7 +153,7 @@ v1.14.23:
 
 v1.14.22:
 
-- Fixed reported issue with a Lua error on Wrath Classic clients. https://www.wowace.com/projects/ice-hud/issues/344
+- 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.
 
@@ -508,7 +574,7 @@ v1.10.13:
 
 v1.10.12:
 
-- Tweaked a few Druid CCs in the CC modules. If you've got a more up-to-date list of any of the CCs, please send them along to icehud@parnic.com
+- Tweaked a few Druid CCs in the CC modules. If you've got a more up-to-date list of any of the CCs, please send them along to <icehud@parnic.com>
 - Fixed a problem that could cause a custom counter to loop forever and cause framerate problems. (ticket #230)
 - Updated default text values for Health and Mana modules to show values in shortened form so they're more readable. Anyone who has customized their text will not be affected by this change and the shortened form only kicks in once values reach 10,000.
 
@@ -1525,7 +1591,7 @@ v1.3.17:
 - fixed <http://www.wowace.com/projects/ice-hud/tickets/8-module-target-info-long-targetnames-overwrites-the/> : target name in the TargetInfo module no longer spills to the next line or gets cut off if it's too long
 - made the threat module only display while the player is in combat or the player has some threat on his target
 - added an option to only display the threat module while in a group. set by default
-- adding HungerForBlood user-submitted module. I don't have an assassination rogue and don't plan on having one, so this is _untested_ by me. the author is responsible for fixing bugs in it
+- adding HungerForBlood user-submitted module. I don't have an assassination rogue and don't plan on having one, so this is *untested* by me. the author is responsible for fixing bugs in it
 - also updated a few settings in SliceAndDice to conform with the rest of the mod
 - fix for malygos fight where the player uses combo points while in a vehicle
 - made runes flash when they become active whether the cooldown or alpha setting is being used

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/CustomBar.lua

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

modules/CustomCDBar.lua

@@ -30,8 +30,14 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
-		return info.name, nil, info.iconID
+		if info then
+			return info.name, nil, info.iconID, info.spellID
+		end
 	end
 end
 
@@ -55,6 +61,11 @@ if not IsUsableSpell and C_Spell then
 	IsUsableSpell = C_Spell.IsSpellUsable
 end
 
+local SpellHasRange = SpellHasRange
+if not SpellHasRange and C_Spell then
+	SpellHasRange = C_Spell.SpellHasRange
+end
+
 IceCustomCDBar.prototype.cooldownDuration = 0
 IceCustomCDBar.prototype.cooldownEndTime = 0
 IceCustomCDBar.prototype.coolingDown = false
@@ -630,17 +641,27 @@ end
 
 -- 'Protected' methods --------------------------------------------------------
 
+function IceCustomCDBar.prototype:GetCooldownDurationOverride(spellID)
+	if spellID and FindSpellOverrideByID then
+		local override = FindSpellOverrideByID(spellID)
+		if override and override ~= spellID then
+			return self:GetCooldownDuration(override)
+		end
+	end
+end
+
 function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
-	buffName = self:GetSpellNameOrId(buffName)
+	local spellID
+	buffName, spellID = self:GetSpellNameOrId(buffName)
 
 	local now = GetTime()
 	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
-			return nil, nil
+		if localDuration <= 1.5 then
+			return self:GetCooldownDurationOverride(spellID)
 		end
 
 		localRemaining = localDuration + (localStart - now)
@@ -651,7 +672,7 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 
 		return localDuration, localRemaining
 	else
-		return nil, nil
+		return self:GetCooldownDurationOverride(spellID)
 	end
 end
 
@@ -734,7 +755,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
@@ -862,7 +883,8 @@ function IceCustomCDBar.prototype:IsReady()
 end
 
 function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
-	return spellName
+	local id = select(4, GetSpellInfo(spellName))
+	return spellName, id
 end
 
 function IceCustomCDBar.prototype:Show(bShouldShow, bForceHide)

modules/CustomCounterBar.lua

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

modules/GlobalCoolDown.lua

@@ -9,8 +9,14 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
-		return info.name, nil, info.iconID, info.castTime
+		if info then
+			return info.name, nil, info.iconID, info.castTime
+		end
 	end
 end
 

modules/HarmonyPower.lua

@@ -40,6 +40,13 @@ function HarmonyPower.prototype:Enable(core)
 	HarmonyPower.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_POWER_FREQUENT", "UpdateRunePower")
+	if IceHUD.EventExistsUnitMaxPower then
+		self:RegisterEvent("UNIT_MAXPOWER", "PlayerChiUpdate")
+	end
+end
+
+function HarmonyPower.prototype:PlayerChiUpdate()
+	self:Redraw()
 end
 
 function HarmonyPower.prototype:UpdateRunePower(event, arg1, arg2)

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/RollTheBones.lua

@@ -477,7 +477,11 @@ function RollTheBones.prototype:GetItemIdFromItemLink(linkStr)
   local _
 
   if linkStr then
-    _, itemId, _, _, _, _, _, _, _ = strsplit(":", linkStr)
+    _, itemId, itemId2, _, _, _, _, _, _ = strsplit(":", linkStr)
+  end
+
+  if not tonumber(itemId) then
+    itemId = itemId2
   end
 
   return itemId or 0

modules/SliceAndDice.lua

@@ -532,7 +532,11 @@ function SliceAndDice.prototype:GetItemIdFromItemLink(linkStr)
 	local _
 
 	if linkStr then
-		_, itemId, _, _, _, _, _, _, _ = strsplit(":", linkStr)
+		_, itemId, itemId2, _, _, _, _, _, _ = strsplit(":", linkStr)
+	end
+
+	if not tonumber(itemId) then
+		itemId = itemId2
 	end
 
 	return itemId or 0

modules/TargetHealth.lua

@@ -713,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
 
@@ -733,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

this_version.md

@@ -1,200 +1,67 @@
 # Changelog
 
-v1.14.42:
+v1.15.14:
 
-- Fix Vengeance module in Cataclysm Classic
+- Support WoW 11.1.5
+- Update TWW TOC to 11.1.5
 
-v1.14.41:
-
-- Fix swapped DK runes in Cataclysm Classic
-- Possible fix for castbar flashing sometimes when set to "Never"
-- Fix IceHUD Vigor bar not showing up for some types of dragons such as the Algarian Stormrider
-
-v1.14.40:
-
-- Update TOC for Dragonflight to 10.2.7
-
-v1.14.39:
-
-- Support Cataclysm Classic 4.4.0
-
-v1.14.38:
+v1.15.13:
 
 - Update TOCs
 
-v1.14.37:
+v1.15.12:
 
-- Update LibRangeCheck version to address taint issues (wowace ticket #353)
+- Update TOCs
 
-v1.14.36:
+v1.15.11:
 
-- Really fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
+- Fix imported profiles not saving across reloads
 
-v1.14.35:
+v1.15.10:
 
-- Fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
+- Fix Chi not updating properly when the player's maximum amount of Chi points changes (e.g. via Ascension talent).
+- Update TOCs
 
-v1.14.34:
+v1.15.9:
 
-- Fix Vigor showing up sometimes when it shouldn't.
+- Update Cataclysm Classic TOC to 4.4.1
+- Update Classic-era TOC to 1.15.4
+- Update TWW TOC to 11.0.5
 
-v1.14.33:
+v1.15.8:
 
-- Update TOC for Dragonflight to 10.2.5
+- Fix reported error with custom cooldown bars set to "when ready" mode due to deprecation in 11.x (wowace issue #368)
 
-v1.14.32:
+v1.15.7:
 
-- Enable GlobalCoolDown module in Classic Era 1.15.0+
-- Enable tracking target buffs/debuffs in Classic Era 1.15.0+
+- Fix cooldown display for overridden spells (such as Evoker spells where Font of Magic replaces the base spell with an override with the same name).
 
-v1.14.31:
+v1.15.6:
 
-- Fix nil concatenation error (wowace ticket #351)
+- Package new version of LibDogTag-Unit to fix an error with some units on 11.0.2
 
-v1.14.30:
+v1.15.5:
 
-- Update Classic-era TOC for 1.15.0
-- Enable TargetCastBar module on Classic-era 1.15+
+- Fix error when using an invalid spell with a custom bar on 11.x
 
-v1.14.29:
+v1.15.4:
 
-- Fix Stagger bar error for 10.2.0 (wowace ticket #348)
+- Update TOC for TWW
 
-v1.14.28:
+v1.15.3:
 
-- Update TOC for Dragonflight to 10.2.0
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
 
-v1.14.27:
+v1.15.2:
 
-- Update TOC for Dragonflight to 10.1.7
+- Re-enable right-click context menus on 11.x.
+- Update TOC for Classic-era
 
-v1.14.26:
+v1.15.1:
 
-- Update TOC for classic-era to 1.14.4
+- Fix error opening options.
 
-v1.14.25:
+v1.15.0:
 
-- 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.
+- Support The War Within/11.0
+- Add support for exporting and importing profiles through text.