- removed the last remnants of Ace2 (AceOO-2.0 and AceLibrary) thanks to a huge amount of help from ckknight for metatables

.pkgmeta

@@ -4,7 +4,6 @@ externals:
     libs/LibStub:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/LibStub
         tag: latest
-    libs/AceLibrary: svn://svn.wowace.com/wow/ace2/mainline/trunk/AceLibrary
     libs/CallbackHandler-1.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/CallbackHandler-1.0
         tag: latest
@@ -26,7 +25,6 @@ externals:
     libs/AceGUI-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
         tag: latest
-    libs/AceOO-2.0: svn://svn.wowace.com/wow/ace2/mainline/trunk/AceOO-2.0
     libs/AceAddon-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
         tag: latest

IceBarElement.lua

@@ -1,9 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 local DogTag = nil
 
-IceBarElement = AceOO.Class(IceElement)
+IceBarElement = IceCore_CreateClass(IceElement)
-IceBarElement.virtual = true
 
 IceBarElement.BarTextureWidth = 128
 
@@ -14,6 +11,7 @@ IceBarElement.prototype.LastScale = 1
 IceBarElement.prototype.DesiredScale = 1
 IceBarElement.prototype.CurrScale = 1
 IceBarElement.prototype.Markers = {}
+IceBarElement.prototype.IsBarElement = true -- cheating to avoid crawling up the 'super' references looking for this class. see IceCore.lua
 
 local lastMarkerPosConfig = 50
 local lastMarkerColorConfig = {r=1, b=0, g=0, a=1}
@@ -33,9 +31,11 @@ end
 function IceBarElement.prototype:Enable()
 	IceBarElement.super.prototype.Enable(self)
 
-	if IceHUD.IceCore:ShouldUseDogTags() and AceLibrary:HasInstance("LibDogTag-3.0") then
+	if IceHUD.IceCore:ShouldUseDogTags() then
-		DogTag = AceLibrary("LibDogTag-3.0")
+		DogTag = LibStub("LibDogTag-3.0", true)
-		AceLibrary("LibDogTag-Unit-3.0")
+		if DogTag then
+			LibStub("LibDogTag-Unit-3.0", true)
+		end
 	end
 
 	if self.moduleSettings.myTagVersion < IceHUD.CurrTagVersion then

IceCastBar.lua

@@ -1,9 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCastBar = IceCore_CreateClass(IceBarElement)
-
-local SPELLINTERRUPTOTHERSELF = SPELLINTERRUPTOTHERSELF
-local SPELLFAILCASTSELF = SPELLFAILCASTSELF
-
-IceCastBar = AceOO.Class(IceBarElement)
 
 
 IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5 }

IceCore.lua

@@ -1,6 +1,22 @@
-local AceOO = AceLibrary("AceOO-2.0")
+function IceCore_CreateClass(parent)
+	local class = { prototype = {} }
+	if parent then
+		class.super = parent
+		setmetatable(class.prototype, { __index = parent.prototype })
+	end
+	local mt = { __index = class.prototype }
+	function class.new(...)
+		local self = setmetatable({}, mt)
+		if self.init then
+			self:init(...)
+		end
+		return self
+	end
 
-IceCore = AceOO.Class()
+	return class
+end
+
+IceCore = IceCore_CreateClass()
 
 IceCore.Side = { Left = "LEFT", Right = "RIGHT" }
 
@@ -27,7 +43,6 @@ IceCore.prototype.bConfigMode = false
 
 -- Constructor --
 function IceCore.prototype:init()
-	IceCore.super.prototype.init(self)
 	IceHUD:Debug("IceCore.prototype:init()")
 
 	self.IceHUDFrame = CreateFrame("Frame","IceHUDFrame", UIParent)
@@ -617,7 +632,7 @@ function IceCore.prototype:ConfigModeToggle(bWantConfig)
 			if self.elements[i]:IsEnabled() then
 				self.elements[i].frame:Show()
 				self.elements[i]:Redraw()
-				if AceOO.inherits(self.elements[i], IceBarElement) then
+				if self.elements[i].IsBarElement then
 					self.elements[i]:SetBottomText1(self.elements[i].elementName)
 				end
 			end
@@ -629,7 +644,7 @@ function IceCore.prototype:ConfigModeToggle(bWantConfig)
 			end
 
 			-- blank the bottom text that we set before. if the module uses this text, it will reset itself on redraw
-			if AceOO.inherits(self.elements[i], IceBarElement) then
+			if self.elements[i].IsBarElement then
 				self.elements[i]:SetBottomText1()
 			end
 
@@ -639,7 +654,7 @@ function IceCore.prototype:ConfigModeToggle(bWantConfig)
 end
 
 function IceCore.prototype:ShouldUseDogTags()
-	return AceLibrary:HasInstance("LibDogTag-3.0") and self.settings.bShouldUseDogTags
+	return LibStub("LibDogTag-3.0", true) and self.settings.bShouldUseDogTags
 end
 
 function IceCore.prototype:SetShouldUseDogTags(should)

IceElement.lua

@@ -1,8 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local SML = LibStub("LibSharedMedia-3.0")
-local SML = AceLibrary("LibSharedMedia-3.0")
 
-IceElement = AceOO.Class()
+IceElement = IceCore_CreateClass()
-IceElement.virtual = true
 
 IceElement.TexturePath = IceHUD.Location .. "\\textures\\"
 
@@ -31,7 +29,6 @@ IceElement.prototype.bIsVisible = true
 -- Therefore we can wait for IceCore to load and then register our
 -- module to the core with another event.
 function IceElement.prototype:init(name)
-	IceElement.super.prototype.init(self)
 	assert(name, "IceElement must have a name")
 
 	self.elementName = name

IceHUD.lua

@@ -1,6 +1,6 @@
 IceHUD = LibStub("AceAddon-3.0"):NewAddon("IceHUD", "AceConsole-3.0")
 
-local SML = AceLibrary("LibSharedMedia-3.0")
+local SML = LibStub("LibSharedMedia-3.0")
 local ACR = LibStub("AceConfigRegistry-3.0")
 local ConfigDialog = LibStub("AceConfigDialog-3.0")
 local icon = LibStub("LibDBIcon-1.0")
@@ -652,7 +652,7 @@ Expand "|cffffdc42Module Settings|r", expand PlayerInfo (or TargetInfo for targe
 				StaticPopup_Show("ICEHUD_CHANGED_DOGTAG")
 			end,
 			hidden = function()
-				return not AceLibrary:HasInstance("LibDogTag-3.0")
+				return not LibStub("LibDogTag-3.0", true)
 			end,
 			order = 96
 		},

IceHUD.toc

@@ -1,11 +1,11 @@
 ## Interface: 30300
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
-## Title: IceHUD |cff7fff7f -Ace2/3-|r
+## Title: IceHUD |cff7fff7f -Ace3-|r
 ## Notes: Another HUD addon
 ## Version: @project-version@ (Revision: @project-revision@)
 ## SavedVariables: IceCoreDB
-## OptionalDeps: Ace2, Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibHealComm-4.0
+## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibHealComm-4.0
 ## X-Category: HUDs
 ## X-Website: http://www.wowace.com/projects/ice-hud/
 ## X-Compatible-With: 40000

IceUnitBar.lua

@@ -1,7 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceUnitBar = IceCore_CreateClass(IceBarElement)
-
-IceUnitBar = AceOO.Class(IceBarElement)
-IceUnitBar.virtual = true
 
 IceUnitBar.prototype.unit = nil
 IceUnitBar.prototype.alive = nil

embeds.xml

@@ -1,8 +1,6 @@
 <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">
 <Script file="libs\LibStub\LibStub.lua"/>
-<Script file="libs\AceLibrary\AceLibrary.lua"/>
 <Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
-<Script file="libs\AceOO-2.0\AceOO-2.0.lua"/>
 <Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
 <Include file="libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
 <Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>

modules/CastBar.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local CastBar = IceCore_CreateClass(IceCastBar)
-
-local CastBar = AceOO.Class(IceCastBar)
 
 CastBar.prototype.lagBar = nil
 CastBar.prototype.spellCastSent = nil

modules/ClassPowerCounter.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceClassPowerCounter = IceCore_CreateClass(IceElement)
-
-IceClassPowerCounter = AceOO.Class(IceElement)
 
 IceClassPowerCounter.prototype.runeHeight = 22
 IceClassPowerCounter.prototype.runeWidth = 36

modules/ComboPoints.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local ComboPoints = IceCore_CreateClass(IceElement)
-
-local ComboPoints = AceOO.Class(IceElement)
 
 ComboPoints.prototype.comboSize = 20
 

modules/ComboPointsBar.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local ComboPointsBar = IceCore_CreateClass(IceBarElement)
-
-local ComboPointsBar = AceOO.Class(IceBarElement)
 
 function ComboPointsBar.prototype:init()
 	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")

modules/CustomBar.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCustomBar = IceCore_CreateClass(IceUnitBar)
-
-IceCustomBar = AceOO.Class(IceUnitBar)
 
 local validUnits = {"player", "target", "focus", "focustarget", "pet", "pettarget", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
 local buffOrDebuff = {"buff", "debuff"}

modules/CustomCDBar.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCustomCDBar = IceCore_CreateClass(IceUnitBar)
-
-IceCustomCDBar = AceOO.Class(IceUnitBar)
 
 
 local validDisplayModes = {"Always", "When ready", "When cooling down"}

modules/CustomCount.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCustomCount = IceCore_CreateClass(IceElement)
-
-IceCustomCount = AceOO.Class(IceElement)
 
 IceCustomCount.prototype.countSize = 20
 

modules/CustomHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCustomHealth = IceCore_CreateClass(IceTargetHealth)
-
-IceCustomHealth = AceOO.Class(IceTargetHealth)
 IceCustomHealth.prototype.scheduledEvent = nil
 
 -- Constructor --

modules/CustomMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceCustomMana = IceCore_CreateClass(IceTargetMana)
-
-IceCustomMana = AceOO.Class(IceTargetMana)
 IceCustomMana.prototype.scheduledEvent = nil
 
 -- Constructor --

modules/DruidMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local DruidMana = IceCore_CreateClass(IceUnitBar)
-
-local DruidMana = AceOO.Class(IceUnitBar)
 
 DruidMana.prototype.druidMana = nil
 DruidMana.prototype.druidManaMax = nil

modules/EclipseBar.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local EclipseBar = IceCore_CreateClass(IceBarElement)
-
-local EclipseBar = AceOO.Class(IceBarElement)
 EclipseBar.prototype.barUpdateColor = "EclipseLunar"
 
 function EclipseBar.prototype:init()

modules/FocusCC.lua

@@ -1,8 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- changed to inherit from the TargetCC bar since the only difference is the unit and the default placement
 -- helps keep changes in one place and we don't have to duplicate the CC spell tables and they don't have to be globals
-local FocusCC = AceOO.Class(TargetCC)
+local FocusCC = IceCore_CreateClass(TargetCC)
 
 -- Constructor --
 function FocusCC.prototype:init()

modules/FocusCast.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local FocusCast = IceCore_CreateClass(IceCastBar)
-
-local FocusCast = AceOO.Class(IceCastBar)
 
 -- Constructor --
 function FocusCast.prototype:init()

modules/FocusHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local FocusHealth = IceCore_CreateClass(IceUnitBar)
-
-local FocusHealth = AceOO.Class(IceUnitBar)
 
 FocusHealth.prototype.color = nil
 

modules/FocusMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local FocusMana = IceCore_CreateClass(IceUnitBar)
-
-local FocusMana = AceOO.Class(IceUnitBar)
 
 
 -- Constructor --

modules/FocusThreat.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local IceFocusThreat = IceCore_CreateClass(IceThreat)
-
-local IceFocusThreat = AceOO.Class(IceThreat)
 
 -- constructor
 function IceFocusThreat.prototype:init()

modules/GlobalCoolDown.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local GlobalCoolDown = IceCore_CreateClass(IceBarElement)
-
-local GlobalCoolDown = AceOO.Class(IceBarElement)
 GlobalCoolDown.prototype.scheduledEvent = nil
 
 -- Constructor --

modules/HolyPower.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
-
-local HolyPower = AceOO.Class(IceClassPowerCounter)
 
 function HolyPower.prototype:init()
 	HolyPower.super.prototype.init(self, "HolyPower")

modules/HungerForBlood.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local HungerForBlood = IceCore_CreateClass(IceUnitBar)
-
-local HungerForBlood = AceOO.Class(IceUnitBar)
 
 local hfbEndTime = 0
 local hfbDuration = 0

modules/LacerateCount.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local LacerateCount = IceCore_CreateClass(IceElement)
-
-local LacerateCount = AceOO.Class(IceElement)
 
 LacerateCount.prototype.lacerateSize = 20
 

modules/MaelstromCount.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local MaelstromCount = IceCore_CreateClass(IceElement)
-
-local MaelstromCount = AceOO.Class(IceElement)
 
 MaelstromCount.prototype.maelstromSize = 20
 

modules/MirrorBar.lua

@@ -1,5 +1,3 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- 2 classes in the same file.. ugly but keeps the idea of
 -- "1 module = 1 file" intact
 
@@ -8,7 +6,7 @@ local AceOO = AceLibrary("AceOO-2.0")
 -- MirrorBar                                                                 --
 -------------------------------------------------------------------------------
 
-local MirrorBar = AceOO.Class(IceBarElement)
+local MirrorBar = IceCore_CreateClass(IceBarElement)
 
 MirrorBar.prototype.timer = nil
 MirrorBar.prototype.value = nil
@@ -155,7 +153,7 @@ end
 -------------------------------------------------------------------------------
 
 
-local MirrorBarHandler = AceOO.Class(IceElement)
+local MirrorBarHandler = IceCore_CreateClass(IceElement)
 
 MirrorBarHandler.prototype.bars = nil
 

modules/PetHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PetHealth = IceCore_CreateClass(IceUnitBar)
-
-local PetHealth = AceOO.Class(IceUnitBar)
 
 PetHealth.prototype.happiness = nil
 

modules/PetInfo.lua

@@ -1,5 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PetInfo = IceCore_CreateClass(IceTargetInfo)
-local PetInfo = AceOO.Class(IceTargetInfo)
 
 -- Constructor --
 function PetInfo.prototype:init()

modules/PetMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PetMana = IceCore_CreateClass(IceUnitBar)
-
-local PetMana = AceOO.Class(IceUnitBar)
 
 -- Constructor --
 function PetMana.prototype:init()

modules/PlayerCC.lua

@@ -1,8 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- changed to inherit from the TargetCC bar since the only difference is the unit and the default placement
 -- helps keep changes in one place and we don't have to duplicate the CC spell tables and they don't have to be globals
-local PlayerCC = AceOO.Class(TargetCC)
+local PlayerCC = IceCore_CreateClass(TargetCC)
 
 -- Constructor --
 function PlayerCC.prototype:init()

modules/PlayerHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PlayerHealth = IceCore_CreateClass(IceUnitBar)
-
-local PlayerHealth = AceOO.Class(IceUnitBar)
 
 PlayerHealth.prototype.resting = nil
 PlayerHealth.prototype.pendingBlizzardPartyHide = false
@@ -90,8 +88,8 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 
 	if IceHUD.WowVer < 40000 then
-		if AceLibrary:HasInstance("LibHealComm-4.0") then
+		HealComm = LibStub("LibHealComm-4.0", true)
-			HealComm = AceLibrary("LibHealComm-4.0")
+		if HealComm then
 			HealComm.RegisterCallback(self, "HealComm_HealStarted", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
 			HealComm.RegisterCallback(self, "HealComm_HealUpdated", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
 			HealComm.RegisterCallback(self, "HealComm_HealDelayed", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
@@ -1417,4 +1415,4 @@ function PlayerHealth.prototype:OutCombat()
 end
 
 -- Load us up
-IceHUD.PlayerHealth = PlayerHealth:new()
+IceHUD.PlayerHealth = PlayerHealth.new()

modules/PlayerInfo.lua

@@ -1,5 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PlayerInfo = IceCore_CreateClass(IceTargetInfo)
-local PlayerInfo = AceOO.Class(IceTargetInfo)
 
 local EPSILON = 0.5
 

modules/PlayerInvuln.lua

@@ -1,8 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- changed to inherit from the TargetInvuln bar since the only difference is the unit and the default placement
 -- helps keep changes in one place and we don't have to duplicate the Invuln spell tables and they don't have to be globals
-local PlayerInvuln = AceOO.Class(TargetInvuln)
+local PlayerInvuln = IceCore_CreateClass(TargetInvuln)
 
 -- Constructor --
 function PlayerInvuln.prototype:init()

modules/PlayerMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local PlayerMana = IceCore_CreateClass(IceUnitBar)
-
-local PlayerMana = AceOO.Class(IceUnitBar)
 
 PlayerMana.prototype.manaType = nil
 PlayerMana.prototype.tickStart = nil

modules/RangeCheck.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local RangeCheck = IceCore_CreateClass(IceElement)
-
-local RangeCheck = AceOO.Class(IceElement)
 RangeCheck.prototype.scheduledEvent = nil
 
 local LibRange = nil
@@ -12,16 +10,14 @@ function RangeCheck.prototype:init()
 
 	self.scalingEnabled = true
 
-	if AceLibrary:HasInstance("LibRangeCheck-2.0") then
+	LibRange = LibStub("LibRangeCheck-2.0", true)
-		LibRange = AceLibrary("LibRangeCheck-2.0")
-	end
 end
 
 function RangeCheck.prototype:Enable(core)
 	RangeCheck.super.prototype.Enable(self, core)
 
 	if IceHUD.IceCore:ShouldUseDogTags() then
-		DogTag = AceLibrary("LibDogTag-3.0")
+		DogTag = LibStub("LibDogTag-3.0", true)
 		self:RegisterFontStrings()
 	else
 		self.scheduledEvent = self:ScheduleRepeatingTimer("UpdateRange", 0.1)

modules/Runes.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local Runes = IceCore_CreateClass(IceElement)
-
-local Runes = AceOO.Class(IceElement)
 
 -- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
 --Readability == win

modules/Shards.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
-
-local ShardCounter = AceOO.Class(IceClassPowerCounter)
 
 function ShardCounter.prototype:init()
 	ShardCounter.super.prototype.init(self, "ShardCounter")

modules/SliceAndDice.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local SliceAndDice = IceCore_CreateClass(IceUnitBar)
-
-local SliceAndDice = AceOO.Class(IceUnitBar)
 
 local NetherbladeItemIdList = {29044, 29045, 29046, 29047, 29048}
 -- Parnic - bah, have to abandon the more robust string representation of each slot because of loc issues...

modules/SunderCount.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local SunderCount = IceCore_CreateClass(IceElement)
-
-local SunderCount = AceOO.Class(IceElement)
 
 SunderCount.prototype.sunderSize = 20
 

modules/TargetCC.lua

@@ -1,7 +1,5 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- needs to not be local so that we can inherit from it
-TargetCC = AceOO.Class(IceUnitBar)
+TargetCC = IceCore_CreateClass(IceUnitBar)
 
 TargetCC.prototype.debuffName = nil
 TargetCC.prototype.debuffRemaining = 0

modules/TargetCast.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local TargetCast = IceCore_CreateClass(IceCastBar)
-
-local TargetCast = AceOO.Class(IceCastBar)
 
 TargetCast.prototype.notInterruptible = false
 

modules/TargetHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceTargetHealth = IceCore_CreateClass(IceUnitBar)
-
-IceTargetHealth = AceOO.Class(IceUnitBar)
 
 IceTargetHealth.prototype.color = nil
 IceTargetHealth.prototype.determineColor = true

modules/TargetInfo.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceTargetInfo = IceCore_CreateClass(IceElement)
-
-IceTargetInfo = AceOO.Class(IceElement)
 
 local DogTag = nil
 
@@ -53,8 +51,10 @@ function IceTargetInfo.prototype:Enable(core)
 	IceTargetInfo.super.prototype.Enable(self, core)
 
 	if IceHUD.IceCore:ShouldUseDogTags() then
-		DogTag = AceLibrary("LibDogTag-3.0")
+		DogTag = LibStub("LibDogTag-3.0", true)
-		AceLibrary("LibDogTag-Unit-3.0")
+		if DogTag then
+			LibStub("LibDogTag-Unit-3.0")
+		end
 	end
 
 	self:RegisterEvent("UNIT_AURA", "AuraChanged")

modules/TargetInvuln.lua

@@ -1,7 +1,5 @@
-local AceOO = AceLibrary("AceOO-2.0")
-
 -- needs to not be local so that we can inherit from it
-TargetInvuln = AceOO.Class(IceUnitBar)
+TargetInvuln = IceCore_CreateClass(IceUnitBar)
 
 TargetInvuln.prototype.buffName = nil
 TargetInvuln.prototype.buffRemaining = 0

modules/TargetMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+IceTargetMana = IceCore_CreateClass(IceUnitBar)
-
-IceTargetMana = AceOO.Class(IceUnitBar)
 IceTargetMana.prototype.registerEvents = true
 IceTargetHealth.prototype.color = nil
 IceTargetMana.prototype.determineColor = true

modules/TargetOfTarget.lua

@@ -1,7 +1,6 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local SML = LibStub("LibSharedMedia-3.0")
-local SML = AceLibrary("LibSharedMedia-3.0")
 
-local TargetOfTarget = AceOO.Class(IceElement)
+local TargetOfTarget = IceCore_CreateClass(IceElement)
 
 TargetOfTarget.prototype.stackedDebuffs = nil
 TargetOfTarget.prototype.buffSize = nil

modules/TargetOfTargetCast.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local TargetTargetCast = IceCore_CreateClass(IceCastBar)
-
-local TargetTargetCast = AceOO.Class(IceCastBar)
 TargetTargetCast.prototype.scheduledEvent = nil
 
 local SelfDisplayModeOptions = {"Hide", "Normal"}

modules/TargetOfTargetHealth.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local TargetTargetHealth = IceCore_CreateClass(IceTargetHealth)
-
-local TargetTargetHealth = AceOO.Class(IceTargetHealth)
 TargetTargetHealth.prototype.scheduledEvent = nil
 
 local SelfDisplayModeOptions = {"Color as SelfColor", "Hide", "Normal"}

modules/TargetOfTargetMana.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local TargetTargetMana = IceCore_CreateClass(IceTargetMana)
-
-local TargetTargetMana = AceOO.Class(IceTargetMana)
 TargetTargetMana.prototype.scheduledEvent = nil
 
 local SelfDisplayModeOptions = {"Hide", "Normal"}

modules/Threat.lua

@@ -4,9 +4,7 @@ Author: Caryna/Turalyon EU (Alliance) (updated for Threat-2.0 by 'acapela' of Wo
 Description: adds a threat bar to IceHUD
 ]]
 
-local AceOO = AceLibrary("AceOO-2.0")
+IceThreat = IceCore_CreateClass(IceUnitBar)
-
-IceThreat = AceOO.Class(IceUnitBar)
 
 IceThreat.prototype.color = nil
 IceThreat.aggroBar = nil

modules/Totems.lua

@@ -1,6 +1,4 @@
-local AceOO = AceLibrary("AceOO-2.0")
+local Totems = IceCore_CreateClass(IceElement)
-
-local Totems = AceOO.Class(IceElement)
 
 -- the below block is copied from TotemFrame.lua
 local FIRE_TOTEM_SLOT = 1;