Updated shard display for Destro Warlocks

Ticket #234, thanks stencil!

.github/workflows/release.yml

@@ -1,45 +0,0 @@
-# description of this workflow, can be anything you want
-name: Package and release
-
-# we need to let GitHub know _when_ we want to release, typically only when we create a new tag.
-# this will target only tags, and not all pushes to the master branch.
-# this part can be heavily customized to your liking, like targeting only tags that match a certain word,
-# other branches or even pullrequests.
-on:
-  push:
-    tags:
-      - '**'
-
-# a workflow is built up as jobs, and within these jobs are steps
-jobs:
-
-  # "release" is a job, you can name it anything you want
-  release:
-
-    # we can run our steps on pretty much anything, but the "ubuntu-latest" image is a safe bet
-    runs-on: ubuntu-latest
-
-    # specify the environment variables used by the packager, matching the secrets from the project on GitHub
-    env:
-      CF_API_KEY: ${{ secrets.CF_API_KEY }}
-      WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
-      GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}  # "GITHUB_TOKEN" is a secret always provided to the workflow
-                                                 # for your own token, the name cannot start with "GITHUB_"
-
-    # "steps" holds a list of all the steps needed to package and release our AddOn
-    steps:
-
-      # we first have to clone the AddOn project, this is a required step
-      - name: Clone project
-        uses: actions/checkout@v1
-
-      # once cloned, we just run the GitHub Action for the packager project
-      - name: Package and release
-        uses: BigWigsMods/packager@master
-
-      # another example where we supply additional arguments, this example is specifically to release
-      # for the Classic version of the game
-      - name: Package and release for Classic
-        uses: BigWigsMods/packager@master
-        with:
-          args: -g 1.13.5 -w 0

.mailmap

@@ -1,3 +1,2 @@
 Parnic <parnic@parnic.com> Parnic <chris@parnic.com>
 rokiyo <rokiyo@example.com> Rokiyo <Rokiyo@example.com>
-Parnic <parnic@parnic.com> Chris Pickett <chris@perniciousgames.com>

.pkgmeta

@@ -24,7 +24,7 @@ externals:
         tag: latest
     libs/AceGUI-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
-        tag: latest
+		tag: latest
     libs/AceGUI-3.0-SharedMediaWidgets:
         url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets
         tag: latest
@@ -65,6 +65,4 @@ tools-used:
 ignore:
     - readme.md
 
-manual-changelog: this_version.md
-
-enable-nolib-creation: yes
+manual-changelog: changelog.txt

IceBarElement.lua

@@ -171,7 +171,6 @@ function IceBarElement.prototype:GetDefaultSettings()
 	settings["rotateBar"] = false
 	settings["markers"] = {}
 	settings["bAllowExpand"] = true
-	settings["textVerticalGap"] = 0
 
 	return settings
 end
@@ -415,7 +414,7 @@ do
 			type='range',
 			name = L["Bar vertical offset"],
 			desc = L["Adjust the vertical placement of this bar"],
-			min = -600,
+			min = -400,
 			max = 600,
 			step = 1,
 			get = function()
@@ -436,7 +435,7 @@ do
 			type='range',
 			name = L["Bar horizontal adjust"],
 			desc = L["This is a per-pixel horizontal adjustment. You should probably use the 'offset' setting above as it is designed to snap bars together. This may be used in the case of a horizontal bar needing to be positioned outside the normal bar locations."],
-			min = -600,
+			min = -400,
 			max = 600,
 			step = 1,
 			get = function()
@@ -725,26 +724,6 @@ do
 					order = 11.3,
 				},
 
-				textVerticalGap = {
-					type = 'range',
-					name = L["Text Vertical Gap"],
-					desc = L["Gap between Upper and Lower text vertically"],
-					min = 0,
-					max = 10,
-					step = 1,
-					get = function()
-						return self.moduleSettings.textVerticalGap
-					end,
-					set = function(info, v)
-						self.moduleSettings.textVerticalGap = v
-						self:Redraw()
-					end,
-					disabled = function()
-						return not self.moduleSettings.enabled
-					end,
-					order = 11.4,
-				},
-
 				textHeader = {
 					type = 'header',
 					name = L["Upper Text"],
@@ -1040,7 +1019,7 @@ end
 
 -- Creates the actual bar
 function IceBarElement.prototype:CreateBar()
-	self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
+	self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK")
 	self:SetBarCoord(self.barFrame)
 
 	self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@@ -1050,9 +1029,9 @@ end
 
 -- Returns a barFrame & barFrame.bar
 -- Rokiyo: Currently keeping old behaviour of running through bar creation on every Redraw, but I'm not convinced we need to.
-function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer, nameSuffix)
+function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer)
 	if not (barFrame) then
-		barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
+		barFrame = CreateFrame("Frame", nil, self.frame)
 	end
 
 	barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
@@ -1137,13 +1116,8 @@ function IceBarElement.prototype:CreateTexts()
 		offy = self.moduleSettings.textVerticalOffset
 	end
 
-	local offgap = 0
-	if self.moduleSettings.textVerticalGap ~= nil then
-		offgap = self.moduleSettings.textVerticalGap
-	end
-
 	self.frame.bottomUpperText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy)
-	self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - (14 + offgap))
+	self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - 14)
 
 	if (self.moduleSettings.textVisible["upper"]) then
 		self.frame.bottomUpperText:Show()
@@ -1459,16 +1433,6 @@ function IceBarElement.prototype:SetScaledColor(colorVar, percent, maxColor, min
 	colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
 end
 
-function IceBarElement.prototype:Round(num)
-	if (num > 1000000) then
-		return IceHUD:MathRound(num/1000000, 1) .. "M"
-	end
-	if (num > 1000) then
-		return IceHUD:MathRound(num/1000, 1) .. "k"
-	end
-	return num
-end
-
 -- To be overridden
 function IceBarElement.prototype:Update()
 end
@@ -1584,7 +1548,7 @@ function IceBarElement.prototype:CreateMarker(idx)
 		self.Markers[idx] = nil
 	end
 
-	self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY", "Marker"..idx)
+	self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY")
 
 	local color = self.moduleSettings.markers[idx].color
 	self.Markers[idx].bar:SetVertexColor(color.r, color.g, color.b, self.alpha)

IceCastBar.lua

@@ -12,32 +12,6 @@ IceCastBar.prototype.actionMessage = nil
 IceCastBar.prototype.unit = nil
 IceCastBar.prototype.current = nil
 
-local SPELL_POWER_MANA = SPELL_POWER_MANA
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
-	SPELL_POWER_MANA = Enum.PowerType.Mana
-end
-
-local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
-if IceHUD.WowClassic then
-	UnitCastingInfo = CastingInfo
-	UnitChannelInfo = ChannelInfo
-end
-
--- Fulzamoth 2019-09-27 : Use LibClassicCasterino if it's there so we can use TargetCast 
---                        module in Classic WoW
-if IceHUD.WowClassic then
-	LibClassicCasterino = LibStub("LibClassicCasterino", true)
-	if LibClassicCasterino then
-		UnitCastingInfo = function(unit)
-			return LibClassicCasterino:UnitCastingInfo(unit)
-		end
-		UnitChannelInfo = function(unit)
-			return LibClassicCasterino:UnitChannelInfo(unit)
-		end
-	end
-end
--- end Fulzamoth change
-
 local AuraIconWidth = 20
 local AuraIconHeight = 20
 
@@ -61,55 +35,21 @@ end
 function IceCastBar.prototype:Enable(core)
 	IceCastBar.super.prototype.Enable(self, core)
 
-	-- Fulzamoth 2019-09-27 : LibClassicCasterino support
-	--                        Setup callback to the library, and route events to
-	--                        IceHUD's handler functions.
-	if LibClassicCasterino then
-			local CastbarEventHandler = function(event, ...) -- unitTarget, castGUID, spellID
-				if (event == "UNIT_SPELLCAST_START") then
-					return IceCastBar.prototype.SpellCastStart(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_DELAYED") then
-					return IceCastBar.prototype.SpellCastDelayed(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_STOP") then
-					return IceCastBar.prototype.SpellCastStop(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_FAILED") then
-					return IceCastBar.prototype.SpellCastFailed(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_INTERRUPTED") then
-					return IceCastBar.prototype.SpellCastInterrupted(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_CHANNEL_START") then
-					return IceCastBar.prototype.SpellCastChannelStart(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_CHANNEL_UPDATE") then
-					return IceCastBar.prototype.SpellCastChannelUpdate(self, event, ...)
-				elseif (event == "UNIT_SPELLCAST_CHANNEL_STOP") then
-					return IceCastBar.prototype.SpellCastChannelStop(self, event, ...)
-				end
-			end
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_START", CastbarEventHandler) 
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_DELAYED", CastbarEventHandler) -- only for player
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_STOP", CastbarEventHandler)
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_FAILED", CastbarEventHandler)
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_INTERRUPTED", CastbarEventHandler)
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_START", CastbarEventHandler)
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_UPDATE", CastbarEventHandler) -- only for player
-			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_STOP", CastbarEventHandler)
-	else -- No LibClassicCasterino, or we're not on Classic, so use IceHUD's normal event handlers.
+	self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
+	self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
+	self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
 
-		self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
-		self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
-		self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
-		self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
 
-		self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
-		self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
 
-		self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
-		self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
+	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
 
-		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
-		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
-		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
-
-	end
 	self:Show(false)
 end
 
@@ -146,7 +86,7 @@ function IceCastBar.prototype:GetOptions()
 		end,
 		order = 39.998
 	}
-if IceHUD.WowVer < 80000 then
+
 	opts["showSpellRank"] =
 	{
 		type = 'toggle',
@@ -163,7 +103,7 @@ if IceHUD.WowVer < 80000 then
 		end,
 		order = 39.999
 	}
-end
+
 	opts["iconSettings"] = {
 		type = 'group',
 		name = "|c"..self.configColor..L["Icon Settings"].."|r",
@@ -406,25 +346,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
-		spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
-	else
-		spell, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
-	end
+	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
 	if not (spell) then
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
-		else
-			spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
-		end
+		spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
 	end
 
-	-- Fulzamoth 2019-09-27 : LibClassicCasterino won't return spell info on target's failed or interrupted cast
-	if LibClassicCasterino and not spell then
-		self:StopBar()
-	elseif not spell then
-	  return
+	if not spell then
+		return
 	end
 
 	if icon ~= nil then
@@ -450,7 +378,7 @@ function IceCastBar.prototype:StartBar(action, message)
 		self.actionDuration = 1 -- instants/failures
 	end
 
-	if not (message) and spell then
+	if not (message) then
 		self.actionMessage = spell .. (self.moduleSettings.showSpellRank and self:GetShortRank(rank) or "")
 	end
 
@@ -470,7 +398,7 @@ function IceCastBar.prototype:StopBar()
 end
 
 function IceCastBar.prototype:GetShortRank(rank)
-	if IceHUD.WowVer < 80000 and rank then
+	if (rank) then
 		local _, _, sRank = string.find(rank, "(%d+)")
 		if (sRank) then
 			return " (" .. sRank .. ")"
@@ -485,30 +413,30 @@ end
 -- NORMAL SPELLS                                                             --
 -------------------------------------------------------------------------------
 
-function IceCastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
+function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastSent", unit, target, castGuid, spellId)
+	IceHUD:Debug("SpellCastSent", unit, spell, rank, target, lineId)
 end
 
-function IceCastBar.prototype:SpellCastChanged(event, cancelled)
-	IceHUD:Debug("SpellCastChanged", cancelled)
+function IceCastBar.prototype:SpellCastChanged(event, arg1)
+	IceHUD:Debug("SpellCastChanged", arg1)
 end
 
-function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
+	IceHUD:Debug("SpellCastStart", unit, spell, rank, lineId, spellId)
 	--UnitCastingInfo(unit)
 
 	self:StartBar(IceCastBar.Actions.Cast)
-	self.current = castGuid
+	self.current = lineId
 end
 
-function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStop", unit, castGuid, spellId)
+	IceHUD:Debug("SpellCastStop", unit, spell, self.current, rank, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and castGuid and self.current ~= castGuid) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -522,12 +450,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
 end
 
 
-function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastFailed", unit, castGuid, spellId)
+	IceHUD:Debug("SpellCastFailed", unit, self.current, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and castGuid and self.current ~= castGuid) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -550,12 +478,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
 	self:StartBar(IceCastBar.Actions.Failure, "Failed")
 end
 
-function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastInterrupted", unit, castGuid, spellId)
+	IceHUD:Debug("SpellCastInterrupted", unit, self.current, lineId, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and castGuid and self.current ~= castGuid) then
+	if (self.current and lineId and self.current ~= lineId) then
 		return
 	end
 
@@ -564,11 +492,11 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellI
 	self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
 end
 
-function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
 	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 spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
 
 	if (endTime and self.actionStartTime) then
 		-- apparently this check is needed, got nils during a horrible lag spike
@@ -577,9 +505,9 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
 end
 
 
-function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
+function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineId, spellId)
 	if (unit ~= self.unit) then return end
-	--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
+	--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
 
 	-- never show on channeled (why on earth does this event even fire when channeling starts?)
 	if (self.action == IceCastBar.Actions.Channel) then
@@ -587,12 +515,10 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
 	end
 
 	-- ignore if not coming from current spell
-	if (self.current and self.current ~= castGuid) then
+	if (self.current and self.current ~= lineId) then
 		return
 	end
 
-	local spell = GetSpellInfo(spellId)
-
 	-- show after normal successfull cast
 	if (self.action == IceCastBar.Actions.Cast) then
 		self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
@@ -628,12 +554,7 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
 	if (unit ~= self.unit or not self.actionStartTime) then return end
 	--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
 
-	local spell, rank, displayName, icon, startTime, endTime
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-		spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
-	else
-		spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
-	end
+	local spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
     if not spell then
         self.actionDuration = 0
     else

IceCore.lua

@@ -94,7 +94,6 @@ function IceCore.prototype:SetupDefaults()
 
 			bHideDuringPetBattles = true,
 			bHideInBarberShop = true,
-			bHideDuringShellGame = true,
 		},
 		global = {
 			lastRunVersion = 0,
@@ -174,13 +173,6 @@ function IceCore.prototype:CheckDisplayUpdateMessage()
 				self.settings.modules["DruidMana"] = nil
 			end
 		end
-		if self.accountSettings.lastRunVersion <= 20180720033008 then
-			if self.settings.modules["HarmonyPower"] ~= nil then
-				self.settings.modules["Chi"] = self.settings.modules["HarmonyPower"]
-				self.settings.modules["HarmonyPower"] = nil
-				self.settings.colors["ChiNumeric"] = self.settings.colors["HarmonyPowerNumeric"]
-			end
-		end
 		self.accountSettings.lastRunVersion = thisVersion
 	end
 end
@@ -251,15 +243,10 @@ function IceCore.prototype:Enable(userToggle)
 		IceHUD_Options:GenerateModuleOptions()
 	end
 
-	if UnitCanPetBattle then
-		self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
-		self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
-	end
-	if GetBarberShopStyleInfo then
-		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
-		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
-	end
-	self.IceHUDFrame:RegisterEvent("UNIT_AURA")
+	self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
+	self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
+	self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
+	self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
 	self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
 		if (event == "PET_BATTLE_OPENING_START") then
 			if IceHUD.IceCore.settings.bHideDuringPetBattles then
@@ -277,15 +264,6 @@ function IceCore.prototype:Enable(userToggle)
 			if IceHUD.IceCore.settings.bHideInBarberShop then
 				self:Show()
 			end
-		elseif (event == "UNIT_AURA") then
-			local unit = ...
-			if IceHUD.IceCore.settings.bHideDuringShellGame and unit == "player" and IceHUD:HasDebuffs("player", {271571})[1] and UnitInVehicle("player") then
-				self:RegisterEvent("UNIT_EXITED_VEHICLE")
-				self:Hide()
-			end
-		elseif (event == "UNIT_EXITED_VEHICLE") then
-			self:UnregisterEvent("UNIT_EXITED_VEHICLE")
-			self:Show()
 		end
 	end)
 
@@ -520,14 +498,10 @@ function IceCore.prototype:Disable(userToggle)
 		end
 	end
 
-	if UnitCanPetBattle then
-		self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
-		self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
-	end
-	if GetBarberShopStyleInfo then
-		self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_OPEN")
-		self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_CLOSE")
-	end
+	self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
+	self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
+	self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_OPEN")
+	self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_CLOSE")
 	self.IceHUDFrame:SetScript("OnEvent", nil)
 
 	self.enabled = false

IceElement.lua

@@ -69,7 +69,7 @@ function IceElement.prototype:Create(parent)
 
 	self.parent = parent
 	if not self.masterFrame then
-		self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
+		self.masterFrame = CreateFrame("Frame", nil, self.parent)
 		self.masterFrame:SetFrameStrata("MEDIUM")
 	end
 	self:CreateFrame()

IceHUD.lua

@@ -6,7 +6,7 @@ local IceHUD = IceHUD
 local SML = LibStub("LibSharedMedia-3.0")
 local ACR = LibStub("AceConfigRegistry-3.0")
 local ConfigDialog = LibStub("AceConfigDialog-3.0")
-local icon = LibStub("LibDBIcon-1.0", true)
+local icon = LibStub("LibDBIcon-1.0")
 local AceGUI = LibStub("AceGUI-3.0")
 local AceSerializer = LibStub("AceSerializer-3.0", 1)
 
@@ -17,9 +17,6 @@ IceHUD.CurrTagVersion = 3
 IceHUD.debugging = false
 
 IceHUD.WowVer = select(4, GetBuildInfo())
-IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
-
-IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
 
 IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc",
 	"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
@@ -259,10 +256,6 @@ function IceHUD:NotifyOptionsChange()
 end
 
 function IceHUD:OnEnable(isFirst)
---	if isFirst then
-		self:SetDebugging(self.IceCore:GetDebug())
-		self.debugFrame = ChatFrame1
---	end
 	self:Debug("IceHUD:OnEnable()")
 
 	if self.db.profile.enable then
@@ -278,6 +271,11 @@ function IceHUD:OnEnable(isFirst)
 	--@debug@
 	IceHUD_Options:OnLoad()
 	--@end-debug@
+
+--	if isFirst then
+		self:SetDebugging(self.IceCore:GetDebug())
+		self.debugFrame = ChatFrame1
+--	end
 end
 
 -- add settings changes/updates here so that existing users don't lose their settings
@@ -324,7 +322,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 and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
 blizOptionsPanel.button:SetText("Open IceHUD configuration")
 blizOptionsPanel.button:SetWidth(240)
 blizOptionsPanel.button:SetHeight(30)
@@ -366,11 +364,7 @@ function IceHUD:Debug(...)
 		for n=1,select('#', ...) do
 			msg = msg .. tostring(select(n, ...)) .. " "
 		end
-		if self.debugFrame then
-			self.debugFrame:AddMessage(msg)
-		else
-			print(msg)
-		end
+		self.debugFrame:AddMessage(msg)
 	end
 end
 
@@ -415,12 +409,7 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 	end
 
 	local i = 1
-	local name, _, texture, applications
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
-	else
-		name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
-	end
+	local name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 	while name do
 		if (not matchByName and string.match(texture:upper(), ability:upper()))
 			or (matchByName and string.match(name:upper(), ability:upper())) then
@@ -428,11 +417,7 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 		end
 
 		i = i + 1
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
-		else
-			name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
-		end
+		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 	end
 
 	return 0
@@ -441,18 +426,13 @@ end
 do
 	local retval = {}
 
-	function IceHUD:HasBuffs(unit, spellIDs, filter)
+	function IceHUD:HasBuffs(unit, spellIDs)
 		for i=1, #spellIDs do
 			retval[i] = false
 		end
 
 		local i = 1
-		local name, _, texture, applications, _, _, _, _, _, _, auraID
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
-		else
-			name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
-		end
+		local name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
 		while name do
 			for i=1, #spellIDs do
 				if spellIDs[i] == auraID then
@@ -462,19 +442,11 @@ do
 			end
 
 			i = i + 1
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-				name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
-			else
-				name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
-			end
+			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
 		end
 
 		return retval
 	end
-
-	function IceHUD:HasDebuffs(unit, spellIDs, filter)
-		return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
-	end
 end
 
 function IceHUD:OnDisable()
@@ -609,10 +581,6 @@ local function CheckLFGMode(mode)
 end
 
 function IceHUD:GetIsInLFGGroup()
-	if not GetLFGMode then
-		return false
-	end
-
 	local mode, submode
 	if IceHUD.WowVer >= 50000 then
 		mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFD)
@@ -756,9 +724,7 @@ local function figure_unit_menu(unit)
 end
 
 IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
-if UnitPopupFrames then
-	UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
-end
+UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
 
 IceHUD.DropdownUnit = nil
 UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()

IceHUD.toc

@@ -1,24 +1,14 @@
-#@retail@
-## Interface: 90002
-#@end-retail@
-#@non-retail@
-# ## Interface: 11305
-#@end-non-retail@
+## Interface: 70200
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
 ## Notes: Another HUD addon
-#@debug@
-## Version: development
-#@end-debug@
-#@non-debug@
-# ## Version: @project-version@
-#@end-non-debug@
+## Version: @project-version@
 ## 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-Compatible-With: 70100
 ## X-Category: HUDs
 ## X-Website: https://www.wowace.com/projects/ice-hud
-## X-Curse-Project-ID: 5394
 ## X-WoWI-ID: 8149
 
 #@no-lib-strip@
@@ -39,6 +29,7 @@ IceCastBar.lua
 IceStackCounter.lua
 
 # IceHUD modules
+# - Feel free to comment these out if you like
 modules\PlayerHealth.lua
 modules\PlayerMana.lua
 modules\TargetHealth.lua

IceHUD_Options/IceHUD_Options.toc

@@ -1,9 +1,4 @@
-#@retail@
-## Interface: 90002
-#@end-retail@
-#@non-retail@
-# ## Interface: 11305
-#@end-non-retail@
+## Interface: 70200
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

IceHUD_Options/Options.lua

@@ -1,6 +1,6 @@
 local LibDualSpec = LibStub('LibDualSpec-1.0', true)
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
-local icon = LibStub("LibDBIcon-1.0", true)
+local icon = LibStub("LibDBIcon-1.0")
 local lastCustomModule = "Bar"
 
 IceHUD_Options = {}
@@ -71,7 +71,7 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's Spell Alerts they added in 4.0.1
 Expand "|cffffdc42Module Settings|r", expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
 
 |cff9999ff14. Which module displays Monk Chi power?|r
-Prior to |cff9999ffIceHUD|r v1.11.2, this module was called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. |cff9999ffIceHUD|r v1.11.2 changed this module to be called |cffdcff42Chi|r.
+This module is called |cffdcff42HarmonyPower|r. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
 
 |cff9999ff15. How do I add commas/periods into big numbers like health?|r
 If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
@@ -83,13 +83,7 @@ If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the
 This is a side effect of the animation API that I'm co-opting to force a rotation without having to provide duplicates of every bar texture in the mod. Any bar moving sufficiently quickly and updating rapidly will cause this. |cff9999ffIceHUD|r is intended to be a vertically-oriented mod, so the rotation feature is there for people who are willing to accept the side effects that come with it. My suggestion is to use one of the many horizontally-oriented bar mods out there if you're wanting horizontal bars. |cff42ffffQuartz|r is a good castbar replacement that you can use and disable |cff9999ffIceHUD|r's built-in castbar, for example.
 
 |cff9999ff18. How do I get rid of the bars that showed up beneath the player in the 7.0 patch?|r
-Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.
-
-|cff9999ff19. Why is there no target castbar for Classic?|r
-The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the LibCasterCasterino addon to enable support, but it's a best guess and not at all accurate.
-
-|cff9999ff20. Why do buff/debuff timers not work in Classic?|r
-The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not at all accurate.]]
+Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.]]
 				}
 			}
 		},
@@ -385,7 +379,6 @@ The Classic game client doesn't provide this information to addons because it wa
 							IceHUD.IceCore.IceHUDFrame:Show()
 						end
 					end,
-					hidden = not UnitCanPetBattle,
 					order = 34,
 				},
 
@@ -403,27 +396,8 @@ The Classic game client doesn't provide this information to addons because it wa
 							IceHUD.IceCore.IceHUDFrame:Show()
 						end
 					end,
-					hidden = not GetBarberShopStyleInfo,
 					order = 35,
 				},
-
-				bHideDuringShellGame = {
-					type = 'toggle',
-					name = L["Hide during shell game"],
-					desc = L["This will hide the entire mod when playing the BfA Tortollan shell game world quest."],
-					width = 'double',
-					get = function()
-						return IceHUD.IceCore.settings.bHideDuringShellGame
-					end,
-					set = function(info, value)
-						IceHUD.IceCore.settings.bHideDuringShellGame = value
-						if not value then
-							IceHUD.IceCore.IceHUDFrame:Show()
-						end
-					end,
-					hidden = IceHUD.WowVer < 80000,
-					order = 36,
-				},
 			}
 		},
 

IceStackCounter.lua

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

IceUnitBar.lua

@@ -19,12 +19,6 @@ 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
-	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
-	SPELL_POWER_RAGE = Enum.PowerType.Rage
-end
-
 -- Constructor --
 function IceUnitBar.prototype:init(name, unit)
 	IceUnitBar.super.prototype.init(self, name)
@@ -171,7 +165,7 @@ end
 -- Creates the low amount warning frame
 function IceUnitBar.prototype:CreateFlashFrame()
 	if not (self.flashFrame) then
-		self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
+		self.flashFrame = CreateFrame("Frame", nil, self.frame)
 	end
 
 	self.flashFrame:SetFrameStrata("BACKGROUND")
@@ -221,7 +215,7 @@ end
 function IceUnitBar.prototype:Update()
 	IceUnitBar.super.prototype.Update(self)
 
-	if UnitIsTapped then
+	if IceHUD.WowVer < 70000 then
 		self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
 	else
 		self.tapped = UnitIsTapDenied(self.unit)
@@ -231,18 +225,8 @@ function IceUnitBar.prototype:Update()
 	self.maxHealth = UnitHealthMax(self.unit)
 	self.healthPercentage = self.maxHealth ~= 0 and (self.health/self.maxHealth) or 0
 
-	-- note that UnitPowerType returns 2 arguments and UnitPower[Max] accepts a third argument to get the values on a different scale
-	-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
 	self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
 	self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
-	if UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
-		self.mana = IceHUD:MathRound(self.mana / 10)
-		self.maxMana = IceHUD:MathRound(self.maxMana / 10)
-	end
-	if IceHUD.WowVer >= 70300 and UnitPowerType(self.unit) == SPELL_POWER_INSANITY then
-		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
 
 	local locClass

embeds.xml

@@ -1,5 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-<!--@non-debug@
 	<Script file="libs\LibStub\LibStub.lua"/>
 	<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
 	<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
@@ -19,5 +18,4 @@
 	<Script file="LibDataBroker-1.1.lua"/>
 	<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
 	<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
-@end-non-debug@-->
 </Ui>

modules/ArcaneCharges.lua

@@ -1,11 +1,6 @@
 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
-	SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
-end
-
 function ArcaneCharges.prototype:init()
 	ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
 

modules/CastBar.lua

@@ -4,6 +4,7 @@ local CastBar = IceCore_CreateClass(IceCastBar)
 local IceHUD = _G.IceHUD
 
 CastBar.prototype.spellCastSent = nil
+CastBar.prototype.sentSpell = nil
 
 -- Constructor --
 function CastBar.prototype:init()
@@ -313,10 +314,8 @@ end
 function CastBar.prototype:Enable(core)
 	CastBar.super.prototype.Enable(self, core)
 
-	if UnitHasVehicleUI then
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	end
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
 
 	self:RegisterEvent("CVAR_UPDATE", "CVarUpdate")
@@ -350,12 +349,10 @@ end
 
 
 function CastBar.prototype:CheckVehicle()
-	if UnitHasVehicleUI then
-		if UnitHasVehicleUI("player") then
-			self:EnteringVehicle(nil, "player", true)
-		else
-			self:ExitingVehicle(nil, "player")
-		end
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
 	end
 end
 
@@ -397,9 +394,7 @@ end
 
 
 function CastBar.prototype:CreateLagBar()
-	if self.lagBar == nil then
-		self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
-	end
+	self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
 
 	local r, g, b = self:GetColor("CastLag")
 	if (self.settings.backgroundToggle) then
@@ -412,13 +407,14 @@ end
 
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
-	CastBar.super.prototype.SpellCastSent(self, event, unit, target, castGuid, spellId)
+function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId)
+	CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target, lineId)
 	if (unit ~= self.unit) then return end
 
 	if IceHUD.WowVer < 70000 then
 		self.spellCastSent = GetTime()
 	end
+	self.sentSpell = lineId
 end
 
 -- OVERRIDE
@@ -430,18 +426,32 @@ function CastBar.prototype:SpellCastChanged(event, arg1)
 end
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
-	CastBar.super.prototype.SpellCastStart(self, event, unit, castGuid, spellId)
-	if (unit ~= self.unit or not spellId) then return end
+function CastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId)
+	CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank, lineId, spellId)
+	if (unit ~= self.unit) then return end
 
 	if not self:IsVisible() or not self.actionDuration then
 		return
 	end
 
-	self:UpdateLagBar()
-	if IceHUD.GlobalCoolDown then
-		self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
+	if self.sentSpell ~= lineId then
+		self.spellCastSent = nil
 	end
+
+	local scale
+	if self.unit == "vehicle" then
+		scale = 0
+	elseif self.useFixedLatency then
+		scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
+	else
+		local now = GetTime()
+		local lag = now - (self.spellCastSent or now)
+		scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
+	end
+
+	self:SetBarCoord(self.lagBar, scale, true, true)
+
+	self.spellCastSent = nil
 end
 
 
@@ -454,45 +464,20 @@ function CastBar.prototype:SpellCastChannelStart(event, unit)
 		return
 	end
 
-	self:UpdateLagBar(self.moduleSettings.reverseChannel)
-end
-
--- OVERRIDE
-function CastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
-	CastBar.super.prototype.SpellCastSucceeded(self, event, unit, castGuid, spellId)
-
-	if not self.actionDuration or unit ~= self.unit then
-		return
-	end
-
-	self:UpdateLagBar()
-	if IceHUD.GlobalCoolDown then
-		self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
-	end
-end
-
-
-function CastBar.prototype:UpdateLagBar(isChannel)
-	local now = GetTime()
-	if self.nextLagUpdate and now <= self.nextLagUpdate then
-		return
-	end
-
 	local scale
 	if self.unit == "vehicle" then
 		scale = 0
 	elseif self.useFixedLatency then
 		scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
 	else
+		local now = GetTime()
 		local lag = now - (self.spellCastSent or now)
-		if lag >= (self.actionDuration / 2) then
-			scale = 0
-		else
-			scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
-		end
+		scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
 	end
 
-	self:SetBarCoord(self.lagBar, scale, not isChannel, true)
+	local top = not self.moduleSettings.reverseChannel
+
+	self:SetBarCoord(self.lagBar, scale, top, true)
 
 	self.spellCastSent = nil
 end

modules/ClassPowerCounter.lua

@@ -465,9 +465,9 @@ end
 function IceClassPowerCounter.prototype:DisplayCounter()
 	self:UnregisterEvent("PLAYER_LEVEL_UP")
 
-	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
+	self:RegisterEvent("UNIT_POWER", "UpdateRunePower")
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateRunePower")
 
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
@@ -484,13 +484,8 @@ function IceClassPowerCounter.prototype:Disable(core)
 	end
 end
 
-function IceClassPowerCounter.prototype:EnteringWorld()
-	self:TargetChanged()
-	self:UpdateRunePower()
-end
-
 function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
-	if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
+	if event and (event == "UNIT_POWER" or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
 		return
 	end
 

modules/ComboPoints.lua

@@ -7,25 +7,12 @@ local AnticipationSpellId = 114015
 
 ComboPoints.prototype.comboSize = 20
 
-local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic 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)
-	self:SetDefaultColor("KyrianAnimaComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
 	self.scalingEnabled = true
 end
 
@@ -171,7 +158,7 @@ function ComboPoints.prototype:GetOptions()
 		order = 33.2
 	}
 
-	if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+	if IceHUD.WowVer < 70000 then
 		opts["anticipation"] = {
 			type = "toggle",
 			name = L["Show Anticipation"],
@@ -223,29 +210,8 @@ 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
 
@@ -264,7 +230,6 @@ function ComboPoints.prototype:GetDefaultSettings()
 	defaults["comboGap"] = 0
 	defaults["showAnticipation"] = true
 	defaults["bShowWithNoTarget"] = true
-	defaults["bShowAnimaCharged"] = true
 	return defaults
 end
 
@@ -283,20 +248,16 @@ 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 IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+	if IceHUD.WowVer >= 30000 then
+		if IceHUD.WowVer < 70000 then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
-			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
-			if IceHUD.WowVer < 80000 then
-				self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
-			end
+			self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
+			self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
 		end
-		if UnitHasVehicleUI then
-			self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
-			self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
-		end
-		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
+		if IceHUD.WowVer < 70000 then
 			self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
 			self:AddAnticipation()
 		end
@@ -304,16 +265,11 @@ 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)
@@ -326,13 +282,6 @@ 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
@@ -441,12 +390,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 		if (self.moduleSettings.gradient) then
 			g = g - ((1 / maxComboPoints)*i)
 		end
-
-		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].texture:SetVertexColor(r, g, b)
 
 		self.frame.graphical[i]:Hide()
 	end
@@ -492,24 +436,24 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 end
 
 function ComboPoints.prototype:UpdateComboPoints(...)
-	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 
 	local points, anticipate, _
 	if IceHUD.IceCore:IsInConfigMode() then
 		points = self:GetMaxComboPoints()
-	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+	elseif IceHUD.WowVer >= 30000 then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
-		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
+		local isInVehicle = UnitHasVehicleUI("player")
 		local checkUnit = isInVehicle and "vehicle" or "player"
-		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+		if IceHUD.WowVer >= 60000 then
 			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
 		else
 			points = GetComboPoints(checkUnit, "target")
 		end
 
-		if IceHUD.WowVer < 70000 and IceHUD.WowVer >= 50000 then
+		if IceHUD.WowVer < 70000 then
 			_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
 		else
 			anticipate = 0
@@ -576,12 +520,7 @@ do
 
 	function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
 		if UnitIsUnit(unit, "player") then
-			local _, _, _, newAntStacks
-			if IceHUD.WowVer < 80000 then
-				_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
-			else
-				_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
-			end
+			local _, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
 			if newAntStacks ~= antStacks then
 				antStacks = newAntStacks
 				self:UpdateComboPoints()
@@ -600,7 +539,4 @@ end
 
 
 -- Load us up
-local _, class = UnitClass("player")
-if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
-	IceHUD.ComboPoints = ComboPoints:new()
-end
+IceHUD.ComboPoints = ComboPoints:new()

modules/ComboPointsBar.lua

@@ -1,18 +1,6 @@
 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
-	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")
 
@@ -64,6 +52,7 @@ 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
@@ -76,31 +65,17 @@ 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 IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+	if IceHUD.WowVer >= 30000 then
+		if IceHUD.WowVer < 70000 then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
-			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
-		end
-		if UnitHasVehicleUI then
-			self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
-			self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
+			self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
 		end
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
 	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()
@@ -112,18 +87,18 @@ end
 local color = {}
 
 function ComboPointsBar.prototype:UpdateComboPoints(...)
-	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 
 	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 then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
-		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
+		local isInVehicle = UnitHasVehicleUI("player")
 		local checkUnit = isInVehicle and "vehicle" or "player"
-		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+		if IceHUD.WowVer >= 60000 then
 			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
 		else
 			points = GetComboPoints(checkUnit, "target")
@@ -147,14 +122,10 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
 	end
 
 	self:SetBottomText1(points or "0")
-	self:SetBottomText2(self.chargedPowerPointIndex)
 end
 
 function ComboPointsBar.prototype:Update()
 	self:UpdateComboPoints()
 end
 
-local _, class = UnitClass("player")
-if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
-	IceHUD.ComboPointsBar = ComboPointsBar:new()
-end
+IceHUD.ComboPointsBar = ComboPointsBar:new()

modules/CustomBar.lua

@@ -36,12 +36,8 @@ function IceCustomBar.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
 	self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
-	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-		self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
-	end
-	if FocusUnit then
-		self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
-	end
+	self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
+	self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
 	if self.unitClass == "SHAMAN" then
 		self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
 	end
@@ -81,10 +77,6 @@ function IceCustomBar.prototype:Disable(core)
 end
 
 function IceCustomBar.prototype:GetUnitToTrack()
-	if IceHUD.WowClassic then
-		return "player"
-	end
-
 	if self.moduleSettings.myUnit == "other" then
 		if self.moduleSettings.customUnit ~= nil and self.moduleSettings.customUnit ~= "" then
 			return self.moduleSettings.customUnit
@@ -175,6 +167,8 @@ function IceCustomBar.prototype:CreateBar()
 
 	if not self.barFrame.icon then
 		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
+		-- default texture so that 'config mode' can work without activating the bar first
+		self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
 		-- this cuts off the border around the buff icon
 		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		self.barFrame.icon:SetDrawLayer("OVERLAY")
@@ -262,53 +256,51 @@ function IceCustomBar.prototype:GetOptions()
 		order = 30.3,
 	}
 
-	if not IceHUD.WowClassic then
-		opts["unitToTrack"] = {
-			type = 'select',
-			values = validUnits,
-			name = L["Unit to track"],
-			desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
-			get = function(info)
-				return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
-			end,
-			set = function(info, v)
-				self.moduleSettings.myUnit = info.option.values[v]
-				self.unit = self:GetUnitToTrack()
-				self:RegisterFontStrings()
-				self:ConditionalSubscribe()
-				self:Redraw()
-				self:UpdateCustomBar(self.unit)
-				IceHUD:NotifyOptionsChange()
-			end,
-			disabled = function()
-				return not self.moduleSettings.enabled
-			end,
-			order = 30.4,
-		}
+	opts["unitToTrack"] = {
+		type = 'select',
+		values = validUnits,
+		name = L["Unit to track"],
+		desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
+		get = function(info)
+			return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
+		end,
+		set = function(info, v)
+			self.moduleSettings.myUnit = info.option.values[v]
+			self.unit = self:GetUnitToTrack()
+			self:RegisterFontStrings()
+			self:ConditionalSubscribe()
+			self:Redraw()
+			self:UpdateCustomBar(self.unit)
+			IceHUD:NotifyOptionsChange()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 30.4,
+	}
 
-		opts["customUnitToTrack"] = {
-			type = 'input',
-			name = L["Custom unit"],
-			desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
-			get = function()
-				return self.moduleSettings.customUnit
-			end,
-			set = function(info, v)
-				self.moduleSettings.customUnit = v
-				self.unit = self:GetUnitToTrack()
-				self:RegisterFontStrings()
-				self:ConditionalSubscribe()
-				self:Redraw()
-				self:UpdateCustomBar(self.unit)
-				IceHUD:NotifyOptionsChange()
-			end,
-			hidden = function()
-				return self.moduleSettings.myUnit ~= "other"
-			end,
-			usage = "<what custom unit to track when unitToTrack is set to 'other'>",
-			order = 30.45,
-		}
-	end
+	opts["customUnitToTrack"] = {
+		type = 'input',
+		name = L["Custom unit"],
+		desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		get = function()
+			return self.moduleSettings.customUnit
+		end,
+		set = function(info, v)
+			self.moduleSettings.customUnit = v
+			self.unit = self:GetUnitToTrack()
+			self:RegisterFontStrings()
+			self:ConditionalSubscribe()
+			self:Redraw()
+			self:UpdateCustomBar(self.unit)
+			IceHUD:NotifyOptionsChange()
+		end,
+		hidden = function()
+			return self.moduleSettings.myUnit ~= "other"
+		end,
+		usage = "<what custom unit to track when unitToTrack is set to 'other'>",
+		order = 30.45,
+	}
 
 	opts["buffOrDebuff"] = {
 		type = 'select',
@@ -641,7 +633,7 @@ end
 -- 'Protected' methods --------------------------------------------------------
 
 function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
-	if not unitName or not buffName or buffName == "" then
+	if not unitName or not buffName then
 		return nil
 	end
 
@@ -672,12 +664,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 	local remaining
 	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
-		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)
-	end
+	local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
 	local isMine = unitCaster == "player"
 	local mySpellId = tonumber(self.moduleSettings.buffToTrack)
 	local checkId = mySpellId ~= nil
@@ -703,11 +690,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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)
-		end
+		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
 		isMine = unitCaster == "player"
 	end
 
@@ -782,10 +765,6 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 		end
 
 		if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
-			if IceHUD.IceCore:IsInConfigMode() and not self.barFrame.icon:GetTexture() then
-				self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
-			end
-
 			self.barFrame.icon:Show()
 		else
 			self.barFrame.icon:Hide()

modules/CustomCDBar.lua

@@ -132,6 +132,8 @@ function IceCustomCDBar.prototype:CreateBar()
 
 	if not self.barFrame.icon then
 		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
+		-- default texture so that 'config mode' can work without activating the bar first
+		self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
 		-- this cuts off the border around the buff icon
 		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		self.barFrame.icon:SetDrawLayer("OVERLAY")
@@ -673,9 +675,6 @@ function IceCustomCDBar.prototype:UpdateIcon()
 		end
 
 		if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
-			if not self.barFrame.icon:GetTexture() and IceHUD.IceCore:IsInConfigMode() then
-				self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
-			end
 			self.barFrame.icon:Show()
 		else
 			self.barFrame.icon:Hide()
@@ -695,10 +694,7 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
 	end
 end
 
-function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
-	if unit ~= self.unit then
-		return
-	end
+function IceCustomCDBar.prototype:UpdateCustomBarEvent()
 	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 		self:UpdateCustomBar()
 	end
@@ -726,8 +722,6 @@ function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate)
 		else
 			self.cooldownEndTime = remaining + now
 		end
-
-		self:UpdateIcon()
 	end
 
 	if self.cooldownEndTime and self.cooldownEndTime >= now then
@@ -802,9 +796,7 @@ function IceCustomCDBar.prototype:IsReady()
 		local checkSpell = self:GetSpellNameOrId(self.moduleSettings.cooldownToTrack)
 
 		if (IsUsableSpell(checkSpell)) then
-			if self.moduleSettings.bIgnoreRange and self.moduleSettings.bOnlyShowWithTarget then
-				is_ready = UnitExists("target") and 1 or nil
-			elseif (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
+			if (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
 				if (UnitExists("target") and (not SpellHasRange(checkSpell) or IsSpellInRange(checkSpell, "target") == 1))
 					or (not UnitExists("target") and not self.moduleSettings.bOnlyShowWithTarget and IsSpellInRange(checkSpell, "player")) then
 					is_ready = 1

modules/CustomCount.lua

@@ -122,7 +122,7 @@ function IceCustomCount.prototype:GetOptions()
 			self.moduleSettings.vpos = v
 			self:Redraw()
 		end,
-		min = -700,
+		min = -400,
 		max = 700,
 		step = 1,
 		disabled = function()

modules/CustomCounterBar.lua

@@ -278,6 +278,7 @@ function IceCustomCounterBar.prototype:CreateFrame()
 
 	if not self.barFrame.icon then
 		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
+		self.barFrame.icon:SetTexture(DefaultAuraIcon)
 		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		self.barFrame.icon:SetDrawLayer("OVERLAY")
 		self.barFrame.icon:Hide()
@@ -305,6 +306,10 @@ function IceCustomCounterBar.prototype:UpdateAuraIcon()
 	local auraIcon, _
 	_, _, auraIcon = GetSpellInfo(self.moduleSettings.auraName)
 
+	if auraIcon == nil then
+		auraIcon = "Interface\\Icons\\Spell_Frost_Frost"
+	end
+
 	self.barFrame.icon:SetTexture(auraIcon)
 end
 
@@ -314,10 +319,6 @@ function IceCustomCounterBar.prototype:UpdateCustomCount()
 	local percent = IceHUD:Clamp(1.0 * points / (max > 0 and max or 1), 0, 1)
 
 	if IceHUD.IceCore:IsInConfigMode() then
-		if not self.barFrame.icon:GetTexture() then
-			self.barFrame.icon:SetTexture(DefaultAuraIcon)
-		end
-
 		points = IceStackCounter_GetMaxCount(self)
 		percent = 1
 		self.barFrame.icon:Show()

modules/EclipseBar.lua

@@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
 end
 
 function EclipseBar.prototype:CreateSolarBar()
-	self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
+	self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK")
 	self:SetBarCoord(self.solarBar, 0.5, true)
 
 	self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))

modules/FocusAbsorb.lua

@@ -26,6 +26,4 @@ function FocusAbsorb.prototype:MyUnregisterCustomEvents()
 end
 
 -- Load us up
-if UnitGetTotalAbsorbs ~= nil then
-	IceHUD.FocusAbsorb = FocusAbsorb:new()
-end
+IceHUD.FocusAbsorb = FocusAbsorb:new()

modules/FocusCC.lua

@@ -23,6 +23,4 @@ end
 -- 'Protected' methods --------------------------------------------------------
 
 -- Load us up
-if FocusUnit then
-	IceHUD.FocusCC = FocusCC:new()
-end
+IceHUD.FocusCC = FocusCC:new()

modules/FocusCast.lua

@@ -112,6 +112,4 @@ end
 
 
 -- Load us up
-if FocusUnit then
-	IceHUD.FocusCast = FocusCast:new()
-end
+IceHUD.FocusCast = FocusCast:new()

modules/FocusHealth.lua

@@ -471,6 +471,4 @@ function FocusHealth.prototype:HideBlizz()
 end
 
 -- Load us up
-if FocusUnit then
-	IceHUD.FocusHealth = FocusHealth:new()
-end
+IceHUD.FocusHealth = FocusHealth:new()

modules/FocusMana.lua

@@ -1,14 +1,6 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 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
-	SPELL_POWER_RAGE = Enum.PowerType.Rage
-	SPELL_POWER_FOCUS = Enum.PowerType.Focus
-	SPELL_POWER_ENERGY = Enum.PowerType.Energy
-end
 
 -- Constructor --
 function FocusMana.prototype:init()
@@ -40,10 +32,8 @@ function FocusMana.prototype:Enable(core)
 	FocusMana.super.prototype.Enable(self, core)
 
 	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 then
-			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
-		end
+		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 	else
 		self:RegisterEvent("UNIT_MANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
@@ -136,6 +126,4 @@ end
 
 
 -- Load us up
-if FocusUnit then
-	IceHUD.FocusMana = FocusMana:new()
-end
+IceHUD.FocusMana = FocusMana:new()

modules/FocusThreat.lua

@@ -16,6 +16,4 @@ function IceFocusThreat.prototype:GetDefaultSettings()
 end
 
 -- Load us up
-if FocusUnit then
-	IceHUD.IceFocusThreat = IceFocusThreat:new()
-end
+IceHUD.IceFocusThreat = IceFocusThreat:new()

modules/GlobalCoolDown.lua

@@ -20,7 +20,7 @@ function GlobalCoolDown.prototype:Enable(core)
 		self.moduleSettings.inverse = "NORMAL"
 	end
 
-	self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
+	self:RegisterEvent("UNIT_SPELLCAST_SENT","SpellCastSent")
 
 	--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
 	self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
@@ -143,16 +143,20 @@ function GlobalCoolDown.prototype:IsFull(scale)
 	return false
 end
 
-function GlobalCoolDown.prototype:SpellCastChanged(event, cancelled)
-	self.spellCastSent = GetTime()
-end
-
-function GlobalCoolDown.prototype:SpellCastStop(event, unit, castGuid, spellId)
-	if unit ~= "player" or not spellId or not self.CurrSpellGuid or self.CurrSpellGuid ~= castGuid then
+function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
+	if unit ~= "player" or not spell then
 		return
 	end
 
-	self.CurrSpellGuid = nil
+	self.spellCastSent = GetTime()
+end
+
+function GlobalCoolDown.prototype:SpellCastStop(event, unit, spell, _, _, spellId)
+	if unit ~= "player" or not spellId or not self.CurrSpellId or self.CurrSpellId ~= spellId then
+		return
+	end
+
+	self.CurrSpellId = nil
 
 	if event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED" then
 		self.CurrLerpTime = self.moduleSettings.desiredLerpTime
@@ -178,19 +182,19 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
 	end
 end
 
-function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, castGuid, spellId)
+function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, _, _, spellId)
 	if unit ~= "player" or not spellId then
 		return
 	end
 
 	-- Ignore all events unrelated to the spell currently being cast
-	if self.CurrSpellGuid and self.CurrSpellGuid ~= castGuid then
+	if self.CurrSpellId and self.CurrSpellId ~= spellId then
 		return
 	end
 
 	-- Update the current spell ID for all events indicating a spellcast is starting
 	if event ~= "UNIT_SPELLCAST_SUCCEEDED" then
-		self.CurrSpellGuid = castGuid
+		self.CurrSpellId = spellId
 	end
 
 	local start, dur = GetSpellCooldown(self.CDSpellId)
@@ -255,7 +259,7 @@ function GlobalCoolDown.prototype:CreateFrame()
 end
 
 function GlobalCoolDown.prototype:CreateLagBar()
-	self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
+	self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY")
 
 	local r, g, b = self:GetColor("CastLag")
 	if (self.settings.backgroundToggle) then
@@ -291,6 +295,4 @@ function GlobalCoolDown.prototype:GetSpellId()
 end
 
 -- Load us up
-if not IceHUD.WowClassic then
-	IceHUD.GlobalCoolDown = GlobalCoolDown:new()
-end
+IceHUD.GlobalCoolDown = GlobalCoolDown:new()

modules/HarmonyPower.lua

@@ -1,15 +1,10 @@
 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
-	SPELL_POWER_CHI = Enum.PowerType.Chi
-end
-
 function HarmonyPower.prototype:init()
-	HarmonyPower.super.prototype.init(self, "Chi")
+	HarmonyPower.super.prototype.init(self, "HarmonyPower")
 
-	self:SetDefaultColor("ChiNumeric", 218, 231, 31)
+	self:SetDefaultColor("HarmonyPowerNumeric", 218, 231, 31)
 
 	-- pulled from MonkHarmonyBar.xml in Blizzard's UI source
 	self.runeCoords =
@@ -22,7 +17,7 @@ function HarmonyPower.prototype:init()
 		{0.00390625, 0.08593750, 0.71093750, 0.87500000},
 	}
 	self.numRunes = 4
-	self.numericColor = "ChiNumeric"
+	self.numericColor = "HarmonyPowerNumeric"
 	if IceHUD.WowVer >= 50100 then
 		self.unitPower = SPELL_POWER_CHI
 	else

modules/HolyPower.lua

@@ -1,11 +1,6 @@
 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
-	SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
-end
-
 function HolyPower.prototype:init()
 	HolyPower.super.prototype.init(self, "HolyPower")
 
@@ -32,7 +27,7 @@ function HolyPower.prototype:init()
 	self.numericColor = "HolyPowerNumeric"
 	self.unitPower = SPELL_POWER_HOLY_POWER
 	self.minLevel = PALADINPOWERBAR_SHOW_LEVEL
-	if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 90000 then
+	if IceHUD.WowVer >= 70000 then
 		self.requiredSpec = SPEC_PALADIN_RETRIBUTION
 	end
 	self.bTreatEmptyAsFull = true

modules/MirrorBar.lua

@@ -280,8 +280,8 @@ function MirrorBarHandler.prototype:GetOptions()
 		type='range',
 		name = L["Bar vertical offset"],
 		desc = L["Adjust the vertical placement of this bar"],
-		min = -600,
-		max = 600,
+		min = -400,
+		max = 400,
 		step = 1,
 		get = function()
 			return self.moduleSettings.barVerticalOffset

modules/PetHealth.lua

@@ -42,23 +42,16 @@ 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
-		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
-	end
-	self:RegisterEvent("PET_BAR_UPDATE_USABLE", "CheckPet");
+	self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
+	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
 	self:RegisterEvent("UNIT_PET", "CheckPet");
 
 	self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
-	if IceHUD.WowVer < 90000 then
-		self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
-	end
 	self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
 
-	if UnitHasVehicleUI then
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	end
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
 
 	self.frame:SetAttribute("unit", self.unit)
 	RegisterUnitWatch(self.frame)
@@ -224,16 +217,11 @@ function PetHealth.prototype:ExitingVehicle(event, unit)
 	end
 end
 
-function PetHealth.prototype:EnteringWorld()
-	self:TargetChanged()
-	self:Update(self.unit)
-
-	if UnitHasVehicleUI then
-		if UnitHasVehicleUI("player") then
-			self:EnteringVehicle(nil, "player", true)
-		else
-			self:ExitingVehicle(nil, "player")
-		end
+function PetHealth.prototype:CheckVehicle()
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
 	end
 end
 

modules/PetMana.lua

@@ -1,17 +1,6 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local PetMana = IceCore_CreateClass(IceUnitBar)
 
-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
-	SPELL_POWER_RAGE = Enum.PowerType.Rage
-	SPELL_POWER_FOCUS = Enum.PowerType.Focus
-	SPELL_POWER_ENERGY = Enum.PowerType.Energy
-	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
-end
-
 -- Constructor --
 function PetMana.prototype:init()
 	PetMana.super.prototype.init(self, "PetMana", "pet")
@@ -62,17 +51,13 @@ 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
-		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("PLAYER_PET_CHANGED", "CheckPet")
+	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
 	self:RegisterEvent("UNIT_PET", "CheckPet")
 
-	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
-		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
-		end
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 	else
 		self:RegisterEvent("UNIT_MANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
@@ -86,11 +71,9 @@ function PetMana.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "ManaType")
 
-	if UnitHasVehicleUI then
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	end
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
 
 	self:CheckPet()
 	self:ManaType(nil, self.unit)
@@ -241,16 +224,11 @@ function PetMana.prototype:ExitingVehicle(event, unit)
 	end
 end
 
-function PetMana.prototype:EnteringWorld()
-	self:TargetChanged()
-	self:Update(self.unit)
-
-	if UnitHasVehicleUI then
-		if UnitHasVehicleUI("player") then
-			self:EnteringVehicle(nil, "player", true)
-		else
-			self:ExitingVehicle(nil, "player")
-		end
+function PetMana.prototype:CheckVehicle()
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
 	end
 end
 

modules/PlayerAbsorb.lua

@@ -19,6 +19,4 @@ function PlayerAbsorb.prototype:GetDefaultSettings()
 end
 
 -- Load us up
-if UnitGetTotalAbsorbs ~= nil then
-	IceHUD.PlayerAbsorb = PlayerAbsorb:new()
-end
+IceHUD.PlayerAbsorb = PlayerAbsorb:new()

modules/PlayerAltMana.lua

@@ -6,13 +6,6 @@ PlayerAltMana.prototype.PlayerAltManaMax = nil
 
 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
-	SPELL_POWER_MANA = Enum.PowerType.Mana
-	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
-end
-
 -- Constructor --
 function PlayerAltMana.prototype:init()
 	PlayerAltMana.super.prototype.init(self, "PlayerAltMana", "player")
@@ -83,7 +76,6 @@ function PlayerAltMana.prototype:Update()
 
 	self.PlayerAltMana = UnitPower(self.unit, SPELL_POWER_MANA)
 	self.PlayerAltManaMax = UnitPowerMax(self.unit, SPELL_POWER_MANA)
-	self.PlayerAltManaPercentage = self.PlayerAltManaMax ~= 0 and (self.PlayerAltMana/self.PlayerAltManaMax) or 0
 
 	if (not self.alive or not ShouldShow(self.unit) or not self.PlayerAltMana or not self.PlayerAltManaMax or self.PlayerAltManaMax == 0) then
 		self:Show(false)
@@ -92,16 +84,6 @@ function PlayerAltMana.prototype:Update()
 		self:Show(true)
 	end
 
-	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
-		self:SetBottomText1(math.floor(self.PlayerAltManaPercentage * 100))
-
-		if (self.PlayerAltManaMax ~= 100) then
-			self:SetBottomText2(self:GetFormattedText(self:Round(self.PlayerAltMana), self:Round(self.PlayerAltManaMax)), "PlayerMana")
-		else
-			self:SetBottomText2()
-		end
-	end
-
 	self:UpdateBar(self.PlayerAltManaMax ~= 0 and self.PlayerAltMana / self.PlayerAltManaMax or 0, "PlayerAltMana")
 end
 

modules/PlayerAlternatePower.lua

@@ -28,10 +28,8 @@ end
 function IceHUDPlayerAlternatePower.prototype:Enable(core)
 	IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
 
-	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-	if IceHUD.WowVer < 80000 then
-		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
-	end
+	self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+	self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 	self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
 	self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
 
@@ -132,6 +130,4 @@ function IceHUDPlayerAlternatePower.prototype:HideBlizz()
 end
 
 -- Load us up
-if ALTERNATE_POWER_INDEX then
-	IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
-end
+IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()

modules/PlayerHealth.lua

@@ -68,9 +68,6 @@ function PlayerHealth.prototype:Enable(core)
 	PlayerHealth.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
-	if IceHUD.WowVer < 90000 then
-		self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
-	end
 	self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
 
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
@@ -81,16 +78,14 @@ 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.WowVer >= 50000 then
 		self:RegisterEvent("GROUP_ROSTER_UPDATE", "CheckLeader")
 	else
 		self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckLeader")
 	end
-	if GetLFGProposal then
-		self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
-		self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
-		self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
-	end
+	self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
+	self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
+	self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
 
 	--self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckPartyFrameStatus")
 
@@ -100,10 +95,8 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
 	self:RegisterEvent("UNIT_FACTION", "CheckPvP")
 
-	if UnitHasVehicleUI then
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	end
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 
 	if IceHUD.WowVer < 40000 then
 		HealComm = LibStub("LibHealComm-4.0", true)
@@ -118,9 +111,7 @@ function PlayerHealth.prototype:Enable(core)
 		self:RegisterEvent("UNIT_HEAL_PREDICTION", "IncomingHealPrediction")
 	end
 
-	if UnitGetTotalAbsorbs then
-		self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
-	end
+	self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
 
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
@@ -936,7 +927,7 @@ function PlayerHealth.prototype:CreateBackground(redraw)
 end
 
 function PlayerHealth.prototype:CreateHealBar()
-	self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND", "Heal")
+	self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND")
 
 	self.healFrame.bar:SetVertexColor(self:GetColor("PlayerHealthHealAmount", self.alpha * self.moduleSettings.healAlpha))
 
@@ -948,7 +939,7 @@ function PlayerHealth.prototype:CreateHealBar()
 end
 
 function PlayerHealth.prototype:CreateAbsorbBar()
-	self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND", "Absorb")
+	self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND")
 
 	self.absorbFrame.bar:SetVertexColor(self:GetColor("PlayerHealthAbsorbAmount", self.alpha * self.moduleSettings.absorbAlpha))
 
@@ -1003,12 +994,10 @@ function PlayerHealth.prototype:EnteringWorld()
 end
 
 function PlayerHealth.prototype:CheckVehicle()
-	if UnitHasVehicleUI then
-		if UnitHasVehicleUI("player") then
-			self:EnteringVehicle(nil, "player", true)
-		else
-			self:ExitingVehicle(nil, "player")
-		end
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
 	end
 end
 
@@ -1171,7 +1160,7 @@ end
 
 function PlayerHealth.prototype:CheckLeader()
 	local isLeader
-	if UnitIsGroupLeader then
+	if IceHUD.WowVer >= 50000 then
 		isLeader = UnitIsGroupLeader("player")
 	else
 		isLeader = IsPartyLeader()

modules/PlayerMana.lua

@@ -3,29 +3,6 @@ local PlayerMana = IceCore_CreateClass(IceUnitBar)
 
 local IceHUD = _G.IceHUD
 
-local SPELL_POWER_MANA = SPELL_POWER_MANA
-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
-local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
-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
-	SPELL_POWER_MANA = Enum.PowerType.Mana
-	SPELL_POWER_RAGE = Enum.PowerType.Rage
-	SPELL_POWER_FOCUS = Enum.PowerType.Focus
-	SPELL_POWER_ENERGY = Enum.PowerType.Energy
-	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
-	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
-	SPELL_POWER_FURY = Enum.PowerType.Fury
-	SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
-	SPELL_POWER_PAIN = Enum.PowerType.Pain
-	SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
-end
-
 PlayerMana.prototype.manaType = nil
 PlayerMana.prototype.tickStart = nil
 PlayerMana.prototype.previousEnergy = nil
@@ -41,9 +18,9 @@ function PlayerMana.prototype:init()
 	self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
 	if IceHUD.WowVer >= 70000 then
 		self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
-		self:SetDefaultColor("PlayerFury", 201, 66, 253)
+		self:SetDefaultColor("PlayerFury", 255, 50, 255)
 		self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
-		self:SetDefaultColor("PlayerPain", 255, 156, 0)
+		self:SetDefaultColor("PlayerPain", 255, 50, 255)
 	end
 end
 
@@ -153,11 +130,9 @@ function PlayerMana.prototype:Enable(core)
 
 	self:CreateTickerFrame()
 
-	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
-		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
-		end
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 	else
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -170,10 +145,8 @@ function PlayerMana.prototype:Enable(core)
 		self:RegisterEvent("UNIT_RUNIC_POWER", "UpdateEvent")
 	end
 
-	if UnitHasVehicleUI then
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	end
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 
 	if not self.CustomOnUpdate then
@@ -193,12 +166,10 @@ function PlayerMana.prototype:EnteringWorld()
 end
 
 function PlayerMana.prototype:CheckVehicle()
-	if UnitHasVehicleUI then
-		if UnitHasVehicleUI("player") then
-			self:EnteringVehicle(nil, "player", true)
-		else
-			self:ExitingVehicle(nil, "player")
-		end
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
 	end
 end
 
@@ -300,14 +271,6 @@ function PlayerMana.prototype:TreatEmptyAsFull()
 		or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_PAIN or self.manaType == SPELL_POWER_MAELSTROM))
 end
 
-function PlayerMana.prototype:IsFull(scale)
-	if IceHUD.WowVer >= 80000 and self.manaType == SPELL_POWER_LUNAR_POWER and IsPlayerSpell(202430) then
-		return scale - 0.5 >= 0
-	end
-
-	return PlayerMana.super.prototype.IsFull(self, scale)
-end
-
 function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
 	self:Update(unit, powertype)
 end
@@ -387,7 +350,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) then
 			displayPercentage = self.mana
 		else
 			displayPercentage = math.floor(displayPercentage * 100)
@@ -419,17 +382,17 @@ function PlayerMana.prototype:UpdateEnergy(event, unit)
 		return
 	end
 
-	if self:ShouldUseTicker() and
-		((not (self.previousEnergy) or (self.previousEnergy < UnitPower(self.unit, UnitPowerType(self.unit)))) and
-		(self.moduleSettings.tickerEnabled) and self.manaType == SPELL_POWER_ENERGY) then
-			self.tickStart = GetTime()
-			self.tickerFrame:Show()
-	end
-
 	self.previousEnergy = UnitPower(self.unit, UnitPowerType(self.unit))
 	if IceHUD.WowVer < 40000 then
 		self:Update(unit)
 	end
+
+	if self:ShouldUseTicker() and
+		((not (self.previousEnergy) or (self.previousEnergy <= UnitPower(self.unit, UnitPowerType(self.unit)))) and
+		(self.moduleSettings.tickerEnabled) and self.manaType == SPELL_POWER_ENERGY) then
+			self.tickStart = GetTime()
+			self.tickerFrame:Show()
+	end
 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(15, UnitAura(self.unit, spellName)) or 0
 
 		self:Update()
 	end

modules/RollTheBones.lua

@@ -9,8 +9,6 @@ local maxComboPoints = 5
 local rtbEndTime = 0
 local rtbDuration = 0
 local rtbCount = 0
-local sixComboPointsTalentID = 19240
-local behaviorDependsOnComboPoints = IceHUD.WowVer < 90000
 
 local CurrMaxRtBDuration = 0
 local PotentialRtBDuration = 0
@@ -21,11 +19,6 @@ for _, v in ipairs(RtBBuffs) do
   RtBSet[v] = true
 end
 
-local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
-  SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
-end
-
 -- Constructor --
 function RollTheBones.prototype:init()
   RollTheBones.super.prototype.init(self, "RollTheBones", "player")
@@ -35,14 +28,10 @@ function RollTheBones.prototype:init()
   self.moduleSettings.shouldAnimate = false
 
   self:SetDefaultColor("RollTheBones", 1, 0.6, 0.2)
-  if behaviorDependsOnComboPoints then
-    self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
-    self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
-    self:SetDefaultColor("RollTheBones4", 0.4, 1, 0.2)
-    self:SetDefaultColor("RollTheBones5", 0.1, 1, 0.7)
-    self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
-    self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
-  end
+  self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
+  self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
+  self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
+  self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
 
   self.bTreatEmptyAsFull = true
 end
@@ -54,10 +43,7 @@ function RollTheBones.prototype:Enable(core)
   RollTheBones.super.prototype.Enable(self, core)
 
   self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
-
-  if behaviorDependsOnComboPoints then
-    self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
-  end
+  self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
 
   if not self.moduleSettings.alwaysFullAlpha then
     self:Show(false)
@@ -73,7 +59,7 @@ function RollTheBones.prototype:Disable(core)
 end
 
 function RollTheBones.prototype:ComboPointsChanged(...)
-  if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+  if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
     return
   end
 
@@ -113,60 +99,41 @@ function RollTheBones.prototype:GetOptions()
   opts["textSettings"].args["upperTextString"]["desc"] = "The text to display under this bar. # will be replaced with the number of Roll the Bones seconds remaining."
   opts["textSettings"].args["upperTextString"].hidden = false
 
-  if behaviorDependsOnComboPoints then
-    opts["showAsPercentOfMax"] =
-    {
-      type = 'toggle',
-      name = L["Show bar as % of maximum"],
-      desc = L["If this is checked, then the RtB buff time shows as a percent of the maximum attainable (taking set bonuses and talents into account). Otherwise, the bar always goes from full to empty when applying RtB no matter the duration."],
-      get = function()
-        return self.moduleSettings.showAsPercentOfMax
-      end,
-      set = function(info, v)
-        self.moduleSettings.showAsPercentOfMax = v
-      end,
-      disabled = function()
-        return not self.moduleSettings.enabled
-      end
-    }
+  opts["showAsPercentOfMax"] =
+  {
+    type = 'toggle',
+    name = L["Show bar as % of maximum"],
+    desc = L["If this is checked, then the RtB buff time shows as a percent of the maximum attainable (taking set bonuses and talents into account). Otherwise, the bar always goes from full to empty when applying RtB no matter the duration."],
+    get = function()
+      return self.moduleSettings.showAsPercentOfMax
+    end,
+    set = function(info, v)
+      self.moduleSettings.showAsPercentOfMax = v
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end
+  }
 
-    opts["durationAlpha"] =
-    {
-      type = "range",
-      name = L["Potential RtB time bar alpha"],
-      desc = L["What alpha value to use for the bar that displays how long your RtB will last if you activate it. (This gets multiplied by the bar's current alpha to stay in line with the bar on top of it)"],
-      min = 0,
-      max = 100,
-      step = 5,
-      get = function()
-        return self.moduleSettings.durationAlpha * 100
-      end,
-      set = function(info, v)
-        self.moduleSettings.durationAlpha = v / 100.0
-        self:Redraw()
-      end,
-      disabled = function()
-        return not self.moduleSettings.enabled
-      end
-    }
-
-    opts["bUseMultipleBuffColors"] =
-    {
-      type = 'toggle',
-      name = L["Use multiple buff colors"],
-      desc = L["If this is checked, then the bar uses different colors depending on how many RtB buffs you have"],
-      get = function()
-        return self.moduleSettings.bUseMultipleBuffColors
-      end,
-      set = function(info, v)
-        self.moduleSettings.bUseMultipleBuffColors = v
-        self:Redraw()
-      end,
-      disabled = function()
-        return not self.moduleSettings.enabled
-      end,
-    }
-  end
+  opts["durationAlpha"] =
+  {
+    type = "range",
+    name = L["Potential RtB time bar alpha"],
+    desc = L["What alpha value to use for the bar that displays how long your RtB will last if you activate it. (This gets multiplied by the bar's current alpha to stay in line with the bar on top of it)"],
+    min = 0,
+    max = 100,
+    step = 5,
+    get = function()
+      return self.moduleSettings.durationAlpha * 100
+    end,
+    set = function(info, v)
+      self.moduleSettings.durationAlpha = v / 100.0
+      self:Redraw()
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end
+  }
 
   opts["bShowWithNoTarget"] =
   {
@@ -185,6 +152,23 @@ function RollTheBones.prototype:GetOptions()
     end,
   }
 
+  opts["bUseMultipleBuffColors"] =
+  {
+    type = 'toggle',
+    name = L["Use multiple buff colors"],
+    desc = L["If this is checked, then the bar uses different colors depending on how many RtB buffs you have"],
+    get = function()
+      return self.moduleSettings.bUseMultipleBuffColors
+    end,
+    set = function(info, v)
+      self.moduleSettings.bUseMultipleBuffColors = v
+      self:Redraw()
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end,
+  }
+
   return opts
 end
 
@@ -195,11 +179,7 @@ function RollTheBones.prototype:CreateFrame()
 end
 
 function RollTheBones.prototype:CreateDurationBar()
-  if not behaviorDependsOnComboPoints then
-    return
-  end
-
-  self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
+  self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
 
   -- Rokiyo: Do we need to call this here?
   self.CurrScale = 0
@@ -217,9 +197,7 @@ end
 function RollTheBones.prototype:RotateHorizontal()
   RollTheBones.super.prototype.RotateHorizontal(self)
 
-  if self.durationFrame then
-    self:RotateFrame(self.durationFrame)
-  end
+  self:RotateFrame(self.durationFrame)
 end
 
 function RollTheBones.prototype:ResetRotation()
@@ -234,12 +212,8 @@ end
 
 function RollTheBones.prototype:GetBuffDuration(unitName, ids)
   local i = 1
-  local buff, _, type, duration, endTime, spellId
-  if IceHUD.WowVer < 80000 then
-    buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
-  else
-    buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
-  end
+  local buff, rank, texture, type, duration, endTime, remaining, spellId
+  buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
 
   local realDuration, remaining, count
   local now = GetTime()
@@ -256,11 +230,7 @@ function RollTheBones.prototype:GetBuffDuration(unitName, ids)
 
     i = i + 1;
 
-    if IceHUD.WowVer < 80000 then
-      buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
-    else
-      buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
-    end
+    buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
 
   end
 
@@ -323,7 +293,7 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
     if not remaining then
       remaining = rtbEndTime - now
     end
-    local denominator = ((self.moduleSettings.showAsPercentOfMax and behaviorDependsOnComboPoints) and CurrMaxRtBDuration or rtbDuration)
+    local denominator = (self.moduleSettings.showAsPercentOfMax and CurrMaxRtBDuration or rtbDuration)
     self:UpdateBar(denominator ~= 0 and remaining / denominator or 0, self:GetColorName(rtbCount))
   else
     self:UpdateBar(0, "RollTheBones")
@@ -341,13 +311,13 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
 
   -- somewhat redundant, but we also need to check potential remaining time
   if (remaining ~= nil) or PotentialRtBDuration > 0 then
-    local potText = behaviorDependsOnComboPoints and " (" .. PotentialRtBDuration .. ")" or ""
+    local potText = " (" .. PotentialRtBDuration .. ")"
     self:SetBottomText1(self.moduleSettings.upperText .. tostring(floor(remaining or 0)) .. (self.moduleSettings.durationAlpha ~= 0 and potText or ""))
   end
 end
 
 function RollTheBones.prototype:GetColorName(count)
-  if behaviorDependsOnComboPoints and self.moduleSettings.bUseMultipleBuffColors and count >= 2 then
+  if self.moduleSettings.bUseMultipleBuffColors and count >= 2 then
     return "RollTheBones"..count
   else
     return "RollTheBones"
@@ -367,17 +337,13 @@ function RollTheBones.prototype:TargetChanged()
 end
 
 function RollTheBones.prototype:UpdateDurationBar(event, unit)
-  if not self.durationFrame then
-    return
-  end
-
   if unit and unit ~= self.unit then
     return
   end
 
   local points = RTBGetComboPoints(self.unit)
   -- check for Deeper Stratagem
-  local _, _, _, DeeperStratagem = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
+  local _, _, _, DeeperStratagem = GetTalentInfo(3, 1, 1)
 
   if DeeperStratagem then
     -- first, set the cached upper limit of RtB duration

modules/Runes.lua

@@ -4,21 +4,21 @@ local Runes = IceCore_CreateClass(IceElement)
 local IceHUD = _G.IceHUD
 
 local CooldownFrame_SetTimer = CooldownFrame_SetTimer
-if CooldownFrame_Set then
+if IceHUD.WowVer >= 70000 then
 	CooldownFrame_SetTimer = CooldownFrame_Set
 end
 
+-- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
+--Readability == win
 local RUNETYPE_BLOOD = 1;
-local RUNETYPE_DEATH = IceHUD.WowVer < 70300 and 2 or 3;
-local RUNETYPE_FROST = IceHUD.WowVer < 70300 and 3 or 2;
+local RUNETYPE_DEATH = 2;
+local RUNETYPE_FROST = 3;
 local RUNETYPE_CHROMATIC = 4;
 local RUNETYPE_LEGION = 5; -- not real, but makes for an easy update
 
 local GetRuneType = GetRuneType
-if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 70300 then
+if IceHUD.WowVer >= 70000 then
 	GetRuneType = function() return RUNETYPE_LEGION end
-elseif IceHUD.WowVer >= 70300 then
-	GetRuneType = function() return GetSpecialization() end
 end
 
 local RUNEMODE_DEFAULT = "Blizzard"
@@ -43,22 +43,15 @@ Runes.prototype.numRunes = 6
 
 Runes.prototype.lastRuneState = {}
 
-local SPELL_POWER_RUNES = SPELL_POWER_RUNES
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
-	SPELL_POWER_RUNES = Enum.PowerType.Runes
-end
-
 -- Constructor --
 function Runes.prototype:init()
 	Runes.super.prototype.init(self, "Runes")
 
-	if IceHUD.WowVer < 70000 or IceHUD.WowVer >= 70300 then
+	if IceHUD.WowVer < 70000 then
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_BLOOD], 255, 0, 0)
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_DEATH], 0, 207, 0)
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_FROST], 0, 255, 255)
-		if IceHUD.WowVer < 70300 then
-			self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
-		end
+		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
 	else
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_LEGION], 204, 204, 255)
 	end
@@ -275,14 +268,9 @@ function Runes.prototype:Enable(core)
 
 	Runes.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("RUNE_POWER_UPDATE", "ResetRuneAvailability")
-	if IceHUD.WowVer < 80000 then
-		self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
-	end
-	if IceHUD.WowVer >= 70300 then
-		self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdateRuneColors")
-	end
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
+	self:RegisterEvent("RUNE_POWER_UPDATE", "UpdateRunePower")
+	self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
 	self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
 
 	if (self.moduleSettings.hideBlizz) then
@@ -290,11 +278,6 @@ function Runes.prototype:Enable(core)
 	end
 end
 
-function Runes.prototype:EnteringWorld()
-	self:TargetChanged()
-	self:ResetRuneAvailability()
-end
-
 function Runes.prototype:Disable(core)
 	Runes.super.prototype.Disable(self, core)
 
@@ -317,17 +300,16 @@ function Runes.prototype:CheckMaxNumRunes(event, unit, powerType)
 	end
 end
 
-function Runes.prototype:ResetRuneAvailability(event)
+function Runes.prototype:ResetRuneAvailability()
 	for i=1, self.numRunes do
-		self:UpdateRunePower(event, i, not event)
+		self:UpdateRunePower(nil, i, true)
 	end
-
 	self:Redraw()
 end
 
 -- simply shows/hides the foreground rune when it becomes usable/unusable. this allows the background transparent rune to show only
 function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
-	if rune and (not self.frame.graphical or #self.frame.graphical < rune) then
+	if not rune or not self.frame.graphical or #self.frame.graphical < rune then
 		return
 	end
 
@@ -341,9 +323,27 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 	local lastState = self.lastRuneState[rune]
 	self.lastRuneState[rune] = usable
 
---	if lastState == usable then
---		return
---	end
+	if self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
+		if lastState == usable then
+			return
+		end
+
+		if usable then
+			for i=1,self.numRunes do
+				if self.frame.graphical[i]:GetAlpha() == 0 then
+					rune = i
+					break
+				end
+			end
+		else
+			for i=1,self.numRunes do
+				if self.frame.graphical[i]:GetAlpha() == 0 then
+					break
+				end
+				rune = i
+			end
+		end
+	end
 
 --	print("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
 
@@ -357,13 +357,12 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 			self.frame.graphical[rune]:SetAlpha(1)
 		end
 
-		if not dontFlash and lastState ~= usable then
+		if not dontFlash then
 			local fadeInfo={
 				mode = "IN",
-				timeToFade = 0.25,
-				finishedFunc = Runes.prototype.ShineFinished,
-				finishedArg1 = self,
-				finishedArg2 = rune
+				timeToFade = 0.5,
+				finishedFunc = function(rune) self:ShineFinished(rune) end,
+				finishedArg1 = rune
 			}
 			UIFrameFade(self.frame.graphical[rune].shine, fadeInfo);
 		end
@@ -381,6 +380,8 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 			self.frame.graphical[rune]:SetAlpha(0.2)
 		end
 	end
+
+	self:Redraw()
 end
 
 function Runes.prototype:GetNumRunesAvailable()
@@ -417,17 +418,7 @@ function Runes.prototype:UpdateRuneType(event, rune)
 	self.frame.graphical[rune].rune:SetVertexColor(self:GetColor("Runes"..thisRuneName))
 end
 
-function Runes.prototype:UpdateRuneColors()
-	for i=1,self.numRunes do
-		self:UpdateRuneType(nil, i)
-	end
-end
-
 function Runes.prototype:GetRuneTexture(runeName)
-	if IceHUD.WowVer >= 70300 then
-		runeName = self.runeNames[RUNETYPE_LEGION]
-	end
-
 	if self.moduleSettings.runeMode == RUNEMODE_DEFAULT and runeName then
 		return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
 	elseif self.moduleSettings.runeMode == RUNEMODE_BAR then
@@ -564,7 +555,13 @@ function Runes.prototype:ShowBlizz()
 	RuneFrame:Show()
 
 	RuneFrame:GetScript("OnLoad")(RuneFrame)
-	RuneFrame:GetScript("OnEvent")(RuneFrame, "PLAYER_ENTERING_WORLD")
+	RuneFrame:GetScript("OnEvent")(frame, "PLAYER_ENTERING_WORLD")
+	for i=1, self.numRunes do
+		local frame = _G["RuneButtonIndividual"..i]
+		if frame then
+			frame:GetScript("OnLoad")(frame)
+		end
+	end
 end
 
 local function hook_playerframe()

modules/Shards.lua

@@ -3,26 +3,14 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
 
 local CurrentSpec = nil
 
-local AfflictionCoords
-if IceHUD.WowVer < 70200 then
-	AfflictionCoords =
-	{
-		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-	}
-else
-	AfflictionCoords =
-	{
-		{0, 1, 0, 1},
-		{0, 1, 0, 1},
-		{0, 1, 0, 1},
-		{0, 1, 0, 1},
-		{0, 1, 0, 1},
-	}
-end
+local AfflictionCoords =
+{
+	{0.01562500, 0.28125000, 0.00781250, 0.13281250},
+	{0.01562500, 0.28125000, 0.00781250, 0.13281250},
+	{0.01562500, 0.28125000, 0.00781250, 0.13281250},
+	{0.01562500, 0.28125000, 0.00781250, 0.13281250},
+	{0.01562500, 0.28125000, 0.00781250, 0.13281250},
+}
 
 local DestructionCoords =
 {
@@ -37,11 +25,6 @@ local DemonologyCoords =
 	{0.03906250, 0.55468750, 0.10546875, 0.19921875},
 }
 
-local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
-if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
-	SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
-end
-
 function ShardCounter.prototype:init()
 	ShardCounter.super.prototype.init(self, "Warlock Power")
 
@@ -53,10 +36,6 @@ function ShardCounter.prototype:init()
 	if IceHUD.WowVer >= 70000 then
 		self.runeHeight = 23
 		self.runeWidth = 26
-		if IceHUD.WowVer >= 70200 then
-			self.runeHeight = 27
-			self.runeWidth = 22
-		end
 		self.runeCoords = AfflictionCoords
 		self.unitPower = SPELL_POWER_SOUL_SHARDS
 		self.unit = "player"
@@ -67,7 +46,7 @@ function ShardCounter.prototype:Enable(core)
 	if IceHUD.WowVer >= 70000 then
 		self.numRunes = UnitPowerMax(self.unit, self.unitPower)
 
-		if IceHUD.WowVer >= 80000 or GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
+		if GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
 			self.shouldShowUnmodified = true
 			self.numericFormat = "%.1f"
 			self.round = floor
@@ -107,7 +86,6 @@ function ShardCounter.prototype:UpdateRunePower(event, arg1, arg2)
 	end
 
 	if event == "PLAYER_ENTERING_WORLD" and IceHUD.WowVer < 70000 then
-		self:TargetChanged()
 		self:UpdatePowerType(event)
 	end
 
@@ -122,10 +100,10 @@ function ShardCounter.prototype:CheckGreenFire()
 end
 
 function ShardCounter.prototype:UpdatePowerType(event)
-	if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 80000 then
+	if IceHUD.WowVer >= 50000 then
 		CurrentSpec = GetSpecialization()
 	else
-		-- all warlocks use shards in pre-5.0/post-8.0, so just act like our spec is affliction
+		-- all warlocks use shards in pre-5.0, so just act like our spec is affliction
 		CurrentSpec = SPEC_WARLOCK_AFFLICTION
 	end
 
@@ -237,10 +215,6 @@ function ShardCounter.prototype:GetDefaultSettings()
 end
 
 function ShardCounter.prototype:GetRuneTexture(rune)
-	if IceHUD.WowVer >= 70200 then
-		return nil
-	end
-
 	if not rune or rune ~= tonumber(rune) then
 		return
 	end
@@ -258,10 +232,6 @@ function ShardCounter.prototype:GetRuneTexture(rune)
 	return "Interface\\PlayerFrame\\UI-WarlockShard"
 end
 
-function ShardCounter.prototype:GetRuneAtlas(rune)
-	return "Warlock-ReadyShard"
-end
-
 function ShardCounter.prototype:ShowBlizz()
 	WarlockPowerFrame:Show()
 

modules/SliceAndDice.lua

@@ -20,7 +20,6 @@ local impSndBonusPerRank = 0.25
 local maxComboPoints = 5
 local sndEndTime = 0
 local sndDuration = 0
-local sixComboPointsTalentID = 19240
 
 local CurrMaxSnDDuration = 0
 local PotentialSnDDuration = 0
@@ -29,16 +28,6 @@ if IceHUD.WowVer >= 50000 then
 	baseTime = 12
 	gapPerComboPoint = 6
 end
-if IceHUD.WowClassic then
-	impSndBonusPerRank = 0.15
-	impSndTalentPage = 1
-	impSndTalentIdx = 6
-end
-
-local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
-if IceHUD.WowVer >= 80000 then
-	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
-end
 
 -- Constructor --
 function SliceAndDice.prototype:init()
@@ -61,15 +50,10 @@ 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.WowVer < 70000 then
 		self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
 	else
-		self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
-	end
-
-	if IceHUD.WowVer >= 70000 then
-		self:RegisterEvent("PLAYER_TALENT_UPDATE", "CheckMaxComboPoints")
-		self:CheckMaxComboPoints()
+		self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
 	end
 
 	if not self.moduleSettings.alwaysFullAlpha then
@@ -81,17 +65,12 @@ function SliceAndDice.prototype:Enable(core)
 	self:SetBottomText1("")
 end
 
-function SliceAndDice.prototype:CheckMaxComboPoints()
-	local talentID, name, texture, selected, available, spellID, unknown, row, column, known, grantedByAura = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
-	maxComboPoints = selected and 6 or 5
-end
-
 function SliceAndDice.prototype:Disable(core)
 	SliceAndDice.super.prototype.Disable(self, core)
 end
 
 function SliceAndDice.prototype:ComboPointsChanged(...)
-	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 
@@ -193,7 +172,7 @@ function SliceAndDice.prototype:CreateFrame()
 end
 
 function SliceAndDice.prototype:CreateDurationBar()
-	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
+	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
 
 	-- Rokiyo: Do we need to call this here?
 	self.CurrScale = 0
@@ -226,15 +205,15 @@ 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
-		buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
+	local buff, rank, texture, count, type, duration, endTime, remaining
+	if IceHUD.WowVer >= 30000 then
+		buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
 	else
-		buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
+		buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
 	end
 
 	while buff do
-		if (texture and (type(buffName) == 'string' and string.match(texture, buffName) or texture == buffName)) then
+		if (texture and string.match(texture, buffName)) then
 			if endTime and not remaining then
 				remaining = endTime - GetTime()
 			end
@@ -243,10 +222,10 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-			buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
+		if IceHUD.WowVer >= 30000 then
+			buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
 		else
-			buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
+			buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
 		end
 	end
 
@@ -264,7 +243,7 @@ function SliceAndDice.prototype:MyOnUpdate()
 end
 
 local function SNDGetComboPoints(unit)
-	if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+	if IceHUD.WowVer >= 60000 then
 		return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
 	elseif IceHUD.WowVer >= 30000 then
 		return GetComboPoints(unit, "target")
@@ -281,10 +260,6 @@ local function HasSpell(id)
 end
 
 local function ShouldHide()
-	if IceHUD.WowVer >= 90000 then
-		return false
-	end
-
 	return --[[(IceHUD.WowVer < 70000 or not IsSpellKnown(193316)) and]] not IsPlayerSpell(5171) -- IsSpellKnown returns incorrect info for SnD in 7.0
 	-- commented code is here in case we decide we'd like to use this module for Roll the Bones.
 	-- if we do, though, the "active" check gets way more complicated since it can activate any number of 6 different abilities
@@ -300,7 +275,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, "Ability_Rogue_SliceDice")
 
 		if not remaining then
 			sndEndTime = 0
@@ -424,10 +399,8 @@ function SliceAndDice.prototype:GetMaxBuffTime(numComboPoints)
 		end
 
 		local rank = 0
-		if GetTalentInfo then
-			local _
-			_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
-		end
+		local _
+		_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
 
 		maxduration = maxduration * (1 + (rank * impSndBonusPerRank))
 	end
@@ -488,9 +461,6 @@ function SliceAndDice.prototype:HasNineTailedBonus()
 end
 
 function SliceAndDice.prototype:HasGlyphBonus()
-	if not GetNumGlyphSockets then
-		return false
-	end
 	for i=1,GetNumGlyphSockets() do
 		local enabled, _, _, spell = GetGlyphSocketInfo(i)
 

modules/Stagger.lua

@@ -13,7 +13,6 @@ local ModerateID = 124274
 local HeavyID = 124273
 local StaggerID = 124255
 local staggerNames = {"", "", ""}
-local staggerIds = {LightID, ModerateID, HeavyID}
 
 local MinLevel = 10
 
@@ -137,7 +136,7 @@ function StaggerBar.prototype:CreateFrame()
 end
 
 function StaggerBar.prototype:CreateTimerBar()
-	self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
+	self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK")
 
 	self.CurrScale = 0
 
@@ -157,7 +156,6 @@ function StaggerBar.prototype:UpdateShown()
 end
 
 function StaggerBar.prototype:PLAYER_ENTERING_WORLD()
-	self:TargetChanged()
 	self:UpdateStaggerBar()
 end
 
@@ -167,7 +165,7 @@ end
 
 function StaggerBar.prototype:GetDebuffInfo()
 	if IceHUD.WowVer >= 70000 then
-		self.amount = UnitStagger(self.unit) or 0
+		self.amount = UnitStagger(self.unit)
 		self.staggerLevel = 1
 
 		local healthMax = UnitHealthMax(self.unit)
@@ -185,13 +183,13 @@ function StaggerBar.prototype:GetDebuffInfo()
 	local staggerLevel = 1
 
 	for i = 1, IceCore.BuffLimit do
-		local debuffID = select(IceHUD.WowVer < 80000 and 11 or 10, UnitDebuff(self.unit, i))
+		local debuffID = select(11, UnitDebuff(self.unit, i))
 
 		if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
-			local spellName = UnitDebuff(self.unit, i)
+			local spellName = select(1, UnitDebuff(self.unit, i))
 
-			duration = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) 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"))
+			duration = select(6, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			amount = select(15, UnitAura(self.unit, spellName, "", "HARMFUL"))
 			staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
 
 			break
@@ -203,14 +201,9 @@ function StaggerBar.prototype:GetDebuffInfo()
 	self.staggerLevel = staggerLevel or 1
 end
 
-function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(...)
-	local eventArgs = {...}
-    if (CombatLogGetCurrentEventInfo) then
-        eventArgs = {CombatLogGetCurrentEventInfo()}
-    end
-
-	if eventArgs[9] == playerName then
-		if eventArgs[12] == StaggerID or eventArgs[2] == "SWING_DAMAGE" or eventArgs[2] == "SPELL_AURA_APPLIED" or eventArgs[2] == "SPELL_AURA_REMOVED" then
+function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(_, timestamp, event, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2, spellID)
+	if destName == playerName then
+		if spellID == StaggerID or event == "SWING_DAMAGE" or event == "SPELL_AURA_APPLIED" or event == "SPELL_AURA_REMOVED" then
 			self:UpdateStaggerBar()
 		end
 	end
@@ -223,7 +216,7 @@ function StaggerBar.prototype:UpdateStaggerBar()
 	local maxHealth = UnitHealthMax(self.unit)
 	local scale = IceHUD:Clamp((self.amount / maxHealth) * (100 / self.moduleSettings.maxPercent), 0, 1)
 
-	if self.amount > 0 and (IceHUD.WowVer >= 70000 or self.duration <= 10) then
+	if self.amount > 0 and (IceHUD.WowVer >= 7000 or self.duration <= 10) then
 		-- self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
 		self:UpdateBar(scale or 0, "Stagger"..self.staggerLevel)
 		self:UpdateShown()
@@ -234,20 +227,8 @@ function StaggerBar.prototype:UpdateStaggerBar()
 	end
 end
 
-function StaggerBar.prototype:GetDebuffDuration(unitName, buffId)
-	local name, _, duration, endTime
-	if IceHUD.WowVer < 80000 then
-		name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
-	else
-		for i = 1, IceCore.BuffLimit do
-			local id
-			name, _, _, _, duration, endTime, _, _, _, id = UnitDebuff(unitName, i)
-
-			if id == buffId then
-				break
-			end
-		end
-	end
+function StaggerBar.prototype:GetDebuffDuration(unitName, buffName)
+	local name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
 
 	if name then
 		return duration, endTime - GetTime()
@@ -274,7 +255,7 @@ function StaggerBar.prototype:UpdateTimerFrame(event, unit, fromUpdate)
 
 	if not fromUpdate then
 		for i = 1, 3 do
-			self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerIds[i])
+			self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerNames[i])
 
 			if remaining then
 				break

modules/TargetAbsorb.lua

@@ -63,22 +63,12 @@ function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
 		self.highestAbsorbSinceLastZero = absorbAmount
 	end
 
-	self.absorbPercent = self.highestAbsorbSinceLastZero ~= 0 and absorbAmount / self.highestAbsorbSinceLastZero or 0
-
 	if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
 		self:Show(false)
 	else
 		self:Show(true)
 		self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
 	end
-
-	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
-		if (self.PlayerAltManaMax ~= 100) then
-			self:SetBottomText1(self:GetFormattedText(self:Round(absorbAmount)), self.ColorName)
-		else
-			self:SetBottomText1()
-		end
-	end
 end
 
 function IceTargetAbsorb.prototype:Disable(core)

modules/TargetCC.lua

@@ -53,8 +53,6 @@ local StunCCList = {
     105593,
     -- Remorseless Winter
     115001,
-    -- Between the Eyes
-    199804,
 }
 
 local IncapacitateCCList = {
@@ -80,14 +78,6 @@ local IncapacitateCCList = {
 	28271,
 	-- Polymorph: Penguin
 	59634,
-	-- Polymorph: Monkey
-	161354,
-	-- Polymorph: Polar Bear Cub
-	120137,
-	-- Polymorph: Porcupine
-	120140,
-	-- Polymorph: Direhorn
-	162625,
 	-- Hibernate
 	2637,
 	-- Freezing Trap Effect
@@ -123,16 +113,6 @@ local FearCCList = {
 	5246,
 	-- Hex
 	51514,
-	-- Hex: Compy
-	210873,
-	-- Hex: Wicker Mongrel
-	277784,
-	-- Hex: Zandalari Tendonripper
-	277778,
-	-- Hex: Spider
-	211004,
-	-- Hex: Skeletal Hatchling
-	269352,
 	-- Scare Beast
 	1513,
 }
@@ -335,12 +315,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
-		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")
-	end
+	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
 	local remaining
@@ -360,11 +335,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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")
-		end
+		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
 		isMine = unitCaster == "player"
 	end
 

modules/TargetCast.lua

@@ -15,10 +15,8 @@ end
 function TargetCast.prototype:Enable(core)
 	TargetCast.super.prototype.Enable(self, core)
 
-	if IceHUD.WowVer >= 30200 then
-		self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
-		self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
-	end
+	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
+	self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
 end
 
 
@@ -65,12 +63,7 @@ function TargetCast.prototype:GetDefaultSettings()
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 3
 	settings["flashInstants"] = "Never"
-	-- Fulzamoth 2019-09-27 : let the flash handler work if in Classic and LibClassicCasterino exists
-	if LibClassicCasterino then
-		settings["flashFailures"] = ""
-	else
-		settings["flashFailures"] = "Never"
-	end 
+	settings["flashFailures"] = "Never"
 	settings["shouldAnimate"] = false
 	settings["hideAnimationSettings"] = true
 	settings["usesDogTagStrings"] = false
@@ -89,24 +82,18 @@ function TargetCast.prototype:TargetChanged(unit)
 		return
 	end
 
-	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))
-		if spell then
-			self.notInterruptible = notInterruptibleCast
-			self:StartBar(IceCastBar.Actions.Cast)
-			return
-		end
+	local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
+	if (spell) then
+		self.notInterruptible = notInterruptibleCast
+		self:StartBar(IceCastBar.Actions.Cast)
+		return
 	end
 
-	if UnitChannelInfo then
-		local channel = UnitChannelInfo(self.unit)
-		notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 8 or 7, UnitChannelInfo(self.unit))
-		if channel then
-			self.notInterruptible = notInterruptibleChannel
-			self:StartBar(IceCastBar.Actions.Channel)
-			return
-		end
+	local channel, _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
+	if (channel) then
+		self.notInterruptible = notInterruptibleChannel
+		self:StartBar(IceCastBar.Actions.Channel)
+		return
 	end
 
 	self:StopBar()
@@ -180,18 +167,13 @@ function TargetCast.prototype:GetOptions()
 end
 
 function TargetCast.prototype:StartBar(action, message)
-	local spell, notInterruptible
-	if UnitCastingInfo then
-		spell = UnitCastingInfo(self.unit)
-		notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
+	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, castId, notInterruptible = UnitCastingInfo(self.unit)
+	if not (spell) then
+		spell, rank, displayName, icon, startTime, endTime, isTradeSkill, notInterruptible = UnitChannelInfo(self.unit)
 	end
-	if UnitChannelInfo and not spell then
-		spell = UnitChannelInfo(self.unit)
-		notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
 
-		if not spell then
-			return
-		end
+	if not spell then
+		return
 	end
 
 	self.notInterruptible = notInterruptible
@@ -202,8 +184,5 @@ end
 -------------------------------------------------------------------------------
 
 
--- Fulzamoth 2019-09-27 : load in Classic if LibClassicCasterino exists
 -- Load us up
-if not IceHUD.WowClassic or LibClassicCasterino then
-	IceHUD.TargetCast = TargetCast:new()
-end
+IceHUD.TargetCast = TargetCast:new()

modules/TargetHealth.lua

@@ -637,11 +637,9 @@ function IceTargetHealth.prototype:Enable(core)
 		self:RegisterEvent("UPDATE_FACTION", "CheckPvP")
 		self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
 		self:RegisterEvent("UNIT_FACTION", "CheckPvP")
-		if GetLFGRoles then
-			self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
-			self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
-			self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
-		end
+		self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
+		self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
+		self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
 	end
 
 	if (self.moduleSettings.hideBlizz) then
@@ -842,46 +840,21 @@ function IceTargetHealth.prototype:Update(unit)
 
 	self:UpdateBar(self.healthPercentage, self.color)
 
-	if IsAddOnLoaded("RealMobHealth") then
-		if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
-			self:SetBottomText1(math.floor(self.healthPercentage * 100))
+	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+		self:SetBottomText1(math.floor(self.healthPercentage * 100))
 
-			if self.moduleSettings.abbreviateHealth then
-				if RealMobHealth.UnitHasHealthData(unit) then
-					self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
-				end
-				self.health = self:Round(self.health)
-				self.maxHealth = self:Round(self.maxHealth)
-			end
-
-			if RealMobHealth.UnitHasHealthData(unit) or (self.maxHealth ~= 100) then
-				if RealMobHealth.UnitHasHealthData(unit) then
-					self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
-					self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
-				else
-					self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
-				end				
-			else
-				self:SetBottomText2()
-			end
+		if self.moduleSettings.abbreviateHealth then
+			self.health = self:Round(self.health)
+			self.maxHealth = self:Round(self.maxHealth)
 		end
-	else
-		if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
-			self:SetBottomText1(math.floor(self.healthPercentage * 100))
 
-			if self.moduleSettings.abbreviateHealth then
-				self.health = self:Round(self.health)
-				self.maxHealth = self:Round(self.maxHealth)
-			end
-
-			if (self.maxHealth ~= 100) then
-				self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
-			else
-				self:SetBottomText2()
-			end
-		end	
+		if (self.maxHealth ~= 100) then
+			self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
+		else
+			self:SetBottomText2()
+		end
 	end
-	
+
 	self:CheckPvP()
 	self:CheckPartyRole()
 	self:SetIconAlpha()
@@ -999,6 +972,17 @@ function IceTargetHealth.prototype:UpdateRaidTargetIcon()
 end
 
 
+function IceTargetHealth.prototype:Round(health)
+	if (health > 1000000) then
+		return IceHUD:MathRound(health/1000000, 1) .. "M"
+	end
+	if (health > 1000) then
+		return IceHUD:MathRound(health/1000, 1) .. "k"
+	end
+	return health
+end
+
+
 function IceTargetHealth.prototype:CheckPvP()
 	local pvpMode = nil
 	local minx, maxx, miny, maxy

modules/TargetInfo.lua

@@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 IceTargetInfo = IceCore_CreateClass(IceElement)
 
 local CooldownFrame_SetTimer = CooldownFrame_SetTimer
-if CooldownFrame_Set then
+if IceHUD.WowVer >= 70000 then
 	CooldownFrame_SetTimer = CooldownFrame_Set
 end
 
@@ -12,10 +12,6 @@ local internal = "internal"
 
 local ValidAnchors = { "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT", "CENTER" }
 
----- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
-local LibClassicDurations = LibStub("LibClassicDurations", 1)
----- end change by Fulzamoth
-
 IceTargetInfo.prototype.unit = "target"
 
 IceTargetInfo.prototype.buffSize = nil
@@ -133,9 +129,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
-		self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
-	end
+	self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
 
 	self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
 
@@ -964,23 +958,6 @@ function IceTargetInfo.prototype:GetOptions()
 		order = 39.3,
 	}
 
-	opts["showRaidIcon"] = {
-		type = 'toggle',
-		name = L['Show raid icon'],
-		desc = L['Whether or not to show the raid icon for this unit.'],
-		get = function()
-			return self.moduleSettings.showRaidIcon
-		end,
-		set = function(info, v)
-			self.moduleSettings.showRaidIcon = v
-			self:UpdateRaidTargetIcon()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 37.02,
-	}
-
 	return opts
 end
 
@@ -1034,7 +1011,6 @@ function IceTargetInfo.prototype:GetDefaultSettings()
 			["sortByExpiration"] = true,
 		}
 	}
-	defaults["showRaidIcon"] = true
 
 	return defaults
 end
@@ -1413,29 +1389,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
 
 	if self.moduleSettings.auras[aura].show then
 		for i = 1, IceCore.BuffLimit do
-			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable
-
-			---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
-			local spellID
-			---- end change by Fulzamoth
-
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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)
-				-- 1. in addition to other info, get the spellID for for the (de)buff
-				name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, _, spellID = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
-				if duration == 0 and LibClassicDurations then
-					-- 2. if no duration defined for the (de)buff, look up the spell in LibClassicDurations
-					local classicDuration, classicExpirationTime = LibClassicDurations:GetAuraDurationByUnit(self.unit, spellID, caster)
-					-- 3. set the duration if we found one.
-					if classicDuration then
-						duration = classicDuration
-						expirationTime = classicExpirationTime
-					end
-				end
-				---- end change by Fulzamoth
-			end
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
 			local isFromMe = (unitCaster == "player")
 
 			if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
@@ -1526,7 +1480,7 @@ function IceTargetInfo.prototype:AuraChanged(event, unit)
 end
 
 function IceTargetInfo.prototype:UpdateRaidTargetIcon()
-	if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
+	if not (UnitExists(self.unit)) then
 		self.frame.raidIcon:Hide()
 		return
 	end
@@ -1605,7 +1559,7 @@ function IceTargetInfo.prototype:TargetName(event, unit)
 		end
 
 
-		if UnitIsPartyLeader then
+		if IceHUD.WowVer < 50000 then
 			self.leader = UnitIsPartyLeader(self.unit) and " |cffcccc11Leader|r" or ""
 		else
 			self.leader = UnitIsGroupLeader(self.unit) and " |cffcccc11Leader|r" or ""
@@ -1676,7 +1630,7 @@ end
 
 function IceTargetInfo.prototype:TargetFlags(event, unit)
 	if (unit == self.unit or unit == internal) then
-		if UnitIsTapped then
+		if IceHUD.WowVer < 70000 then
 			self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
 		else
 			self.tapped = UnitIsTapDenied(self.unit)

modules/TargetInvuln.lua

@@ -146,12 +146,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
-		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
-	else
-		buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
-	end
+	local buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
 	local remaining
@@ -178,11 +173,7 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 
 		i = i + 1;
 
-		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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")
-		end
+		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
 		isMine = unitCaster == "player"
 	end
 

modules/TargetMana.lua

@@ -4,28 +4,6 @@ IceTargetMana.prototype.registerEvents = true
 IceTargetMana.prototype.color = nil
 IceTargetMana.prototype.determineColor = true
 
-local SPELL_POWER_MANA = SPELL_POWER_MANA
-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
-local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
-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
-	SPELL_POWER_MANA = Enum.PowerType.Mana
-	SPELL_POWER_RAGE = Enum.PowerType.Rage
-	SPELL_POWER_FOCUS = Enum.PowerType.Focus
-	SPELL_POWER_ENERGY = Enum.PowerType.Energy
-	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
-	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
-	SPELL_POWER_FURY = Enum.PowerType.Fury
-	SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
-	SPELL_POWER_PAIN = Enum.PowerType.Pain
-	SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
-end
 
 -- Constructor --
 function IceTargetMana.prototype:init(moduleName, unit)
@@ -66,11 +44,9 @@ function IceTargetMana.prototype:Enable(core)
 	IceTargetMana.super.prototype.Enable(self, core)
 
 	if self.registerEvents then
-		if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
-			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
-				self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
-			end
+		if IceHUD.WowVer >= 40000 then
+			self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 		else
 			self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 			self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -156,7 +132,7 @@ function IceTargetMana.prototype:Update(unit)
 
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		self:SetBottomText1(math.floor(self.manaPercentage * 100))
-		self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), self.color)
+		self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), color)
 	end
 end
 

modules/TargetOfTarget.lua

@@ -485,12 +485,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
-				buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
-			else
-				buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)
-			end
+			local buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
 
 			if (buffApplications and (buffApplications > 1)) then
 				debuffs = debuffs + 1

modules/TargetOfTargetCast.lua

@@ -58,20 +58,16 @@ function TargetTargetCast.prototype:UpdateTargetTarget()
 		return
 	end
 
-	if UnitCastingInfo then
-		local spell = UnitCastingInfo(self.unit)
-		if spell then
-			self:StartBar(IceCastBar.Actions.Cast)
-			return
-		end
+	local spell = UnitCastingInfo(self.unit)
+	if (spell) then
+		self:StartBar(IceCastBar.Actions.Cast)
+		return
 	end
 
-	if UnitChannelInfo then
-		local channel = UnitChannelInfo(self.unit)
-		if channel then
-			self:StartBar(IceCastBar.Actions.Channel)
-			return
-		end
+	local channel = UnitChannelInfo(self.unit)
+	if (channel) then
+		self:StartBar(IceCastBar.Actions.Channel)
+		return
 	end
 
 	self:StopBar()
@@ -148,6 +144,4 @@ end
 
 
 -- Load us up
-if not IceHUD.WowClassic then
-	IceHUD.TargetTargetCast = TargetTargetCast:new()
-end
+IceHUD.TargetTargetCast = TargetTargetCast:new()

modules/Threat.lua

@@ -16,20 +16,13 @@ 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 IceHUD.WowVer >= 50000 then
 	GetNumPartyMembers = GetNumGroupMembers
 	GetNumRaidMembers = GetNumGroupMembers
 	MAX_NUM_PARTY_MEMBERS = MAX_PARTY_MEMBERS
 	MAX_NUM_RAID_MEMBERS = MAX_RAID_MEMBERS
 end
 
-local UnitGroupRolesAssigned = UnitGroupRolesAssigned
-if not UnitGroupRolesAssigned then
-	UnitGroupRolesAssigned = function()
-		return "NONE"
-	end
-end
-
 local MAX_NUM_RAID_MEMBERS = 40
 local MAX_NUM_PARTY_MEMBERS = 5
 
@@ -231,7 +224,7 @@ end
 
 -- create the aggro range indicator bar
 function IceThreat.prototype:CreateAggroBar()
-	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
+	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK")
 
 	local r, g, b = self:GetColor("ThreatPullAggro")
 	if (self.settings.backgroundToggle) then
@@ -243,7 +236,7 @@ function IceThreat.prototype:CreateAggroBar()
 end
 
 function IceThreat.prototype:CreateSecondThreatBar()
-	self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY", "SecondThreat")
+	self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY")
 
 	self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))
 
@@ -475,6 +468,4 @@ function IceThreat.prototype:Show(bShouldShow)
 end
 
 -- Load us up
-if UnitDetailedThreatSituation then
-	IceHUD.IceThreat = IceThreat:new()
-end
+IceHUD.IceThreat = IceThreat:new()

modules/Totems.lua

@@ -2,7 +2,7 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local Totems = IceCore_CreateClass(IceElement)
 
 local CooldownFrame_SetTimer = CooldownFrame_SetTimer
-if CooldownFrame_Set then
+if IceHUD.WowVer >= 70000 then
 	CooldownFrame_SetTimer = CooldownFrame_Set
 end
 
@@ -215,7 +215,7 @@ function Totems.prototype:Enable(core)
 	Totems.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotem");
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld");
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetTotemAvailability");
 
 	if self.moduleSettings.hideBlizz then
 		self:HideBlizz()
@@ -230,11 +230,6 @@ function Totems.prototype:Disable(core)
 	end
 end
 
-function Totems.prototype:EnteringWorld()
-	self:TargetChanged()
-	self:ResetTotemAvailability()
-end
-
 function Totems.prototype:ResetTotemAvailability()
 	for i=1, self.numTotems do
 		self:UpdateTotem(nil, i)
@@ -242,7 +237,7 @@ function Totems.prototype:ResetTotemAvailability()
 end
 
 function Totems.prototype:UpdateTotem(event, totem, ...)
-	if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems or not GetTotemInfo then
+	if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems then
 		return
 	end
 	local thisTotemName = self.totemNames[TOTEM_PRIORITIES[totem]]
@@ -252,7 +247,6 @@ function Totems.prototype:UpdateTotem(event, totem, ...)
 		CooldownFrame_SetTimer(self.frame.graphical[totem].cd, startTime, duration, true)
 		self.frame.graphical[totem].cd:Show()
 		self.frame.graphical[totem]:Show()
-		self.frame.graphical[totem].name = name
 	else
 		self.frame.graphical[totem].cd:Hide()
 		self.frame.graphical[totem]:Hide()
@@ -299,18 +293,14 @@ function Totems.prototype:GetAlphaAdd()
 end
 
 function Totems.prototype:ShowBlizz()
-	if TotemFrame then
-		TotemFrame:Show()
-		TotemFrame:GetScript("OnLoad")(TotemFrame)
-	end
+	TotemFrame:Show()
+	TotemFrame:GetScript("OnLoad")(TotemFrame)
 end
 
 
 function Totems.prototype:HideBlizz()
-	if TotemFrame then
-		TotemFrame:Hide()
-		TotemFrame:UnregisterAllEvents()
-	end
+	TotemFrame:Hide()
+	TotemFrame:UnregisterAllEvents()
 end
 
 function Totems.prototype:TargetChanged()
@@ -336,7 +326,8 @@ function Totems.prototype:CheckCombat()
 end
 
 function Totems.prototype:CreateTotem(i, name)
-	if not name or not GetTotemInfo then
+	-- whiskey tango foxtrot?! apparently arenas can cause this? I can't test out the real cause myself, so putting in a stopgap for now
+	if not name then
 		return
 	end
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
@@ -363,14 +354,7 @@ function Totems.prototype:CreateTotem(i, name)
 	end
 
 	if not self.graphicalOnEnter then
-		self.graphicalOnEnter = function(button)
-			GameTooltip:SetOwner(button)
-			if IceHUD.WowClassic then
-				GameTooltip:SetText(button.name)
-			else
-				GameTooltip:SetTotem(button.slot)
-			end
-		end
+		self.graphicalOnEnter = function(button) GameTooltip:SetOwner(button); GameTooltip:SetTotem(button.slot) end
 	end
 	if not self.graphicalOnLeave then
 		self.graphicalOnLeave = function() GameTooltip:Hide() end
@@ -412,7 +396,6 @@ function Totems.prototype:CreateTotem(i, name)
 		self.frame.graphical[i]:SetScript("OnLeave", nil)
 	end
 	self.frame.graphical[i].slot = i
-	self.frame.graphical[i].name = name
 
 	-- it looks like HookScript will continue to add handlers every time instead of replacing them like SetScript
 	if (bWasNewFrame) then

readme.md

@@ -1,13 +1,11 @@
-# IceHUD
-
 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**
 
-* Player and target health and mana bars, casting and mirror bars, pet health and mana bars, druid mana bar in forms, extensive target info, ToT display, and much more, in a vertically-oriented heads-up display.
+### **What it is**
+* Player and target health and mana bars, casting and mirror bars, pet health and mana bars, druid mana bar in forms, extensive target info, ToT display, and much more
 
-## **Short feature list**
 
+### **Short feature list**
 * Lots of different bar shapes and patterns to make the HUD look like you want
 * Class-specific modules such as combo point counters, Slice'n'dice timers, druid mana trackers, Eclipse bar, Holy Power monitoring, Warlock shard tracking, and more
 * Target-of-target bars, Crowd Control timers, Range Finders, Threat meters, and plenty of other helpful modules
@@ -17,12 +15,13 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
 * Fully customizable bars and counters capable of tracking buff/debuff applications on any unit, spell/ability cooldowns, and the health/mana of any unit you specify. The custom health/mana bars will even work with crazy unit specifications like "focustargettargetfocustarget" if you want!
 * Highly configurable (can totally re-arrange all bars, change text display, etc.)
 
-## **Slash commands**
 
+### **Slash commands**
 * /icehud - opens the configuration UI to tweak any setting
 * /icehudCL - command-line access to tweak IceHUD settings (for use with macros, etc.)
 
-## **Frequently Asked Questions**
+
+# **Frequently Asked Questions**
 
 1. **How do I hide the default Blizzard player, target unit frames and party unit frames?**
    Type /icehud, expand the "Module Settings" section, click "Player Health" or "Target Health," and check "Hide Blizzard Frame" and/or "Hide Blizzard Party Frame". (NOTE: before version 1.3.7, the player/target unitframes were hidden by default. Follow the same steps to enable them if desired)
@@ -64,7 +63,7 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
    Type /icehud, expand Module Settings, expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
 
 1. **Which module displays Monk Chi power?**
-   Prior to v1.11.2, this module was called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. IceHUD v1.11.2 changed this module to be called Chi.
+   This module is called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
 
 1. **How do I add commas/periods into big numbers like health?**
    If you have DogTags enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
@@ -78,10 +77,5 @@ IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD
 1. **How do I get rid of the bars that showed up beneath the player in the 7.0 patch?**
    Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.
 
-1. **Why is there no target castbar for Classic?**
-   The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. IceHUD doesn't support the type of inaccurate guessing at combat log details that would be required to get a semi-useful target castbar.
 
-1. **Why do buff/debuff timers not work in Classic?**
-   The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not completely accurate.
-
-See [here](https://www.wowace.com/projects/ice-hud/issues/113) for a user-created guide to creating new IceHUD textures.
+See [here](http://www.wowace.com/addons/ice-hud/tickets/113-basic-guide-to-texture-creation/) for a user-created guide to creating new IceHUD textures.

this_version.md

@@ -1,6 +0,0 @@
-# Changelog
-
-v1.13.1:
-
-- Added support for Anima-charged combo points for Kyrian covenant (ticket #291).
-- Updated TOC for 9.0.2