diff --git a/.pkgmeta b/.pkgmeta index bee8354..11403eb 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -49,8 +49,8 @@ externals: Libs/LibDataBroker-1.1: url: git://github.com/tekkub/libdatabroker-1-1.git tag: v1.1.4 - Libs/LibScriptableDisplay-1.0: - url: svn://svn.curseforge.net/wow/libscriptabledisplay-1-0/mainline/trunk + Libs/LibScriptable-1.0: + url: svn://svn.wowace.com/wow/libscriptable-1-0/mainline/trunk move-folders: StarTip/Modules/Appearance: StarTip_Appearance diff --git a/Modules/Bars/Bars.lua b/Modules/Bars/Bars.lua index d94b4af..70c4679 100644 --- a/Modules/Bars/Bars.lua +++ b/Modules/Bars/Bars.lua @@ -12,10 +12,10 @@ local UnitSelectionColor = _G.UnitSelectionColor local UnitClass = _G.UnitClass local self = mod local LSM = LibStub("LibSharedMedia-3.0") -local WidgetBar = LibStub("LibScriptableDisplayWidgetBar-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local Utils = LibStub("LibScriptableDisplayPluginUtils-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") +local WidgetBar = LibStub("LibScriptableWidgetBar-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local Utils = LibStub("LibScriptablePluginUtils-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") local environment = {} @@ -366,7 +366,7 @@ function mod:OnEnable() StarTip:SetOptionsDisabled(options, false) intersectTimer = intersectTimer or LibTimer:New("Texts.intersectTimer", 100, true, intersectUpdate) self:ClearBars() - for k, bar in pairs(self.bars) do + for k, bar in pairs(self.bars or {}) do if bar.config.alwaysShown then bar:Start() bar.bar:Show() diff --git a/Modules/Border/Border.lua b/Modules/Border/Border.lua index 6ddd554..c53e9a7 100644 --- a/Modules/Border/Border.lua +++ b/Modules/Border/Border.lua @@ -3,8 +3,8 @@ mod.name = "Border" mod.toggled = true mod.defaultOff = false local L = StarTip.L -local WidgetColor = LibStub("LibScriptableDisplayWidgetColor-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") +local WidgetColor = LibStub("LibScriptableWidgetColor-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Debug/Debug.lua b/Modules/Debug/Debug.lua index f497724..2670e2d 100644 --- a/Modules/Debug/Debug.lua +++ b/Modules/Debug/Debug.lua @@ -3,12 +3,12 @@ local mod = StarTip:NewModule("Debug", "AceEvent-3.0") mod.name = "Debug" mod.toggled = true mod.defaultOff = true -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local LibBuffer = LibStub("LibScriptableDisplayBuffer-1.0") -local WidgetText = LibStub("LibScriptableDisplayWidgetText-1.0") -local LibProperty = LibStub("LibScriptableDisplayProperty-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local PluginUnitTooltipStats = LibStub("LibScriptableDisplayPluginUnitTooltipStats-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local LibBuffer = LibStub("LibScriptableUtilsBuffer-1.0") +local WidgetText = LibStub("LibScriptableWidgetText-1.0") +local LibProperty = LibStub("LibScriptableUtilsProperty-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local PluginUnitTooltipScan = LibStub("LibScriptablePluginUnitTooltipScan-1.0") local environment = {} diff --git a/Modules/Gestures/Gestures.lua b/Modules/Gestures/Gestures.lua index e6b16d8..d18d344 100644 --- a/Modules/Gestures/Gestures.lua +++ b/Modules/Gestures/Gestures.lua @@ -3,8 +3,8 @@ mod.name = "Gestures" mod.toggled = true mod.defaultOff = true local L = StarTip.L -local WidgetGestures = LibStub("LibScriptableDisplayWidgetGestures-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") +local WidgetGestures = LibStub("LibScriptableWidgetGestures-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Histograms/Histograms.lua b/Modules/Histograms/Histograms.lua index 350e5a1..cb1f2d9 100644 --- a/Modules/Histograms/Histograms.lua +++ b/Modules/Histograms/Histograms.lua @@ -13,9 +13,9 @@ local UnitSelectionColor = _G.UnitSelectionColor local UnitClass = _G.UnitClass local self = mod local LSM = LibStub("LibSharedMedia-3.0") -local WidgetHistogram = LibStub("LibScriptableDisplayWidgetHistogram-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") +local WidgetHistogram = LibStub("LibScriptableWidgetHistogram-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") local unit local environment = {} @@ -405,7 +405,7 @@ function mod:GetOptions() return options end -local plugin = LibStub("LibScriptableDisplayPluginString-1.0") +local plugin = LibStub("LibScriptablePluginString-1.0") function mod:SetUnit() GameTooltipStatusBar:Hide() diff --git a/Modules/Icons/Icons.lua b/Modules/Icons/Icons.lua index 28b7ea4..17a41b2 100644 --- a/Modules/Icons/Icons.lua +++ b/Modules/Icons/Icons.lua @@ -2,11 +2,11 @@ local mod = StarTip:NewModule("Icons") mod.name = "Icons" mod.toggled = true mod.defaultOff = true -local LibBuffer = LibStub("LibScriptableDisplayBuffer-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local PluginUtils = LibStub("LibScriptableDisplayPluginUtils-1.0") -local WidgetIcon = LibStub("LibScriptableDisplayWidgetIcon-1.0") +local LibBuffer = LibStub("LibScriptableUtilsBuffer-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local PluginUtils = LibStub("LibScriptablePluginUtils-1.0") +local WidgetIcon = LibStub("LibScriptableWidgetIcon-1.0") local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Images/Images.lua b/Modules/Images/Images.lua index 1f97061..ae53443 100644 --- a/Modules/Images/Images.lua +++ b/Modules/Images/Images.lua @@ -2,12 +2,12 @@ local mod = StarTip:NewModule("Images") mod.name = "IMages" mod.toggled = true mod.defaultOff = true -local LibBuffer = LibStub("LibScriptableDisplayBuffer-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local PluginUtils = LibStub("LibScriptableDisplayPluginUtils-1.0"):New({}) -local WidgetImage = LibStub("LibScriptableDisplayWidgetImage-1.0") -local PluginColor = LibStub("LibScriptableDisplayPluginColor-1.0"):New({}) +local LibBuffer = LibStub("LibScriptableBuffer-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local PluginUtils = LibStub("LibScriptablePluginUtils-1.0"):New({}) +local WidgetImage = LibStub("LibScriptableWidgetImage-1.0") +local PluginColor = LibStub("LibScriptablePluginColor-1.0"):New({}) local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Nameplates/Nameplates.lua b/Modules/Nameplates/Nameplates.lua index 4b68a9e..02baf47 100644 --- a/Modules/Nameplates/Nameplates.lua +++ b/Modules/Nameplates/Nameplates.lua @@ -13,10 +13,10 @@ local UnitSelectionColor = _G.UnitSelectionColor local UnitClass = _G.UnitClass local self = mod local LSM = LibStub("LibSharedMedia-3.0") -local WidgetHistogram = LibStub("LibScriptableDisplayWidgetHistogram-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local PluginUtils = LibStub("LibScriptableDisplayPluginUtils-1.0") +local WidgetHistogram = LibStub("LibScriptableWidgetHistogram-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local PluginUtils = LibStub("LibScriptablePluginUtils-1.0") local unit local environment = {} diff --git a/Modules/Portrait/Portrait.lua b/Modules/Portrait/Portrait.lua index 63041a4..0dfa0f0 100644 --- a/Modules/Portrait/Portrait.lua +++ b/Modules/Portrait/Portrait.lua @@ -2,7 +2,7 @@ local mod = StarTip:NewModule("Portrait") mod.name = "Portrait" mod.toggled = true local luaTexts = {} -LibStub("LibScriptableDisplayPluginLuaTexts-1.0"):New(luaTexts) +LibStub("LibScriptablePluginLuaTexts-1.0"):New(luaTexts) local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Position/Position.lua b/Modules/Position/Position.lua index d9dba78..c3535f3 100644 --- a/Modules/Position/Position.lua +++ b/Modules/Position/Position.lua @@ -1,6 +1,6 @@ local mod = StarTip:NewModule("Position", "AceEvent-3.0", "AceHook-3.0") mod.name = "Positioning" -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") local _G = _G local GameTooltip = _G.GameTooltip local StarTip = _G.StarTip diff --git a/Modules/Texts/Texts.lua b/Modules/Texts/Texts.lua index e38f554..1dc6c71 100644 --- a/Modules/Texts/Texts.lua +++ b/Modules/Texts/Texts.lua @@ -14,12 +14,12 @@ local UnitClass = _G.UnitClass local self = mod local timer local LSM = LibStub("LibSharedMedia-3.0") -local WidgetText = LibStub("LibScriptableDisplayWidgetText-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0") +local WidgetText = LibStub("LibScriptableWidgetText-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") local LibQTip = LibStub("LibQTip-1.0") -local PluginUtils = LibStub("LibScriptableDisplayPluginUtils-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local Widget = LibStub("LibScriptableDisplayWidget-1.0") +local PluginUtils = LibStub("LibScriptablePluginUtils-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local Widget = LibStub("LibScriptableWidget-1.0") local environment = {} diff --git a/Modules/UnitTooltip/UnitTooltip.lua b/Modules/UnitTooltip/UnitTooltip.lua index 9a325bf..be50a82 100644 --- a/Modules/UnitTooltip/UnitTooltip.lua +++ b/Modules/UnitTooltip/UnitTooltip.lua @@ -2,18 +2,16 @@ local mod = StarTip:NewModule("UnitTooltip", "AceEvent-3.0") mod.name = "Unit Tooltip" mod.toggled = true -local LibProperty = LibStub("LibScriptableDisplayProperty-1.0", true) -assert(LibProperty, "Text module requires LibScriptableDisplayProperty-1.0") -local WidgetText = LibStub("LibScriptableDisplayWidgetText-1.0", true) -assert(WidgetText, "Text module requires LibScriptableDisplayWidgetText-1.0") -local LCDText = LibStub("LibScriptableDisplayLCDText-1.0", true) -assert(LCDText, mod.name .. " requires LibScriptableDisplayLCDText-1.0") -local LibCore = LibStub("LibScriptableDisplayCore-1.0", true) -assert(LibCore, mod.name .. " requires LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0", true) -assert(LibTimer, mod.name .. " requires LibScriptableDisplayTimer-1.0") -local LibEvaluator = LibStub("LibScriptableDisplayEvaluator-1.0", true) -assert(LibEvaluator, mod.name .. " requires LibScriptableDisplayEvaluator-1.0") +local WidgetText = LibStub("LibScriptableWidgetText-1.0", true) +assert(WidgetText, "Text module requires LibScriptableWidgetText-1.0") +local LCDText = LibStub("LibScriptableLCDText-1.0", true) +assert(LCDText, mod.name .. " requires LibScriptableLCDText-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0", true) +assert(LibCore, mod.name .. " requires LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0", true) +assert(LibTimer, mod.name .. " requires LibScriptableUtilsTimer-1.0") +local LibEvaluator = LibStub("LibScriptableUtilsEvaluator-1.0", true) +assert(LibEvaluator, mod.name .. " requires LibScriptableUtilsEvaluator-1.0") local _G = _G local StarTip = _G.StarTip @@ -478,7 +476,7 @@ return select(6, UnitGuildInfo(unit)) return "Location:" ]], right = [[ -return select(3, GetUnitTooltipStats(unit)) +return select(3, GetUnitTooltipScan(unit)) ]], enabled = true }, @@ -1329,7 +1327,7 @@ function mod:RebuildOpts() end end -local plugin = LibStub("LibScriptableDisplayPluginString-1.0") +local plugin = LibStub("LibScriptablePluginString-1.0") local ff = CreateFrame("Frame") function mod:SetUnit() diff --git a/StarTip.lua b/StarTip.lua index b7bda23..fc8e9ae 100644 --- a/StarTip.lua +++ b/StarTip.lua @@ -1,4 +1,4 @@ -StarTip = LibStub("AceAddon-3.0"):NewAddon("StarTip: @project-version@", "AceConsole-3.0", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0") +_G["StarTip"] = LibStub("AceAddon-3.0"):NewAddon("StarTip: @project-version@", "AceConsole-3.0", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0") StarTip.version = GetAddOnMetadata("StarTip", "Version") or "" StarTip.name = GetAddOnMetadata("StarTip", "Notes") StarTip.name = "StarTip " .. StarTip.version @@ -10,10 +10,10 @@ local AceConfigDialog = LibStub("AceConfigDialog-3.0") local L = LibStub("AceLocale-3.0"):GetLocale("StarTip") StarTip.L = L -local LibCore = LibStub("LibScriptableDisplayCore-1.0") -local LibTimer = LibStub("LibScriptableDisplayTimer-1.0") -local PluginTalents = LibStub("LibScriptableDisplayPluginTalents-1.0") -local WidgetTimer = LibStub("LibScriptableDisplayWidgetTimer-1.0") +local LibCore = LibStub("LibScriptableLCDCore-1.0") +local LibTimer = LibStub("LibScriptableUtilsTimer-1.0") +local PluginTalents = LibStub("LibScriptablePluginTalents-1.0") +local WidgetTimer = LibStub("LibScriptableWidgetTimer-1.0") local _G = _G local GameTooltip = _G.GameTooltip @@ -252,7 +252,7 @@ local options = { name = L["Error Level"], desc = L["StarTip's error level"], type = "select", - values = LibStub("LibScriptableDisplayError-1.0").defaultTexts, + values = LibStub("LibScriptableUtilsError-1.0").defaultTexts, get = function() return StarTip.db.profile.errorLevel end, set = function(info, v) StarTip.db.profile.errorLevel = v; StarTip:Print("Note that changing error verbosity requires a UI reload.") end, order = 11 @@ -356,7 +356,7 @@ PluginString:New(environment) PluginTable:New(environment) PluginResourceTools:New(environment) PluginLocation:New(environment) -PluginUnitTooltipStats:New(environment) +PluginUnitTooltipScan:New(environment) if PluginDBM then PluginDBM:New(environment) end --PluginLinq:New(environment) --]] @@ -495,7 +495,7 @@ function StarTip:OnEnable() self:RegisterEvent("MODIFIER_STATE_CHANGED") local plugin = {} - LibStub("LibScriptableDisplayPluginColor-1.0"):New(plugin) + LibStub("LibScriptablePluginColor-1.0"):New(plugin) if self.db.profile.message then ChatFrame1:AddMessage(plugin.Colorize(L["Welcome to "] .. StarTip.name, 0, 1, 1) .. plugin.Colorize(L[" Type /startip to open config. Alternatively you could press escape and choose the addons menu. Or you can choose to show a minimap icon. You can turn off this message under Settings."], 1, 1, 0)) end diff --git a/StarTip.toc b/StarTip.toc index ee66bd1..17a3165 100644 --- a/StarTip.toc +++ b/StarTip.toc @@ -6,7 +6,7 @@ ## X-Category: Tooltip ## X-License: GPL v3 ## X-Credits: ckknight for CowTip and DogTags -## OptionalDeps: Ace3, LibScriptableDisplay-1.0, ResourceServer, kgPanels, Skada +## OptionalDeps: Ace3, LibScriptable-1.0, ResourceServer, kgPanels, Skada ## SavedVariables: StarTipDB Libs\LibStub\LibStub.lua diff --git a/embeds.xml b/embeds.xml index 4e1f3c6..0f2dcc8 100644 --- a/embeds.xml +++ b/embeds.xml @@ -19,6 +19,6 @@ <Script file = "Libs\LibDatabroker-1.1\LibDatabroker-1.1.lua"/> <Script file = "Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/> -<Include file = "Libs\LibScriptableDisplay-1.0\LibScriptableDisplay-1.0.xml"/> +<Include file = "Libs\LibScriptable-1.0\LibScriptable-1.0.xml"/> </Ui>