mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 06:40:13 -05:00
More TWW/11.0.2 compatibility
I don't have beta access so I can't test this yet, but this should catch everything in the Deprecated_11_0_0 file in wow's official ui source as well as some stuff not mentioned but reported by users.
This commit is contained in:
@ -30,9 +30,15 @@ end
|
|||||||
|
|
||||||
local GetSpellInfo = GetSpellInfo
|
local GetSpellInfo = GetSpellInfo
|
||||||
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
GetSpellInfo = function(id)
|
GetSpellInfo = function(spellID)
|
||||||
local info = C_Spell.GetSpellInfo
|
if not spellID then
|
||||||
return info.name, nil, info.iconID
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
14
IceCore.lua
14
IceCore.lua
@ -19,6 +19,20 @@ end
|
|||||||
|
|
||||||
local DogTag = LibStub("LibDogTag-3.0", true)
|
local DogTag = LibStub("LibDogTag-3.0", true)
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
14
IceHUD.lua
14
IceHUD.lua
@ -53,6 +53,20 @@ else
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -3,6 +3,21 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
|
|||||||
local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
|
local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
|
||||||
local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
|
local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
|
||||||
|
|
||||||
|
local GetSpellCharges = GetSpellCharges
|
||||||
|
if not GetSpellCharges and C_Spell then
|
||||||
|
GetSpellCharges = function(spellID)
|
||||||
|
local spellChargeInfo = C_Spell.GetSpellCharges(spellID)
|
||||||
|
if spellChargeInfo then
|
||||||
|
return spellChargeInfo.currentCharges, spellChargeInfo.maxCharges, spellChargeInfo.cooldownStartTime, spellChargeInfo.cooldownDuration, spellChargeInfo.chargeModRate
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local GetSpellCount = GetSpellCount
|
||||||
|
if not GetSpellCount and C_Spell then
|
||||||
|
GetSpellCount = C_Spell.GetSpellCastCount
|
||||||
|
end
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
function IceStackCounter_GetOptions(frame, opts)
|
function IceStackCounter_GetOptions(frame, opts)
|
||||||
opts["customHeader"] = {
|
opts["customHeader"] = {
|
||||||
|
@ -13,6 +13,16 @@ if not IsSpellInRange and C_Spell then
|
|||||||
IsSpellInRange = C_Spell.IsSpellInRange
|
IsSpellInRange = C_Spell.IsSpellInRange
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellCooldown = GetSpellCooldown
|
||||||
|
if not GetSpellCooldown and C_Spell then
|
||||||
|
GetSpellCooldown = function(spellID)
|
||||||
|
local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
|
||||||
|
if spellCooldownInfo then
|
||||||
|
return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
CastBar.prototype.spellCastSent = nil
|
CastBar.prototype.spellCastSent = nil
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
|
@ -3,6 +3,20 @@ local ComboPoints = IceCore_CreateClass(IceElement)
|
|||||||
|
|
||||||
local IceHUD = _G.IceHUD
|
local IceHUD = _G.IceHUD
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -20,7 +20,7 @@ end
|
|||||||
local GetSpellInfo = GetSpellInfo
|
local GetSpellInfo = GetSpellInfo
|
||||||
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
GetSpellInfo = function(id)
|
GetSpellInfo = function(id)
|
||||||
local info = C_Spell.GetSpellInfo
|
local info = C_Spell.GetSpellInfo(id)
|
||||||
return info.name, nil, info.iconID
|
return info.name, nil, info.iconID
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -30,16 +30,31 @@ end
|
|||||||
local GetSpellInfo = GetSpellInfo
|
local GetSpellInfo = GetSpellInfo
|
||||||
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
GetSpellInfo = function(id)
|
GetSpellInfo = function(id)
|
||||||
local info = C_Spell.GetSpellInfo
|
local info = C_Spell.GetSpellInfo(id)
|
||||||
return info.name, nil, info.iconID
|
return info.name, nil, info.iconID
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellCooldown = GetSpellCooldown
|
||||||
|
if not GetSpellCooldown and C_Spell then
|
||||||
|
GetSpellCooldown = function(spellID)
|
||||||
|
local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
|
||||||
|
if spellCooldownInfo then
|
||||||
|
return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetItemInfo = GetItemInfo
|
local GetItemInfo = GetItemInfo
|
||||||
if not GetItemInfo and C_Item then
|
if not GetItemInfo and C_Item then
|
||||||
GetItemInfo = C_Item.GetItemInfo
|
GetItemInfo = C_Item.GetItemInfo
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local IsUsableSpell = IsUsableSpell
|
||||||
|
if not IsUsableSpell and C_Spell then
|
||||||
|
IsUsableSpell = C_Spell.IsSpellUsable
|
||||||
|
end
|
||||||
|
|
||||||
IceCustomCDBar.prototype.cooldownDuration = 0
|
IceCustomCDBar.prototype.cooldownDuration = 0
|
||||||
IceCustomCDBar.prototype.cooldownEndTime = 0
|
IceCustomCDBar.prototype.cooldownEndTime = 0
|
||||||
IceCustomCDBar.prototype.coolingDown = false
|
IceCustomCDBar.prototype.coolingDown = false
|
||||||
|
@ -10,7 +10,7 @@ local DefaultAuraIcon = "Interface\\Icons\\Spell_Frost_Frost"
|
|||||||
local GetSpellInfo = GetSpellInfo
|
local GetSpellInfo = GetSpellInfo
|
||||||
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
GetSpellInfo = function(id)
|
GetSpellInfo = function(id)
|
||||||
local info = C_Spell.GetSpellInfo
|
local info = C_Spell.GetSpellInfo(id)
|
||||||
return info.name, nil, info.iconID
|
return info.name, nil, info.iconID
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -9,11 +9,21 @@ end
|
|||||||
local GetSpellInfo = GetSpellInfo
|
local GetSpellInfo = GetSpellInfo
|
||||||
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
GetSpellInfo = function(id)
|
GetSpellInfo = function(id)
|
||||||
local info = C_Spell.GetSpellInfo
|
local info = C_Spell.GetSpellInfo(id)
|
||||||
return info.name, nil, info.iconID, info.castTime
|
return info.name, nil, info.iconID, info.castTime
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellCooldown = GetSpellCooldown
|
||||||
|
if not GetSpellCooldown and C_Spell then
|
||||||
|
GetSpellCooldown = function(spellID)
|
||||||
|
local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
|
||||||
|
if spellCooldownInfo then
|
||||||
|
return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- Constructor --
|
-- Constructor --
|
||||||
function GlobalCoolDown.prototype:init()
|
function GlobalCoolDown.prototype:init()
|
||||||
GlobalCoolDown.super.prototype.init(self, "GlobalCoolDown")
|
GlobalCoolDown.super.prototype.init(self, "GlobalCoolDown")
|
||||||
|
@ -4,6 +4,20 @@ local Resolve = IceCore_CreateClass(IceUnitBar)
|
|||||||
local RESOLVE_SPELL_ID = 158300
|
local RESOLVE_SPELL_ID = 158300
|
||||||
local RESOLVE_MAX = 240
|
local RESOLVE_MAX = 240
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -26,6 +26,20 @@ if Enum and Enum.PowerType then
|
|||||||
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -23,6 +23,20 @@ if STAGGER_STATES then
|
|||||||
STAGGER_RED_TRANSITION = STAGGER_STATES.RED.threshold
|
STAGGER_RED_TRANSITION = STAGGER_STATES.RED.threshold
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -12,6 +12,20 @@ if GetNumGroupMembers then
|
|||||||
GetNumRaidMembers = GetNumGroupMembers
|
GetNumRaidMembers = GetNumGroupMembers
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -3,6 +3,11 @@ IceTargetHealth = IceCore_CreateClass(IceUnitBar)
|
|||||||
|
|
||||||
local IceHUD = _G.IceHUD
|
local IceHUD = _G.IceHUD
|
||||||
|
|
||||||
|
local IsAddOnLoaded = IsAddOnLoaded
|
||||||
|
if not IsAddOnLoaded and C_AddOns then
|
||||||
|
IsAddOnLoaded = C_AddOns.IsAddOnLoaded
|
||||||
|
end
|
||||||
|
|
||||||
IceTargetHealth.prototype.color = nil
|
IceTargetHealth.prototype.color = nil
|
||||||
IceTargetHealth.prototype.determineColor = true
|
IceTargetHealth.prototype.determineColor = true
|
||||||
IceTargetHealth.prototype.registerEvents = true
|
IceTargetHealth.prototype.registerEvents = true
|
||||||
|
@ -12,6 +12,20 @@ if GetNumGroupMembers then
|
|||||||
GetNumRaidMembers = GetNumGroupMembers
|
GetNumRaidMembers = GetNumGroupMembers
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
@ -3,6 +3,20 @@ local Vengeance = IceCore_CreateClass(IceUnitBar)
|
|||||||
|
|
||||||
local VENGEANCE_SPELL_ID = 93098
|
local VENGEANCE_SPELL_ID = 93098
|
||||||
|
|
||||||
|
local GetSpellInfo = GetSpellInfo
|
||||||
|
if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
|
||||||
|
GetSpellInfo = function(spellID)
|
||||||
|
if not spellID then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local spellInfo = C_Spell.GetSpellInfo(spellID)
|
||||||
|
if spellInfo then
|
||||||
|
return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local GetSpellName = GetSpellInfo
|
local GetSpellName = GetSpellInfo
|
||||||
if C_Spell and C_Spell.GetSpellName then
|
if C_Spell and C_Spell.GetSpellName then
|
||||||
GetSpellName = C_Spell.GetSpellName
|
GetSpellName = C_Spell.GetSpellName
|
||||||
|
Reference in New Issue
Block a user