Update changelog for release

This enables these bars to better represent the full 0-100 spectrum.
Previously, they would cut off the top and bottom by some amount
(differed per texture).

.github/workflows/release.yml

@@ -42,4 +42,9 @@ jobs:
       - name: Package and release for Classic
         uses: BigWigsMods/packager@master
         with:
-          args: -g 1.13.5 -w 0
+          args: -g classic -w 0
+
+      - name: Package and release for TBC
+        uses: BigWigsMods/packager@master
+        with:
+          args: -g bcc -w 0

.pkgmeta

@@ -38,7 +38,7 @@ externals:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
         tag: latest
     libs/LibRangeCheck-2.0:
-        url: svn://svn.wowace.com/wow/librangecheck-2-0/mainline/trunk/LibRangeCheck-2.0
+        url: https://github.com/WeakAuras/LibRangeCheck-2.0/
     libs/LibSharedMedia-3.0:
         url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
         tag: latest
@@ -58,6 +58,7 @@ optional-dependencies:
 
 move-folders:
     IceHUD/IceHUD_Options: IceHUD_Options
+    IceHUD/libs/LibRangeCheck-2.0/LibRangeCheck-2.0: IceHUD/libs/LibRangeCheck-2.0
 
 tools-used:
     - libdatabroker-1-1
@@ -65,4 +66,6 @@ tools-used:
 ignore:
     - readme.md
 
-manual-changelog: changelog.txt
+manual-changelog: this_version.md
+
+enable-nolib-creation: yes

IceBarElement.lua

@@ -626,7 +626,7 @@ do
 							v = DogTag:CleanCode(v)
 						end
 
-						self.moduleSettings.upperText = v
+						self.moduleSettings.upperText = strtrim(v)
 						self:RegisterFontStrings()
 						self:Redraw()
 					end,
@@ -655,7 +655,7 @@ do
 							v = DogTag:CleanCode(v)
 						end
 
-						self.moduleSettings.lowerText = v
+						self.moduleSettings.lowerText = strtrim(v)
 						self:RegisterFontStrings()
 						self:Redraw()
 					end,

IceCastBar.lua

@@ -13,12 +13,12 @@ IceCastBar.prototype.unit = nil
 IceCastBar.prototype.current = nil
 
 local SPELL_POWER_MANA = SPELL_POWER_MANA
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_MANA = Enum.PowerType.Mana
 end
 
 local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
-if IceHUD.WowClassic then
+if not UnitCastingInfo then
 	UnitCastingInfo = CastingInfo
 	UnitChannelInfo = ChannelInfo
 end
@@ -407,13 +407,13 @@ end
 
 function IceCastBar.prototype:StartBar(action, message)
 	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
 	else
 		spell, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
 	end
 	if not (spell) then
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
 		else
 			spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
@@ -568,7 +568,7 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
 	--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
 
-	local endTime = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 6 or 5, UnitCastingInfo(self.unit))
+	local endTime = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, UnitCastingInfo(self.unit))
 
 	if (endTime and self.actionStartTime) then
 		-- apparently this check is needed, got nils during a horrible lag spike
@@ -629,7 +629,7 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
 	--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
 
 	local spell, rank, displayName, icon, startTime, endTime
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
 	else
 		spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)

IceHUD.lua

@@ -17,7 +17,24 @@ IceHUD.CurrTagVersion = 3
 IceHUD.debugging = false
 
 IceHUD.WowVer = select(4, GetBuildInfo())
+IceHUD.WowMain = not WOW_PROJECT_ID or WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
+IceHUD.WowClassicBC = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
+
+-- compatibility/feature flags
+IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
+IceHUD.EventExistsPlayerPetChanged = IceHUD.WowVer < 80000 and not IceHUD.WowClassic and not IceHUD.WowClassicBC
+IceHUD.EventExistsPetBarChanged = IceHUD.WowVer < 80000 and not IceHUD.WowClassic and not IceHUD.WowClassicBC
+IceHUD.EventExistsPlayerComboPoints = IceHUD.WowMain and IceHUD.WowVer < 30000
+IceHUD.EventExistsUnitComboPoints = IceHUD.WowMain and IceHUD.WowVer < 70000
+IceHUD.EventExistsUnitMaxPower = IceHUD.WowMain and IceHUD.WowVer < 80000
+IceHUD.EventExistsGroupRosterUpdate = IceHUD.WowVer >= 50000 or IceHUD.WowClassic or IceHUD.WowClassicBC
+IceHUD.EventExistsUnitDynamicFlags = IceHUD.WowMain and IceHUD.WowVer < 80000
+IceHUD.PerPowerEventsExist = IceHUD.WowMain and IceHUD.WowVer < 40000
+IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
+IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
+IceHUD.CanTrackGCD = not IceHUD.WowClassic
+IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
 
 IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
 
@@ -324,7 +341,7 @@ end
 -- blizzard interface options
 local blizOptionsPanel = CreateFrame("FRAME", "IceHUDConfigPanel", UIParent)
 blizOptionsPanel.name = "IceHUD"
-blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, (IceHUD.WowVer >= 50000 or IceHUD.WowClassic) and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
+blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, (IceHUD.WowVer >= 50000 or IceHUD.WowClassic or IceHUD.WowClassicBC) and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
 blizOptionsPanel.button:SetText("Open IceHUD configuration")
 blizOptionsPanel.button:SetWidth(240)
 blizOptionsPanel.button:SetHeight(30)
@@ -416,7 +433,7 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 
 	local i = 1
 	local name, _, texture, applications
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 	else
 		name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
@@ -428,7 +445,7 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 		end
 
 		i = i + 1
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 		else
 			name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
@@ -448,7 +465,7 @@ do
 
 		local i = 1
 		local name, _, texture, applications, _, _, _, _, _, _, auraID
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
 		else
 			name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
@@ -462,7 +479,7 @@ do
 			end
 
 			i = i + 1
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			if IceHUD.SpellFunctionsReturnRank then
 				name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
 			else
 				name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)

IceHUD.toc

@@ -1,14 +1,17 @@
-#@retail@
+## Interface: 90100
-## Interface: 90001
+## Interface-Retail: 90100
-#@end-retail@
+## Interface-Classic: 11306
-#@non-retail@
+## Interface-BCC: 20501
-# ## Interface: 11305
-#@end-non-retail@
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
 ## Notes: Another HUD addon
-## Version: @project-version@
+#@debug@
+## Version: development
+#@end-debug@
+#@non-debug@
+# ## Version: @project-version@
+#@end-non-debug@
 ## SavedVariables: IceCoreDB
 ## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
 ## X-Category: HUDs

IceHUD_Options/IceHUD_Options.toc

@@ -1,4 +1,7 @@
-## Interface: 90001
+## Interface: 90100
+## Interface-Retail: 90100
+## Interface-Classic: 11306
+## Interface-BCC: 20501
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

IceStackCounter.lua

@@ -128,7 +128,7 @@ end
 function IceStackCounter_Enable(frame)
 	frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
 	frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsPlayerPetChanged then
 		frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
 	end
 	if FocusUnit then

IceUnitBar.lua

@@ -20,7 +20,7 @@ IceUnitBar.prototype.hasPet = nil
 IceUnitBar.prototype.noFlash = nil
 
 local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
 end
@@ -243,7 +243,14 @@ function IceUnitBar.prototype:Update()
 		self.mana = IceHUD:MathRound(self.mana / 100)
 		self.maxMana = IceHUD:MathRound(self.maxMana / 100)
 	end
-	self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
+
+	-- account for cases where maxMana is 0, perhaps briefly (during certain spells, for example)
+	-- and properly handle it as full. this allows for proper alpha handling during these times.
+	if self.maxMana == self.mana then
+		self.manaPercentage = 1
+	else
+		self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
+	end
 
 	local locClass
 	locClass, self.unitClass = UnitClass(self.unit)

modules/ArcaneCharges.lua

@@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local ArcaneCharges = IceCore_CreateClass(IceClassPowerCounter)
 
 local SPELL_POWER_ARCANE_CHARGES = SPELL_POWER_ARCANE_CHARGES
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
 end
 

modules/ComboPoints.lua

@@ -4,20 +4,31 @@ local ComboPoints = IceCore_CreateClass(IceElement)
 local IceHUD = _G.IceHUD
 
 local AnticipationSpellId = 114015
+local AnticipationExists = GetSpellInfo(AnticipationSpellId) and IceHUD.WowVer < 70000
 
 ComboPoints.prototype.comboSize = 20
 
 local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
+if not GetUnitChargedPowerPoints then
+	GetUnitChargedPowerPoints = function()
+		return nil
+	end
+end
+
 -- Constructor --
 function ComboPoints.prototype:init()
 	ComboPoints.super.prototype.init(self, "ComboPoints")
 
 	self:SetDefaultColor("ComboPoints", 1, 1, 0)
-	self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
+	if AnticipationExists then
+		self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
+	end
+	self:SetDefaultColor("KyrianAnimaComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
 	self.scalingEnabled = true
 end
 
@@ -163,7 +174,7 @@ function ComboPoints.prototype:GetOptions()
 		order = 33.2
 	}
 
-	if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+	if AnticipationExists then
 		opts["anticipation"] = {
 			type = "toggle",
 			name = L["Show Anticipation"],
@@ -215,8 +226,29 @@ function ComboPoints.prototype:GetOptions()
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
+		order = 35
 	}
 
+	if IceHUD.WowVer >= 90000 then
+		opts["bShowAnimaCharged"] = {
+			type = 'toggle',
+			width = 'double',
+			name = L["Show Anima-charged points"],
+			desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."],
+			get = function()
+				return self.moduleSettings.bShowAnimaCharged
+			end,
+			set = function(info, v)
+				self.moduleSettings.bShowAnimaCharged = v
+				self:UpdateChargedComboPoints()
+			end,
+			disabled = function()
+				return not self.moduleSettings.enabled
+			end,
+			order = 36
+		}
+	end
+
 	return opts
 end
 
@@ -235,6 +267,7 @@ function ComboPoints.prototype:GetDefaultSettings()
 	defaults["comboGap"] = 0
 	defaults["showAnticipation"] = true
 	defaults["bShowWithNoTarget"] = true
+	defaults["bShowAnimaCharged"] = true
 	return defaults
 end
 
@@ -253,8 +286,8 @@ function ComboPoints.prototype:Enable(core)
 	ComboPoints.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
-	if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+	if not IceHUD.EventExistsPlayerComboPoints then
-		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		if IceHUD.EventExistsUnitComboPoints then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
 			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
@@ -266,7 +299,7 @@ function ComboPoints.prototype:Enable(core)
 			self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
 			self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
 		end
-		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		if AnticipationExists then
 			self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
 			self:AddAnticipation()
 		end
@@ -274,11 +307,16 @@ function ComboPoints.prototype:Enable(core)
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
 
+	if IceHUD.WowVer >= 90000 then
+		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
+	end
+
 	if self.moduleSettings.comboMode == "Graphical" then
 		self.moduleSettings.comboMode = "Graphical Bar"
 	end
 
 	self:CreateComboFrame(true)
+	self:UpdateChargedComboPoints()
 end
 
 function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
@@ -291,6 +329,13 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
 	end
 end
 
+function ComboPoints.prototype:UpdateChargedComboPoints()
+	local chargedPowerPoints = GetUnitChargedPowerPoints("player")
+	self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
+	self:CreateComboFrame()
+	self:UpdateComboPoints()
+end
+
 -- 'Protected' methods --------------------------------------------------------
 
 -- OVERRIDE
@@ -399,13 +444,18 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 		if (self.moduleSettings.gradient) then
 			g = g - ((1 / maxComboPoints)*i)
 		end
-		self.frame.graphical[i].texture:SetVertexColor(r, g, b)
+
+		if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
+			self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
+		else
+			self.frame.graphical[i].texture:SetVertexColor(r, g, b)
+		end
 
 		self.frame.graphical[i]:Hide()
 	end
 
 	-- create Anticipation points
-	if IceHUD.WowVer < 70000 then
+	if AnticipationExists then
 		for i = 1, 5 do
 			if (not self.frame.graphicalAnt[i]) then
 				local frame = CreateFrame("Frame", nil, self.frame)
@@ -452,17 +502,17 @@ function ComboPoints.prototype:UpdateComboPoints(...)
 	local points, anticipate, _
 	if IceHUD.IceCore:IsInConfigMode() then
 		points = self:GetMaxComboPoints()
-	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic or IceHUD.WowClassicBC then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
 		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
 		local checkUnit = isInVehicle and "vehicle" or "player"
-		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+		if IceHUD.PerTargetComboPoints then
-			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
-		else
 			points = GetComboPoints(checkUnit, "target")
+		else
+			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
 		end
 
-		if IceHUD.WowVer < 70000 and IceHUD.WowVer >= 50000 then
+		if AnticipationExists then
 			_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
 		else
 			anticipate = 0
@@ -554,6 +604,6 @@ end
 
 -- Load us up
 local _, class = UnitClass("player")
-if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
+if (not IceHUD.WowClassic and not IceHUD.WowClassicBC) or class == "ROGUE" or class == "DRUID" then
 	IceHUD.ComboPoints = ComboPoints:new()
 end

modules/ComboPointsBar.lua

@@ -2,10 +2,17 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local ComboPointsBar = IceCore_CreateClass(IceBarElement)
 
 local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
+if not GetUnitChargedPowerPoints then
+	GetUnitChargedPowerPoints = function()
+		return nil
+	end
+end
+
 function ComboPointsBar.prototype:init()
 	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
 
@@ -57,7 +64,6 @@ end
 
 function ComboPointsBar.prototype:GetDefaultSettings()
 	local defaults =  ComboPointsBar.super.prototype.GetDefaultSettings(self)
-	defaults.textVisible['lower'] = false
 	defaults.offset = 8
 	defaults.enabled = false
 	defaults.alwaysDisplay = false
@@ -70,8 +76,8 @@ function ComboPointsBar.prototype:Enable(core)
 	ComboPointsBar.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
-	if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+	if not IceHUD.EventExistsPlayerComboPoints then
-		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		if IceHUD.EventExistsUnitComboPoints then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
 			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
@@ -83,6 +89,18 @@ function ComboPointsBar.prototype:Enable(core)
 	else
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
+
+	if IceHUD.WowVer >= 90000 then
+		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
+	end
+
+	self:UpdateChargedComboPoints()
+end
+
+function ComboPointsBar.prototype:UpdateChargedComboPoints()
+	local chargedPowerPoints = GetUnitChargedPowerPoints("player")
+	self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
+	self:UpdateComboPoints()
 end
 
 function ComboPointsBar.prototype:CreateFrame()
@@ -101,14 +119,14 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
 	local points
 	if IceHUD.IceCore:IsInConfigMode() then
 		points = UnitPowerMax("player", SPELL_POWER_COMBO_POINTS)
-	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic or IceHUD.WowClassicBC then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
 		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
 		local checkUnit = isInVehicle and "vehicle" or "player"
-		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+		if IceHUD.PerTargetComboPoints then
-			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
-		else
 			points = GetComboPoints(checkUnit, "target")
+		else
+			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
 		end
 	else
 		points = GetComboPoints("target")
@@ -129,6 +147,7 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
 	end
 
 	self:SetBottomText1(points or "0")
+	self:SetBottomText2(self.chargedPowerPointIndex)
 end
 
 function ComboPointsBar.prototype:Update()
@@ -136,6 +155,6 @@ function ComboPointsBar.prototype:Update()
 end
 
 local _, class = UnitClass("player")
-if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
+if (not IceHUD.WowClassic and not IceHUD.WowClassicBC) or class == "ROGUE" or class == "DRUID" then
 	IceHUD.ComboPointsBar = ComboPointsBar:new()
 end

modules/CustomBar.lua

@@ -19,6 +19,7 @@ IceCustomBar.prototype.bIsAura = false
 function IceCustomBar.prototype:init()
 	IceCustomBar.super.prototype.init(self, "MyCustomBar", "player")
 	self.textColorOverride = true
+	self.CustomBarUpdateFunc = function() self:UpdateCustomBar(self.unit, true) end
 end
 
 -- 'Public' methods -----------------------------------------------------------
@@ -36,7 +37,7 @@ function IceCustomBar.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
 	self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsPlayerPetChanged then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
 	end
 	if FocusUnit then
@@ -81,7 +82,7 @@ function IceCustomBar.prototype:Disable(core)
 end
 
 function IceCustomBar.prototype:GetUnitToTrack()
-	if IceHUD.WowClassic then
+	if not IceHUD.CanTrackOtherUnitBuffs then
 		return "player"
 	end
 
@@ -107,11 +108,7 @@ end
 
 function IceCustomBar.prototype:ConditionalSubscribe()
 	if self:ShouldAlwaysSubscribe() then
-		if not IceHUD.IceCore:IsUpdateSubscribed(self) then
+		if not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
-			if not self.CustomBarUpdateFunc then
-				self.CustomBarUpdateFunc = function() self:UpdateCustomBar() end
-			end
-
 			self.handlesOwnUpdates = true
 			IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
 		end
@@ -122,7 +119,7 @@ function IceCustomBar.prototype:ConditionalSubscribe()
 end
 
 function IceCustomBar.prototype:ShouldAlwaysSubscribe()
-	return self.unit == "focustarget" or self.unit == "pettarget"
+	return self.unit == "focustarget" or self.unit == "pettarget" or self.unit == "targettarget"
 end
 
 function IceCustomBar.prototype:TargetChanged()
@@ -262,7 +259,7 @@ function IceCustomBar.prototype:GetOptions()
 		order = 30.3,
 	}
 
-	if not IceHUD.WowClassic then
+	if IceHUD.CanTrackOtherUnitBuffs then
 		opts["unitToTrack"] = {
 			type = 'select',
 			values = validUnits,
@@ -673,7 +670,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 	local isBuff = self.moduleSettings.buffOrDebuff == "buff" and true or false
 	local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
 	local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
 	else
 		buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
@@ -703,7 +700,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
 		else
 			buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
@@ -755,7 +752,7 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 	local auraIcon = nil
 	local endTime = 0
 
-	if not fromUpdate then
+	--if not fromUpdate then
 		if tonumber(self.moduleSettings.buffToTrack) == nil then
 			self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
 				self:GetAuraDuration(self.unit, self.moduleSettings.buffToTrack)
@@ -790,18 +787,14 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 		else
 			self.barFrame.icon:Hide()
 		end
-	end
+	--end
 
 	self.auraBuffCount = self.auraBuffCount or 0
 
 	if self.auraEndTime ~= nil and (self.auraEndTime == 0 or self.auraEndTime >= now) and (not self.moduleSettings.minCount or self.auraBuffCount >= self.moduleSettings.minCount) then
-		if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self) then
+		if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
-			if not self.UpdateCustomBarFunc then
-				self.UpdateCustomBarFunc = function() self:UpdateCustomBar(self.unit, true) end
-			end
-
 			self.handlesOwnUpdates = true
-			IceHUD.IceCore:RequestUpdates(self, self.UpdateCustomBarFunc)
+			IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
 		end
 
 		self:Show(true)

modules/FocusMana.lua

@@ -4,7 +4,7 @@ local FocusMana = IceCore_CreateClass(IceUnitBar)
 local SPELL_POWER_RAGE = SPELL_POWER_RAGE
 local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
 local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
 	SPELL_POWER_FOCUS = Enum.PowerType.Focus
 	SPELL_POWER_ENERGY = Enum.PowerType.Energy

modules/GlobalCoolDown.lua

@@ -165,7 +165,7 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
 	end
 
 	local spellname, castTime, _
-	if IceHUD.WowVer < 60000 then
+	if IceHUD.GetSpellInfoReturnsFunnel then
 		spellName, _, _, _, _, _, castTime = GetSpellInfo(spell)
 	else
 		spellName, _, _, castTime = GetSpellInfo(spell)
@@ -267,30 +267,31 @@ function GlobalCoolDown.prototype:CreateLagBar()
 end
 
 function GlobalCoolDown.prototype:GetSpellId()
-	return 61304
+	if GetSpellInfo(61304) then
---[[
+		return 61304
-	local defaultSpells
+	else
+		local defaultSpells
 
-	defaultSpells = {
+		defaultSpells = {
-		ROGUE=1752, -- sinister strike
+			ROGUE=1752, -- sinister strike
-		PRIEST=585, -- smite
+			PRIEST=585, -- smite
-		DRUID=5176, -- wrath
+			DRUID=5176, -- wrath
-		WARRIOR=34428, -- victory rush (not available until 5, sadly)
+			WARRIOR=34428, -- victory rush (not available until 5, sadly)
-		MAGE=44614, -- frostfire bolt
+			MAGE=44614, -- frostfire bolt
-		WARLOCK=686, -- shadow bolt
+			WARLOCK=686, -- shadow bolt
-		PALADIN=105361, -- seal of command (level 3)
+			PALADIN=105361, -- seal of command (level 3)
-		SHAMAN=403, -- lightning bolt
+			SHAMAN=403, -- lightning bolt
-		HUNTER=3044, -- arcane shot
+			HUNTER=3044, -- arcane shot
-		DEATHKNIGHT=47541, -- death coil
+			DEATHKNIGHT=47541, -- death coil
-		MONK=100780, -- jab
+			MONK=100780, -- jab
-	}
+		}
 
-	local _, unitClass = UnitClass("player")
+		local _, unitClass = UnitClass("player")
-	return defaultSpells[unitClass]
+		return defaultSpells[unitClass]
-]]
+	end
 end
 
 -- Load us up
-if not IceHUD.WowClassic then
+if IceHUD.CanTrackGCD then
 	IceHUD.GlobalCoolDown = GlobalCoolDown:new()
 end

modules/HarmonyPower.lua

@@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
 
 local SPELL_POWER_CHI = SPELL_POWER_CHI
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_CHI = Enum.PowerType.Chi
 end
 

modules/HolyPower.lua

@@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
 
 local SPELL_POWER_HOLY_POWER = SPELL_POWER_HOLY_POWER
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
 end
 

modules/PetHealth.lua

@@ -42,7 +42,7 @@ function PetHealth.prototype:Enable(core)
 	PetHealth.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet");
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsPlayerPetChanged then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
 	end
 	self:RegisterEvent("PET_BAR_UPDATE_USABLE", "CheckPet");

modules/PetMana.lua

@@ -5,7 +5,7 @@ local SPELL_POWER_RAGE = SPELL_POWER_RAGE
 local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
 local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
 local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
 	SPELL_POWER_FOCUS = Enum.PowerType.Focus
 	SPELL_POWER_ENERGY = Enum.PowerType.Energy
@@ -62,15 +62,15 @@ function PetMana.prototype:Enable(core)
 	PetMana.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet")
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsPlayerPetChanged then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
 	end
-	self:RegisterEvent(IceHUD.WowVer < 80000 and not IceHUD.WowClassic and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
+	self:RegisterEvent(IceHUD.EventExistsPetBarChanged and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
 	self:RegisterEvent("UNIT_PET", "CheckPet")
 
-	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+	if not IceHUD.PerPowerEventsExist then
 		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.EventExistsUnitMaxPower then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 		end
 	else

modules/PlayerAltMana.lua

@@ -8,7 +8,7 @@ local _, unitClass = UnitClass("player")
 
 local SPELL_POWER_MANA = SPELL_POWER_MANA
 local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_MANA = Enum.PowerType.Mana
 	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
 end

modules/PlayerHealth.lua

@@ -81,7 +81,7 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("PLAYER_REGEN_DISABLED", "CheckCombat")
 
 	self:RegisterEvent("PARTY_LEADER_CHANGED", "CheckLeader")
-	if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
+	if IceHUD.EventExistsGroupRosterUpdate then
 		self:RegisterEvent("GROUP_ROSTER_UPDATE", "CheckLeader")
 	else
 		self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckLeader")

modules/PlayerMana.lua

@@ -13,7 +13,7 @@ local SPELL_POWER_FURY = SPELL_POWER_FURY
 local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
 local SPELL_POWER_PAIN = SPELL_POWER_PAIN
 local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_MANA = Enum.PowerType.Mana
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
 	SPELL_POWER_FOCUS = Enum.PowerType.Focus
@@ -153,9 +153,9 @@ function PlayerMana.prototype:Enable(core)
 
 	self:CreateTickerFrame()
 
-	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+	if not IceHUD.PerPowerEventsExist then
 		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.EventExistsUnitMaxPower then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 		end
 	else
@@ -280,7 +280,7 @@ function PlayerMana.prototype:ManaType(event, unit)
 
 	if self:ShouldUseTicker() then
 		-- register ticker for rogue energy
-		if (self.moduleSettings.tickerEnabled and (self.manaType == SPELL_POWER_ENERGY) and self.alive) then
+		if self.moduleSettings.tickerEnabled and self.manaType == SPELL_POWER_ENERGY then
 			self.tickerFrame:Show()
 			self.tickerFrame:SetScript("OnUpdate", function() self:EnergyTick() end)
 		else
@@ -387,7 +387,7 @@ function PlayerMana.prototype:Update(unit, powertype)
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		-- extra hack for whiny rogues (are there other kind?)
 		local displayPercentage = self.manaPercentage
-		if self.manaType == SPELL_POWER_ENERGY or self.manaType == SPELL_POWER_FOCUS then
+		if self.manaType == SPELL_POWER_ENERGY or self.manaType == SPELL_POWER_FOCUS or self.manaType == SPELL_POWER_FURY then
 			displayPercentage = self.mana
 		else
 			displayPercentage = math.floor(displayPercentage * 100)
@@ -438,7 +438,7 @@ function PlayerMana.prototype:EnergyTick()
 		return
 	end
 
-	if not (self.tickStart) then
+	if not self.tickStart or not self.alive then
 		self.tickerFrame:Hide()
 		return
 	end

modules/Resolve.lua

@@ -56,7 +56,7 @@ do
 			return
 		end
 
-		self.current = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName)) or 0
+		self.current = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName)) or 0
 
 		self:Update()
 	end

modules/RollTheBones.lua

@@ -22,7 +22,7 @@ for _, v in ipairs(RtBBuffs) do
 end
 
 local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
   SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 

modules/Runes.lua

@@ -44,7 +44,7 @@ Runes.prototype.numRunes = 6
 Runes.prototype.lastRuneState = {}
 
 local SPELL_POWER_RUNES = SPELL_POWER_RUNES
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_RUNES = Enum.PowerType.Runes
 end
 

modules/Shards.lua

@@ -38,7 +38,7 @@ local DemonologyCoords =
 }
 
 local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
 end
 

modules/SliceAndDice.lua

@@ -25,6 +25,11 @@ local sixComboPointsTalentID = 19240
 local CurrMaxSnDDuration = 0
 local PotentialSnDDuration = 0
 
+local sndBuffName = 132306
+if IceHUD.WowMain and IceHUD.WowVer < 80000 then
+	sndBuffName = "Ability_Rogue_SliceDice"
+end
+
 if IceHUD.WowVer >= 50000 then
 	baseTime = 12
 	gapPerComboPoint = 6
@@ -33,10 +38,14 @@ if IceHUD.WowClassic then
 	impSndBonusPerRank = 0.15
 	impSndTalentPage = 1
 	impSndTalentIdx = 6
+elseif IceHUD.WowClassicBC then
+	impSndBonusPerRank = 0.15
+	impSndTalentPage = 2
+	impSndTalentIdx = 4
 end
 
 local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 then
+if Enum and Enum.PowerType then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
@@ -61,7 +70,7 @@ function SliceAndDice.prototype:Enable(core)
 	SliceAndDice.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
-	if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsUnitComboPoints then
 		self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
 	else
 		self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
@@ -227,7 +236,7 @@ end
 function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
 	local i = 1
 	local buff, _, texture, duration, endTime, remaining
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 	else
 		buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
@@ -243,7 +252,7 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 		else
 			buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
@@ -264,10 +273,10 @@ function SliceAndDice.prototype:MyOnUpdate()
 end
 
 local function SNDGetComboPoints(unit)
-	if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+	if IceHUD.PerTargetComboPoints then
-		return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
-	elseif IceHUD.WowVer >= 30000 then
 		return GetComboPoints(unit, "target")
+	elseif IceHUD.WowVer >= 60000 then
+		return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
 	else
 		return GetComboPoints()
 	end
@@ -281,7 +290,7 @@ local function HasSpell(id)
 end
 
 local function ShouldHide()
-	if IceHUD.WowVer >= 90000 then
+	if IceHUD.WowVer >= 90000 or IceHUD.WowClassicBC then
 		return false
 	end
 
@@ -300,7 +309,7 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
 	local remaining = nil
 
 	if not fromUpdate or IceHUD.WowVer < 30000 then
-		sndDuration, remaining = self:GetBuffDuration(self.unit, (IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and "Ability_Rogue_SliceDice" or 132306)
+		sndDuration, remaining = self:GetBuffDuration(self.unit, sndBuffName)
 
 		if not remaining then
 			sndEndTime = 0

modules/Stagger.lua

@@ -190,8 +190,8 @@ function StaggerBar.prototype:GetDebuffInfo()
 		if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
 			local spellName = UnitDebuff(self.unit, i)
 
-			duration = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			duration = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
-			amount = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			amount = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
 			staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
 
 			break

modules/TargetCC.lua

@@ -113,6 +113,8 @@ local IncapacitateCCList = {
 local FearCCList = {
 	-- Psychic Scream
 	8122,
+	-- Fear (Retail)
+	118699,
 	-- Fear
 	5782,
 	-- Howl of Terror
@@ -336,7 +338,7 @@ end
 function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	local i = 1
 	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
 	else
 		debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
@@ -360,7 +362,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
 		else
 			debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")

modules/TargetCast.lua

@@ -91,7 +91,7 @@ function TargetCast.prototype:TargetChanged(unit)
 
 	if UnitCastingInfo then
 		local spell = UnitCastingInfo(self.unit)
-		local notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 9 or 8, UnitCastingInfo(self.unit))
+		local notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 9 or 8, UnitCastingInfo(self.unit))
 		if spell then
 			self.notInterruptible = notInterruptibleCast
 			self:StartBar(IceCastBar.Actions.Cast)
@@ -101,7 +101,7 @@ function TargetCast.prototype:TargetChanged(unit)
 
 	if UnitChannelInfo then
 		local channel = UnitChannelInfo(self.unit)
-		notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 8 or 7, UnitChannelInfo(self.unit))
+		notInterruptible = select(IceHUD.SpellFunctionsReturnRank and 8 or 7, UnitChannelInfo(self.unit))
 		if channel then
 			self.notInterruptible = notInterruptibleChannel
 			self:StartBar(IceCastBar.Actions.Channel)

modules/TargetInfo.lua

@@ -133,7 +133,7 @@ function IceTargetInfo.prototype:Enable(core)
 	self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
 
 	self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.EventExistsUnitDynamicFlags then
 		self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
 	end
 
@@ -1419,7 +1419,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
 			local spellID
 			---- end change by Fulzamoth
 
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			if IceHUD.SpellFunctionsReturnRank then
 				name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
 			else
 				---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)

modules/TargetInvuln.lua

@@ -147,7 +147,7 @@ end
 function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 	local i = 1
 	local buff, rank, texture, count, buffType, duration, endTime, unitCaster
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+	if IceHUD.SpellFunctionsReturnRank then
 		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
 	else
 		buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
@@ -178,7 +178,7 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		if IceHUD.SpellFunctionsReturnRank then
 			buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
 		else
 			buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")

modules/TargetMana.lua

@@ -14,7 +14,7 @@ local SPELL_POWER_FURY = SPELL_POWER_FURY
 local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
 local SPELL_POWER_PAIN = SPELL_POWER_PAIN
 local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+if Enum and Enum.PowerType then
 	SPELL_POWER_MANA = Enum.PowerType.Mana
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
 	SPELL_POWER_FOCUS = Enum.PowerType.Focus
@@ -66,9 +66,9 @@ function IceTargetMana.prototype:Enable(core)
 	IceTargetMana.super.prototype.Enable(self, core)
 
 	if self.registerEvents then
-		if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+		if not IceHUD.PerPowerEventsExist then
 			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			if IceHUD.EventExistsUnitMaxPower then
 				self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 			end
 		else

modules/TargetOfTarget.lua

@@ -486,7 +486,7 @@ function TargetOfTarget.prototype:UpdateBuffs()
 	if (self.moduleSettings.showDebuffs) then
 		for i = 1, IceCore.BuffLimit do
 			local buffName, buffRank, buffTexture, buffApplications
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			if IceHUD.SpellFunctionsReturnRank then
 				buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
 			else
 				buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)

modules/Threat.lua

@@ -16,7 +16,7 @@ IceThreat.prototype.scheduledEvent = nil
 
 local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
 local MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS = MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS
-if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
+if not GetNumPartyMembers then
 	GetNumPartyMembers = GetNumGroupMembers
 	GetNumRaidMembers = GetNumGroupMembers
 	MAX_NUM_PARTY_MEMBERS = MAX_PARTY_MEMBERS

modules/Totems.lua

@@ -245,7 +245,7 @@ function Totems.prototype:UpdateTotem(event, totem, ...)
 	if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems or not GetTotemInfo then
 		return
 	end
-	local thisTotemName = self.totemNames[TOTEM_PRIORITIES[totem]]
+
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(totem);
 	if duration > 0 then
 		self.frame.graphical[totem].totem:SetTexture(icon)
@@ -422,6 +422,6 @@ end
 
 -- Load us up
 local _, unitClass = UnitClass("player")
-if (unitClass == "SHAMAN") or (unitClass == "DRUID") then
+if IceHUD.WowVer >= 90000 or (unitClass == "SHAMAN") or (unitClass == "DRUID") then
 	IceHUD.Totems = Totems:new()
 end

readme.md

@@ -1,15 +1,5 @@
 # IceHUD
 
-## Shadowlands/9.0 note
-
-Anyone wanting to try out my first attempt at 9.0 compatibility is welcome to download the latest alpha build. I'm going to give this some time to percolate and wait for reports to come in before tagging it as a final build. I don't have a whole lot of time right now to work on the mod, so feedback is helpful.
-
-Additionally, if you find this mod integral to your WoW experience, [a donation is very helpful](https://www.paypal.com/cgi-bin/webscr?return=https://www.github.com/parnic/ice-hud&cn=Add+special+instructions+to+the+addon+author()&business=icehud%40parnic.com&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted&cancel_return=https://www.github.com/parnic/ice-hud&lc=US&item_name=IceHUD+(from+github.com)&cmd=_donations&rm=1&no_shipping=1&currency_code=USD) to allow me to gauge how much time I need to put into this as well as maintain a WoW subscription to be able to develop the mod.
-
-Thanks!
-
-----
-
 IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD, MetaHUD, and others designed to keep your focus in the center of the screen where your character is.
 
 ## **What it is**

this_version.md

@@ -0,0 +1,7 @@
+# Changelog
+
+v1.13.7:
+
+- Fixed energy ticker when zoning back into an instance after dying (Classic builds)
+- Added newer Fear spell to CC modules.
+- Fixed the straight textures (Tanks) not showing the lowest or highest values appropriately (10% could look empty, 90% could look full).