diff --git a/.packager.ps1 b/.packager.ps1 index 6d39120e..de4b1041 100644 --- a/.packager.ps1 +++ b/.packager.ps1 @@ -28,11 +28,11 @@ $includedItems = @( ".\init.lua", ".\LICENSE.txt", ".\ls_UI.toc", + ".\assets\", ".\config\", ".\core\", ".\embeds\", ".\locales\", - ".\media\", ".\modules\" ) diff --git a/media/absorb.TGA b/assets/absorb.TGA similarity index 100% rename from media/absorb.TGA rename to assets/absorb.TGA diff --git a/media/border-thick-glow.TGA b/assets/border-thick-glow.TGA similarity index 100% rename from media/border-thick-glow.TGA rename to assets/border-thick-glow.TGA diff --git a/media/border-thick.TGA b/assets/border-thick.TGA similarity index 100% rename from media/border-thick.TGA rename to assets/border-thick.TGA diff --git a/media/border-thin.TGA b/assets/border-thin.TGA similarity index 100% rename from media/border-thin.TGA rename to assets/border-thin.TGA diff --git a/media/console.TGA b/assets/console.TGA similarity index 100% rename from media/console.TGA rename to assets/console.TGA diff --git a/media/micromenu.TGA b/assets/micromenu.TGA similarity index 100% rename from media/micromenu.TGA rename to assets/micromenu.TGA diff --git a/media/minimap-buttons.TGA b/assets/minimap-buttons.TGA similarity index 100% rename from media/minimap-buttons.TGA rename to assets/minimap-buttons.TGA diff --git a/media/minimap.TGA b/assets/minimap.TGA similarity index 100% rename from media/minimap.TGA rename to assets/minimap.TGA diff --git a/media/pet-frame-glow.TGA b/assets/pet-frame-glow.TGA similarity index 100% rename from media/pet-frame-glow.TGA rename to assets/pet-frame-glow.TGA diff --git a/media/pet-frame.TGA b/assets/pet-frame.TGA similarity index 100% rename from media/pet-frame.TGA rename to assets/pet-frame.TGA diff --git a/media/player-frame-glow.TGA b/assets/player-frame-glow.TGA similarity index 100% rename from media/player-frame-glow.TGA rename to assets/player-frame-glow.TGA diff --git a/media/player-frame.TGA b/assets/player-frame.TGA similarity index 100% rename from media/player-frame.TGA rename to assets/player-frame.TGA diff --git a/media/pvp-banner-alliance.TGA b/assets/pvp-banner-alliance.TGA old mode 100755 new mode 100644 similarity index 100% rename from media/pvp-banner-alliance.TGA rename to assets/pvp-banner-alliance.TGA diff --git a/media/pvp-banner-ffa.TGA b/assets/pvp-banner-ffa.TGA old mode 100755 new mode 100644 similarity index 100% rename from media/pvp-banner-ffa.TGA rename to assets/pvp-banner-ffa.TGA diff --git a/media/pvp-banner-horde.TGA b/assets/pvp-banner-horde.TGA old mode 100755 new mode 100644 similarity index 100% rename from media/pvp-banner-horde.TGA rename to assets/pvp-banner-horde.TGA diff --git a/media/statusbar-glass-shadow.TGA b/assets/statusbar-glass-shadow.TGA similarity index 100% rename from media/statusbar-glass-shadow.TGA rename to assets/statusbar-glass-shadow.TGA diff --git a/media/statusbar-glass.TGA b/assets/statusbar-glass.TGA similarity index 100% rename from media/statusbar-glass.TGA rename to assets/statusbar-glass.TGA diff --git a/media/statusbar-sep.TGA b/assets/statusbar-sep.TGA similarity index 100% rename from media/statusbar-sep.TGA rename to assets/statusbar-sep.TGA diff --git a/media/statusbar.TGA b/assets/statusbar.TGA similarity index 100% rename from media/statusbar.TGA rename to assets/statusbar.TGA diff --git a/media/transparent.TGA b/assets/transparent.TGA similarity index 100% rename from media/transparent.TGA rename to assets/transparent.TGA diff --git a/media/unit-frame-bg.TGA b/assets/unit-frame-bg.TGA similarity index 100% rename from media/unit-frame-bg.TGA rename to assets/unit-frame-bg.TGA diff --git a/media/unit-frame-icons.TGA b/assets/unit-frame-icons.TGA similarity index 100% rename from media/unit-frame-icons.TGA rename to assets/unit-frame-icons.TGA diff --git a/media/unit-frame-sep-horiz.TGA b/assets/unit-frame-sep-horiz.TGA similarity index 100% rename from media/unit-frame-sep-horiz.TGA rename to assets/unit-frame-sep-horiz.TGA diff --git a/media/unit-frame-sep-vert.TGA b/assets/unit-frame-sep-vert.TGA similarity index 100% rename from media/unit-frame-sep-vert.TGA rename to assets/unit-frame-sep-vert.TGA diff --git a/media/warning-bg.TGA b/assets/warning-bg.TGA similarity index 100% rename from media/warning-bg.TGA rename to assets/warning-bg.TGA diff --git a/core/button.lua b/core/button.lua index f19f1f6a..c81d2b2d 100644 --- a/core/button.lua +++ b/core/button.lua @@ -199,7 +199,7 @@ local function skinButton(button) hooksecurefunc(button, "SetNormalTexture", setNormalTextureHook) local border = E:CreateBorder(button) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) button.Border_ = border @@ -433,7 +433,7 @@ function E:CreateButton(parent, name, isSandwich, isSecure) button.Icon = setIcon(button) local border = E:CreateBorder(button) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) button.Border = border @@ -468,7 +468,7 @@ function E:CreateCheckButton(parent, name, isSandwich, isSecure) button.Icon = setIcon(button) local border = E:CreateBorder(button) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) button.Border = border diff --git a/core/constants.lua b/core/constants.lua index a8f61f75..12943fea 100644 --- a/core/constants.lua +++ b/core/constants.lua @@ -219,61 +219,61 @@ local textures = { }, inlineicons = { -- first line - ["LEADER"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:1:33|t", - ["DAMAGER"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:1:33|t", - ["HEALER"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:1:33|t", - ["TANK"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:1:33|t", - ["RESTING"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:1:33|t", - ["COMBAT"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:1:33|t", - ["HORDE"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:1:33|t", + ["LEADER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:1:33|t", + ["DAMAGER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:1:33|t", + ["HEALER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:1:33|t", + ["TANK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:1:33|t", + ["RESTING"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:1:33|t", + ["COMBAT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:1:33|t", + ["HORDE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:1:33|t", -- second line - ["ALLIANCE"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:34:66|t", - ["FFA"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:34:66|t", - ["PHASE"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:34:66|t", - ["QUEST"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:34:66|t", - ["SHEEP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:34:66|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:34:66|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:34:66|t", + ["ALLIANCE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:34:66|t", + ["FFA"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:34:66|t", + ["PHASE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:34:66|t", + ["QUEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:34:66|t", + ["SHEEP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:34:66|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:34:66|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:34:66|t", -- third line - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:67:99|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:67:99|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:67:99|t", -- fourth line - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:100:132|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:100:132|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:100:132|t", -- fifth line - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:133:165|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:133:165|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:133:165|t", -- sixth line - ["WARRIOR"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:166:198|t", - ["MAGE"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:166:198|t", - ["ROGUE"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:166:198|t", - ["DRUID"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:166:198|t", - ["HUNTER"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:166:198|t", - ["SHAMAN"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:166:198|t", - ["PRIEST"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:166:198|t", + ["WARRIOR"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:166:198|t", + ["MAGE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:166:198|t", + ["ROGUE"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:166:198|t", + ["DRUID"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:166:198|t", + ["HUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:166:198|t", + ["SHAMAN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:166:198|t", + ["PRIEST"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:166:198|t", -- seventh line - ["WARLOCK"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:1:33:199:231|t", - ["PALADIN"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:34:66:199:231|t", - ["DEATHKNIGHT"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:67:99:199:231|t", - ["MONK"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:100:132:199:231|t", - ["DEMONHUNTER"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:133:165:199:231|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:166:198:199:231|t", - -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\media\\unit-frame-icons:%d:%d:0:0:256:256:199:231:199:231|t", + ["WARLOCK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:1:33:199:231|t", + ["PALADIN"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:34:66:199:231|t", + ["DEATHKNIGHT"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:67:99:199:231|t", + ["MONK"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:100:132:199:231|t", + ["DEMONHUNTER"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:133:165:199:231|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:166:198:199:231|t", + -- ["TEMP"] = "|TInterface\\AddOns\\ls_UI\\assets\\unit-frame-icons:%d:%d:0:0:256:256:199:231:199:231|t", }, } diff --git a/core/statusbar.lua b/core/statusbar.lua index 73eeae18..8fab3433 100644 --- a/core/statusbar.lua +++ b/core/statusbar.lua @@ -409,16 +409,16 @@ do object.Tube[i]:SetTexture(nil) object.Tube[i]:ClearAllPoints() else - object.Tube[i]:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar") + object.Tube[i]:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar") object.Tube[i]:SetTexCoord(unpack(LAYOUT[s][v][i].coords)) object.Tube[i]:ClearAllPoints() object.Tube[i]:SetSize(unpack(LAYOUT[s][v][i].size)) end end - object.Tube[5]:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + object.Tube[5]:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") object.Tube[5]:SetAllPoints() - object.Tube[6]:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + object.Tube[6]:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") object.Tube[6]:SetAllPoints() if s == "HORIZONTAL" then diff --git a/modules/auras/auras.lua b/modules/auras/auras.lua index a94c5a9a..c698f6f5 100644 --- a/modules/auras/auras.lua +++ b/modules/auras/auras.lua @@ -161,7 +161,7 @@ local function HandleButton(button) button.Icon = E:SetIcon(button, [[Interface\ICONS\INV_Misc_QuestionMark]]) local border = E:CreateBorder(button) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) button.Border = border @@ -294,7 +294,7 @@ local function CreateHeader(filter) totem.Icon = E:SetIcon(icon) border = E:CreateBorder(totem) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) totem.Border = border diff --git a/modules/bars/controller.lua b/modules/bars/controller.lua index ca9346b6..63c45c64 100644 --- a/modules/bars/controller.lua +++ b/modules/bars/controller.lua @@ -95,7 +95,7 @@ WIDGETS.BAG = { point = {"BOTTOMLEFT", "LSActionBarControllerBag", "BOTTOMLEFT", 17, 11}, on_add = function(self) local texture = anim_controller.Bag:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.bottom.bag.coords)) texture:SetAllPoints() texture:SetSize(unpack(elements.bottom.bag.size)) @@ -262,20 +262,20 @@ function MODULE.SetupActionBarController() anim_controller.Top = top local texture = top:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.top.left.coords)) texture:SetPoint("BOTTOMRIGHT", top, "BOTTOMLEFT", 0, 0) texture:SetSize(unpack(elements.top.left.size)) top.Left = texture texture = top:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.top.mid.coords)) texture:SetAllPoints() top.Mid = texture texture = top:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.top.right.coords)) texture:SetPoint("BOTTOMLEFT", top, "BOTTOMRIGHT", 0, 0) texture:SetSize(unpack(elements.top.right.size)) @@ -288,20 +288,20 @@ function MODULE.SetupActionBarController() anim_controller.Bottom = bottom texture = bottom:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.bottom.left.coords)) texture:SetPoint("BOTTOMRIGHT", bottom, "BOTTOMLEFT", 0, 0) texture:SetSize(unpack(elements.bottom.left.size)) bottom.Left = texture texture = bottom:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.bottom.mid.coords)) texture:SetAllPoints() bottom.Mid = texture texture = bottom:CreateTexture(nil, "ARTWORK") - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\console") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\console") texture:SetTexCoord(unpack(elements.bottom.right.coords)) texture:SetPoint("BOTTOMLEFT", bottom, "BOTTOMRIGHT", 0, 0) texture:SetSize(unpack(elements.bottom.right.size)) diff --git a/modules/bars/micromenu.lua b/modules/bars/micromenu.lua index 00849837..b927c382 100644 --- a/modules/bars/micromenu.lua +++ b/modules/bars/micromenu.lua @@ -210,7 +210,7 @@ local function SetPushedTexture(button) local pushed = button:GetPushedTexture() if pushed then - pushed:SetTexture("Interface\\AddOns\\ls_UI\\media\\micromenu") + pushed:SetTexture("Interface\\AddOns\\ls_UI\\assets\\micromenu") pushed:SetTexCoord(unpack(TEXTURE_COORDS.pushed)) pushed:ClearAllPoints() pushed:SetPoint("TOPLEFT", 1, -1) @@ -256,13 +256,13 @@ local function HandleMicroButton(button) SetDisabledTexture(button) local border = E:CreateBorder(button) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thin") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin") border:SetSize(16) border:SetOffset(-4) button.Border = border if highlight then - highlight:SetTexture("Interface\\AddOns\\ls_UI\\media\\micromenu") + highlight:SetTexture("Interface\\AddOns\\ls_UI\\assets\\micromenu") highlight:SetTexCoord(unpack(TEXTURE_COORDS.highlight)) highlight:ClearAllPoints() highlight:SetPoint("TOPLEFT", 1, -1) @@ -282,7 +282,7 @@ local function HandleMicroButton(button) bg:SetAllPoints() local icon = button:CreateTexture(nil, "BACKGROUND", nil, 1) - icon:SetTexture("Interface\\AddOns\\ls_UI\\media\\micromenu") + icon:SetTexture("Interface\\AddOns\\ls_UI\\assets\\micromenu") icon:SetPoint("TOPLEFT", 1, -1) icon:SetPoint("BOTTOMRIGHT", -1, 1) button.Icon = icon diff --git a/modules/bars/xpbar.lua b/modules/bars/xpbar.lua index f3c7694a..3fc0b052 100644 --- a/modules/bars/xpbar.lua +++ b/modules/bars/xpbar.lua @@ -488,13 +488,13 @@ function BARS.CreateXPBar() local sep = texParent:CreateTexture(nil, "ARTWORK", nil, -7) sep:SetPoint("LEFT", bar[1], "RIGHT", -5, 0) - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") sep:Hide() bar[1].Sep = sep sep = texParent:CreateTexture(nil, "ARTWORK", nil, -7) sep:SetPoint("LEFT", bar[2], "RIGHT", -5, 0) - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") sep:Hide() bar[2].Sep = sep diff --git a/modules/minimap/minimap.lua b/modules/minimap/minimap.lua index 8d4caf69..1ded3216 100644 --- a/modules/minimap/minimap.lua +++ b/modules/minimap/minimap.lua @@ -211,7 +211,7 @@ local function handleMinimapButton(button, recursive) border = button:CreateTexture() end - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\minimap-buttons") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\minimap-buttons") border:SetTexCoord(unpack(TEXTURES[t].coords)) border:SetDrawLayer("ARTWORK", 1) border:SetAllPoints(button) @@ -335,7 +335,7 @@ function MODULE.Init() RegisterStateDriver(Minimap, "visibility", "[petbattle] hide; show") local border = Minimap:CreateTexture(nil, "BORDER") - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\minimap") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\minimap") border:SetTexCoord(1 / 512, 333 / 512, 1 / 512, 333 / 512) border:SetSize(332 / 2, 332 / 2) border:SetPoint("CENTER", 0, 0) @@ -518,7 +518,7 @@ function MODULE.Init() frame.BG = bg local border = E:CreateBorder(frame) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) border:Hide() @@ -547,9 +547,9 @@ function MODULE.Init() button:SetHitRectInsets(0, 0, 0, 0) button:SetScript("OnMouseUp", nil) button:SetScript("OnMouseDown", nil) - button:SetHighlightTexture("Interface\\AddOns\\ls_UI\\media\\minimap-buttons", "ADD") + button:SetHighlightTexture("Interface\\AddOns\\ls_UI\\assets\\minimap-buttons", "ADD") button:GetHighlightTexture():SetTexCoord(106 / 256, 210 / 256, 90 / 256, 146 / 256) - button:SetPushedTexture("Interface\\AddOns\\ls_UI\\media\\minimap-buttons") + button:SetPushedTexture("Interface\\AddOns\\ls_UI\\assets\\minimap-buttons") button:GetPushedTexture():SetBlendMode("ADD") button:GetPushedTexture():SetTexCoord(1 / 256, 105 / 256, 147 / 256, 203 / 256) Minimap.Clock = button @@ -566,7 +566,7 @@ function MODULE.Init() local bg, ticker, glow = button:GetRegions() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\minimap-buttons") + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\minimap-buttons") bg:SetTexCoord(1 / 256, 105 / 256, 90 / 256, 146 / 256) ticker:ClearAllPoints() @@ -576,7 +576,7 @@ function MODULE.Init() ticker:SetJustifyV("MIDDLE") button.Ticker = ticker - glow:SetTexture("Interface\\AddOns\\ls_UI\\media\\minimap-buttons") + glow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\minimap-buttons") glow:SetTexCoord(1 / 256, 105 / 256, 147 / 256, 203 / 256) end diff --git a/modules/unitframes/core.lua b/modules/unitframes/core.lua index d4184c3a..165b734f 100644 --- a/modules/unitframes/core.lua +++ b/modules/unitframes/core.lua @@ -4,80 +4,77 @@ local UF = P:AddModule("UnitFrames") -- Lua local _G = getfenv(0) -local string = _G.string local unpack = _G.unpack +--[[ luacheck: globals +UnitFrame_OnEnter +PartyMemberBuffTooltip +PartyMemberBuffTooltip_Update +UnitFrame_OnLeave +]] + -- Mine local isInit = false local objects = {} local units = {} -local function LSUnitFrame_OnEnter(self) - if self.__owner then - self = self.__owner - end +local function frame_OnEnter(self) + self = self.__owner or self - _G.UnitFrame_OnEnter(self) + UnitFrame_OnEnter(self) - if string.match(self:GetName(), "LSPetFrame") then - _G.PartyMemberBuffTooltip:ClearAllPoints() - _G.PartyMemberBuffTooltip:SetPoint("BOTTOMRIGHT", self, "TOPLEFT", 4, -4) - _G.PartyMemberBuffTooltip_Update(self) + if self:GetName() == "LSPetFrame" then + PartyMemberBuffTooltip:ClearAllPoints() + PartyMemberBuffTooltip:SetPoint("BOTTOMRIGHT", self, "TOPLEFT", 4, -4) + PartyMemberBuffTooltip_Update(self) end end -local function LSUnitFrame_OnLeave(self) - if self.__owner then - self = self.__owner - end - - _G.UnitFrame_OnLeave(self) +local function frame_OnLeave(self) + self = self.__owner or self - if string.match(self:GetName(), "LSPetFrame") then - _G.PartyMemberBuffTooltip:Hide() - end + UnitFrame_OnLeave(self) + PartyMemberBuffTooltip:Hide() end -local function Style(frame, unit) - frame:RegisterForClicks("AnyUp") - frame:SetScript("OnEnter", LSUnitFrame_OnEnter) - frame:SetScript("OnLeave", LSUnitFrame_OnLeave) - - if unit == "player" then - if E.UI_LAYOUT == "ls" then - UF:CreateVerticalPlayerFrame(frame) - else - UF:CreateHorizontalPlayerFrame(frame) - end - elseif unit == "pet" then - if E.UI_LAYOUT == "ls" then - UF:CreateVerticalPetFrame(frame) - else - UF:CreateHorizontalPetFrame(frame) +local function constructor() + oUF:RegisterStyle("LS", function(frame, unit) + frame:RegisterForClicks("AnyUp") + frame:SetScript("OnEnter", frame_OnEnter) + frame:SetScript("OnLeave", frame_OnLeave) + + if unit == "player" then + if E.UI_LAYOUT == "ls" then + UF:CreateVerticalPlayerFrame(frame) + else + UF:CreateHorizontalPlayerFrame(frame) + end + elseif unit == "pet" then + if E.UI_LAYOUT == "ls" then + UF:CreateVerticalPetFrame(frame) + else + UF:CreateHorizontalPetFrame(frame) + end + elseif unit == "target" then + UF:CreateTargetFrame(frame) + elseif unit == "targettarget" then + UF:CreateTargetTargetFrame(frame) + elseif unit == "focus" then + UF:CreateFocusFrame(frame) + elseif unit == "focustarget" then + UF:CreateFocusTargetFrame(frame) + elseif unit == "boss1" then + UF:CreateBossFrame(frame) + elseif unit == "boss2" then + UF:CreateBossFrame(frame) + elseif unit == "boss3" then + UF:CreateBossFrame(frame) + elseif unit == "boss4" then + UF:CreateBossFrame(frame) + elseif unit == "boss5" then + UF:CreateBossFrame(frame) end - elseif unit == "target" then - UF:CreateTargetFrame(frame) - elseif unit == "targettarget" then - UF:CreateTargetTargetFrame(frame) - elseif unit == "focus" then - UF:CreateFocusFrame(frame) - elseif unit == "focustarget" then - UF:CreateFocusTargetFrame(frame) - elseif unit == "boss1" then - UF:CreateBossFrame(frame) - elseif unit == "boss2" then - UF:CreateBossFrame(frame) - elseif unit == "boss3" then - UF:CreateBossFrame(frame) - elseif unit == "boss4" then - UF:CreateBossFrame(frame) - elseif unit == "boss5" then - UF:CreateBossFrame(frame) - end -end - -local function MainConstructor() - oUF:RegisterStyle("LS", Style) + end) oUF:SetActiveStyle("LS") if C.db.profile.units[E.UI_LAYOUT].player.enabled then @@ -273,7 +270,7 @@ end function UF:Init() if not isInit and C.db.char.units.enabled then - oUF:Factory(MainConstructor) + oUF:Factory(constructor) isInit = true end diff --git a/modules/unitframes/elements/castbar.lua b/modules/unitframes/elements/castbar.lua index 31d73781..8eb1d02c 100644 --- a/modules/unitframes/elements/castbar.lua +++ b/modules/unitframes/elements/castbar.lua @@ -73,7 +73,7 @@ function UF:CreateCastbar(parent) element.LeftIcon = icon local sep = element:CreateTexture(nil, "OVERLAY") - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") sep:SetPoint("LEFT", icon, "RIGHT", -5, 0) element.LeftSep = sep @@ -83,7 +83,7 @@ function UF:CreateCastbar(parent) element.RightIcon = icon sep = element:CreateTexture(nil, "OVERLAY") - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") sep:SetPoint("RIGHT", icon, "LEFT", 5, 0) element.RightSep = sep diff --git a/modules/unitframes/elements/health.lua b/modules/unitframes/elements/health.lua index 631486a8..b8de498c 100644 --- a/modules/unitframes/elements/health.lua +++ b/modules/unitframes/elements/health.lua @@ -24,7 +24,7 @@ do function UF:CreateHealth(parent, text, textFontObject, textParent) local element = _G.CreateFrame("StatusBar", nil, parent) - element:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\media\\transparent") + element:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\assets\\transparent") E:SmoothBar(element) @@ -83,7 +83,7 @@ do local myBar = _G.CreateFrame("StatusBar", nil, parent) myBar:SetFrameLevel(level) - myBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\media\\transparent") + myBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\assets\\transparent") myBar:SetStatusBarColor(M.COLORS.HEALPREDICTION.MY_HEAL:GetRGB()) parent.MyHeal = myBar @@ -93,7 +93,7 @@ do local otherBar = _G.CreateFrame("StatusBar", nil, parent) otherBar:SetFrameLevel(level) - otherBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\media\\transparent") + otherBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\assets\\transparent") parent.OtherHeal = otherBar otherBar._texture = otherBar:CreateTexture(nil, "ARTWORK") @@ -102,11 +102,11 @@ do local absorbBar = _G.CreateFrame("StatusBar", nil, parent) absorbBar:SetFrameLevel(level + 1) - absorbBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\media\\transparent") + absorbBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\assets\\transparent") parent.DamageAbsorb = absorbBar local overlay = absorbBar:CreateTexture(nil, "ARTWORK", nil, 1) - overlay:SetTexture("Interface\\AddOns\\ls_UI\\media\\absorb", true) + overlay:SetTexture("Interface\\AddOns\\ls_UI\\assets\\absorb", true) overlay:SetHorizTile(true) overlay:SetVertTile(true) overlay:SetAllPoints(absorbBar:GetStatusBarTexture()) @@ -115,7 +115,7 @@ do local healAbsorbBar = _G.CreateFrame("StatusBar", nil, parent) healAbsorbBar:SetReverseFill(true) healAbsorbBar:SetFrameLevel(level + 1) - healAbsorbBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\media\\transparent") + healAbsorbBar:SetStatusBarTexture("Interface\\AddOns\\ls_UI\\assets\\transparent") healAbsorbBar:SetStatusBarColor(M.COLORS.HEALPREDICTION.HEAL_ABSORB:GetRGB()) parent.HealAbsorb = healAbsorbBar diff --git a/modules/unitframes/elements/insets.lua b/modules/unitframes/elements/insets.lua index 563b3062..e96de7d6 100644 --- a/modules/unitframes/elements/insets.lua +++ b/modules/unitframes/elements/insets.lua @@ -62,31 +62,31 @@ function UF:CreateInsets(parent, texParent) top_inset:SetPoint("TOPRIGHT", 0, 0) local texture1 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture1:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz") + texture1:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz") texture1:SetTexCoord(1 / 64, 15 / 64, 11 / 32, 23 / 32) texture1:SetSize(14 / 2, 12 / 2) texture1:SetPoint("BOTTOMLEFT", top_inset, "BOTTOMLEFT", -1, -2) local texture2 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture2:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz", true) + texture2:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz", true) texture2:SetTexCoord(16 / 64, 30 / 64, 11 / 32, 23 / 32) texture2:SetSize(14 / 2, 12 / 2) texture2:SetPoint("BOTTOMRIGHT", top_inset, "BOTTOMRIGHT", 1, -2) local texture3 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture3:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz", true) + texture3:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz", true) texture3:SetTexCoord(0 / 64, 64 / 64, 0 / 32, 12 / 32) texture3:SetHorizTile(true) texture3:SetPoint("TOPLEFT", texture1, "TOPRIGHT", 0, 0) texture3:SetPoint("BOTTOMRIGHT", texture2, "BOTTOMLEFT", 0, 0) local texture4 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 0) - texture4:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + texture4:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") texture4:SetPoint("TOPLEFT", top_inset, "TOPLEFT", 0, 0) texture4:SetPoint("BOTTOMRIGHT", top_inset, "BOTTOMRIGHT", 0, 2) local texture5 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, -1) - texture5:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + texture5:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") texture5:SetPoint("TOPLEFT", top_inset, "TOPLEFT", 0, 0) texture5:SetPoint("BOTTOMRIGHT", top_inset, "BOTTOMRIGHT", 0, 2) @@ -108,31 +108,31 @@ function UF:CreateInsets(parent, texParent) bottom_inset:SetPoint("BOTTOMRIGHT", 0, 0) texture1 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture1:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz") + texture1:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz") texture1:SetTexCoord(1 / 64, 15 / 64, 11 / 32, 23 / 32) texture1:SetSize(14 / 2, 12 / 2) texture1:SetPoint("TOPLEFT", bottom_inset, "TOPLEFT", -1, 2) texture2 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture2:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz", true) + texture2:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz", true) texture2:SetTexCoord(16 / 64, 30 / 64, 11 / 32, 23 / 32) texture2:SetSize(14 / 2, 12 / 2) texture2:SetPoint("TOPRIGHT", bottom_inset, "TOPRIGHT", 1, 2) texture3 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 4) - texture3:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-sep-horiz", true) + texture3:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-sep-horiz", true) texture3:SetTexCoord(0 / 64, 64 / 64, 0 / 32, 12 / 32) texture3:SetHorizTile(true) texture3:SetPoint("TOPLEFT", texture1, "TOPRIGHT", 0, 0) texture3:SetPoint("BOTTOMRIGHT", texture2, "BOTTOMLEFT", 0, 0) texture4 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, 0) - texture4:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + texture4:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") texture4:SetPoint("TOPLEFT", bottom_inset, "TOPLEFT", 0, -2) texture4:SetPoint("BOTTOMRIGHT", bottom_inset, "BOTTOMRIGHT", 0, 0) texture5 = (texParent or parent):CreateTexture(nil, "OVERLAY", nil, -1) - texture5:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + texture5:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") texture5:SetPoint("TOPLEFT", bottom_inset, "TOPLEFT", 0, -2) texture5:SetPoint("BOTTOMRIGHT", bottom_inset, "BOTTOMRIGHT", 0, 0) diff --git a/modules/unitframes/elements/pvpindicator.lua b/modules/unitframes/elements/pvpindicator.lua index 5f5322e4..78cb4fc3 100644 --- a/modules/unitframes/elements/pvpindicator.lua +++ b/modules/unitframes/elements/pvpindicator.lua @@ -46,11 +46,11 @@ local function Override(self, _, unit) pvp:SetTexture(GetPrestigeInfo(level)) pvp:SetTexCoord(0, 1, 0, 1) else - pvp:SetTexture("Interface\\AddOns\\ls_UI\\media\\pvp-banner-"..status) + pvp:SetTexture("Interface\\AddOns\\ls_UI\\assets\\pvp-banner-"..status) pvp:SetTexCoord(102 / 256, 162 / 256, 22 / 128, 82 / 128) end - pvp.Prestige:SetTexture("Interface\\AddOns\\ls_UI\\media\\pvp-banner-"..status) + pvp.Prestige:SetTexture("Interface\\AddOns\\ls_UI\\assets\\pvp-banner-"..status) pvp.Prestige:SetTexCoord(1 / 256, 101 / 256, 1 / 128, 109 / 128) pvp:Show() diff --git a/modules/unitframes/elements/threatindicator.lua b/modules/unitframes/elements/threatindicator.lua index 287fe3f7..5dd162d0 100644 --- a/modules/unitframes/elements/threatindicator.lua +++ b/modules/unitframes/elements/threatindicator.lua @@ -17,7 +17,7 @@ function UF:CreateThreatIndicator(parent, isTexture) element = parent:CreateTexture(nil, "BACKGROUND", nil, -7) else element = E:CreateBorder(parent) - element:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick-glow", "BACKGROUND", -7) + element:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick-glow", "BACKGROUND", -7) element:SetSize(16) element:SetOffset(-6) end diff --git a/modules/unitframes/units/boss.lua b/modules/unitframes/units/boss.lua index cb1d9dc3..5f4b3756 100644 --- a/modules/unitframes/units/boss.lua +++ b/modules/unitframes/units/boss.lua @@ -46,7 +46,7 @@ function UF:CreateBossFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fgParent = CreateFrame("Frame", nil, frame) @@ -126,18 +126,18 @@ function UF:CreateBossFrame(frame) frame.Auras = self:CreateAuras(frame, "boss") local border = E:CreateBorder(fgParent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fgParent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fgParent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) diff --git a/modules/unitframes/units/focus.lua b/modules/unitframes/units/focus.lua index a3122323..e7a123de 100644 --- a/modules/unitframes/units/focus.lua +++ b/modules/unitframes/units/focus.lua @@ -19,7 +19,7 @@ function UF:CreateFocusFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -98,18 +98,18 @@ function UF:CreateFocusFrame(frame) frame:Tag(status, "[ls:questicon][ls:sheepicon][ls:phaseicon][ls:leadericon][ls:lfdroleicon][ls:classicon]") local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) diff --git a/modules/unitframes/units/focustarget.lua b/modules/unitframes/units/focustarget.lua index a24977c5..84085a08 100644 --- a/modules/unitframes/units/focustarget.lua +++ b/modules/unitframes/units/focustarget.lua @@ -13,7 +13,7 @@ function UF:CreateFocusTargetFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -71,18 +71,18 @@ function UF:CreateFocusTargetFrame(frame) frame:Tag(status, "[ls:questicon][ls:sheepicon][ls:phaseicon][ls:leadericon][ls:lfdroleicon][ls:classicon]") local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) end diff --git a/modules/unitframes/units/pet.lua b/modules/unitframes/units/pet.lua index ab041642..d382bcd4 100644 --- a/modules/unitframes/units/pet.lua +++ b/modules/unitframes/units/pet.lua @@ -18,7 +18,7 @@ function UF:CreateVerticalPetFrame(frame) local fg = fg_parent:CreateTexture(nil, "ARTWORK", nil, 1) fg:SetSize(80 / 2, 148 / 2) - fg:SetTexture("Interface\\AddOns\\ls_UI\\media\\pet-frame") + fg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\pet-frame") fg:SetTexCoord(1 / 128, 81 / 128, 1 / 256, 149 / 256) fg:SetPoint("CENTER", 0, 0) @@ -55,7 +55,7 @@ function UF:CreateVerticalPetFrame(frame) frame.DebuffIndicator:SetWidth(14) local threat = self:CreateThreatIndicator(frame, true) - threat:SetTexture("Interface\\AddOns\\ls_UI\\media\\pet-frame-glow") + threat:SetTexture("Interface\\AddOns\\ls_UI\\assets\\pet-frame-glow") threat:SetTexCoord(1 / 128, 85 / 128, 1 / 128, 97 / 128) threat:SetSize(84 / 2, 96 / 2) threat:SetPoint("CENTER", 0, 0) @@ -86,7 +86,7 @@ function UF:CreateHorizontalPetFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -144,18 +144,18 @@ function UF:CreateHorizontalPetFrame(frame) frame.DebuffIndicator = self:CreateDebuffIndicator(text_parent) local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) end diff --git a/modules/unitframes/units/player.lua b/modules/unitframes/units/player.lua index 18b9c756..55bca7de 100644 --- a/modules/unitframes/units/player.lua +++ b/modules/unitframes/units/player.lua @@ -36,7 +36,7 @@ function UF:CreateVerticalPlayerFrame(frame) -- bg local texture = frame:CreateTexture(nil, "BACKGROUND", nil, -7) texture:SetAllPoints() - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\player-frame") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\player-frame") texture:SetTexCoord(667 / 1024, 999 / 1024, 1 / 512, 333 / 512) -- border @@ -47,7 +47,7 @@ function UF:CreateVerticalPlayerFrame(frame) texture = border_parent:CreateTexture(nil, "BACKGROUND") texture:SetAllPoints() - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\player-frame") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\player-frame") texture:SetTexCoord(1 / 1024, 333 / 1024, 1 / 512, 333 / 512) -- fg @@ -58,7 +58,7 @@ function UF:CreateVerticalPlayerFrame(frame) texture = fg_parent:CreateTexture(nil, "ARTWORK", nil, 2) texture:SetAllPoints() - texture:SetTexture("Interface\\AddOns\\ls_UI\\media\\player-frame") + texture:SetTexture("Interface\\AddOns\\ls_UI\\assets\\player-frame") texture:SetTexCoord(334 / 1024, 666 / 1024, 1 / 512, 333 / 512) -- text @@ -81,7 +81,7 @@ function UF:CreateVerticalPlayerFrame(frame) for i = 1, 9 do local sep = left_tube:CreateTexture(nil, "ARTWORK", nil, 1) sep:SetSize(12, 12) - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") sep:SetTexCoord(0.03125, 3, 0.78125, 3, 0.03125, 0, 0.78125, 0) seps[i] = sep end @@ -264,7 +264,7 @@ function UF:CreateVerticalPlayerFrame(frame) -- threat local threat = self:CreateThreatIndicator(border_parent, true) - threat:SetTexture("Interface\\AddOns\\ls_UI\\media\\player-frame-glow") + threat:SetTexture("Interface\\AddOns\\ls_UI\\assets\\player-frame-glow") threat:SetTexCoord(1 / 512, 337 / 512, 1 / 512, 337 / 512) threat:SetSize(336 / 2, 336 / 2) threat:SetPoint("CENTER", 0, 0) @@ -280,7 +280,7 @@ function UF:CreateHorizontalPlayerFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -299,7 +299,7 @@ function UF:CreateHorizontalPlayerFrame(frame) for i = 1, 9 do local sep = fg_parent:CreateTexture(nil, "ARTWORK", nil, 1) - sep:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-sep", "REPEAT", "REPEAT") + sep:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-sep", "REPEAT", "REPEAT") seps[i] = sep end @@ -484,18 +484,18 @@ function UF:CreateHorizontalPlayerFrame(frame) frame:Tag(status, "[ls:combatresticon][ls:leadericon][ls:lfdroleicon]") local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) diff --git a/modules/unitframes/units/target.lua b/modules/unitframes/units/target.lua index 9a407bee..344411e7 100644 --- a/modules/unitframes/units/target.lua +++ b/modules/unitframes/units/target.lua @@ -19,7 +19,7 @@ function UF:CreateTargetFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -98,18 +98,18 @@ function UF:CreateTargetFrame(frame) frame:Tag(status, "[ls:questicon][ls:sheepicon][ls:phaseicon][ls:leadericon][ls:lfdroleicon][ls:classicon]") local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) diff --git a/modules/unitframes/units/targettarget.lua b/modules/unitframes/units/targettarget.lua index 6b442b96..fef6d4a4 100644 --- a/modules/unitframes/units/targettarget.lua +++ b/modules/unitframes/units/targettarget.lua @@ -13,7 +13,7 @@ function UF:CreateTargetTargetFrame(frame) local bg = frame:CreateTexture(nil, "BACKGROUND") bg:SetAllPoints() - bg:SetTexture("Interface\\AddOns\\ls_UI\\media\\unit-frame-bg", true) + bg:SetTexture("Interface\\AddOns\\ls_UI\\assets\\unit-frame-bg", true) bg:SetHorizTile(true) local fg_parent = _G.CreateFrame("Frame", nil, frame) @@ -71,18 +71,18 @@ function UF:CreateTargetTargetFrame(frame) frame:Tag(status, "[ls:questicon][ls:sheepicon][ls:phaseicon][ls:leadericon][ls:lfdroleicon][ls:classicon]") local border = E:CreateBorder(fg_parent) - border:SetTexture("Interface\\AddOns\\ls_UI\\media\\border-thick") + border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thick") border:SetSize(16) border:SetOffset(-6) frame.Border = border local glass = fg_parent:CreateTexture(nil, "OVERLAY", nil, 0) glass:SetAllPoints(health) - glass:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass") + glass:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass") local shadow = fg_parent:CreateTexture(nil, "OVERLAY", nil, -1) shadow:SetAllPoints(health) - shadow:SetTexture("Interface\\AddOns\\ls_UI\\media\\statusbar-glass-shadow") + shadow:SetTexture("Interface\\AddOns\\ls_UI\\assets\\statusbar-glass-shadow") self:CreateClassIndicator(frame) end