Attempt to fix other uses of PowerBarContainer

Apparently other things are now using the game's UIWidgetPowerBarContainerFrame but we're forcing it to be hidden due to a variety of factors. This attempts to restrict the Hide behavior of that frame to only when we're Dragonriding.

IceCastBar.lua

@@ -361,7 +361,7 @@ function IceCastBar.prototype:MyOnUpdate()
 
 		local timeString = self.moduleSettings.showCastTime and string.format("%.1fs ", remainingTime) or ""
 		local empowerString = self.NumStages ~= nil and (L["Stage %d"]):format(self:GetCurrentStage()) or ""
-		local line1 = timeString .. self.actionMessage
+		local line1 = timeString .. (self.actionMessage or "")
 		if self.moduleSettings.empowerStageTextDisplay == "TOPLINE" then
 			line1 = line1 .. " " .. empowerString
 		end

IceHUD.lua

@@ -49,8 +49,8 @@ IceHUD.EventExistsUnitDynamicFlags = IceHUD.WowMain and IceHUD.WowVer < 80000
 IceHUD.EventExistsUnitHealthFrequent = not IceHUD.WowMain or (IceHUD.WowVer >= 40000 and IceHUD.WowVer < 90000)
 IceHUD.PerPowerEventsExist = IceHUD.WowMain and IceHUD.WowVer < 40000
 IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
-IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
-IceHUD.CanTrackGCD = not IceHUD.WowClassic
+IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
+IceHUD.CanTrackGCD = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
 IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
 IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath
 IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth")

IceHUD.toc

@@ -1,5 +1,5 @@
-## Interface: 100200
-## Interface-Retail: 100200
+## Interface: 100205
+## Interface-Retail: 100205
 ## Interface-Classic: 11500
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403

IceHUD_Options/IceHUD_Options.toc

@@ -1,5 +1,5 @@
-## Interface: 100200
-## Interface-Retail: 100200
+## Interface: 100205
+## Interface-Retail: 100205
 ## Interface-Classic: 11500
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403

changelog.md

@@ -1,5 +1,26 @@
 # Changelog
 
+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

modules/DragonridingVigor.lua

@@ -38,6 +38,7 @@ function DragonridingVigor.prototype:Enable(core)
 	end
 
 	DragonridingVigor.super.prototype.Enable(self, core)
+	self:Show(false)
 
 	self:RegisterEvent("UNIT_AURA", "CheckShouldShow")
 	self:RegisterEvent("UPDATE_UI_WIDGET", "UpdateVigorRecharge")
@@ -54,16 +55,29 @@ function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
 		return
 	end
 
-	if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
-		self:Show(true)
-	elseif IceHUD:HasAnyBuff("player", DragonridingBuffs) then
-		self:Show(true)
-	else
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
+	if not info or info.shownState == 0 then
 		self:Show(false)
+		self.suppressHideBlizz = true
 		if self.moduleSettings.hideBlizz then
 			self:ShowBlizz()
 		end
+
+		return
 	end
+
+	self:Show(true)
+
+	-- if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
+	-- 	self:Show(true)
+	-- elseif not knowsAlternateMountEnum and IceHUD:HasAnyBuff("player", DragonridingBuffs) then
+	-- 	self:Show(true)
+	-- else
+	-- 	self:Show(false)
+	-- 	if self.moduleSettings.hideBlizz then
+	-- 		self:ShowBlizz()
+	-- 	end
+	-- end
 end
 
 function DragonridingVigor.prototype:UpdateRunePower(event, arg1, arg2)
@@ -78,6 +92,8 @@ function DragonridingVigor.prototype:UpdateVigorRecharge(event, widget)
 		return
 	end
 
+	self.suppressHideBlizz = false
+
 	if event ~= "internal" then
 		if self.moduleSettings.hideBlizz then
 			self:HideBlizz()
@@ -154,7 +170,9 @@ function DragonridingVigor.prototype:ShowBlizz()
 end
 
 function DragonridingVigor.prototype:HideBlizz()
-	UIWidgetPowerBarContainerFrame:Hide()
+	if not self.suppressHideBlizz then
+		UIWidgetPowerBarContainerFrame:Hide()
+	end
 end
 
 -- Load us up

modules/GlobalCoolDown.lua

@@ -289,6 +289,12 @@ function GlobalCoolDown.prototype:GetSpellId()
 		if not GetSpellInfo(defaultSpells["PALADIN"]) then
 			defaultSpells["PALADIN"] = 635
 		end
+		if not GetSpellInfo(defaultSpells["MAGE"]) then
+			defaultSpells["MAGE"] = 133
+		end
+		if not GetSpellInfo(defaultSpells["WARRIOR"]) then
+			defaultSpells["WARRIOR"] = 6673
+		end
 
 		local _, unitClass = UnitClass("player")
 		return defaultSpells[unitClass]

this_version.md

@@ -1,5 +1,26 @@
 # Changelog
 
+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