diff --git a/RaidNotifier.lua b/RaidNotifier.lua index 3919330..cafe30d 100644 --- a/RaidNotifier.lua +++ b/RaidNotifier.lua @@ -5,7 +5,7 @@ local RaidNotifier = RaidNotifier RaidNotifier.Name = "RaidNotifier" RaidNotifier.DisplayName = "Raid Notifier" -RaidNotifier.Version = "2.11.11" +RaidNotifier.Version = "2.12" RaidNotifier.Author = "|c009ad6Kyoma, Memus, Woeler, silentgecko|r" RaidNotifier.SV_Name = "RNVars" RaidNotifier.SV_Version = 4 @@ -262,8 +262,8 @@ do ---------------------- local window = nil - local LGS = LibStub:GetLibrary("LibGroupSocket") - local ultimateHandler = LGS:GetHandler(LGS.MESSAGE_TYPE_ULTIMATE) + local LGS = LibStub("LibGroupSocket", true) + local ultimateHandler = LGS and LGS:GetHandler(LGS.MESSAGE_TYPE_ULTIMATE) RNUltimateHandler = ultimateHandler -- debug local ultimateAbilityId = 40223 -- Aggressive Warhorn Rank IV local ultimateGroupId = 29 -- hardcoded for now @@ -316,6 +316,8 @@ do ---------------------- local settings = self.Vars.ultimate if not settings.enabled then return end + if not ultimateHandler then return end + if listening then return end listening = true dbg("RegisterForUltimateChanges") @@ -381,6 +383,8 @@ do ---------------------- end function RaidNotifier:UnregisterForUltimateChanges() + if not ultimateHandler then return end + if not listening then return end listening = false dbg("UnregisterForUltimateChanges") @@ -437,11 +441,17 @@ do ---------------------- self:UnregisterForUltimateChanges() elseif (args[1] == "refresh") then ultimates = {} - ultimateHandler:Refresh() + if ultimateHandler then + ultimateHandler:Refresh() + end elseif (args[1] == "debug") then - ultimateHandler:SetDebug(tonumber(args[2])) + if ultimateHandler then + ultimateHandler:SetDebug(tonumber(args[2])) + end elseif (args[1] == "clear") then - ultimateHandler:ResetResources() + if ultimateHandler then + ultimateHandler:ResetResources() + end elseif (args[1] == "cost") then if (#args == 2) then if (tonumber(args[2]) ~= nil) then @@ -861,7 +871,7 @@ end do --------------------------- - local LUNIT = LibStub:GetLibrary("LibUnits") + local LUNIT = LibUnits2 local Util = RaidNotifier.Util function RaidNotifier.UnitIdToString(id) @@ -877,9 +887,9 @@ do --------------------------- end RaidNotifier.AA = RaidNotifier.AA or {} - RaidNotifier.HRC = RaidNotifier.HRC or {} + RaidNotifier.HRC = RaidNotifier.HRC or {} RaidNotifier.SO = RaidNotifier.SO or {} - RaidNotifier.DSA = RaidNotifier.DSA or {} + RaidNotifier.DSA = RaidNotifier.DSA or {} RaidNotifier.MOL = RaidNotifier.MOL or {} RaidNotifier.MA = RaidNotifier.MA or {} RaidNotifier.HOF = RaidNotifier.HOF or {} diff --git a/RaidNotifier.txt b/RaidNotifier.txt index f89a845..5b28749 100644 --- a/RaidNotifier.txt +++ b/RaidNotifier.txt @@ -1,10 +1,11 @@ ## Title: |cEFEBBERaidNotifier|r ## Description: Displays on-screen notifications on different events during trials. ## Author: |c009ad6Kyoma, Memus, Woeler, silentgecko|r -## Version: 2.11.11 +## Version: 2.12 ## APIVersion: 100030 100031 ## SavedVariables: RNVars RN_DEBUG_LOG -## OptionalDependsOn: LibAddonMenu-2.0 LibMapPing LibGPS LibGroupSocket +## DependsOn: LibAddonMenu-2.0>=28 +## OptionalDependsOn: LibGroupSocket libs/LibStub/LibStub.lua libs/LibCustomTitles/LibTitleLocale.lua @@ -13,28 +14,10 @@ libs/LibCustomTitles/Titles/Kyoma.lua libs/LibCustomTitles/Titles/Woeler.lua libs/LibCustomTitles/Titles/Valve.lua libs/LibCustomTitles/Titles/Memus.lua -libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua -libs/LibAddonMenu-2.0/controls/panel.lua -libs/LibAddonMenu-2.0/controls/submenu.lua -libs/LibAddonMenu-2.0/controls/button.lua -libs/LibAddonMenu-2.0/controls/checkbox.lua -libs/LibAddonMenu-2.0/controls/colorpicker.lua -libs/LibAddonMenu-2.0/controls/custom.lua -libs/LibAddonMenu-2.0/controls/description.lua -libs/LibAddonMenu-2.0/controls/divider.lua -libs/LibAddonMenu-2.0/controls/dropdown.lua -libs/LibAddonMenu-2.0/controls/editbox.lua -libs/LibAddonMenu-2.0/controls/header.lua -libs/LibAddonMenu-2.0/controls/slider.lua -libs/LibAddonMenu-2.0/controls/texture.lua -libs/LibMapPing/LibMapPing.lua -libs/LibGPS/LibGPS.lua -libs/LibGroupSocket/LibGroupSocket.lua -libs/LibGroupSocket/handlers/UltimateHandler.lua libs/LibCSA/LibCSA.lua -libs/LibUnits/LibUnits.lua +UltimateHandler.lua TrialAetherianArchive.lua TrialAsylumSanctorium.lua TrialDragonStarArena.lua diff --git a/Settings.lua b/Settings.lua index 1c9966a..c4730e9 100644 --- a/Settings.lua +++ b/Settings.lua @@ -412,7 +412,7 @@ function RaidNotifier:CreateSettingsMenu() self:TryUpgradeSettings() - local LAM = LibStub:GetLibrary("LibAddonMenu-2.0") + local LAM = LibAddonMenu2 self.panelData = { type = "panel", name = self.DisplayName, diff --git a/libs/LibGroupSocket/handlers/UltimateHandler.lua b/UltimateHandler.lua similarity index 99% rename from libs/LibGroupSocket/handlers/UltimateHandler.lua rename to UltimateHandler.lua index 29f1082..e07fedd 100644 --- a/libs/LibGroupSocket/handlers/UltimateHandler.lua +++ b/UltimateHandler.lua @@ -4,7 +4,8 @@ -- 1: isFullUpdate - the user is sending cost in addition to percentages in this packet -- 2: requestsFullUpdate - the user does not have all the necessary data and wants to have a full update from everyone (e.g. after reloading the ui) -local LGS = LibStub("LibGroupSocket") +local LGS = LibStub("LibGroupSocket", true) +if not LGS then return end LGS.MESSAGE_TYPE_ULTIMATE = 21 -- aka, the code for 'u' local type, version = LGS.MESSAGE_TYPE_ULTIMATE, 2 local handler, saveData = LGS:RegisterHandler(type, version) diff --git a/libs/LibAddonMenu-2.0/LICENSE b/libs/LibAddonMenu-2.0/LICENSE deleted file mode 100644 index f69cbd4..0000000 --- a/libs/LibAddonMenu-2.0/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2016 Ryan Lakanen (Seerah) - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua b/libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua deleted file mode 100644 index 7a88896..0000000 --- a/libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua +++ /dev/null @@ -1,1248 +0,0 @@ --- LibAddonMenu-2.0 & its files © Ryan Lakanen (Seerah) -- --- Distributed under The Artistic License 2.0 (see LICENSE) -- ------------------------------------------------------------------- - - ---Register LAM with LibStub -local MAJOR, MINOR = "LibAddonMenu-2.0", 26 -local lam, oldminor = LibStub:NewLibrary(MAJOR, MINOR) -if not lam then return end --the same or newer version of this lib is already loaded into memory - -local messages = {} -local MESSAGE_PREFIX = "[LAM2] " -local function PrintLater(msg) - if CHAT_SYSTEM.primaryContainer then - d(MESSAGE_PREFIX .. msg) - else - messages[#messages + 1] = msg - end -end - -local function FlushMessages() - for i = 1, #messages do - d(MESSAGE_PREFIX .. messages[i]) - end - messages = {} -end - -if LAMSettingsPanelCreated and not LAMCompatibilityWarning then - PrintLater("An old version of LibAddonMenu with compatibility issues was detected. For more information on how to proceed search for LibAddonMenu on esoui.com") - LAMCompatibilityWarning = true -end - ---UPVALUES-- -local wm = WINDOW_MANAGER -local em = EVENT_MANAGER -local sm = SCENE_MANAGER -local cm = CALLBACK_MANAGER -local tconcat = table.concat -local tinsert = table.insert - -local MIN_HEIGHT = 26 -local HALF_WIDTH_LINE_SPACING = 2 -local OPTIONS_CREATION_RUNNING = 1 -local OPTIONS_CREATED = 2 -local LAM_CONFIRM_DIALOG = "LAM_CONFIRM_DIALOG" -local LAM_DEFAULTS_DIALOG = "LAM_DEFAULTS" -local LAM_RELOAD_DIALOG = "LAM_RELOAD_DIALOG" - -local addonsForList = {} -local addonToOptionsMap = {} -local optionsState = {} -lam.widgets = lam.widgets or {} -local widgets = lam.widgets -lam.util = lam.util or {} -local util = lam.util -lam.controlsForReload = lam.controlsForReload or {} -local controlsForReload = lam.controlsForReload - -local function GetDefaultValue(default) - if type(default) == "function" then - return default() - end - return default -end - -local function GetStringFromValue(value) - if type(value) == "function" then - return value() - elseif type(value) == "number" then - return GetString(value) - end - return value -end - -local function CreateBaseControl(parent, controlData, controlName) - local control = wm:CreateControl(controlName or controlData.reference, parent.scroll or parent, CT_CONTROL) - control.panel = parent.panel or parent -- if this is in a submenu, panel is the submenu's parent - control.data = controlData - - control.isHalfWidth = controlData.width == "half" - local width = 510 -- set default width in case a custom parent object is passed - if control.panel.GetWidth ~= nil then width = control.panel:GetWidth() - 60 end - control:SetWidth(width) - return control -end - -local function CreateLabelAndContainerControl(parent, controlData, controlName) - local control = CreateBaseControl(parent, controlData, controlName) - local width = control:GetWidth() - - local container = wm:CreateControl(nil, control, CT_CONTROL) - container:SetDimensions(width / 3, MIN_HEIGHT) - control.container = container - - local label = wm:CreateControl(nil, control, CT_LABEL) - label:SetFont("ZoFontWinH4") - label:SetHeight(MIN_HEIGHT) - label:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - label:SetText(GetStringFromValue(controlData.name)) - control.label = label - - if control.isHalfWidth then - control:SetDimensions(width / 2, MIN_HEIGHT * 2 + HALF_WIDTH_LINE_SPACING) - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - label:SetAnchor(TOPRIGHT, control, TOPRIGHT, 0, 0) - container:SetAnchor(TOPRIGHT, control.label, BOTTOMRIGHT, 0, HALF_WIDTH_LINE_SPACING) - else - control:SetDimensions(width, MIN_HEIGHT) - container:SetAnchor(TOPRIGHT, control, TOPRIGHT, 0, 0) - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - label:SetAnchor(TOPRIGHT, container, TOPLEFT, 5, 0) - end - - control.data.tooltipText = GetStringFromValue(control.data.tooltip) - control:SetMouseEnabled(true) - control:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - control:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - return control -end - -local function GetTopPanel(panel) - while panel.panel and panel.panel ~= panel do - panel = panel.panel - end - return panel -end - -local function IsSame(objA, objB) - if #objA ~= #objB then return false end - for i = 1, #objA do - if objA[i] ~= objB[i] then return false end - end - return true -end - -local function RefreshReloadUIButton() - lam.requiresReload = false - - for i = 1, #controlsForReload do - local reloadControl = controlsForReload[i] - if not IsSame(reloadControl.startValue, {reloadControl.data.getFunc()}) then - lam.requiresReload = true - break - end - end - - lam.applyButton:SetHidden(not lam.requiresReload) -end - -local function RequestRefreshIfNeeded(control) - -- if our parent window wants to refresh controls, then fire the callback - local panel = GetTopPanel(control.panel) - local panelData = panel.data - if panelData.registerForRefresh then - cm:FireCallbacks("LAM-RefreshPanel", control) - end - RefreshReloadUIButton() -end - -local function RegisterForRefreshIfNeeded(control) - -- if our parent window wants to refresh controls, then add this to the list - local panel = GetTopPanel(control.panel) - local panelData = panel.data - if panelData.registerForRefresh or panelData.registerForDefaults then - tinsert(panel.controlsToRefresh or {}, control) -- prevent errors on custom panels - end -end - -local function RegisterForReloadIfNeeded(control) - if control.data.requiresReload then - tinsert(controlsForReload, control) - control.startValue = {control.data.getFunc()} - end -end - -local function GetConfirmDialog() - if(not ESO_Dialogs[LAM_CONFIRM_DIALOG]) then - ESO_Dialogs[LAM_CONFIRM_DIALOG] = { - canQueue = true, - title = { - text = "", - }, - mainText = { - text = "", - }, - buttons = { - [1] = { - text = SI_DIALOG_CONFIRM, - callback = function(dialog) end, - }, - [2] = { - text = SI_DIALOG_CANCEL, - } - } - } - end - return ESO_Dialogs[LAM_CONFIRM_DIALOG] -end - -local function ShowConfirmationDialog(title, body, callback) - local dialog = GetConfirmDialog() - dialog.title.text = title - dialog.mainText.text = body - dialog.buttons[1].callback = callback - ZO_Dialogs_ShowDialog(LAM_CONFIRM_DIALOG) -end - -local function GetDefaultsDialog() - if(not ESO_Dialogs[LAM_DEFAULTS_DIALOG]) then - ESO_Dialogs[LAM_DEFAULTS_DIALOG] = { - canQueue = true, - title = { - text = SI_INTERFACE_OPTIONS_RESET_TO_DEFAULT_TOOLTIP, - }, - mainText = { - text = SI_OPTIONS_RESET_PROMPT, - }, - buttons = { - [1] = { - text = SI_OPTIONS_RESET, - callback = function(dialog) end, - }, - [2] = { - text = SI_DIALOG_CANCEL, - } - } - } - end - return ESO_Dialogs[LAM_DEFAULTS_DIALOG] -end - -local function ShowDefaultsDialog(panel) - local dialog = GetDefaultsDialog() - dialog.buttons[1].callback = function() - panel:ForceDefaults() - RefreshReloadUIButton() - end - ZO_Dialogs_ShowDialog(LAM_DEFAULTS_DIALOG) -end - -local function DiscardChangesOnReloadControls() - for i = 1, #controlsForReload do - local reloadControl = controlsForReload[i] - if not IsSame(reloadControl.startValue, {reloadControl.data.getFunc()}) then - reloadControl:UpdateValue(false, unpack(reloadControl.startValue)) - end - end - lam.requiresReload = false - lam.applyButton:SetHidden(true) -end - -local function StorePanelForReopening() - local saveData = ZO_Ingame_SavedVariables["LAM"] or {} - saveData.reopenPanel = lam.currentAddonPanel:GetName() - ZO_Ingame_SavedVariables["LAM"] = saveData -end - -local function RetrievePanelForReopening() - local saveData = ZO_Ingame_SavedVariables["LAM"] - if(saveData) then - ZO_Ingame_SavedVariables["LAM"] = nil - return _G[saveData.reopenPanel] - end -end - -local function HandleReloadUIPressed() - StorePanelForReopening() - ReloadUI() -end - -local function HandleLoadDefaultsPressed() - ShowDefaultsDialog(lam.currentAddonPanel) -end - -local function GetReloadDialog() - if(not ESO_Dialogs[LAM_RELOAD_DIALOG]) then - ESO_Dialogs[LAM_RELOAD_DIALOG] = { - canQueue = true, - title = { - text = util.L["RELOAD_DIALOG_TITLE"], - }, - mainText = { - text = util.L["RELOAD_DIALOG_TEXT"], - }, - buttons = { - [1] = { - text = util.L["RELOAD_DIALOG_RELOAD_BUTTON"], - callback = function() ReloadUI() end, - }, - [2] = { - text = util.L["RELOAD_DIALOG_DISCARD_BUTTON"], - callback = DiscardChangesOnReloadControls, - } - }, - noChoiceCallback = DiscardChangesOnReloadControls, - } - end - return ESO_Dialogs[LAM_CONFIRM_DIALOG] -end - -local function ShowReloadDialogIfNeeded() - if lam.requiresReload then - local dialog = GetReloadDialog() - ZO_Dialogs_ShowDialog(LAM_RELOAD_DIALOG) - end -end - -local function UpdateWarning(control) - local warning - if control.data.warning ~= nil then - warning = util.GetStringFromValue(control.data.warning) - end - - if control.data.requiresReload then - if not warning then - warning = string.format("|cff0000%s", util.L["RELOAD_UI_WARNING"]) - else - warning = string.format("%s\n\n|cff0000%s", warning, util.L["RELOAD_UI_WARNING"]) - end - end - - if not warning then - control.warning:SetHidden(true) - else - control.warning.data = {tooltipText = warning} - control.warning:SetHidden(false) - end -end - -local localization = { - en = { - PANEL_NAME = "Addons", - AUTHOR = string.format("%s: <>", GetString(SI_ADDON_MANAGER_AUTHOR)), -- "Author: <>" - VERSION = "Version: <>", - WEBSITE = "Visit Website", - PANEL_INFO_FONT = "$(CHAT_FONT)|14|soft-shadow-thin", - RELOAD_UI_WARNING = "Changes to this setting require an UI reload in order to take effect.", - RELOAD_DIALOG_TITLE = "UI Reload required", - RELOAD_DIALOG_TEXT = "Some changes require an UI reload in order to take effect. Do you want to reload now or discard the changes?", - RELOAD_DIALOG_RELOAD_BUTTON = "Reload", - RELOAD_DIALOG_DISCARD_BUTTON = "Discard", - }, - it = { -- provided by JohnnyKing - PANEL_NAME = "Addon", - VERSION = "Versione: <>", - WEBSITE = "Visita il Sitoweb", - RELOAD_UI_WARNING = "Cambiare questa impostazione richiede un Ricarica UI al fine che faccia effetto.", - RELOAD_DIALOG_TITLE = "Ricarica UI richiesto", - RELOAD_DIALOG_TEXT = "Alcune modifiche richiedono un Ricarica UI al fine che facciano effetto. Sei sicuro di voler ricaricare ora o di voler annullare le modifiche?", - RELOAD_DIALOG_RELOAD_BUTTON = "Ricarica", - RELOAD_DIALOG_DISCARD_BUTTON = "Annulla", - }, - fr = { -- provided by Ayantir - PANEL_NAME = "Extensions", - WEBSITE = "Visiter le site Web", - RELOAD_UI_WARNING = "La modification de ce paramètre requiert un rechargement de l'UI pour qu'il soit pris en compte.", - RELOAD_DIALOG_TITLE = "Reload UI requis", - RELOAD_DIALOG_TEXT = "Certaines modifications requièrent un rechargement de l'UI pour qu'ils soient pris en compte. Souhaitez-vous recharger l'interface maintenant ou annuler les modifications ?", - RELOAD_DIALOG_RELOAD_BUTTON = "Recharger", - RELOAD_DIALOG_DISCARD_BUTTON = "Annuler", - }, - de = { -- provided by sirinsidiator - PANEL_NAME = "Erweiterungen", - WEBSITE = "Webseite besuchen", - RELOAD_UI_WARNING = "Änderungen an dieser Option werden erst übernommen nachdem die Benutzeroberfläche neu geladen wird.", - RELOAD_DIALOG_TITLE = "Neuladen benötigt", - RELOAD_DIALOG_TEXT = "Einige Änderungen werden erst übernommen nachdem die Benutzeroberfläche neu geladen wird. Wollt Ihr sie jetzt neu laden oder die Änderungen verwerfen?", - RELOAD_DIALOG_RELOAD_BUTTON = "Neu laden", - RELOAD_DIALOG_DISCARD_BUTTON = "Verwerfen", - }, - ru = { -- provided by TERAB1T - PANEL_NAME = "Дополнения", - VERSION = "Версия: <>", - WEBSITE = "Посетить сайт", - PANEL_INFO_FONT = "RuESO/fonts/Univers57.otf|14|soft-shadow-thin", - RELOAD_UI_WARNING = "Для применения этой настройки необходима перезагрузка интерфейса.", - RELOAD_DIALOG_TITLE = "Необходима перезагрузка интерфейса", - RELOAD_DIALOG_TEXT = "Для применения некоторых изменений необходима перезагрузка интерфейса. Перезагрузить интерфейс сейчас или отменить изменения?", - RELOAD_DIALOG_RELOAD_BUTTON = "Перезагрузить", - RELOAD_DIALOG_DISCARD_BUTTON = "Отменить изменения", - }, - es = { -- provided by Morganlefai, checked by Kwisatz - PANEL_NAME = "Configuración", - VERSION = "Versión: <>", - WEBSITE = "Visita la página web", - RELOAD_UI_WARNING = "Cambiar este ajuste recargará la interfaz del usuario.", - RELOAD_DIALOG_TITLE = "Requiere recargar la interfaz", - RELOAD_DIALOG_TEXT = "Algunos cambios requieren recargar la interfaz para poder aplicarse. Quieres aplicar los cambios y recargar la interfaz?", - RELOAD_DIALOG_RELOAD_BUTTON = "Recargar", - RELOAD_DIALOG_DISCARD_BUTTON = "Cancelar", - }, - jp = { -- provided by k0ta0uchi - PANEL_NAME = "アドオン設定", - WEBSITE = "ウェブサイトを見る", - }, - zh = { -- provided by bssthu - PANEL_NAME = "插件", - VERSION = "版本: <>", - WEBSITE = "访问网站", - PANEL_INFO_FONT = "EsoZh/fonts/univers57.otf|14|soft-shadow-thin", - }, - pl = { -- provided by EmiruTegryfon - PANEL_NAME = "Dodatki", - VERSION = "Wersja: <>", - WEBSITE = "Odwiedź stronę", - RELOAD_UI_WARNING = "Zmiany będą widoczne po ponownym załadowaniu UI.", - RELOAD_DIALOG_TITLE = "Wymagane przeładowanie UI", - RELOAD_DIALOG_TEXT = "Niektóre zmiany wymagają ponownego załadowania UI. Czy chcesz teraz ponownie załadować, czy porzucić zmiany?", - RELOAD_DIALOG_RELOAD_BUTTON = "Przeładuj", - RELOAD_DIALOG_DISCARD_BUTTON = "Porzuć", - }, - kr = { -- provided by p.walker - PANEL_NAME = "蝠盜蠨", - VERSION = "纄訄: <>", - WEBSITE = "裹芬襴钸 縩紸", - PANEL_INFO_FONT = "EsoKR/fonts/Univers57.otf|14|soft-shadow-thin", - RELOAD_UI_WARNING = "襴 茤訕襄 绀溽靘籴 風滼筼 訁袩靘瀰褄靴 UI 苈穜滠遨襴 靄袔革瓈瓤.", - RELOAD_DIALOG_TITLE = "UI 苈穜滠遨 靄袔", - RELOAD_DIALOG_TEXT = "绀溽瘜 茤訕 謑 UI 苈穜滠遨襄 靄袔穜靘璔 芬靭襴 覈蒵瓈瓤. 诀瀈 苈穜滠遨靘蓜溠蒵瓈灌? 蝄瓈籴 绀溽襄 迨莌靘蓜溠蒵瓈灌?", - RELOAD_DIALOG_RELOAD_BUTTON = "苈穜滠遨", - RELOAD_DIALOG_DISCARD_BUTTON = "绀溽迨莌", - }, - br = { -- provided by mlsevero - PANEL_NAME = "Addons", - AUTHOR = string.format("%s: <>", GetString(SI_ADDON_MANAGER_AUTHOR)), -- "Autor: <>" - VERSION = "Versão: <>", - WEBSITE = "Visite o Website", - RELOAD_UI_WARNING = "Mudanças nessa configuração requer a releitura da UI para ter efeito.", - RELOAD_DIALOG_TITLE = "Releitura da UI requerida", - RELOAD_DIALOG_TEXT = "Algumas mudanças requerem a releitura da UI para ter efeito. Você deseja reler agora ou descartar as mudanças?", - RELOAD_DIALOG_RELOAD_BUTTON = "Relê", - RELOAD_DIALOG_DISCARD_BUTTON = "Descarta", - }, -} - -util.L = ZO_ShallowTableCopy(localization[GetCVar("Language.2")] or {}, localization["en"]) -util.GetTooltipText = GetStringFromValue -- deprecated, use util.GetStringFromValue instead -util.GetStringFromValue = GetStringFromValue -util.GetDefaultValue = GetDefaultValue -util.CreateBaseControl = CreateBaseControl -util.CreateLabelAndContainerControl = CreateLabelAndContainerControl -util.RequestRefreshIfNeeded = RequestRefreshIfNeeded -util.RegisterForRefreshIfNeeded = RegisterForRefreshIfNeeded -util.RegisterForReloadIfNeeded = RegisterForReloadIfNeeded -util.GetTopPanel = GetTopPanel -util.ShowConfirmationDialog = ShowConfirmationDialog -util.UpdateWarning = UpdateWarning - -local ADDON_DATA_TYPE = 1 -local RESELECTING_DURING_REBUILD = true -local USER_REQUESTED_OPEN = true - - ---INTERNAL FUNCTION ---scrolls ZO_ScrollList `list` to move the row corresponding to `data` --- into view (does nothing if there is no such row in the list) ---unlike ZO_ScrollList_ScrollDataIntoView, this function accounts for --- fading near the list's edges - it avoids the fading area by scrolling --- a little further than the ZO function -local function ScrollDataIntoView(list, data) - local targetIndex = data.sortIndex - if not targetIndex then return end - - local scrollMin, scrollMax = list.scrollbar:GetMinMax() - local scrollTop = list.scrollbar:GetValue() - local controlHeight = list.uniformControlHeight or list.controlHeight - local targetMin = controlHeight * (targetIndex - 1) - 64 - -- subtracting 64 ain't arbitrary, it's the maximum fading height - -- (libraries/zo_templates/scrolltemplates.lua/UpdateScrollFade) - - if targetMin < scrollTop then - ZO_ScrollList_ScrollAbsolute(list, zo_max(targetMin, scrollMin)) - else - local listHeight = ZO_ScrollList_GetHeight(list) - local targetMax = controlHeight * targetIndex + 64 - listHeight - - if targetMax > scrollTop then - ZO_ScrollList_ScrollAbsolute(list, zo_min(targetMax, scrollMax)) - end - end -end - - ---INTERNAL FUNCTION ---constructs a string pattern from the text in `searchEdit` control --- * metacharacters are escaped, losing their special meaning --- * whitespace matches anything (including empty substring) ---if there is nothing but whitespace, returns nil ---otherwise returns a filter function, which takes a `data` table argument --- and returns true iff `data.filterText` matches the pattern -local function GetSearchFilterFunc(searchEdit) - local text = searchEdit:GetText():lower() - local pattern = text:match("(%S+.-)%s*$") - - if not pattern then -- nothing but whitespace - return nil - end - - -- escape metacharacters, e.g. "ESO-Datenbank.de" => "ESO%-Datenbank%.de" - pattern = pattern:gsub("[-*+?^$().[%]%%]", "%%%0") - - -- replace whitespace with "match shortest anything" - pattern = pattern:gsub("%s+", ".-") - - return function(data) - return data.filterText:lower():find(pattern) ~= nil - end -end - - ---INTERNAL FUNCTION ---populates `addonList` with entries from `addonsForList` --- addonList = ZO_ScrollList control --- filter = [optional] function(data) -local function PopulateAddonList(addonList, filter) - local entryList = ZO_ScrollList_GetDataList(addonList) - local numEntries = 0 - local selectedData = nil - local selectionIsFinal = false - - ZO_ScrollList_Clear(addonList) - - for i, data in ipairs(addonsForList) do - if not filter or filter(data) then - local dataEntry = ZO_ScrollList_CreateDataEntry(ADDON_DATA_TYPE, data) - numEntries = numEntries + 1 - data.sortIndex = numEntries - entryList[numEntries] = dataEntry - -- select the first panel passing the filter, or the currently - -- shown panel, but only if it passes the filter as well - if selectedData == nil or data.panel == lam.pendingAddonPanel or data.panel == lam.currentAddonPanel then - if not selectionIsFinal then - selectedData = data - end - if data.panel == lam.pendingAddonPanel then - lam.pendingAddonPanel = nil - selectionIsFinal = true - end - end - else - data.sortIndex = nil - end - end - - ZO_ScrollList_Commit(addonList) - - if selectedData then - if selectedData.panel == lam.currentAddonPanel then - ZO_ScrollList_SelectData(addonList, selectedData, nil, RESELECTING_DURING_REBUILD) - else - ZO_ScrollList_SelectData(addonList, selectedData, nil) - end - ScrollDataIntoView(addonList, selectedData) - end -end - - ---METHOD: REGISTER WIDGET-- ---each widget has its version checked before loading, ---so we only have the most recent one in memory ---Usage: --- widgetType = "string"; the type of widget being registered --- widgetVersion = integer; the widget's version number -LAMCreateControl = LAMCreateControl or {} -local lamcc = LAMCreateControl - -function lam:RegisterWidget(widgetType, widgetVersion) - if widgets[widgetType] and widgets[widgetType] >= widgetVersion then - return false - else - widgets[widgetType] = widgetVersion - return true - end -end - --- INTERNAL METHOD: hijacks the handlers for the actions in the OptionsWindow layer if not already done -local function InitKeybindActions() - if not lam.keybindsInitialized then - lam.keybindsInitialized = true - ZO_PreHook(KEYBOARD_OPTIONS, "ApplySettings", function() - if lam.currentPanelOpened then - if not lam.applyButton:IsHidden() then - HandleReloadUIPressed() - end - return true - end - end) - ZO_PreHook("ZO_Dialogs_ShowDialog", function(dialogName) - if lam.currentPanelOpened and dialogName == "OPTIONS_RESET_TO_DEFAULTS" then - if not lam.defaultButton:IsHidden() then - HandleLoadDefaultsPressed() - end - return true - end - end) - end -end - --- INTERNAL METHOD: fires the LAM-PanelOpened callback if not already done -local function OpenCurrentPanel() - if lam.currentAddonPanel and not lam.currentPanelOpened then - lam.currentPanelOpened = true - lam.defaultButton:SetHidden(not lam.currentAddonPanel.data.registerForDefaults) - cm:FireCallbacks("LAM-PanelOpened", lam.currentAddonPanel) - end -end - --- INTERNAL METHOD: fires the LAM-PanelClosed callback if not already done -local function CloseCurrentPanel() - if lam.currentAddonPanel and lam.currentPanelOpened then - lam.currentPanelOpened = false - cm:FireCallbacks("LAM-PanelClosed", lam.currentAddonPanel) - end -end - ---METHOD: OPEN TO ADDON PANEL-- ---opens to a specific addon's option panel ---Usage: --- panel = userdata; the panel returned by the :RegisterOptionsPanel method -local locSettings = GetString(SI_GAME_MENU_SETTINGS) -function lam:OpenToPanel(panel) - - -- find and select the panel's row in addon list - - local addonList = lam.addonList - local selectedData = nil - - for _, addonData in ipairs(addonsForList) do - if addonData.panel == panel then - selectedData = addonData - ScrollDataIntoView(addonList, selectedData) - lam.pendingAddonPanel = addonData.panel - break - end - end - - ZO_ScrollList_SelectData(addonList, selectedData) - ZO_ScrollList_RefreshVisible(addonList, selectedData) - - local srchEdit = LAMAddonSettingsWindow:GetNamedChild("SearchFilterEdit") - srchEdit:Clear() - - -- note that ZO_ScrollList doesn't require `selectedData` to be actually - -- present in the list, and that the list will only be populated once LAM - -- "Addon Settings" menu entry is selected for the first time - - local function openAddonSettingsMenu() - local gameMenu = ZO_GameMenu_InGame.gameMenu - local settingsMenu = gameMenu.headerControls[locSettings] - - if settingsMenu then -- an instance of ZO_TreeNode - local children = settingsMenu:GetChildren() - for i = 1, (children and #children or 0) do - local childNode = children[i] - local data = childNode:GetData() - if data and data.id == lam.panelId then - -- found LAM "Addon Settings" node, yay! - childNode:GetTree():SelectNode(childNode) - break - end - end - end - end - - if sm:GetScene("gameMenuInGame"):GetState() == SCENE_SHOWN then - openAddonSettingsMenu() - else - sm:CallWhen("gameMenuInGame", SCENE_SHOWN, openAddonSettingsMenu) - sm:Show("gameMenuInGame") - end -end - -local TwinOptionsContainer_Index = 0 -local function TwinOptionsContainer(parent, leftWidget, rightWidget) - TwinOptionsContainer_Index = TwinOptionsContainer_Index + 1 - local cParent = parent.scroll or parent - local panel = parent.panel or cParent - local container = wm:CreateControl("$(parent)TwinContainer" .. tostring(TwinOptionsContainer_Index), - cParent, CT_CONTROL) - container:SetResizeToFitDescendents(true) - container:SetAnchor(select(2, leftWidget:GetAnchor(0) )) - - leftWidget:ClearAnchors() - leftWidget:SetAnchor(TOPLEFT, container, TOPLEFT) - rightWidget:SetAnchor(TOPLEFT, leftWidget, TOPRIGHT, 5, 0) - - leftWidget:SetWidth( leftWidget:GetWidth() - 2.5 ) -- fixes bad alignment with 'full' controls - rightWidget:SetWidth( rightWidget:GetWidth() - 2.5 ) - - leftWidget:SetParent(container) - rightWidget:SetParent(container) - - container.data = {type = "container"} - container.panel = panel - return container -end - ---INTERNAL FUNCTION ---creates controls when options panel is first shown ---controls anchoring of these controls in the panel -local function CreateOptionsControls(panel) - local addonID = panel:GetName() - if(optionsState[addonID] == OPTIONS_CREATED) then - return false - elseif(optionsState[addonID] == OPTIONS_CREATION_RUNNING) then - return true - end - optionsState[addonID] = OPTIONS_CREATION_RUNNING - - local function CreationFinished() - optionsState[addonID] = OPTIONS_CREATED - cm:FireCallbacks("LAM-PanelControlsCreated", panel) - OpenCurrentPanel() - end - - local optionsTable = addonToOptionsMap[addonID] - if optionsTable then - local function CreateAndAnchorWidget(parent, widgetData, offsetX, offsetY, anchorTarget, wasHalf) - local widget - local status, err = pcall(function() widget = LAMCreateControl[widgetData.type](parent, widgetData) end) - if not status then - return err or true, offsetY, anchorTarget, wasHalf - else - local isHalf = (widgetData.width == "half") - if not anchorTarget then -- the first widget in a panel is just placed in the top left corner - widget:SetAnchor(TOPLEFT) - anchorTarget = widget - elseif wasHalf and isHalf then -- when the previous widget was only half width and this one is too, we place it on the right side - widget.lineControl = anchorTarget - isHalf = false - offsetY = 0 - anchorTarget = TwinOptionsContainer(parent, anchorTarget, widget) - else -- otherwise we just put it below the previous one normally - widget:SetAnchor(TOPLEFT, anchorTarget, BOTTOMLEFT, 0, 15) - offsetY = 0 - anchorTarget = widget - end - return false, offsetY, anchorTarget, isHalf - end - end - - local THROTTLE_TIMEOUT, THROTTLE_COUNT = 10, 20 - local fifo = {} - local anchorOffset, lastAddedControl, wasHalf - local CreateWidgetsInPanel, err - - local function PrepareForNextPanel() - anchorOffset, lastAddedControl, wasHalf = 0, nil, false - end - - local function SetupCreationCalls(parent, widgetDataTable) - fifo[#fifo + 1] = PrepareForNextPanel - local count = #widgetDataTable - for i = 1, count, THROTTLE_COUNT do - fifo[#fifo + 1] = function() - CreateWidgetsInPanel(parent, widgetDataTable, i, zo_min(i + THROTTLE_COUNT - 1, count)) - end - end - return count ~= NonContiguousCount(widgetDataTable) - end - - CreateWidgetsInPanel = function(parent, widgetDataTable, startIndex, endIndex) - for i=startIndex,endIndex do - local widgetData = widgetDataTable[i] - if not widgetData then - PrintLater("Skipped creation of missing entry in the settings menu of " .. addonID .. ".") - else - local widgetType = widgetData.type - local offsetX = 0 - local isSubmenu = (widgetType == "submenu") - if isSubmenu then - wasHalf = false - offsetX = 5 - end - - err, anchorOffset, lastAddedControl, wasHalf = CreateAndAnchorWidget(parent, widgetData, offsetX, anchorOffset, lastAddedControl, wasHalf) - if err then - PrintLater(("Could not create %s '%s' of %s."):format(widgetData.type, GetStringFromValue(widgetData.name or "unnamed"), addonID)) - end - - if isSubmenu then - if SetupCreationCalls(lastAddedControl, widgetData.controls) then - PrintLater(("The sub menu '%s' of %s is missing some entries."):format(GetStringFromValue(widgetData.name or "unnamed"), addonID)) - end - end - end - end - end - - local function DoCreateSettings() - if #fifo > 0 then - local nextCall = table.remove(fifo, 1) - nextCall() - if(nextCall == PrepareForNextPanel) then - DoCreateSettings() - else - zo_callLater(DoCreateSettings, THROTTLE_TIMEOUT) - end - else - CreationFinished() - end - end - - if SetupCreationCalls(panel, optionsTable) then - PrintLater(("The settings menu of %s is missing some entries."):format(addonID)) - end - DoCreateSettings() - else - CreationFinished() - end - - return true -end - ---INTERNAL FUNCTION ---handles switching between panels -local function ToggleAddonPanels(panel) --called in OnShow of newly shown panel - local currentlySelected = lam.currentAddonPanel - if currentlySelected and currentlySelected ~= panel then - currentlySelected:SetHidden(true) - CloseCurrentPanel() - end - lam.currentAddonPanel = panel - - -- refresh visible rows to reflect panel IsHidden status - ZO_ScrollList_RefreshVisible(lam.addonList) - - if not CreateOptionsControls(panel) then - OpenCurrentPanel() - end - - cm:FireCallbacks("LAM-RefreshPanel", panel) -end - -local CheckSafetyAndInitialize - ---METHOD: REGISTER ADDON PANEL ---registers your addon with LibAddonMenu and creates a panel ---Usage: --- addonID = "string"; unique ID which will be the global name of your panel --- panelData = table; data object for your panel - see controls\panel.lua -function lam:RegisterAddonPanel(addonID, panelData) - CheckSafetyAndInitialize(addonID) - local container = lam:GetAddonPanelContainer() - local panel = lamcc.panel(container, panelData, addonID) --addonID==global name of panel - panel:SetHidden(true) - panel:SetAnchorFill(container) - panel:SetHandler("OnShow", ToggleAddonPanels) - - local function stripMarkup(str) - return str:gsub("|[Cc]%x%x%x%x%x%x", ""):gsub("|[Rr]", "") - end - - local filterParts = {panelData.name, nil, nil} - -- append keywords and author separately, the may be nil - filterParts[#filterParts + 1] = panelData.keywords - filterParts[#filterParts + 1] = panelData.author - - local addonData = { - panel = panel, - name = stripMarkup(panelData.name), - filterText = stripMarkup(tconcat(filterParts, "\t")):lower(), - } - - tinsert(addonsForList, addonData) - - if panelData.slashCommand then - SLASH_COMMANDS[panelData.slashCommand] = function() - lam:OpenToPanel(panel) - end - end - - return panel --return for authors creating options manually -end - - ---METHOD: REGISTER OPTION CONTROLS ---registers the options you want shown for your addon ---these are stored in a table where each key-value pair is the order ---of the options in the panel and the data for that control, respectively ---see exampleoptions.lua for an example ---see controls\.lua for each widget type ---Usage: --- addonID = "string"; the same string passed to :RegisterAddonPanel --- optionsTable = table; the table containing all of the options controls and their data -function lam:RegisterOptionControls(addonID, optionsTable) --optionsTable = {sliderData, buttonData, etc} - addonToOptionsMap[addonID] = optionsTable -end - ---INTERNAL FUNCTION ---creates LAM's Addon Settings entry in ZO_GameMenu -local function CreateAddonSettingsMenuEntry() - local panelData = { - id = KEYBOARD_OPTIONS.currentPanelId, - name = util.L["PANEL_NAME"], - } - - KEYBOARD_OPTIONS.currentPanelId = panelData.id + 1 - KEYBOARD_OPTIONS.panelNames[panelData.id] = panelData.name - - lam.panelId = panelData.id - - local addonListSorted = false - - function panelData.callback() - sm:AddFragment(lam:GetAddonSettingsFragment()) - KEYBOARD_OPTIONS:ChangePanels(lam.panelId) - - local title = LAMAddonSettingsWindow:GetNamedChild("Title") - title:SetText(panelData.name) - - if not addonListSorted and #addonsForList > 0 then - local searchEdit = LAMAddonSettingsWindow:GetNamedChild("SearchFilterEdit") - --we're about to show our list for the first time - let's sort it - table.sort(addonsForList, function(a, b) return a.name < b.name end) - PopulateAddonList(lam.addonList, GetSearchFilterFunc(searchEdit)) - addonListSorted = true - end - end - - function panelData.unselectedCallback() - sm:RemoveFragment(lam:GetAddonSettingsFragment()) - if SetCameraOptionsPreviewModeEnabled then -- available since API version 100011 - SetCameraOptionsPreviewModeEnabled(false) - end - end - - ZO_GameMenu_AddSettingPanel(panelData) -end - - ---INTERNAL FUNCTION ---creates the left-hand menu in LAM's window -local function CreateAddonList(name, parent) - local addonList = wm:CreateControlFromVirtual(name, parent, "ZO_ScrollList") - - local function addonListRow_OnMouseDown(control, button) - if button == 1 then - local data = ZO_ScrollList_GetData(control) - ZO_ScrollList_SelectData(addonList, data, control) - end - end - - local function addonListRow_OnMouseEnter(control) - ZO_ScrollList_MouseEnter(addonList, control) - end - - local function addonListRow_OnMouseExit(control) - ZO_ScrollList_MouseExit(addonList, control) - end - - local function addonListRow_Select(previouslySelectedData, selectedData, reselectingDuringRebuild) - if not reselectingDuringRebuild then - if previouslySelectedData then - previouslySelectedData.panel:SetHidden(true) - end - if selectedData then - selectedData.panel:SetHidden(false) - PlaySound(SOUNDS.MENU_SUBCATEGORY_SELECTION) - end - end - end - - local function addonListRow_Setup(control, data) - control:SetText(data.name) - control:SetSelected(not data.panel:IsHidden()) - end - - ZO_ScrollList_AddDataType(addonList, ADDON_DATA_TYPE, "ZO_SelectableLabel", 28, addonListRow_Setup) - -- I don't know how to make highlights clear properly; they often - -- get stuck and after a while the list is full of highlighted rows - --ZO_ScrollList_EnableHighlight(addonList, "ZO_ThinListHighlight") - ZO_ScrollList_EnableSelection(addonList, "ZO_ThinListHighlight", addonListRow_Select) - - local addonDataType = ZO_ScrollList_GetDataTypeTable(addonList, ADDON_DATA_TYPE) - local addonListRow_CreateRaw = addonDataType.pool.m_Factory - - local function addonListRow_Create(pool) - local control = addonListRow_CreateRaw(pool) - control:SetHandler("OnMouseDown", addonListRow_OnMouseDown) - --control:SetHandler("OnMouseEnter", addonListRow_OnMouseEnter) - --control:SetHandler("OnMouseExit", addonListRow_OnMouseExit) - control:SetHeight(28) - control:SetFont("ZoFontHeader") - control:SetHorizontalAlignment(TEXT_ALIGN_LEFT) - control:SetVerticalAlignment(TEXT_ALIGN_CENTER) - control:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - return control - end - - addonDataType.pool.m_Factory = addonListRow_Create - - return addonList -end - - ---INTERNAL FUNCTION -local function CreateSearchFilterBox(name, parent) - local boxControl = wm:CreateControl(name, parent, CT_CONTROL) - - local srchButton = wm:CreateControl("$(parent)Button", boxControl, CT_BUTTON) - srchButton:SetDimensions(32, 32) - srchButton:SetAnchor(LEFT, nil, LEFT, 2, 0) - srchButton:SetNormalTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_up.dds") - srchButton:SetPressedTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_down.dds") - srchButton:SetMouseOverTexture("EsoUI/Art/LFG/LFG_tabIcon_groupTools_over.dds") - - local srchEdit = wm:CreateControlFromVirtual("$(parent)Edit", boxControl, "ZO_DefaultEdit") - srchEdit:SetAnchor(LEFT, srchButton, RIGHT, 4, 1) - srchEdit:SetAnchor(RIGHT, nil, RIGHT, -4, 1) - srchEdit:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) - - local srchBg = wm:CreateControl("$(parent)Bg", boxControl, CT_BACKDROP) - srchBg:SetAnchorFill() - srchBg:SetAlpha(0) - srchBg:SetCenterColor(0, 0, 0, 0.5) - srchBg:SetEdgeColor(ZO_DISABLED_TEXT:UnpackRGBA()) - srchBg:SetEdgeTexture("", 1, 1, 0, 0) - - -- search backdrop should appear whenever you hover over either - -- the magnifying glass button or the edit field (which is only - -- visible when it contains some text), and also while the edit - -- field has keyboard focus - - local srchActive = false - local srchHover = false - - local function srchBgUpdateAlpha() - if srchActive or srchEdit:HasFocus() then - srchBg:SetAlpha(srchHover and 0.8 or 0.6) - else - srchBg:SetAlpha(srchHover and 0.6 or 0.0) - end - end - - local function srchMouseEnter(control) - srchHover = true - srchBgUpdateAlpha() - end - - local function srchMouseExit(control) - srchHover = false - srchBgUpdateAlpha() - end - - boxControl:SetMouseEnabled(true) - boxControl:SetHitInsets(1, 1, -1, -1) - boxControl:SetHandler("OnMouseEnter", srchMouseEnter) - boxControl:SetHandler("OnMouseExit", srchMouseExit) - - srchButton:SetHandler("OnMouseEnter", srchMouseEnter) - srchButton:SetHandler("OnMouseExit", srchMouseExit) - - local focusLostTime = 0 - - srchButton:SetHandler("OnClicked", function(self) - srchEdit:Clear() - if GetFrameTimeMilliseconds() - focusLostTime < 100 then - -- re-focus the edit box if it lost focus due to this - -- button click (note that this handler may run a few - -- frames later) - srchEdit:TakeFocus() - end - end) - - srchEdit:SetHandler("OnMouseEnter", srchMouseEnter) - srchEdit:SetHandler("OnMouseExit", srchMouseExit) - srchEdit:SetHandler("OnFocusGained", srchBgUpdateAlpha) - - srchEdit:SetHandler("OnFocusLost", function() - focusLostTime = GetFrameTimeMilliseconds() - srchBgUpdateAlpha() - end) - - srchEdit:SetHandler("OnEscape", function(self) - self:Clear() - self:LoseFocus() - end) - - srchEdit:SetHandler("OnTextChanged", function(self) - local filterFunc = GetSearchFilterFunc(self) - if filterFunc then - srchActive = true - srchBg:SetEdgeColor(ZO_SECOND_CONTRAST_TEXT:UnpackRGBA()) - srchButton:SetState(BSTATE_PRESSED) - else - srchActive = false - srchBg:SetEdgeColor(ZO_DISABLED_TEXT:UnpackRGBA()) - srchButton:SetState(BSTATE_NORMAL) - end - srchBgUpdateAlpha() - PopulateAddonList(lam.addonList, filterFunc) - PlaySound(SOUNDS.SPINNER_DOWN) - end) - - return boxControl -end - - ---INTERNAL FUNCTION ---creates LAM's Addon Settings top-level window -local function CreateAddonSettingsWindow() - local tlw = wm:CreateTopLevelWindow("LAMAddonSettingsWindow") - tlw:SetHidden(true) - tlw:SetDimensions(1010, 914) -- same height as ZO_OptionsWindow - - ZO_ReanchorControlForLeftSidePanel(tlw) - - -- create black background for the window (mimic ZO_RightFootPrintBackground) - - local bgLeft = wm:CreateControl("$(parent)BackgroundLeft", tlw, CT_TEXTURE) - bgLeft:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_left.dds") - bgLeft:SetDimensions(1024, 1024) - bgLeft:SetAnchor(TOPLEFT, nil, TOPLEFT) - bgLeft:SetDrawLayer(DL_BACKGROUND) - bgLeft:SetExcludeFromResizeToFitExtents(true) - - local bgRight = wm:CreateControl("$(parent)BackgroundRight", tlw, CT_TEXTURE) - bgRight:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_right.dds") - bgRight:SetDimensions(64, 1024) - bgRight:SetAnchor(TOPLEFT, bgLeft, TOPRIGHT) - bgRight:SetDrawLayer(DL_BACKGROUND) - bgRight:SetExcludeFromResizeToFitExtents(true) - - -- create gray background for addon list (mimic ZO_TreeUnderlay) - - local underlayLeft = wm:CreateControl("$(parent)UnderlayLeft", tlw, CT_TEXTURE) - underlayLeft:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_indexArea_left.dds") - underlayLeft:SetDimensions(256, 1024) - underlayLeft:SetAnchor(TOPLEFT, bgLeft, TOPLEFT) - underlayLeft:SetDrawLayer(DL_BACKGROUND) - underlayLeft:SetExcludeFromResizeToFitExtents(true) - - local underlayRight = wm:CreateControl("$(parent)UnderlayRight", tlw, CT_TEXTURE) - underlayRight:SetTexture("EsoUI/Art/Miscellaneous/centerscreen_indexArea_right.dds") - underlayRight:SetDimensions(128, 1024) - underlayRight:SetAnchor(TOPLEFT, underlayLeft, TOPRIGHT) - underlayRight:SetDrawLayer(DL_BACKGROUND) - underlayRight:SetExcludeFromResizeToFitExtents(true) - - -- create title bar (mimic ZO_OptionsWindow) - - local title = wm:CreateControl("$(parent)Title", tlw, CT_LABEL) - title:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 70) - title:SetFont("ZoFontWinH1") - title:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE) - - local divider = wm:CreateControlFromVirtual("$(parent)Divider", tlw, "ZO_Options_Divider") - divider:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 108) - - -- create search filter box - - local srchBox = CreateSearchFilterBox("$(parent)SearchFilter", tlw) - srchBox:SetAnchor(TOPLEFT, nil, TOPLEFT, 63, 120) - srchBox:SetDimensions(260, 30) - - -- create scrollable addon list - - local addonList = CreateAddonList("$(parent)AddonList", tlw) - addonList:SetAnchor(TOPLEFT, nil, TOPLEFT, 65, 160) - addonList:SetDimensions(285, 665) - - lam.addonList = addonList -- for easy access from elsewhere - - -- create container for option panels - - local panelContainer = wm:CreateControl("$(parent)PanelContainer", tlw, CT_CONTROL) - panelContainer:SetAnchor(TOPLEFT, nil, TOPLEFT, 365, 120) - panelContainer:SetDimensions(645, 675) - - local defaultButton = wm:CreateControlFromVirtual("$(parent)ResetToDefaultButton", tlw, "ZO_DialogButton") - ZO_KeybindButtonTemplate_Setup(defaultButton, "OPTIONS_LOAD_DEFAULTS", HandleLoadDefaultsPressed, GetString(SI_OPTIONS_DEFAULTS)) - defaultButton:SetAnchor(TOPLEFT, panelContainer, BOTTOMLEFT, 0, 2) - lam.defaultButton = defaultButton - - local applyButton = wm:CreateControlFromVirtual("$(parent)ApplyButton", tlw, "ZO_DialogButton") - ZO_KeybindButtonTemplate_Setup(applyButton, "OPTIONS_APPLY_CHANGES", HandleReloadUIPressed, GetString(SI_ADDON_MANAGER_RELOAD)) - applyButton:SetAnchor(TOPRIGHT, panelContainer, BOTTOMRIGHT, 0, 2) - applyButton:SetHidden(true) - lam.applyButton = applyButton - - return tlw -end - - ---INITIALIZING -local safeToInitialize = false -local hasInitialized = false - -local eventHandle = table.concat({MAJOR, MINOR}, "r") -local function OnLoad(_, addonName) - -- wait for the first loaded event - em:UnregisterForEvent(eventHandle, EVENT_ADD_ON_LOADED) - safeToInitialize = true -end -em:RegisterForEvent(eventHandle, EVENT_ADD_ON_LOADED, OnLoad) - -local function OnActivated(_, initial) - em:UnregisterForEvent(eventHandle, EVENT_PLAYER_ACTIVATED) - FlushMessages() - - local reopenPanel = RetrievePanelForReopening() - if not initial and reopenPanel then - lam:OpenToPanel(reopenPanel) - end -end -em:RegisterForEvent(eventHandle, EVENT_PLAYER_ACTIVATED, OnActivated) - -function CheckSafetyAndInitialize(addonID) - if not safeToInitialize then - local msg = string.format("The panel with id '%s' was registered before addon loading has completed. This might break the AddOn Settings menu.", addonID) - PrintLater(msg) - end - if not hasInitialized then - hasInitialized = true - end -end - - ---TODO documentation -function lam:GetAddonPanelContainer() - local fragment = lam:GetAddonSettingsFragment() - local window = fragment:GetControl() - return window:GetNamedChild("PanelContainer") -end - - ---TODO documentation -function lam:GetAddonSettingsFragment() - assert(hasInitialized or safeToInitialize) - if not LAMAddonSettingsFragment then - local window = CreateAddonSettingsWindow() - LAMAddonSettingsFragment = ZO_FadeSceneFragment:New(window, true, 100) - LAMAddonSettingsFragment:RegisterCallback("StateChange", function(oldState, newState) - if(newState == SCENE_FRAGMENT_SHOWN) then - InitKeybindActions() - PushActionLayerByName("OptionsWindow") - OpenCurrentPanel() - elseif(newState == SCENE_FRAGMENT_HIDDEN) then - CloseCurrentPanel() - RemoveActionLayerByName("OptionsWindow") - ShowReloadDialogIfNeeded() - end - end) - CreateAddonSettingsMenuEntry() - end - return LAMAddonSettingsFragment -end diff --git a/libs/LibAddonMenu-2.0/controls/button.lua b/libs/LibAddonMenu-2.0/controls/button.lua deleted file mode 100644 index 82b5032..0000000 --- a/libs/LibAddonMenu-2.0/controls/button.lua +++ /dev/null @@ -1,91 +0,0 @@ ---[[buttonData = { - type = "button", - name = "My Button", -- string id or function returning a string - func = function() end, - tooltip = "Button's tooltip text.", -- string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - icon = "icon\\path.dds", --(optional) - isDangerous = false, -- boolean, if set to true, the button text will be red and a confirmation dialog with the button label and warning text will show on click before the callback is executed (optional) - warning = "Will need to reload the UI.", --(optional) - reference = "MyAddonButton", -- unique global reference to control (optional) -} ]] - -local widgetVersion = 11 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("button", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable = control.data.disabled - if type(disable) == "function" then - disable = disable() - end - control.button:SetEnabled(not disable) -end - ---controlName is optional -local MIN_HEIGHT = 28 -- default_button height -local HALF_WIDTH_LINE_SPACING = 2 -function LAMCreateControl.button(parent, buttonData, controlName) - local control = LAM.util.CreateBaseControl(parent, buttonData, controlName) - control:SetMouseEnabled(true) - - local width = control:GetWidth() - if control.isHalfWidth then - control:SetDimensions(width / 2, MIN_HEIGHT * 2 + HALF_WIDTH_LINE_SPACING) - else - control:SetDimensions(width, MIN_HEIGHT) - end - - if buttonData.icon then - control.button = wm:CreateControl(nil, control, CT_BUTTON) - control.button:SetDimensions(26, 26) - control.button:SetNormalTexture(buttonData.icon) - control.button:SetPressedOffset(2, 2) - else - --control.button = wm:CreateControlFromVirtual(controlName.."Button", control, "ZO_DefaultButton") - control.button = wm:CreateControlFromVirtual(nil, control, "ZO_DefaultButton") - control.button:SetWidth(width / 3) - control.button:SetText(LAM.util.GetStringFromValue(buttonData.name)) - if buttonData.isDangerous then control.button:SetNormalFontColor(ZO_ERROR_COLOR:UnpackRGBA()) end - end - local button = control.button - button:SetAnchor(control.isHalfWidth and CENTER or RIGHT) - button:SetClickSound("Click") - button.data = {tooltipText = LAM.util.GetStringFromValue(buttonData.tooltip)} - button:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - button:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - button:SetHandler("OnClicked", function(...) - local args = {...} - local function callback() - buttonData.func(unpack(args)) - LAM.util.RequestRefreshIfNeeded(control) - end - - if(buttonData.isDangerous) then - local title = LAM.util.GetStringFromValue(buttonData.name) - local body = LAM.util.GetStringFromValue(buttonData.warning) - LAM.util.ShowConfirmationDialog(title, body, callback) - else - callback() - end - end) - - if buttonData.warning ~= nil then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, button, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - if buttonData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/checkbox.lua b/libs/LibAddonMenu-2.0/controls/checkbox.lua deleted file mode 100644 index 6696dd7..0000000 --- a/libs/LibAddonMenu-2.0/controls/checkbox.lua +++ /dev/null @@ -1,142 +0,0 @@ ---[[checkboxData = { - type = "checkbox", - name = "My Checkbox", -- or string id or function returning a string - getFunc = function() return db.var end, - setFunc = function(value) db.var = value doStuff() end, - tooltip = "Checkbox's tooltip text.", -- or string id or function returning a string (optional) - width = "full", -- or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- a boolean or function that returns a boolean (optional) - reference = "MyAddonCheckbox", -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 14 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("checkbox", widgetVersion) then return end - -local wm = WINDOW_MANAGER - ---label -local enabledColor = ZO_DEFAULT_ENABLED_COLOR -local enabledHLcolor = ZO_HIGHLIGHT_TEXT -local disabledColor = ZO_DEFAULT_DISABLED_COLOR -local disabledHLcolor = ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR ---checkbox -local checkboxColor = ZO_NORMAL_TEXT -local checkboxHLcolor = ZO_HIGHLIGHT_TEXT - - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.label:SetColor((disable and ZO_DEFAULT_DISABLED_COLOR or control.value and ZO_DEFAULT_ENABLED_COLOR or ZO_DEFAULT_DISABLED_COLOR):UnpackRGBA()) - control.checkbox:SetColor((disable and ZO_DEFAULT_DISABLED_COLOR or ZO_NORMAL_TEXT):UnpackRGBA()) - --control:SetMouseEnabled(not disable) - --control:SetMouseEnabled(true) - - control.isDisabled = disable -end - -local function ToggleCheckbox(control) - if control.value then - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.checkbox:SetText(control.checkedText) - else - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.checkbox:SetText(control.uncheckedText) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - elseif value ~= nil then --our value could be false - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - end - control.value = value - - ToggleCheckbox(control) -end - -local function OnMouseEnter(control) - ZO_Options_OnMouseEnter(control) - - if control.isDisabled then return end - - local label = control.label - if control.value then - label:SetColor(ZO_HIGHLIGHT_TEXT:UnpackRGBA()) - else - label:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - end - control.checkbox:SetColor(ZO_HIGHLIGHT_TEXT:UnpackRGBA()) -end - -local function OnMouseExit(control) - ZO_Options_OnMouseExit(control) - - if control.isDisabled then return end - - local label = control.label - if control.value then - label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - else - label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - end - control.checkbox:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) -end - ---controlName is optional -function LAMCreateControl.checkbox(parent, checkboxData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, checkboxData, controlName) - control:SetHandler("OnMouseEnter", OnMouseEnter) - control:SetHandler("OnMouseExit", OnMouseExit) - control:SetHandler("OnMouseUp", function(control) - if control.isDisabled then return end - PlaySound(SOUNDS.DEFAULT_CLICK) - control.value = not control.value - control:UpdateValue(false, control.value) - end) - - control.checkbox = wm:CreateControl(nil, control.container, CT_LABEL) - local checkbox = control.checkbox - checkbox:SetAnchor(LEFT, control.container, LEFT, 0, 0) - checkbox:SetFont("ZoFontGameBold") - checkbox:SetColor(ZO_NORMAL_TEXT:UnpackRGBA()) - control.checkedText = GetString(SI_CHECK_BUTTON_ON):upper() - control.uncheckedText = GetString(SI_CHECK_BUTTON_OFF):upper() - - if checkboxData.warning ~= nil or checkboxData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, checkbox, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.data.tooltipText = LAM.util.GetStringFromValue(checkboxData.tooltip) - - control.UpdateValue = UpdateValue - control:UpdateValue() - if checkboxData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/colorpicker.lua b/libs/LibAddonMenu-2.0/controls/colorpicker.lua deleted file mode 100644 index a57aab0..0000000 --- a/libs/LibAddonMenu-2.0/controls/colorpicker.lua +++ /dev/null @@ -1,106 +0,0 @@ ---[[colorpickerData = { - type = "colorpicker", - name = "My Color Picker", -- or string id or function returning a string - getFunc = function() return db.r, db.g, db.b, db.a end, --(alpha is optional) - setFunc = function(r,g,b,a) db.r=r, db.g=g, db.b=b, db.a=a end, --(alpha is optional) - tooltip = "Color Picker's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = {r = defaults.r, g = defaults.g, b = defaults.b, a = defaults.a}, --(optional) table of default color values (or default = defaultColor, where defaultColor is a table with keys of r, g, b[, a]) or a function that returns the color - reference = "MyAddonColorpicker" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 13 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("colorpicker", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end - - control.isDisabled = disable -end - -local function UpdateValue(control, forceDefault, valueR, valueG, valueB, valueA) - if forceDefault then --if we are forcing defaults - local color = LAM.util.GetDefaultValue(control.data.default) - valueR, valueG, valueB, valueA = color.r, color.g, color.b, color.a - control.data.setFunc(valueR, valueG, valueB, valueA) - elseif valueR and valueG and valueB then - control.data.setFunc(valueR, valueG, valueB, valueA or 1) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - valueR, valueG, valueB, valueA = control.data.getFunc() - end - - control.thumb:SetColor(valueR, valueG, valueB, valueA or 1) -end - -function LAMCreateControl.colorpicker(parent, colorpickerData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, colorpickerData, controlName) - - control.color = control.container - local color = control.color - - control.thumb = wm:CreateControl(nil, color, CT_TEXTURE) - local thumb = control.thumb - thumb:SetDimensions(36, 18) - thumb:SetAnchor(LEFT, color, LEFT, 4, 0) - - color.border = wm:CreateControl(nil, color, CT_TEXTURE) - local border = color.border - border:SetTexture("EsoUI\\Art\\ChatWindow\\chatOptions_bgColSwatch_frame.dds") - border:SetTextureCoords(0, .625, 0, .8125) - border:SetDimensions(40, 22) - border:SetAnchor(CENTER, thumb, CENTER, 0, 0) - - local function ColorPickerCallback(r, g, b, a) - control:UpdateValue(false, r, g, b, a) - end - - control:SetHandler("OnMouseUp", function(self, btn, upInside) - if self.isDisabled then return end - - if upInside then - local r, g, b, a = colorpickerData.getFunc() - COLOR_PICKER:Show(ColorPickerCallback, r, g, b, a, LAM.util.GetStringFromValue(colorpickerData.name)) - end - end) - - if colorpickerData.warning ~= nil or colorpickerData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, control.color, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.data.tooltipText = LAM.util.GetStringFromValue(colorpickerData.tooltip) - - control.UpdateValue = UpdateValue - control:UpdateValue() - if colorpickerData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/custom.lua b/libs/LibAddonMenu-2.0/controls/custom.lua deleted file mode 100644 index 40a7c42..0000000 --- a/libs/LibAddonMenu-2.0/controls/custom.lua +++ /dev/null @@ -1,35 +0,0 @@ ---[[customData = { - type = "custom", - reference = "MyAddonCustomControl", --(optional) unique name for your control to use as reference - refreshFunc = function(customControl) end, --(optional) function to call when panel/controls refresh - width = "full", --or "half" (optional) -} ]] - -local widgetVersion = 7 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("custom", widgetVersion) then return end - -local function UpdateValue(control) - if control.data.refreshFunc then - control.data.refreshFunc(control) - end -end - -local MIN_HEIGHT = 26 -function LAMCreateControl.custom(parent, customData, controlName) - local control = LAM.util.CreateBaseControl(parent, customData, controlName) - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if control.isHalfWidth then --note these restrictions - control:SetDimensionConstraints(width / 2, MIN_HEIGHT, width / 2, MIN_HEIGHT * 4) - else - control:SetDimensionConstraints(width, MIN_HEIGHT, width, MIN_HEIGHT * 4) - end - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/description.lua b/libs/LibAddonMenu-2.0/controls/description.lua deleted file mode 100644 index da207a0..0000000 --- a/libs/LibAddonMenu-2.0/controls/description.lua +++ /dev/null @@ -1,60 +0,0 @@ ---[[descriptionData = { - type = "description", - text = "My description text to display.", -- or string id or function returning a string - title = "My Title", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - reference = "MyAddonDescription" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 8 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("description", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateValue(control) - if control.title then - control.title:SetText(LAM.util.GetStringFromValue(control.data.title)) - end - control.desc:SetText(LAM.util.GetStringFromValue(control.data.text)) -end - -function LAMCreateControl.description(parent, descriptionData, controlName) - local control = LAM.util.CreateBaseControl(parent, descriptionData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if isHalfWidth then - control:SetDimensionConstraints(width / 2, 0, width / 2, 0) - else - control:SetDimensionConstraints(width, 0, width, 0) - end - - control.desc = wm:CreateControl(nil, control, CT_LABEL) - local desc = control.desc - desc:SetVerticalAlignment(TEXT_ALIGN_TOP) - desc:SetFont("ZoFontGame") - desc:SetText(LAM.util.GetStringFromValue(descriptionData.text)) - desc:SetWidth(isHalfWidth and width / 2 or width) - - if descriptionData.title then - control.title = wm:CreateControl(nil, control, CT_LABEL) - local title = control.title - title:SetWidth(isHalfWidth and width / 2 or width) - title:SetAnchor(TOPLEFT, control, TOPLEFT) - title:SetFont("ZoFontWinH4") - title:SetText(LAM.util.GetStringFromValue(descriptionData.title)) - desc:SetAnchor(TOPLEFT, title, BOTTOMLEFT) - else - desc:SetAnchor(TOPLEFT) - end - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control - -end diff --git a/libs/LibAddonMenu-2.0/controls/divider.lua b/libs/LibAddonMenu-2.0/controls/divider.lua deleted file mode 100644 index 8089539..0000000 --- a/libs/LibAddonMenu-2.0/controls/divider.lua +++ /dev/null @@ -1,45 +0,0 @@ ---[[dividerData = { - type = "divider", - width = "full", --or "half" (optional) - height = 10, (optional) - alpha = 0.25, (optional) - reference = "MyAddonDivider" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 2 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("divider", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local MIN_HEIGHT = 10 -local MAX_HEIGHT = 50 -local MIN_ALPHA = 0 -local MAX_ALPHA = 1 -local DEFAULT_ALPHA = 0.25 - -local function GetValueInRange(value, min, max, default) - if not value or type(value) ~= "number" then - return default - end - return math.min(math.max(min, value), max) -end - -function LAMCreateControl.divider(parent, dividerData, controlName) - local control = LAM.util.CreateBaseControl(parent, dividerData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - local height = GetValueInRange(dividerData.height, MIN_HEIGHT, MAX_HEIGHT, MIN_HEIGHT) - local alpha = GetValueInRange(dividerData.alpha, MIN_ALPHA, MAX_ALPHA, DEFAULT_ALPHA) - - control:SetDimensions(isHalfWidth and width / 2 or width, height) - - control.divider = wm:CreateControlFromVirtual(nil, control, "ZO_Options_Divider") - local divider = control.divider - divider:SetWidth(isHalfWidth and width / 2 or width) - divider:SetAnchor(TOPLEFT) - divider:SetAlpha(alpha) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/dropdown.lua b/libs/LibAddonMenu-2.0/controls/dropdown.lua deleted file mode 100644 index 70e23bb..0000000 --- a/libs/LibAddonMenu-2.0/controls/dropdown.lua +++ /dev/null @@ -1,387 +0,0 @@ ---[[dropdownData = { - type = "dropdown", - name = "My Dropdown", -- or string id or function returning a string - choices = {"table", "of", "choices"}, - choicesValues = {"foo", 2, "three"}, -- if specified, these values will get passed to setFunc instead (optional) - getFunc = function() return db.var end, - setFunc = function(var) db.var = var doStuff() end, - tooltip = "Dropdown's tooltip text.", -- or string id or function returning a string (optional) - choicesTooltips = {"tooltip 1", "tooltip 2", "tooltip 3"}, -- or array of string ids or array of functions returning a string (optional) - sort = "name-up", --or "name-down", "numeric-up", "numeric-down", "value-up", "value-down", "numericvalue-up", "numericvalue-down" (optional) - if not provided, list will not be sorted - width = "full", --or "half" (optional) - scrollable = true, -- boolean or number, if set the dropdown will feature a scroll bar if there are a large amount of choices and limit the visible lines to the specified number or 10 if true is used (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonDropdown" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 18 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("dropdown", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local SORT_BY_VALUE = { ["value"] = {} } -local SORT_BY_VALUE_NUMERIC = { ["value"] = { isNumeric = true } } -local SORT_TYPES = { - name = ZO_SORT_BY_NAME, - numeric = ZO_SORT_BY_NAME_NUMERIC, - value = SORT_BY_VALUE, - numericvalue = SORT_BY_VALUE_NUMERIC, -} -local SORT_ORDERS = { - up = ZO_SORT_ORDER_UP, - down = ZO_SORT_ORDER_DOWN, -} - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.dropdown:SetEnabled(not disable) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.dropdown:SetSelectedItem(control.choices[value]) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.dropdown:SetSelectedItem(control.choices[value]) - end -end - -local function DropdownCallback(control, choiceText, choice) - choice.control:UpdateValue(false, choice.value or choiceText) -end - -local function SetupTooltips(comboBox, choicesTooltips) - local function ShowTooltip(control) - InitializeTooltip(InformationTooltip, control, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(control.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() - end - local function HideTooltip(control) - ClearTooltip(InformationTooltip) - end - - -- allow for tooltips on the drop down entries - local originalShow = comboBox.ShowDropdownInternal - comboBox.ShowDropdownInternal = function(comboBox) - originalShow(comboBox) - local entries = ZO_Menu.items - for i = 1, #entries do - local entry = entries[i] - local control = entries[i].item - control.tooltip = choicesTooltips[i] - entry.onMouseEnter = control:GetHandler("OnMouseEnter") - entry.onMouseExit = control:GetHandler("OnMouseExit") - ZO_PreHookHandler(control, "OnMouseEnter", ShowTooltip) - ZO_PreHookHandler(control, "OnMouseExit", HideTooltip) - end - end - - local originalHide = comboBox.HideDropdownInternal - comboBox.HideDropdownInternal = function(self) - local entries = ZO_Menu.items - for i = 1, #entries do - local entry = entries[i] - local control = entries[i].item - control:SetHandler("OnMouseEnter", entry.onMouseEnter) - control:SetHandler("OnMouseExit", entry.onMouseExit) - control.tooltip = nil - end - originalHide(self) - end -end - -local function UpdateChoices(control, choices, choicesValues, choicesTooltips) - control.dropdown:ClearItems() --remove previous choices --(need to call :SetSelectedItem()?) - ZO_ClearTable(control.choices) - - --build new list of choices - local choices = choices or control.data.choices - local choicesValues = choicesValues or control.data.choicesValues - local choicesTooltips = choicesTooltips or control.data.choicesTooltips - - if choicesValues then - assert(#choices == #choicesValues, "choices and choicesValues need to have the same size") - end - - if choicesTooltips then - assert(#choices == #choicesTooltips, "choices and choicesTooltips need to have the same size") - if not control.scrollHelper then -- only do this for non-scrollable - SetupTooltips(control.dropdown, choicesTooltips) - end - end - - for i = 1, #choices do - local entry = control.dropdown:CreateItemEntry(choices[i], DropdownCallback) - entry.control = control - if choicesValues then - entry.value = choicesValues[i] - end - if choicesTooltips and control.scrollHelper then - entry.tooltip = choicesTooltips[i] - end - control.choices[entry.value or entry.name] = entry.name - control.dropdown:AddItem(entry, not control.data.sort and ZO_COMBOBOX_SUPRESS_UPDATE) --if sort type/order isn't specified, then don't sort - end -end - -local function GrabSortingInfo(sortInfo) - local t, i = {}, 1 - for info in string.gmatch(sortInfo, "([^%-]+)") do - t[i] = info - i = i + 1 - end - - return t -end - -local DEFAULT_VISIBLE_ROWS = 10 -local SCROLLABLE_ENTRY_TEMPLATE_HEIGHT = 25 -- same as in zo_combobox.lua -local CONTENT_PADDING = 24 -local SCROLLBAR_PADDING = 16 -local PADDING = GetMenuPadding() / 2 -- half the amount looks closer to the regular dropdown -local ROUNDING_MARGIN = 0.01 -- needed to avoid rare issue with too many anchors processed -local ScrollableDropdownHelper = ZO_Object:Subclass() - -function ScrollableDropdownHelper:New(...) - local object = ZO_Object.New(self) - object:Initialize(...) - return object -end - -function ScrollableDropdownHelper:Initialize(parent, control, visibleRows) - local combobox = control.combobox - local dropdown = control.dropdown - self.parent = parent - self.control = control - self.combobox = combobox - self.dropdown = dropdown - self.visibleRows = visibleRows - - -- clear anchors so we can adjust the width dynamically - dropdown.m_dropdown:ClearAnchors() - dropdown.m_dropdown:SetAnchor(TOPLEFT, combobox, BOTTOMLEFT) - - -- handle dropdown or settingsmenu opening/closing - local function onShow() self:OnShow() end - local function onHide() self:OnHide() end - local function doHide() self:DoHide() end - - ZO_PreHook(dropdown, "ShowDropdownOnMouseUp", onShow) - ZO_PreHook(dropdown, "HideDropdownInternal", onHide) - combobox:SetHandler("OnEffectivelyHidden", onHide) - parent:SetHandler("OnEffectivelyHidden", doHide) - - -- dont fade entries near the edges - local scrollList = dropdown.m_scroll - scrollList.selectionTemplate = nil - scrollList.highlightTemplate = nil - ZO_ScrollList_EnableSelection(scrollList, "ZO_SelectionHighlight") - ZO_ScrollList_EnableHighlight(scrollList, "ZO_SelectionHighlight") - ZO_Scroll_SetUseFadeGradient(scrollList, false) - - -- adjust scroll content anchor to mimic menu padding - local scroll = dropdown.m_dropdown:GetNamedChild("Scroll") - local anchor1 = {scroll:GetAnchor(0)} - local anchor2 = {scroll:GetAnchor(1)} - scroll:ClearAnchors() - scroll:SetAnchor(anchor1[2], anchor1[3], anchor1[4], anchor1[5] + PADDING, anchor1[6] + PADDING) - scroll:SetAnchor(anchor2[2], anchor2[3], anchor2[4], anchor2[5] - PADDING, anchor2[6] - PADDING) - ZO_ScrollList_Commit(scrollList) - - -- hook mouse enter/exit - local function onMouseEnter(control) self:OnMouseEnter(control) end - local function onMouseExit(control) self:OnMouseExit(control) end - - -- adjust row setup to mimic the highlight padding - local dataType1 = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, 1) - local dataType2 = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, 2) - local oSetup = dataType1.setupCallback -- both types have the same setup function - local function SetupEntry(control, data, list) - oSetup(control, data, list) - control.m_label:SetAnchor(LEFT, nil, nil, 2) - -- no need to store old ones since we have full ownership of our dropdown controls - if not control.hookedMouseHandlers then --only do it once per control - control.hookedMouseHandlers = true - ZO_PreHookHandler(control, "OnMouseEnter", onMouseEnter) - ZO_PreHookHandler(control, "OnMouseExit", onMouseExit) - -- we could also just replace the handlers - --control:SetHandler("OnMouseEnter", onMouseEnter) - --control:SetHandler("OnMouseExit", onMouseExit) - end - end - dataType1.setupCallback = SetupEntry - dataType2.setupCallback = SetupEntry - - -- adjust dimensions based on entries - local scrollContent = scroll:GetNamedChild("Contents") - ZO_PreHook(dropdown, "AddMenuItems", function() - local width = PADDING * 2 + zo_max(self:GetMaxWidth(), combobox:GetWidth()) - local numItems = #dropdown.m_sortedItems - local anchorOffset = 0 - if(numItems > self.visibleRows) then - width = width + CONTENT_PADDING + SCROLLBAR_PADDING - anchorOffset = -SCROLLBAR_PADDING - numItems = self.visibleRows - end - scrollContent:SetAnchor(BOTTOMRIGHT, nil, nil, anchorOffset) - local height = PADDING * 2 + numItems * (SCROLLABLE_ENTRY_TEMPLATE_HEIGHT + dropdown.m_spacing) - dropdown.m_spacing + ROUNDING_MARGIN - dropdown.m_dropdown:SetWidth(width) - dropdown.m_dropdown:SetHeight(height) - end) -end - -function ScrollableDropdownHelper:OnShow() - local dropdown = self.dropdown - if dropdown.m_lastParent ~= ZO_Menus then - dropdown.m_lastParent = dropdown.m_dropdown:GetParent() - dropdown.m_dropdown:SetParent(ZO_Menus) - ZO_Menus:BringWindowToTop() - end -end - -function ScrollableDropdownHelper:OnHide() - local dropdown = self.dropdown - if dropdown.m_lastParent then - dropdown.m_dropdown:SetParent(dropdown.m_lastParent) - dropdown.m_lastParent = nil - end -end - -function ScrollableDropdownHelper:DoHide() - local dropdown = self.dropdown - if dropdown:IsDropdownVisible() then - dropdown:HideDropdown() - end -end - -function ScrollableDropdownHelper:GetMaxWidth() - local dropdown = self.dropdown - local dataType = ZO_ScrollList_GetDataTypeTable(dropdown.m_scroll, 1) - - local dummy = dataType.pool:AcquireObject() - dataType.setupCallback(dummy, { - m_owner = dropdown, - name = "Dummy" - }, dropdown) - - local maxWidth = 0 - local label = dummy.m_label - local entries = dropdown.m_sortedItems - local numItems = #entries - for index = 1, numItems do - label:SetText(entries[index].name) - local width = label:GetTextWidth() - if (width > maxWidth) then - maxWidth = width - end - end - - dataType.pool:ReleaseObject(dummy.key) - return maxWidth -end - -function ScrollableDropdownHelper:OnMouseEnter(control) - -- call original code if we replace instead of hook the handler - --ZO_ScrollableComboBox_Entry_OnMouseEnter(control) - -- show tooltip - if control.m_data.tooltip then - InitializeTooltip(InformationTooltip, control, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(control.m_data.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() - end -end -function ScrollableDropdownHelper:OnMouseExit(control) - -- call original code if we replace instead of hook the handler - --ZO_ScrollableComboBox_Entry_OnMouseExit(control) - -- hide tooltip - if control.m_data.tooltip then - ClearTooltip(InformationTooltip) - end -end - -function LAMCreateControl.dropdown(parent, dropdownData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, dropdownData, controlName) - control.choices = {} - - local countControl = parent - local name = parent:GetName() - if not name or #name == 0 then - countControl = LAMCreateControl - name = "LAM" - end - local comboboxCount = (countControl.comboboxCount or 0) + 1 - countControl.comboboxCount = comboboxCount - control.combobox = wm:CreateControlFromVirtual(zo_strjoin(nil, name, "Combobox", comboboxCount), control.container, dropdownData.scrollable and "ZO_ScrollableComboBox" or "ZO_ComboBox") - - local combobox = control.combobox - combobox:SetAnchor(TOPLEFT) - combobox:SetDimensions(control.container:GetDimensions()) - combobox:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - combobox:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - control.dropdown = ZO_ComboBox_ObjectFromContainer(combobox) - local dropdown = control.dropdown - dropdown:SetSortsItems(false) -- need to sort ourselves in order to be able to sort by value - - if dropdownData.scrollable then - local visibleRows = type(dropdownData.scrollable) == "number" and dropdownData.scrollable or DEFAULT_VISIBLE_ROWS - control.scrollHelper = ScrollableDropdownHelper:New(parent, control, visibleRows) - end - - ZO_PreHook(dropdown, "UpdateItems", function(self) - assert(not self.m_sortsItems, "built-in dropdown sorting was reactivated, sorting is handled by LAM") - if control.m_sortOrder ~= nil and control.m_sortType then - local sortKey = next(control.m_sortType) - local sortFunc = function(item1, item2) return ZO_TableOrderingFunction(item1, item2, sortKey, control.m_sortType, control.m_sortOrder) end - table.sort(self.m_sortedItems, sortFunc) - end - end) - - if dropdownData.sort then - local sortInfo = GrabSortingInfo(dropdownData.sort) - control.m_sortType, control.m_sortOrder = SORT_TYPES[sortInfo[1]], SORT_ORDERS[sortInfo[2]] - elseif dropdownData.choicesValues then - control.m_sortType, control.m_sortOrder = ZO_SORT_ORDER_UP, SORT_BY_VALUE - end - - if dropdownData.warning ~= nil or dropdownData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, combobox, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateChoices = UpdateChoices - control:UpdateChoices(dropdownData.choices, dropdownData.choicesValues) - control.UpdateValue = UpdateValue - control:UpdateValue() - if dropdownData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/editbox.lua b/libs/LibAddonMenu-2.0/controls/editbox.lua deleted file mode 100644 index d6baf11..0000000 --- a/libs/LibAddonMenu-2.0/controls/editbox.lua +++ /dev/null @@ -1,156 +0,0 @@ ---[[editboxData = { - type = "editbox", - name = "My Editbox", -- or string id or function returning a string - getFunc = function() return db.text end, - setFunc = function(text) db.text = text doStuff() end, - tooltip = "Editbox's tooltip text.", -- or string id or function returning a string (optional) - isMultiline = true, --boolean (optional) - isExtraWide = true, --boolean (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.text, -- default value or function that returns the default value (optional) - reference = "MyAddonEditbox" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 14 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("editbox", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.editbox:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.editbox:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end - --control.editbox:SetEditEnabled(not disable) - control.editbox:SetMouseEnabled(not disable) -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.editbox:SetText(value) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.editbox:SetText(value) - end -end - -local MIN_HEIGHT = 24 -local HALF_WIDTH_LINE_SPACING = 2 -function LAMCreateControl.editbox(parent, editboxData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, editboxData, controlName) - - local container = control.container - control.bg = wm:CreateControlFromVirtual(nil, container, "ZO_EditBackdrop") - local bg = control.bg - bg:SetAnchorFill() - - if editboxData.isMultiline then - control.editbox = wm:CreateControlFromVirtual(nil, bg, "ZO_DefaultEditMultiLineForBackdrop") - control.editbox:SetHandler("OnMouseWheel", function(self, delta) - if self:HasFocus() then --only set focus to new spots if the editbox is currently in use - local cursorPos = self:GetCursorPosition() - local text = self:GetText() - local textLen = text:len() - local newPos - if delta > 0 then --scrolling up - local reverseText = text:reverse() - local revCursorPos = textLen - cursorPos - local revPos = reverseText:find("\n", revCursorPos+1) - newPos = revPos and textLen - revPos - else --scrolling down - newPos = text:find("\n", cursorPos+1) - end - if newPos then --if we found a new line, then scroll, otherwise don't - self:SetCursorPosition(newPos) - end - end - end) - else - control.editbox = wm:CreateControlFromVirtual(nil, bg, "ZO_DefaultEditForBackdrop") - end - local editbox = control.editbox - editbox:SetText(editboxData.getFunc()) - editbox:SetMaxInputChars(3000) - editbox:SetHandler("OnFocusLost", function(self) control:UpdateValue(false, self:GetText()) end) - editbox:SetHandler("OnEscape", function(self) self:LoseFocus() control:UpdateValue(false, self:GetText()) end) - editbox:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - editbox:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - local MIN_WIDTH = (parent.GetWidth and (parent:GetWidth() / 10)) or (parent.panel.GetWidth and (parent.panel:GetWidth() / 10)) or 0 - - control.label:ClearAnchors() - container:ClearAnchors() - - control.label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 0) - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, 0, 0) - - if control.isHalfWidth then - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, 0, 0) - end - - if editboxData.isExtraWide then - container:SetAnchor(BOTTOMLEFT, control, BOTTOMLEFT, 0, 0) - else - container:SetWidth(MIN_WIDTH * 3.2) - end - - if editboxData.isMultiline then - container:SetHeight(MIN_HEIGHT * 3) - else - container:SetHeight(MIN_HEIGHT) - end - - if control.isHalfWidth ~= true and editboxData.isExtraWide ~= true then - control:SetHeight(container:GetHeight()) - else - control:SetHeight(container:GetHeight() + control.label:GetHeight()) - end - - editbox:ClearAnchors() - editbox:SetAnchor(TOPLEFT, container, TOPLEFT, 2, 2) - editbox:SetAnchor(BOTTOMRIGHT, container, BOTTOMRIGHT, -2, -2) - - if editboxData.warning ~= nil or editboxData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - if editboxData.isExtraWide then - control.warning:SetAnchor(BOTTOMRIGHT, control.bg, TOPRIGHT, 2, 0) - else - control.warning:SetAnchor(TOPRIGHT, control.bg, TOPLEFT, -5, 0) - end - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateValue = UpdateValue - control:UpdateValue() - if editboxData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/header.lua b/libs/LibAddonMenu-2.0/controls/header.lua deleted file mode 100644 index eadff38..0000000 --- a/libs/LibAddonMenu-2.0/controls/header.lua +++ /dev/null @@ -1,42 +0,0 @@ ---[[headerData = { - type = "header", - name = "My Header", -- or string id or function returning a string - width = "full", --or "half" (optional) - reference = "MyAddonHeader" -- unique global reference to control (optional) -} ]] - - -local widgetVersion = 8 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("header", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local function UpdateValue(control) - control.header:SetText(LAM.util.GetStringFromValue(control.data.name)) -end - -local MIN_HEIGHT = 30 -function LAMCreateControl.header(parent, headerData, controlName) - local control = LAM.util.CreateBaseControl(parent, headerData, controlName) - local isHalfWidth = control.isHalfWidth - local width = control:GetWidth() - control:SetDimensions(isHalfWidth and width / 2 or width, MIN_HEIGHT) - - control.divider = wm:CreateControlFromVirtual(nil, control, "ZO_Options_Divider") - local divider = control.divider - divider:SetWidth(isHalfWidth and width / 2 or width) - divider:SetAnchor(TOPLEFT) - - control.header = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local header = control.header - header:SetAnchor(TOPLEFT, divider, BOTTOMLEFT) - header:SetAnchor(BOTTOMRIGHT) - header:SetText(LAM.util.GetStringFromValue(headerData.name)) - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/iconpicker.lua b/libs/LibAddonMenu-2.0/controls/iconpicker.lua deleted file mode 100644 index 65c7782..0000000 --- a/libs/LibAddonMenu-2.0/controls/iconpicker.lua +++ /dev/null @@ -1,436 +0,0 @@ ---[[iconpickerData = { - type = "iconpicker", - name = "My Icon Picker", -- or string id or function returning a string - choices = {"texture path 1", "texture path 2", "texture path 3"}, - getFunc = function() return db.var end, - setFunc = function(var) db.var = var doStuff() end, - tooltip = "Color Picker's tooltip text.", -- or string id or function returning a string (optional) - choicesTooltips = {"icon tooltip 1", "icon tooltip 2", "icon tooltip 3"}, -- or array of string ids or array of functions returning a string (optional) - maxColumns = 5, -- number of icons in one row (optional) - visibleRows = 4.5, -- number of visible rows (optional) - iconSize = 28, -- size of the icons (optional) - defaultColor = ZO_ColorDef:New("FFFFFF"), -- default color of the icons (optional) - width = "full", --or "half" (optional) - beforeShow = function(control, iconPicker) return preventShow end, --(optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonIconPicker" -- unique global reference to control (optional) -} ]] - -local widgetVersion = 8 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("iconpicker", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local IconPickerMenu = ZO_Object:Subclass() -local iconPicker -LAM.util.GetIconPickerMenu = function() - if not iconPicker then - iconPicker = IconPickerMenu:New("LAMIconPicker") - local sceneFragment = LAM:GetAddonSettingsFragment() - ZO_PreHook(sceneFragment, "OnHidden", function() - if not iconPicker.control:IsHidden() then - iconPicker:Clear() - end - end) - end - return iconPicker -end - -function IconPickerMenu:New(...) - local object = ZO_Object.New(self) - object:Initialize(...) - return object -end - -function IconPickerMenu:Initialize(name) - local control = wm:CreateTopLevelWindow(name) - control:SetDrawTier(DT_HIGH) - control:SetHidden(true) - self.control = control - - local scrollContainer = wm:CreateControlFromVirtual(name .. "ScrollContainer", control, "ZO_ScrollContainer") - -- control:SetDimensions(control.container:GetWidth(), height) -- adjust to icon size / col count - scrollContainer:SetAnchorFill() - ZO_Scroll_SetUseFadeGradient(scrollContainer, false) - ZO_Scroll_SetHideScrollbarOnDisable(scrollContainer, false) - ZO_VerticalScrollbarBase_OnMouseExit(scrollContainer:GetNamedChild("ScrollBar")) -- scrollbar initialization seems to be broken so we force it to update the correct alpha value - local scroll = GetControl(scrollContainer, "ScrollChild") - self.scroll = scroll - self.scrollContainer = scrollContainer - - local bg = wm:CreateControl(nil, scrollContainer, CT_BACKDROP) - bg:SetAnchor(TOPLEFT, scrollContainer, TOPLEFT, 0, -3) - bg:SetAnchor(BOTTOMRIGHT, scrollContainer, BOTTOMRIGHT, 2, 5) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI\\Art\\Tooltips\\UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - - local mungeOverlay = wm:CreateControl(nil, bg, CT_TEXTURE) - mungeOverlay:SetTexture("EsoUI/Art/Tooltips/munge_overlay.dds") - mungeOverlay:SetDrawLevel(1) - mungeOverlay:SetAddressMode(TEX_MODE_WRAP) - mungeOverlay:SetAnchorFill() - - local mouseOver = wm:CreateControl(nil, scrollContainer, CT_TEXTURE) - mouseOver:SetDrawLevel(2) - mouseOver:SetTexture("EsoUI/Art/Buttons/minmax_mouseover.dds") - mouseOver:SetHidden(true) - - local function IconFactory(pool) - local icon = wm:CreateControl(name .. "Entry" .. pool:GetNextControlId(), scroll, CT_TEXTURE) - icon:SetMouseEnabled(true) - icon:SetDrawLevel(3) - icon:SetHandler("OnMouseEnter", function() - mouseOver:SetAnchor(TOPLEFT, icon, TOPLEFT, 0, 0) - mouseOver:SetAnchor(BOTTOMRIGHT, icon, BOTTOMRIGHT, 0, 0) - mouseOver:SetHidden(false) - if self.customOnMouseEnter then - self.customOnMouseEnter(icon) - else - self:OnMouseEnter(icon) - end - end) - icon:SetHandler("OnMouseExit", function() - mouseOver:ClearAnchors() - mouseOver:SetHidden(true) - if self.customOnMouseExit then - self.customOnMouseExit(icon) - else - self:OnMouseExit(icon) - end - end) - icon:SetHandler("OnMouseUp", function(control, ...) - PlaySound("Click") - icon.OnSelect(icon, icon.texture) - self:Clear() - end) - return icon - end - - local function ResetFunction(icon) - icon:ClearAnchors() - end - - self.iconPool = ZO_ObjectPool:New(IconFactory, ResetFunction) - self:SetMaxColumns(1) - self.icons = {} - self.color = ZO_DEFAULT_ENABLED_COLOR - - EVENT_MANAGER:RegisterForEvent(name .. "_OnGlobalMouseUp", EVENT_GLOBAL_MOUSE_UP, function() - if self.refCount ~= nil then - local moc = wm:GetMouseOverControl() - if(moc:GetOwningWindow() ~= control) then - self.refCount = self.refCount - 1 - if self.refCount <= 0 then - self:Clear() - end - end - end - end) -end - -function IconPickerMenu:OnMouseEnter(icon) - InitializeTooltip(InformationTooltip, icon, TOPLEFT, 0, 0, BOTTOMRIGHT) - SetTooltipText(InformationTooltip, LAM.util.GetStringFromValue(icon.tooltip)) - InformationTooltipTopLevel:BringWindowToTop() -end - -function IconPickerMenu:OnMouseExit(icon) - ClearTooltip(InformationTooltip) -end - -function IconPickerMenu:SetMaxColumns(value) - self.maxCols = value ~= nil and value or 5 -end - -local DEFAULT_SIZE = 28 -function IconPickerMenu:SetIconSize(value) - local iconSize = DEFAULT_SIZE - if value ~= nil then iconSize = math.max(iconSize, value) end - self.iconSize = iconSize -end - -function IconPickerMenu:SetVisibleRows(value) - self.visibleRows = value ~= nil and value or 4.5 -end - -function IconPickerMenu:SetMouseHandlers(onEnter, onExit) - self.customOnMouseEnter = onEnter - self.customOnMouseExit = onExit -end - -function IconPickerMenu:UpdateDimensions() - local iconSize = self.iconSize - local width = iconSize * self.maxCols + 20 - local height = iconSize * self.visibleRows - self.control:SetDimensions(width, height) - - local icons = self.icons - for i = 1, #icons do - local icon = icons[i] - icon:SetDimensions(iconSize, iconSize) - end -end - -function IconPickerMenu:UpdateAnchors() - local iconSize = self.iconSize - local col, maxCols = 1, self.maxCols - local previousCol, previousRow - local scroll = self.scroll - local icons = self.icons - - for i = 1, #icons do - local icon = icons[i] - icon:ClearAnchors() - if i == 1 then - icon:SetAnchor(TOPLEFT, scroll, TOPLEFT, 0, 0) - previousRow = icon - elseif col == 1 then - icon:SetAnchor(TOPLEFT, previousRow, BOTTOMLEFT, 0, 0) - previousRow = icon - else - icon:SetAnchor(TOPLEFT, previousCol, TOPRIGHT, 0, 0) - end - previousCol = icon - col = col >= maxCols and 1 or col + 1 - end -end - -function IconPickerMenu:Clear() - self.icons = {} - self.iconPool:ReleaseAllObjects() - self.control:SetHidden(true) - self.color = ZO_DEFAULT_ENABLED_COLOR - self.refCount = nil - self.parent = nil - self.customOnMouseEnter = nil - self.customOnMouseExit = nil -end - -function IconPickerMenu:AddIcon(texturePath, callback, tooltip) - local icon, key = self.iconPool:AcquireObject() - icon:SetTexture(texturePath) - icon:SetColor(self.color:UnpackRGBA()) - icon.texture = texturePath - icon.tooltip = tooltip - icon.OnSelect = callback - self.icons[#self.icons + 1] = icon -end - -function IconPickerMenu:Show(parent) - if #self.icons == 0 then return false end - if not self.control:IsHidden() then self:Clear() return false end - self:UpdateDimensions() - self:UpdateAnchors() - - local control = self.control - control:ClearAnchors() - control:SetAnchor(TOPLEFT, parent, BOTTOMLEFT, 0, 8) - control:SetHidden(false) - control:BringWindowToTop() - self.parent = parent - self.refCount = 2 - - return true -end - -function IconPickerMenu:SetColor(color) - local icons = self.icons - self.color = color - for i = 1, #icons do - local icon = icons[i] - icon:SetColor(color:UnpackRGBA()) - end -end - -------------------------------------------------------------- - -local function UpdateChoices(control, choices, choicesTooltips) - local data = control.data - if not choices then - choices, choicesTooltips = data.choices, data.choicesTooltips or {} - end - local addedChoices = {} - - local iconPicker = LAM.util.GetIconPickerMenu() - iconPicker:Clear() - for i = 1, #choices do - local texture = choices[i] - if not addedChoices[texture] then -- remove duplicates - iconPicker:AddIcon(choices[i], function(self, texture) - control.icon:SetTexture(texture) - data.setFunc(texture) - LAM.util.RequestRefreshIfNeeded(control) - end, LAM.util.GetStringFromValue(choicesTooltips[i])) - addedChoices[texture] = true - end - end -end - -local function IsDisabled(control) - if type(control.data.disabled) == "function" then - return control.data.disabled() - else - return control.data.disabled - end -end - -local function SetColor(control, color) - local icon = control.icon - if IsDisabled(control) then - icon:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - icon.color = color or control.data.defaultColor or ZO_DEFAULT_ENABLED_COLOR - icon:SetColor(icon.color:UnpackRGBA()) - end - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:SetColor(icon.color) - end -end - -local function UpdateDisabled(control) - local disable = IsDisabled(control) - - control.dropdown:SetMouseEnabled(not disable) - control.dropdownButton:SetEnabled(not disable) - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:Clear() - end - - SetColor(control, control.icon.color) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - control.icon:SetTexture(value) - elseif value then - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - control.icon:SetTexture(value) - end -end - -local MIN_HEIGHT = 26 -local HALF_WIDTH_LINE_SPACING = 2 -local function SetIconSize(control, size) - local icon = control.icon - icon.size = size - icon:SetDimensions(size, size) - - local height = size + 4 - control.dropdown:SetDimensions(size + 20, height) - height = math.max(height, MIN_HEIGHT) - control.container:SetHeight(height) - if control.lineControl then - control.lineControl:SetHeight(MIN_HEIGHT + size + HALF_WIDTH_LINE_SPACING) - else - control:SetHeight(height) - end - - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container and not iconPicker.control:IsHidden() then - iconPicker:SetIconSize(size) - iconPicker:UpdateDimensions() - iconPicker:UpdateAnchors() - end -end - -function LAMCreateControl.iconpicker(parent, iconpickerData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, iconpickerData, controlName) - - local function ShowIconPicker() - local iconPicker = LAM.util.GetIconPickerMenu() - if iconPicker.parent == control.container then - iconPicker:Clear() - else - iconPicker:SetMaxColumns(iconpickerData.maxColumns) - iconPicker:SetVisibleRows(iconpickerData.visibleRows) - iconPicker:SetIconSize(control.icon.size) - UpdateChoices(control) - iconPicker:SetColor(control.icon.color) - if iconpickerData.beforeShow then - if iconpickerData.beforeShow(control, iconPicker) then - iconPicker:Clear() - return - end - end - iconPicker:Show(control.container) - end - end - - local iconSize = iconpickerData.iconSize ~= nil and iconpickerData.iconSize or DEFAULT_SIZE - control.dropdown = wm:CreateControl(nil, control.container, CT_CONTROL) - local dropdown = control.dropdown - dropdown:SetAnchor(LEFT, control.container, LEFT, 0, 0) - dropdown:SetMouseEnabled(true) - dropdown:SetHandler("OnMouseUp", ShowIconPicker) - dropdown:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - dropdown:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - control.icon = wm:CreateControl(nil, dropdown, CT_TEXTURE) - local icon = control.icon - icon:SetAnchor(LEFT, dropdown, LEFT, 3, 0) - icon:SetDrawLevel(2) - - local dropdownButton = wm:CreateControlFromVirtual(nil, dropdown, "ZO_DropdownButton") - dropdownButton:SetDimensions(16, 16) - dropdownButton:SetHandler("OnClicked", ShowIconPicker) - dropdownButton:SetAnchor(RIGHT, dropdown, RIGHT, -3, 0) - control.dropdownButton = dropdownButton - - control.bg = wm:CreateControl(nil, dropdown, CT_BACKDROP) - local bg = control.bg - bg:SetAnchor(TOPLEFT, dropdown, TOPLEFT, 0, -3) - bg:SetAnchor(BOTTOMRIGHT, dropdown, BOTTOMRIGHT, 2, 5) - bg:SetEdgeTexture("EsoUI/Art/Tooltips/UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI/Art/Tooltips/UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - local mungeOverlay = wm:CreateControl(nil, bg, CT_TEXTURE) - mungeOverlay:SetTexture("EsoUI/Art/Tooltips/munge_overlay.dds") - mungeOverlay:SetDrawLevel(1) - mungeOverlay:SetAddressMode(TEX_MODE_WRAP) - mungeOverlay:SetAnchorFill() - - if iconpickerData.warning ~= nil or iconpickerData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, control.container, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateChoices = UpdateChoices - control.UpdateValue = UpdateValue - control:UpdateValue() - control.SetColor = SetColor - control:SetColor() - control.SetIconSize = SetIconSize - control:SetIconSize(iconSize) - - if iconpickerData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/panel.lua b/libs/LibAddonMenu-2.0/controls/panel.lua deleted file mode 100644 index 1404686..0000000 --- a/libs/LibAddonMenu-2.0/controls/panel.lua +++ /dev/null @@ -1,126 +0,0 @@ ---[[panelData = { - type = "panel", - name = "Window Title", -- or string id or function returning a string - displayName = "My Longer Window Title", -- or string id or function returning a string (optional) (can be useful for long addon names or if you want to colorize it) - author = "Seerah", -- or string id or function returning a string (optional) - version = "2.0", -- or string id or function returning a string (optional) - website = "http://www.esoui.com/downloads/info7-LibAddonMenu.html", -- URL of website where the addon can be updated (optional) - keywords = "settings", -- additional keywords for search filter (it looks for matches in name..keywords..author) (optional) - slashCommand = "/myaddon", -- will register a keybind to open to this panel (don't forget to include the slash!) (optional) - registerForRefresh = true, --boolean (optional) (will refresh all options controls when a setting is changed and when the panel is shown) - registerForDefaults = true, --boolean (optional) (will set all options controls back to default values) - resetFunc = function() print("defaults reset") end, --(optional) custom function to run after settings are reset to defaults -} ]] - - -local widgetVersion = 13 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("panel", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local cm = CALLBACK_MANAGER - -local function RefreshPanel(control) - local panel = LAM.util.GetTopPanel(control) --callback can be fired by a single control, by the panel showing or by a nested submenu - local panelControls = panel.controlsToRefresh - - for i = 1, #panelControls do - local updateControl = panelControls[i] - if updateControl ~= control and updateControl.UpdateValue then - updateControl:UpdateValue() - end - if updateControl.UpdateDisabled then - updateControl:UpdateDisabled() - end - if updateControl.UpdateWarning then - updateControl:UpdateWarning() - end - end -end - -local function ForceDefaults(panel) - local panelControls = panel.controlsToRefresh - - for i = 1, #panelControls do - local updateControl = panelControls[i] - if updateControl.UpdateValue and updateControl.data.default ~= nil then - updateControl:UpdateValue(true) - end - end - - if panel.data.resetFunc then - panel.data.resetFunc() - end - - cm:FireCallbacks("LAM-RefreshPanel", panel) -end - -local callbackRegistered = false -LAMCreateControl.scrollCount = LAMCreateControl.scrollCount or 1 -local SEPARATOR = " - " -local LINK_COLOR = ZO_ColorDef:New("5959D5") -local LINK_MOUSE_OVER_COLOR = ZO_ColorDef:New("B8B8D3") - -function LAMCreateControl.panel(parent, panelData, controlName) - local control = wm:CreateControl(controlName, parent, CT_CONTROL) - - control.label = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local label = control.label - label:SetAnchor(TOPLEFT, control, TOPLEFT, 0, 4) - label:SetText(LAM.util.GetStringFromValue(panelData.displayName or panelData.name)) - - if panelData.author or panelData.version then - control.info = wm:CreateControl(nil, control, CT_LABEL) - local info = control.info - info:SetFont(LAM.util.L["PANEL_INFO_FONT"]) - info:SetAnchor(TOPLEFT, label, BOTTOMLEFT, 0, -2) - - local output = {} - if panelData.author then - output[#output + 1] = zo_strformat(LAM.util.L["AUTHOR"], LAM.util.GetStringFromValue(panelData.author)) - end - if panelData.version then - output[#output + 1] = zo_strformat(LAM.util.L["VERSION"], LAM.util.GetStringFromValue(panelData.version)) - end - info:SetText(table.concat(output, SEPARATOR)) - end - - if panelData.website then - control.website = wm:CreateControl(nil, control, CT_BUTTON) - local website = control.website - website:SetClickSound("Click") - website:SetFont(LAM.util.L["PANEL_INFO_FONT"]) - website:SetNormalFontColor(LINK_COLOR:UnpackRGBA()) - website:SetMouseOverFontColor(LINK_MOUSE_OVER_COLOR:UnpackRGBA()) - if(control.info) then - website:SetAnchor(TOPLEFT, control.info, TOPRIGHT, 0, 0) - website:SetText(string.format("|cffffff%s|r%s", SEPARATOR, LAM.util.L["WEBSITE"])) - else - website:SetAnchor(TOPLEFT, label, BOTTOMLEFT, 0, -2) - website:SetText(LAM.util.L["WEBSITE"]) - end - website:SetDimensions(website:GetLabelControl():GetTextDimensions()) - website:SetHandler("OnClicked", function() - RequestOpenUnsafeURL(panelData.website) - end) - end - - control.container = wm:CreateControlFromVirtual("LAMAddonPanelContainer"..LAMCreateControl.scrollCount, control, "ZO_ScrollContainer") - LAMCreateControl.scrollCount = LAMCreateControl.scrollCount + 1 - local container = control.container - container:SetAnchor(TOPLEFT, control.info or label, BOTTOMLEFT, 0, 20) - container:SetAnchor(BOTTOMRIGHT, control, BOTTOMRIGHT, -3, -3) - control.scroll = GetControl(control.container, "ScrollChild") - control.scroll:SetResizeToFitPadding(0, 20) - - if panelData.registerForRefresh and not callbackRegistered then --don't want to register our callback more than once - cm:RegisterCallback("LAM-RefreshPanel", RefreshPanel) - callbackRegistered = true - end - - control.ForceDefaults = ForceDefaults - control.data = panelData - control.controlsToRefresh = {} - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/slider.lua b/libs/LibAddonMenu-2.0/controls/slider.lua deleted file mode 100644 index bd721c5..0000000 --- a/libs/LibAddonMenu-2.0/controls/slider.lua +++ /dev/null @@ -1,212 +0,0 @@ ---[[sliderData = { - type = "slider", - name = "My Slider", -- or string id or function returning a string - getFunc = function() return db.var end, - setFunc = function(value) db.var = value doStuff() end, - min = 0, - max = 20, - step = 1, --(optional) - clampInput = true, -- boolean, if set to false the input won't clamp to min and max and allow any number instead (optional) - decimals = 0, -- when specified the input value is rounded to the specified number of decimals (optional) - autoSelect = false, -- boolean, automatically select everything in the text input field when it gains focus (optional) - inputLocation = "below", -- or "right", determines where the input field is shown. This should not be used within the addon menu and is for custom sliders (optional) - tooltip = "Slider's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - disabled = function() return db.someBooleanSetting end, --or boolean (optional) - warning = "May cause permanent awesomeness.", -- or string id or function returning a string (optional) - requiresReload = false, -- boolean, if set to true, the warning text will contain a notice that changes are only applied after an UI reload and any change to the value will make the "Apply Settings" button appear on the panel which will reload the UI when pressed (optional) - default = defaults.var, -- default value or function that returns the default value (optional) - reference = "MyAddonSlider" -- unique global reference to control (optional) -} ]] - -local widgetVersion = 12 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("slider", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local strformat = string.format - -local function RoundDecimalToPlace(d, place) - return tonumber(strformat("%." .. tostring(place) .. "f", d)) -end - -local function UpdateDisabled(control) - local disable - if type(control.data.disabled) == "function" then - disable = control.data.disabled() - else - disable = control.data.disabled - end - - control.slider:SetEnabled(not disable) - control.slidervalue:SetEditEnabled(not disable) - if disable then - control.label:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.minText:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.maxText:SetColor(ZO_DEFAULT_DISABLED_COLOR:UnpackRGBA()) - control.slidervalue:SetColor(ZO_DEFAULT_DISABLED_MOUSEOVER_COLOR:UnpackRGBA()) - else - control.label:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.minText:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.maxText:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - control.slidervalue:SetColor(ZO_DEFAULT_ENABLED_COLOR:UnpackRGBA()) - end -end - -local function UpdateValue(control, forceDefault, value) - if forceDefault then --if we are forcing defaults - value = LAM.util.GetDefaultValue(control.data.default) - control.data.setFunc(value) - elseif value then - if control.data.decimals then - value = RoundDecimalToPlace(value, control.data.decimals) - end - if control.data.clampInput ~= false then - value = math.max(math.min(value, control.data.max), control.data.min) - end - control.data.setFunc(value) - --after setting this value, let's refresh the others to see if any should be disabled or have their settings changed - LAM.util.RequestRefreshIfNeeded(control) - else - value = control.data.getFunc() - end - - control.slider:SetValue(value) - control.slidervalue:SetText(value) -end - -function LAMCreateControl.slider(parent, sliderData, controlName) - local control = LAM.util.CreateLabelAndContainerControl(parent, sliderData, controlName) - local isInputOnRight = sliderData.inputLocation == "right" - - --skipping creating the backdrop... Is this the actual slider texture? - control.slider = wm:CreateControl(nil, control.container, CT_SLIDER) - local slider = control.slider - slider:SetAnchor(TOPLEFT) - slider:SetHeight(14) - if(isInputOnRight) then - slider:SetAnchor(TOPRIGHT, nil, nil, -60) - else - slider:SetAnchor(TOPRIGHT) - end - slider:SetMouseEnabled(true) - slider:SetOrientation(ORIENTATION_HORIZONTAL) - --put nil for highlighted texture file path, and what look to be texture coords - slider:SetThumbTexture("EsoUI\\Art\\Miscellaneous\\scrollbox_elevator.dds", "EsoUI\\Art\\Miscellaneous\\scrollbox_elevator_disabled.dds", nil, 8, 16) - local minValue = sliderData.min - local maxValue = sliderData.max - slider:SetMinMax(minValue, maxValue) - slider:SetHandler("OnMouseEnter", function() ZO_Options_OnMouseEnter(control) end) - slider:SetHandler("OnMouseExit", function() ZO_Options_OnMouseExit(control) end) - - slider.bg = wm:CreateControl(nil, slider, CT_BACKDROP) - local bg = slider.bg - bg:SetCenterColor(0, 0, 0) - bg:SetAnchor(TOPLEFT, slider, TOPLEFT, 0, 4) - bg:SetAnchor(BOTTOMRIGHT, slider, BOTTOMRIGHT, 0, -4) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-SliderBackdrop.dds", 32, 4) - - control.minText = wm:CreateControl(nil, slider, CT_LABEL) - local minText = control.minText - minText:SetFont("ZoFontGameSmall") - minText:SetAnchor(TOPLEFT, slider, BOTTOMLEFT) - minText:SetText(sliderData.min) - - control.maxText = wm:CreateControl(nil, slider, CT_LABEL) - local maxText = control.maxText - maxText:SetFont("ZoFontGameSmall") - maxText:SetAnchor(TOPRIGHT, slider, BOTTOMRIGHT) - maxText:SetText(sliderData.max) - - control.slidervalueBG = wm:CreateControlFromVirtual(nil, slider, "ZO_EditBackdrop") - if(isInputOnRight) then - control.slidervalueBG:SetDimensions(60, 26) - control.slidervalueBG:SetAnchor(LEFT, slider, RIGHT, 5, 0) - else - control.slidervalueBG:SetDimensions(50, 16) - control.slidervalueBG:SetAnchor(TOP, slider, BOTTOM, 0, 0) - end - control.slidervalue = wm:CreateControlFromVirtual(nil, control.slidervalueBG, "ZO_DefaultEditForBackdrop") - local slidervalue = control.slidervalue - slidervalue:ClearAnchors() - slidervalue:SetAnchor(TOPLEFT, control.slidervalueBG, TOPLEFT, 3, 1) - slidervalue:SetAnchor(BOTTOMRIGHT, control.slidervalueBG, BOTTOMRIGHT, -3, -1) - slidervalue:SetTextType(TEXT_TYPE_NUMERIC) - if(isInputOnRight) then - slidervalue:SetFont("ZoFontGameLarge") - else - slidervalue:SetFont("ZoFontGameSmall") - end - - local isHandlingChange = false - local function HandleValueChanged(value) - if isHandlingChange then return end - if sliderData.decimals then - value = RoundDecimalToPlace(value, sliderData.decimals) - end - isHandlingChange = true - slider:SetValue(value) - slidervalue:SetText(value) - isHandlingChange = false - end - - slidervalue:SetHandler("OnEscape", function(self) - HandleValueChanged(sliderData.getFunc()) - self:LoseFocus() - end) - slidervalue:SetHandler("OnEnter", function(self) - self:LoseFocus() - end) - slidervalue:SetHandler("OnFocusLost", function(self) - local value = tonumber(self:GetText()) - control:UpdateValue(false, value) - end) - slidervalue:SetHandler("OnTextChanged", function(self) - local input = self:GetText() - if(#input > 1 and not input:sub(-1):match("[0-9]")) then return end - local value = tonumber(input) - if(value) then - HandleValueChanged(value) - end - end) - if(sliderData.autoSelect) then - ZO_PreHookHandler(slidervalue, "OnFocusGained", function(self) - self:SelectAll() - end) - end - - local range = maxValue - minValue - slider:SetValueStep(sliderData.step or 1) - slider:SetHandler("OnValueChanged", function(self, value, eventReason) - if eventReason == EVENT_REASON_SOFTWARE then return end - HandleValueChanged(value) - end) - slider:SetHandler("OnSliderReleased", function(self, value) - control:UpdateValue(false, value) - end) - slider:SetHandler("OnMouseWheel", function(self, value) - if(not self:GetEnabled()) then return end - local new_value = (tonumber(slidervalue:GetText()) or sliderData.min or 0) + ((sliderData.step or 1) * value) - control:UpdateValue(false, new_value) - end) - - if sliderData.warning ~= nil or sliderData.requiresReload then - control.warning = wm:CreateControlFromVirtual(nil, control, "ZO_Options_WarningIcon") - control.warning:SetAnchor(RIGHT, slider, LEFT, -5, 0) - control.UpdateWarning = LAM.util.UpdateWarning - control:UpdateWarning() - end - - control.UpdateValue = UpdateValue - control:UpdateValue() - - if sliderData.disabled ~= nil then - control.UpdateDisabled = UpdateDisabled - control:UpdateDisabled() - end - - LAM.util.RegisterForRefreshIfNeeded(control) - LAM.util.RegisterForReloadIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/submenu.lua b/libs/LibAddonMenu-2.0/controls/submenu.lua deleted file mode 100644 index 1766a1f..0000000 --- a/libs/LibAddonMenu-2.0/controls/submenu.lua +++ /dev/null @@ -1,108 +0,0 @@ ---[[submenuData = { - type = "submenu", - name = "Submenu Title", -- or string id or function returning a string - tooltip = "My submenu tooltip", -- -- or string id or function returning a string (optional) - controls = {sliderData, buttonData} --(optional) used by LAM - reference = "MyAddonSubmenu" --(optional) unique global reference to control -} ]] - -local widgetVersion = 11 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("submenu", widgetVersion) then return end - -local wm = WINDOW_MANAGER -local am = ANIMATION_MANAGER - -local function UpdateValue(control) - control.label:SetText(LAM.util.GetStringFromValue(control.data.name)) - if control.data.tooltip then - control.label.data.tooltipText = LAM.util.GetStringFromValue(control.data.tooltip) - end -end - -local function AnimateSubmenu(clicked) - local control = clicked:GetParent() - control.open = not control.open - - if control.open then - control.animation:PlayFromStart() - else - control.animation:PlayFromEnd() - end -end - -function LAMCreateControl.submenu(parent, submenuData, controlName) - local width = parent:GetWidth() - 45 - local control = wm:CreateControl(controlName or submenuData.reference, parent.scroll or parent, CT_CONTROL) - control.panel = parent - control.data = submenuData - - control.label = wm:CreateControlFromVirtual(nil, control, "ZO_Options_SectionTitleLabel") - local label = control.label - label:SetAnchor(TOPLEFT, control, TOPLEFT, 5, 5) - label:SetDimensions(width, 30) - label:SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS) - label:SetText(LAM.util.GetStringFromValue(submenuData.name)) - label:SetMouseEnabled(true) - if submenuData.tooltip then - label.data = {tooltipText = LAM.util.GetStringFromValue(submenuData.tooltip)} - label:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - label:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - end - - control.scroll = wm:CreateControl(nil, control, CT_SCROLL) - local scroll = control.scroll - scroll:SetParent(control) - scroll:SetAnchor(TOPLEFT, label, BOTTOMLEFT, 0, 10) - scroll:SetDimensionConstraints(width + 5, 0, width + 5, 0) - - control.bg = wm:CreateControl(nil, label, CT_BACKDROP) - local bg = control.bg - bg:SetAnchor(TOPLEFT, label, TOPLEFT, -5, -5) - bg:SetAnchor(BOTTOMRIGHT, scroll, BOTTOMRIGHT, -7, 0) - bg:SetEdgeTexture("EsoUI\\Art\\Tooltips\\UI-Border.dds", 128, 16) - bg:SetCenterTexture("EsoUI\\Art\\Tooltips\\UI-TooltipCenter.dds") - bg:SetInsets(16, 16, -16, -16) - - control.arrow = wm:CreateControl(nil, bg, CT_TEXTURE) - local arrow = control.arrow - arrow:SetDimensions(28, 28) - arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortdown.dds") --list_sortup for the other way - arrow:SetAnchor(TOPRIGHT, bg, TOPRIGHT, -5, 5) - - --figure out the cool animation later... - control.animation = am:CreateTimeline() - local animation = control.animation - animation:SetPlaybackType(ANIMATION_SIZE, 0) --2nd arg = loop count - - control:SetResizeToFitDescendents(true) - control.open = false - label:SetHandler("OnMouseUp", AnimateSubmenu) - animation:SetHandler("OnStop", function(self, completedPlaying) - scroll:SetResizeToFitDescendents(control.open) - if control.open then - control.arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortup.dds") - scroll:SetResizeToFitPadding(5, 20) - else - control.arrow:SetTexture("EsoUI\\Art\\Miscellaneous\\list_sortdown.dds") - scroll:SetResizeToFitPadding(5, 0) - scroll:SetHeight(0) - end - end) - - --small strip at the bottom of the submenu that you can click to close it - control.btmToggle = wm:CreateControl(nil, control, CT_TEXTURE) - local btmToggle = control.btmToggle - btmToggle:SetMouseEnabled(true) - btmToggle:SetAnchor(BOTTOMLEFT, control.scroll, BOTTOMLEFT) - btmToggle:SetAnchor(BOTTOMRIGHT, control.scroll, BOTTOMRIGHT) - btmToggle:SetHeight(15) - btmToggle:SetAlpha(0) - btmToggle:SetHandler("OnMouseUp", AnimateSubmenu) - - control.UpdateValue = UpdateValue - - LAM.util.RegisterForRefreshIfNeeded(control) - - return control -end diff --git a/libs/LibAddonMenu-2.0/controls/texture.lua b/libs/LibAddonMenu-2.0/controls/texture.lua deleted file mode 100644 index 29dda7c..0000000 --- a/libs/LibAddonMenu-2.0/controls/texture.lua +++ /dev/null @@ -1,45 +0,0 @@ ---[[textureData = { - type = "texture", - image = "file/path.dds", - imageWidth = 64, --max of 250 for half width, 510 for full - imageHeight = 32, --max of 100 - tooltip = "Image's tooltip text.", -- or string id or function returning a string (optional) - width = "full", --or "half" (optional) - reference = "MyAddonTexture" --(optional) unique global reference to control -} ]] - ---add texture coords support? - -local widgetVersion = 9 -local LAM = LibStub("LibAddonMenu-2.0") -if not LAM:RegisterWidget("texture", widgetVersion) then return end - -local wm = WINDOW_MANAGER - -local MIN_HEIGHT = 26 -function LAMCreateControl.texture(parent, textureData, controlName) - local control = LAM.util.CreateBaseControl(parent, textureData, controlName) - local width = control:GetWidth() - control:SetResizeToFitDescendents(true) - - if control.isHalfWidth then --note these restrictions - control:SetDimensionConstraints(width / 2, MIN_HEIGHT, width / 2, MIN_HEIGHT * 4) - else - control:SetDimensionConstraints(width, MIN_HEIGHT, width, MIN_HEIGHT * 4) - end - - control.texture = wm:CreateControl(nil, control, CT_TEXTURE) - local texture = control.texture - texture:SetAnchor(CENTER) - texture:SetDimensions(textureData.imageWidth, textureData.imageHeight) - texture:SetTexture(textureData.image) - - if textureData.tooltip then - texture:SetMouseEnabled(true) - texture.data = {tooltipText = LAM.util.GetStringFromValue(textureData.tooltip)} - texture:SetHandler("OnMouseEnter", ZO_Options_OnMouseEnter) - texture:SetHandler("OnMouseExit", ZO_Options_OnMouseExit) - end - - return control -end diff --git a/libs/LibGPS/LICENSE b/libs/LibGPS/LICENSE deleted file mode 100644 index ed4a182..0000000 --- a/libs/LibGPS/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2017 sirinsidiator - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/LibGPS/LibGPS.lua b/libs/LibGPS/LibGPS.lua deleted file mode 100644 index e1e112b..0000000 --- a/libs/LibGPS/LibGPS.lua +++ /dev/null @@ -1,788 +0,0 @@ --- LibGPS2 & its files © sirinsidiator -- --- Distributed under The Artistic License 2.0 (see LICENSE) -- ------------------------------------------------------------------- - -local LIB_NAME = "LibGPS2" -local lib = LibStub:NewLibrary(LIB_NAME, 16) - -if not lib then - return - -- already loaded and no upgrade necessary -end - -local LMP = LibStub("LibMapPing", true) -if(not LMP) then - error(string.format("[%s] Cannot load without LibMapPing", LIB_NAME)) -end - -local DUMMY_PIN_TYPE = LIB_NAME .. "DummyPin" -local LIB_IDENTIFIER_FINALIZE = LIB_NAME .. "_Finalize" -lib.LIB_EVENT_STATE_CHANGED = "OnLibGPS2MeasurementChanged" - -local LOG_WARNING = "Warning" -local LOG_NOTICE = "Notice" -local LOG_DEBUG = "Debug" - -local POSITION_MIN = 0.085 -local POSITION_MAX = 0.915 - -local TAMRIEL_MAP_INDEX = 1 - -local rootMaps = lib.rootMaps or {} -lib.rootMaps = rootMaps - ---lib.debugMode = 1 -- TODO -lib.mapMeasurements = lib.mapMeasurements or {} -local mapMeasurements = lib.mapMeasurements -lib.mapStack = lib.mapStack or {} -local mapStack = lib.mapStack -lib.suppressCount = lib.suppressCount or 0 - -local MAP_PIN_TYPE_PLAYER_WAYPOINT = MAP_PIN_TYPE_PLAYER_WAYPOINT -local currentWaypointX, currentWaypointY, currentWaypointMapId = 0, 0, nil -local needWaypointRestore = false -local orgSetMapToMapListIndex = nil -local orgSetMapToPlayerLocation = nil -local orgSetMapFloor = nil -local orgProcessMapClick = nil -local orgFunctions = {} -local measuring = false - -SLASH_COMMANDS["/libgpsdebug"] = function(value) - lib.debugMode = (tonumber(value) == 1) - df("[%s] debug mode %s", LIB_NAME, lib.debugMode and "enabled" or "disabled") -end - -local function LogMessage(type, message, ...) - if not lib.debugMode then return end - df("[%s] %s: %s", LIB_NAME, type, zo_strjoin(" ", message, ...)) -end - -local function GetAddon() - local addOn - local function errornous() addOn = 'a' + 1 end - local function errorHandler(err) addOn = string.match(err, "'GetAddon'.+user:/AddOns/(.-:.-):") end - xpcall(errornous, errorHandler) - return addOn -end - -local function FinalizeMeasurement() - EVENT_MANAGER:UnregisterForUpdate(LIB_IDENTIFIER_FINALIZE) - while lib.suppressCount > 0 do - LMP:UnsuppressPing(MAP_PIN_TYPE_PLAYER_WAYPOINT) - lib.suppressCount = lib.suppressCount - 1 - end - if needWaypointRestore then - LogMessage(LOG_DEBUG, "Update waypoint pin", LMP:GetMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT)) - LMP:RefreshMapPin(MAP_PIN_TYPE_PLAYER_WAYPOINT) - needWaypointRestore = false - end - measuring = false - CALLBACK_MANAGER:FireCallbacks(lib.LIB_EVENT_STATE_CHANGED, measuring) -end - -local function HandlePingEvent(pingType, pingTag, x, y, isPingOwner) - if(not isPingOwner or pingType ~= MAP_PIN_TYPE_PLAYER_WAYPOINT or not measuring) then return end - -- we delay our handler until all events have been fired and so that other addons can react to it first in case they use IsMeasuring - EVENT_MANAGER:UnregisterForUpdate(LIB_IDENTIFIER_FINALIZE) - EVENT_MANAGER:RegisterForUpdate(LIB_IDENTIFIER_FINALIZE, 0, FinalizeMeasurement) -end - -local function GetPlayerPosition() - return GetMapPlayerPosition("player") -end - -local function GetPlayerWaypoint() - return LMP:GetMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT) -end - -local function SetMeasurementWaypoint(x, y) - -- this waypoint stays invisible for others - lib.suppressCount = lib.suppressCount + 1 - LMP:SuppressPing(MAP_PIN_TYPE_PLAYER_WAYPOINT) - LMP:SetMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT, MAP_TYPE_LOCATION_CENTERED, x, y) -end - -local function SetPlayerWaypoint(x, y) - LMP:SetMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT, MAP_TYPE_LOCATION_CENTERED, x, y) -end - -local function RemovePlayerWaypoint() - LMP:RemoveMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT) -end - -local function GetReferencePoints() - local x1, y1 = GetPlayerPosition() - local x2, y2 = GetPlayerWaypoint() - return x1, y1, x2, y2 -end - -local function IsMapMeasured(mapId) - return (mapMeasurements[mapId or GetMapTileTexture()] ~= nil) -end - -local function StoreTamrielMapMeasurements() - -- no need to actually measure the world map - if (orgSetMapToMapListIndex(TAMRIEL_MAP_INDEX) ~= SET_MAP_RESULT_FAILED) then - local measurement = { - scaleX = 1, - scaleY = 1, - offsetX = 0, - offsetY = 0, - mapIndex = TAMRIEL_MAP_INDEX, - zoneIndex = GetCurrentMapZoneIndex() - } - mapMeasurements[GetMapTileTexture()] = measurement - rootMaps[TAMRIEL_MAP_INDEX] = measurement - return true - end - - return false -end - -local function CalculateMeasurements(mapId, localX, localY) - -- select the map corner farthest from the player position - local wpX, wpY = POSITION_MIN, POSITION_MIN - -- on some maps we cannot set the waypoint to the map border (e.g. Aurdion) - -- Opposite corner: - if (localX < 0.5) then wpX = POSITION_MAX end - if (localY < 0.5) then wpY = POSITION_MAX end - - SetMeasurementWaypoint(wpX, wpY) - - -- add local points to seen maps - local measurementPositions = {} - table.insert(measurementPositions, { mapId = mapId, pX = localX, pY = localY, wpX = wpX, wpY = wpY }) - - -- switch to zone map in order to get the mapIndex for the current location - local x1, y1, x2, y2 - while not(GetMapType() == MAPTYPE_ZONE and GetMapContentType() ~= MAP_CONTENT_DUNGEON) do - if (MapZoomOut() ~= SET_MAP_RESULT_MAP_CHANGED) then break end - -- collect measurements for all maps we come through on our way to the zone map - x1, y1, x2, y2 = GetReferencePoints() - table.insert(measurementPositions, { mapId = GetMapTileTexture(), pX = x1, pY = y1, wpX = x2, wpY = y2 }) - end - - -- some non-zone maps like Eyevea zoom directly to the Tamriel map - local mapIndex = GetCurrentMapIndex() or TAMRIEL_MAP_INDEX - local zoneIndex = GetCurrentMapZoneIndex() - - -- switch to world map so we can calculate the global map scale and offset - if orgSetMapToMapListIndex(TAMRIEL_MAP_INDEX) == SET_MAP_RESULT_FAILED then - -- failed to switch to the world map - LogMessage(LOG_NOTICE, "Could not switch to world map") - return - end - - -- get the two reference points on the world map - x1, y1, x2, y2 = GetReferencePoints() - - -- calculate scale and offset for all maps that we saw - local scaleX, scaleY, offsetX, offsetY - for _, m in ipairs(measurementPositions) do - if (mapMeasurements[m.mapId]) then break end -- we always go up in the hierarchy so we can stop once a measurement already exists - LogMessage(LOG_DEBUG, "Store map measurement for", m.mapId:sub(10, -7)) - scaleX = (x2 - x1) / (m.wpX - m.pX) - scaleY = (y2 - y1) / (m.wpY - m.pY) - offsetX = x1 - m.pX * scaleX - offsetY = y1 - m.pY * scaleY - if (math.abs(scaleX - scaleY) > 1e-3) then - LogMessage(LOG_WARNING, "Current map measurement might be wrong", m.mapId:sub(10, -7), mapIndex, m.pX, m.pY, m.wpX, m.wpY, x1, y1, x2, y2, offsetX, offsetY, scaleX, scaleY) - end - - -- store measurements - mapMeasurements[m.mapId] = { - scaleX = scaleX, - scaleY = scaleY, - offsetX = offsetX, - offsetY = offsetY, - mapIndex = mapIndex, - zoneIndex = zoneIndex - } - end - return mapIndex -end - -local function StoreCurrentWaypoint() - currentWaypointX, currentWaypointY = GetPlayerWaypoint() - currentWaypointMapId = GetMapTileTexture() -end - -local function ClearCurrentWaypoint() - currentWaypointX, currentWaypointY = 0, 0, nil -end - -local function GetExtraMapMeasurement(extraMapIndex) - -- switch to the map - orgSetMapToMapListIndex(extraMapIndex) - local extraMapId = GetMapTileTexture() - if(not IsMapMeasured(extraMapId)) then - -- calculate the measurements of map without worrying about the waypoint - local mapIndex = CalculateMeasurements(extraMapId, GetPlayerPosition()) - if (mapIndex ~= extraMapIndex) then - local name = GetMapInfo(extraMapIndex) - name = zo_strformat("<>", name) - LogMessage(LOG_WARNING, "CalculateMeasurements returned different index while measuring ", name, " map. expected:", extraMapIndex, "actual:", mapIndex) - if (not IsMapMeasured(extraMapId)) then - LogMessage(LOG_WARNING, "Failed to measure ", name, " map.") - return - end - end - end - return mapMeasurements[extraMapId] -end - -local function RestoreCurrentWaypoint() - if(not currentWaypointMapId) then - LogMessage(LOG_DEBUG, "Called RestoreCurrentWaypoint without calling StoreCurrentWaypoint.") - return - end - - local wasSet = false - if (currentWaypointX ~= 0 or currentWaypointY ~= 0) then - -- calculate waypoint position on the worldmap - local measurements = mapMeasurements[currentWaypointMapId] - local x = currentWaypointX * measurements.scaleX + measurements.offsetX - local y = currentWaypointY * measurements.scaleY + measurements.offsetY - - for rootMapIndex, measurements in pairs(rootMaps) do - if not measurements then - measurements = GetExtraMapMeasurement(rootMapIndex) - rootMaps[rootMapIndex] = measurements - end - if(measurements) then - if(x > measurements.offsetX and x < (measurements.offsetX + measurements.scaleX) and - y > measurements.offsetY and y < (measurements.offsetY + measurements.scaleY)) then - if(orgSetMapToMapListIndex(rootMapIndex) ~= SET_MAP_RESULT_FAILED) then - -- calculate waypoint coodinates within root map - x = (x - measurements.offsetX) / measurements.scaleX - y = (y - measurements.offsetY) / measurements.scaleY - SetPlayerWaypoint(x, y) - wasSet = true - break - end - end - end - end - if (not wasSet) then - LogMessage(LOG_DEBUG, "Cannot reset waypoint because it was outside of our reach") - end - end - - if(wasSet) then - LogMessage(LOG_DEBUG, "Waypoint was restored, request pin update") - needWaypointRestore = true -- we need to update the pin on the worldmap afterwards - else - RemovePlayerWaypoint() - end - ClearCurrentWaypoint() -end - -local function ConnectToWorldMap() - lib.panAndZoom = ZO_WorldMap_GetPanAndZoom() - lib.mapPinManager = ZO_WorldMap_GetPinManager() - if (_G[DUMMY_PIN_TYPE]) then return end - ZO_WorldMap_AddCustomPin(DUMMY_PIN_TYPE, function(pinManager) end , nil, { level = 0, size = 0, texture = "" }) - ZO_WorldMap_SetCustomPinEnabled(_G[DUMMY_PIN_TYPE], false) -end - -local function HookSetMapToFunction(funcName) - local orgFunction = _G[funcName] - orgFunctions[funcName] = orgFunction - local function NewFunction(...) - local result = orgFunction(...) - if(result ~= SET_MAP_RESULT_MAP_FAILED and not IsMapMeasured()) then - LogMessage(LOG_DEBUG, funcName) - - local success, mapResult = lib:CalculateMapMeasurements(false) - if(mapResult ~= SET_MAP_RESULT_CURRENT_MAP_UNCHANGED) then - result = mapResult - end - orgFunction(...) - end - -- All stuff is done before anyone triggers an "OnWorldMapChanged" event due to this result - return result - end - _G[funcName] = NewFunction -end - -local function HookSetMapToPlayerLocation() - orgSetMapToPlayerLocation = SetMapToPlayerLocation - orgFunctions["SetMapToPlayerLocation"] = orgSetMapToPlayerLocation - local function NewSetMapToPlayerLocation(...) - if not DoesUnitExist("player") then return SET_MAP_RESULT_MAP_FAILED end - local result = orgSetMapToPlayerLocation(...) - if(result ~= SET_MAP_RESULT_MAP_FAILED and not IsMapMeasured()) then - LogMessage(LOG_DEBUG, "SetMapToPlayerLocation") - - local success, mapResult = lib:CalculateMapMeasurements(false) - if(mapResult ~= SET_MAP_RESULT_CURRENT_MAP_UNCHANGED) then - result = mapResult - end - orgSetMapToPlayerLocation(...) - end - -- All stuff is done before anyone triggers an "OnWorldMapChanged" event due to this result - return result - end - SetMapToPlayerLocation = NewSetMapToPlayerLocation -end - -local function HookSetMapToMapListIndex() - orgSetMapToMapListIndex = SetMapToMapListIndex - orgFunctions["SetMapToMapListIndex"] = orgSetMapToMapListIndex - local function NewSetMapToMapListIndex(mapIndex) - local result = orgSetMapToMapListIndex(mapIndex) - if(result ~= SET_MAP_RESULT_MAP_FAILED and not IsMapMeasured()) then - LogMessage(LOG_DEBUG, "SetMapToMapListIndex") - - local success, mapResult = lib:CalculateMapMeasurements(false) - if(mapResult ~= SET_MAP_RESULT_CURRENT_MAP_UNCHANGED) then - result = mapResult - end - orgSetMapToMapListIndex(mapIndex) - end - - -- All stuff is done before anyone triggers an "OnWorldMapChanged" event due to this result - return result - end - SetMapToMapListIndex = NewSetMapToMapListIndex -end - -local function HookProcessMapClick() - orgProcessMapClick = ProcessMapClick - orgFunctions["ProcessMapClick"] = orgProcessMapClick - local function NewProcessMapClick(...) - local result = orgProcessMapClick(...) - if(result ~= SET_MAP_RESULT_MAP_FAILED and not IsMapMeasured()) then - LogMessage(LOG_DEBUG, "ProcessMapClick") - local success, mapResult = lib:CalculateMapMeasurements(true) - if(mapResult ~= SET_MAP_RESULT_CURRENT_MAP_UNCHANGED) then - result = mapResult - end - -- Returning is done via clicking already - end - return result - end - ProcessMapClick = NewProcessMapClick -end - -local function HookSetMapFloor() - orgSetMapFloor = SetMapFloor - orgFunctions["SetMapFloor"] = orgSetMapFloor - local function NewSetMapFloor(...) - local result = orgSetMapFloor(...) - if result ~= SET_MAP_RESULT_MAP_FAILED and not IsMapMeasured() then - LogMessage(LOG_DEBUG, "SetMapFloor") - local success, mapResult = lib:CalculateMapMeasurements(true) - if(mapResult ~= SET_MAP_RESULT_CURRENT_MAP_UNCHANGED) then - result = mapResult - end - orgSetMapFloor(...) - end - return result - end - SetMapFloor = NewSetMapFloor -end - -local function Initialize() -- wait until we have defined all functions - --- Unregister handler from older libGPS ( < 3) - EVENT_MANAGER:UnregisterForEvent("LibGPS2_SaveWaypoint", EVENT_PLAYER_DEACTIVATED) - EVENT_MANAGER:UnregisterForEvent("LibGPS2_RestoreWaypoint", EVENT_PLAYER_ACTIVATED) - - --- Unregister handler from older libGPS ( <= 5.1) - EVENT_MANAGER:UnregisterForEvent(LIB_NAME .. "_Init", EVENT_PLAYER_ACTIVATED) - --- Unregister handler from older libGPS, as it is now managed by LibMapPing ( >= 6) - EVENT_MANAGER:UnregisterForEvent(LIB_NAME .. "_UnmuteMapPing", EVENT_MAP_PING) - - if (lib.Unload) then - -- Undo action from older libGPS ( >= 5.2) - lib:Unload() - if (lib.suppressCount > 0) then - if lib.debugMode then zo_callLater(function() LogMessage(LOG_WARNING, "There is a measure in progress before loading is completed.") end, 2000) end - FinalizeMeasurement() - end - end - - --- Register new Unload - function lib:Unload() - for funcName, func in pairs(orgFunctions) do - _G[funcName] = func - end - - LMP:UnregisterCallback("AfterPingAdded", HandlePingEvent) - LMP:UnregisterCallback("AfterPingRemoved", HandlePingEvent) - - rootMaps, mapMeasurements, mapStack = nil, nil, nil - end - - ConnectToWorldMap() - - HookSetMapToFunction("SetMapToQuestCondition") - HookSetMapToFunction("SetMapToQuestStepEnding") - HookSetMapToFunction("SetMapToQuestZone") - HookSetMapToPlayerLocation() - HookSetMapToMapListIndex() - HookProcessMapClick() - HookSetMapFloor() - - StoreTamrielMapMeasurements() - - local function addRootMap(zoneId) - local mapIndex = GetMapIndexByZoneId(zoneId) - if mapIndex then rootMaps[mapIndex] = false end - end - addRootMap(347) -- Coldhabour - addRootMap(980) -- Clockwork City - addRootMap(1027) -- Artaeum - -- Any future extra dimension map here - - SetMapToPlayerLocation() -- initial measurement so we can get back to where we are currently - - LMP:RegisterCallback("AfterPingAdded", HandlePingEvent) - LMP:RegisterCallback("AfterPingRemoved", HandlePingEvent) -end - ------------------------- public functions ---------------------- - ---- Returns true as long as the player exists. -function lib:IsReady() - return DoesUnitExist("player") -end - ---- Returns true if the library is currently doing any measurements. -function lib:IsMeasuring() - return measuring -end - ---- Removes all cached measurement values. -function lib:ClearMapMeasurements() - mapMeasurements = { } -end - ---- Removes the cached measurement values for the map that is currently active. -function lib:ClearCurrentMapMeasurements() - local mapId = GetMapTileTexture() - mapMeasurements[mapId] = nil -end - ---- Returns a table with the measurement values for the active map or nil if the measurements could not be calculated for some reason. ---- The table contains scaleX, scaleY, offsetX, offsetY and mapIndex. ---- scaleX and scaleY are the dimensions of the active map on the Tamriel map. ---- offsetX and offsetY are the offset of the top left corner on the Tamriel map. ---- mapIndex is the mapIndex of the parent zone of the current map. -function lib:GetCurrentMapMeasurements() - local mapId = GetMapTileTexture() - if (not mapMeasurements[mapId]) then - -- try to calculate the measurements if they are not yet available - lib:CalculateMapMeasurements() - end - return mapMeasurements[mapId] -end - ---- Returns the mapIndex and zoneIndex of the parent zone for the currently set map. ---- return[1] number - The mapIndex of the parent zone ---- return[2] number - The zoneIndex of the parent zone -function lib:GetCurrentMapParentZoneIndices() - local measurements = lib:GetCurrentMapMeasurements() - local mapIndex = measurements.mapIndex - if(not measurements.zoneIndex) then - lib:PushCurrentMap() - SetMapToMapListIndex(mapIndex) - measurements.zoneIndex = GetCurrentMapZoneIndex() - lib:PopCurrentMap() - end - local zoneIndex = measurements.zoneIndex - return mapIndex, zoneIndex -end - ---- Calculates the measurements for the current map and all parent maps. ---- This method does nothing if there is already a cached measurement for the active map. ---- return[1] boolean - True, if a valid measurement was calculated ---- return[2] SetMapResultCode - Specifies if the map has changed or failed during measurement (independent of the actual result of the measurement) -function lib:CalculateMapMeasurements(returnToInitialMap) - -- cosmic map cannot be measured (GetMapPlayerWaypoint returns 0,0) - if (GetMapType() == MAPTYPE_COSMIC) then return false, SET_MAP_RESULT_CURRENT_MAP_UNCHANGED end - - -- no need to take measurements more than once - local mapId = GetMapTileTexture() - if (mapMeasurements[mapId] or mapId == "") then return false end - - if (lib.debugMode) then - LogMessage("Called from", GetAddon(), "for", mapId) - end - - -- get the player position on the current map - local localX, localY = GetPlayerPosition() - if (localX == 0 and localY == 0) then - -- cannot take measurements while player position is not initialized - return false, SET_MAP_RESULT_CURRENT_MAP_UNCHANGED - end - - returnToInitialMap = (returnToInitialMap ~= false) - - measuring = true - CALLBACK_MANAGER:FireCallbacks(lib.LIB_EVENT_STATE_CHANGED, measuring) - - -- check some facts about the current map, so we can reset it later - -- local oldMapIsZoneMap, oldMapFloor, oldMapFloorCount - if returnToInitialMap then - lib:PushCurrentMap() - end - - local hasWaypoint = LMP:HasMapPing(MAP_PIN_TYPE_PLAYER_WAYPOINT) - if(hasWaypoint) then StoreCurrentWaypoint() end - - local mapIndex = CalculateMeasurements(mapId, localX, localY) - - -- Until now, the waypoint was abused. Now the waypoint must be restored or removed again (not from Lua only). - if(hasWaypoint) then - RestoreCurrentWaypoint() - else - RemovePlayerWaypoint() - end - - if (returnToInitialMap) then - local result = lib:PopCurrentMap() - return true, result - end - - return true, (mapId == GetMapTileTexture()) and SET_MAP_RESULT_CURRENT_MAP_UNCHANGED or SET_MAP_RESULT_MAP_CHANGED -end - ---- Converts the given map coordinates on the current map into coordinates on the Tamriel map. ---- Returns x and y on the world map and the mapIndex of the parent zone ---- or nil if the measurements of the active map are not available. -function lib:LocalToGlobal(x, y) - local measurements = lib:GetCurrentMapMeasurements() - if (measurements) then - x = x * measurements.scaleX + measurements.offsetX - y = y * measurements.scaleY + measurements.offsetY - return x, y, measurements.mapIndex - end -end - ---- Converts the given global coordinates into a position on the active map. ---- Returns x and y on the current map or nil if the measurements of the active map are not available. -function lib:GlobalToLocal(x, y) - local measurements = lib:GetCurrentMapMeasurements() - if (measurements) then - x = (x - measurements.offsetX) / measurements.scaleX - y = (y - measurements.offsetY) / measurements.scaleY - return x, y - end -end - ---- Converts the given map coordinates on the specified zone map into coordinates on the Tamriel map. ---- This method is useful if you want to convert global positions from the old LibGPS version into the new format. ---- Returns x and y on the world map and the mapIndex of the parent zone ---- or nil if the measurements of the zone map are not available. -function lib:ZoneToGlobal(mapIndex, x, y) - lib:GetCurrentMapMeasurements() - -- measurement done in here: - SetMapToMapListIndex(mapIndex) - x, y, mapIndex = lib:LocalToGlobal(x, y) - return x, y, mapIndex -end - ---- This function zooms and pans to the specified position on the active map. -function lib:PanToMapPosition(x, y) - -- if we don't have access to the mapPinManager we cannot do anything - if (not self.mapPinManager) then return end - local mapPinManager = self.mapPinManager - -- create dummy pin - local pin = mapPinManager:CreatePin(_G[DUMMY_PIN_TYPE], "libgpsdummy", x, y) - - self.panAndZoom:PanToPin(pin) - - -- cleanup - mapPinManager:RemovePins(DUMMY_PIN_TYPE) -end - -local function FakeZO_WorldMap_IsMapChangingAllowed() return true end -local function FakeSetMapToMapListIndex() return SET_MAP_RESULT_MAP_CHANGED end -local FakeCALLBACK_MANAGER = { FireCallbacks = function() end } - ---- This function sets the current map as player chosen so it won't switch back to the previous map. -function lib:SetPlayerChoseCurrentMap() - -- replace the original functions - local oldIsChangingAllowed = ZO_WorldMap_IsMapChangingAllowed - ZO_WorldMap_IsMapChangingAllowed = FakeZO_WorldMap_IsMapChangingAllowed - - local oldSetMapToMapListIndex = SetMapToMapListIndex - SetMapToMapListIndex = FakeSetMapToMapListIndex - - local oldCALLBACK_MANAGER = CALLBACK_MANAGER - CALLBACK_MANAGER = FakeCALLBACK_MANAGER - - -- make our rigged call to set the player chosen flag - ZO_WorldMap_SetMapByIndex() - - -- cleanup - ZO_WorldMap_IsMapChangingAllowed = oldIsChangingAllowed - SetMapToMapListIndex = oldSetMapToMapListIndex - CALLBACK_MANAGER = oldCALLBACK_MANAGER -end - ---- Sets the best matching root map: Tamriel, Cold Harbour or Clockwork City and what ever will come. ---- Returns SET_MAP_RESULT_FAILED, SET_MAP_RESULT_MAP_CHANGED depending on the result of the API calls. -function lib:SetMapToRootMap(x, y) - local result = SET_MAP_RESULT_FAILED - for rootMapIndex, measurements in pairs(rootMaps) do - if (not measurements) then - measurements = GetExtraMapMeasurement(rootMapIndex) - rootMaps[rootMapIndex] = measurements - result = SET_MAP_RESULT_MAP_CHANGED - end - if (measurements) then - if (x > measurements.offsetX and x < (measurements.offsetX + measurements.scaleX) and - y > measurements.offsetY and y < (measurements.offsetY + measurements.scaleY)) then - if (orgSetMapToMapListIndex(rootMapIndex) ~= SET_MAP_RESULT_FAILED) then - return SET_MAP_RESULT_MAP_CHANGED - end - end - end - end - return result -end - ---- Repeatedly calls ProcessMapClick on the given global position starting on the Tamriel map until nothing more would happen. ---- Returns SET_MAP_RESULT_FAILED, SET_MAP_RESULT_MAP_CHANGED or SET_MAP_RESULT_CURRENT_MAP_UNCHANGED depending on the result of the API calls. -function lib:MapZoomInMax(x, y) - local result = lib:SetMapToRootMap(x, y) - - if (result ~= SET_MAP_RESULT_FAILED) then - local localX, localY = lib:GlobalToLocal(x, y) - - while WouldProcessMapClick(localX, localY) do - result = orgProcessMapClick(localX, localY) - if (result == SET_MAP_RESULT_FAILED) then break end - localX, localY = lib:GlobalToLocal(x, y) - end - end - - return result -end - -local SetCurrentZoom, GetCurrentZoom -- TODO remove -if(GetAPIVersion() >= 100025) then - function SetCurrentZoom(zoom) - return lib.panAndZoom:SetCurrentNormalizedZoom(zoom) - end - function GetCurrentZoom() - return lib.panAndZoom:GetCurrentNormalizedZoom() - end -else - function GetCurrentZoom() - return lib.panAndZoom:GetCurrentZoom() - end - function SetCurrentZoom(zoom) - return lib.panAndZoom:SetCurrentZoom(zoom) - end -end - ---- Stores information about how we can back to this map on a stack. --- There is no panAndZoom:GetCurrentOffset(), yet -local function CalculateContainerAnchorOffsets() - local containerCenterX, containerCenterY = ZO_WorldMapContainer:GetCenter() - local scrollCenterX, scrollCenterY = ZO_WorldMapScroll:GetCenter() - return containerCenterX - scrollCenterX, containerCenterY - scrollCenterY -end -function lib:PushCurrentMap() - local wasPlayerLocation, targetMapTileTexture, currentMapFloor, currentMapFloorCount, currentMapIndex, zoom, offsetX, offsetY - currentMapIndex = GetCurrentMapIndex() - wasPlayerLocation = DoesCurrentMapMatchMapForPlayerLocation() - targetMapTileTexture = GetMapTileTexture() - currentMapFloor, currentMapFloorCount = GetMapFloorInfo() - zoom = GetCurrentZoom() - offsetX, offsetY = CalculateContainerAnchorOffsets() - - mapStack[#mapStack + 1] = { wasPlayerLocation, targetMapTileTexture, currentMapFloor, currentMapFloorCount, currentMapIndex, zoom, offsetX, offsetY } -end - ---- Switches to the map that was put on the stack last. ---- Returns SET_MAP_RESULT_FAILED, SET_MAP_RESULT_MAP_CHANGED or SET_MAP_RESULT_CURRENT_MAP_UNCHANGED depending on the result of the API calls. -function lib:PopCurrentMap() - local result = SET_MAP_RESULT_FAILED - local data = table.remove(mapStack, #mapStack) - if(not data) then - LogMessage(LOG_DEBUG, "PopCurrentMap failed. No data on map stack.") - return result - end - - local wasPlayerLocation, targetMapTileTexture, currentMapFloor, currentMapFloorCount, currentMapIndex, zoom, offsetX, offsetY = unpack(data) - local currentTileTexture = GetMapTileTexture() - if(currentTileTexture ~= targetMapTileTexture) then - if(wasPlayerLocation) then - result = orgSetMapToPlayerLocation() - - elseif(currentMapIndex ~= nil and currentMapIndex > 0) then -- set to a zone map - result = orgSetMapToMapListIndex(currentMapIndex) - - else -- here is where it gets tricky - local target = mapMeasurements[targetMapTileTexture] - if(not target) then -- always just return to player map if we cannot restore the previous map. - LogMessage(LOG_DEBUG, string.format("No measurement for \"%s\". Returning to player location.", targetMapTileTexture)) - return orgSetMapToPlayerLocation() - end - - -- switch to the parent zone - if(target.mapIndex == TAMRIEL_MAP_INDEX) then -- zone map has no mapIndex (e.g. Eyevea or Hew's Bane on first PTS patch for update 9) - -- switch to the tamriel map just in case - result = orgSetMapToMapListIndex(TAMRIEL_MAP_INDEX) - if(result == SET_MAP_RESULT_FAILED) then return result end - -- get global coordinates of target map center - local x = target.offsetX + (target.scaleX / 2) - local y = target.offsetY + (target.scaleY / 2) - if(not WouldProcessMapClick(x, y)) then - LogMessage(LOG_DEBUG, string.format("Cannot process click at %s/%s on map \"%s\" in order to get to \"%s\". Returning to player location instead.", tostring(x), tostring(y), GetMapTileTexture(), targetMapTileTexture)) - return orgSetMapToPlayerLocation() - end - result = orgProcessMapClick(x, y) - if(result == SET_MAP_RESULT_FAILED) then return result end - else - result = orgSetMapToMapListIndex(target.mapIndex) - if(result == SET_MAP_RESULT_FAILED) then return result end - end - - -- switch to the sub zone - currentTileTexture = GetMapTileTexture() - if(currentTileTexture ~= targetMapTileTexture) then - -- determine where on the zone map we have to click to get to the sub zone map - -- get global coordinates of target map center - local x = target.offsetX + (target.scaleX / 2) - local y = target.offsetY + (target.scaleY / 2) - -- transform to local coordinates - local current = mapMeasurements[currentTileTexture] - if(not current) then - LogMessage(LOG_DEBUG, string.format("No measurement for \"%s\". Returning to player location.", currentTileTexture)) - return orgSetMapToPlayerLocation() - end - - x = (x - current.offsetX) / current.scaleX - y = (y - current.offsetY) / current.scaleY - - if(not WouldProcessMapClick(x, y)) then - LogMessage(LOG_DEBUG, string.format("Cannot process click at %s/%s on map \"%s\" in order to get to \"%s\". Returning to player location instead.", tostring(x), tostring(y), GetMapTileTexture(), targetMapTileTexture)) - return orgSetMapToPlayerLocation() - end - result = orgProcessMapClick(x, y) - if(result == SET_MAP_RESULT_FAILED) then return result end - end - - -- switch to the correct floor (e.g. Elden Root) - if (currentMapFloorCount > 0) then - result = orgSetMapFloor(currentMapFloor) - end - if (result ~= SET_MAP_RESULT_FAILED) then - SetCurrentZoom(zoom) - lib.panAndZoom:SetCurrentOffset(offsetX, offsetY) - end - end - else - result = SET_MAP_RESULT_CURRENT_MAP_UNCHANGED - end - - return result -end - -Initialize() diff --git a/libs/LibGroupSocket/LICENSE b/libs/LibGroupSocket/LICENSE deleted file mode 100644 index 12b3fde..0000000 --- a/libs/LibGroupSocket/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2016 sirinsidiator - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/LibGroupSocket/LibGroupSocket.lua b/libs/LibGroupSocket/LibGroupSocket.lua deleted file mode 100644 index d67a5eb..0000000 --- a/libs/LibGroupSocket/LibGroupSocket.lua +++ /dev/null @@ -1,658 +0,0 @@ -local LIB_IDENTIFIER = "LibGroupSocket" -local lib = LibStub:NewLibrary(LIB_IDENTIFIER, 2) - -if not lib then - return -- already loaded and no upgrade necessary -end - -local LMP = LibStub("LibMapPing", true) -if(not LMP) then - error(string.format("[%s] Cannot load without LibMapPing", LIB_IDENTIFIER)) -end - -local LGPS = LibStub("LibGPS2", true) -if(not LGPS) then - error(string.format("[%s] Cannot load without LibGPS2", LIB_IDENTIFIER)) -end - -local function Log(message, ...) - df("[%s] %s", LIB_IDENTIFIER, message:format(...)) -end -lib.Log = Log - ---/script PingMap(89, 1, 1 / 2^16, 1 / 2^16) StartChatInput(table.concat({GetMapPlayerWaypoint()}, ",")) --- smallest step is around 1.428571431461e-005 for Wrothgar, so there should be 70000 steps --- Coldharbour has a similar step size, meaning we can send 4 bytes of data per ping on both -local WROTHGAR_MAP_INDEX = 27 -local COLDHARBOUR_MAP_INDEX = 23 -local MAP_METRICS = { - [WROTHGAR_MAP_INDEX] = { zoneIndex = GetZoneIndex(684), stepSize = 1.428571431461e-005 }, - [COLDHARBOUR_MAP_INDEX] = { zoneIndex = GetZoneIndex(347), stepSize = 1.4285034012573e-005 }, -} -local NO_UPDATE = true - ---lib.debug = true -- TODO -lib.cm = lib.cm or ZO_CallbackObject:New() -lib.outgoing = lib.outgoing or {} -lib.incoming = lib.incoming or {} -lib.handlers = lib.handlers or {} -local handlers = lib.handlers -local suppressedList = {} -local panel, button, entry - -function lib:GetMapIndexForUnit(unitTag) - if(MAP_METRICS[WROTHGAR_MAP_INDEX].zoneIndex == GetUnitZoneIndex(unitTag)) then - return COLDHARBOUR_MAP_INDEX - else - return WROTHGAR_MAP_INDEX - end -end - -function lib:GetStepSizeForUnit(unitTag) - return MAP_METRICS[lib:GetMapIndexForUnit(unitTag)].stepSize -end - -------------------------------------------------------- Settings ------------------------------------------------------ - -local defaultData = { - version = 1, - enabled = false, - autoDisableOnGroupLeft = true, - autoDisableOnSessionStart = true, - handlers = {}, -} - --- saved variables are not ready yet so we just use the defaults, the real saved variables will be loaded later in case the standalone lib is active -local saveData = ZO_DeepTableCopy(defaultData) - -local function RefreshSettingsPanel() - if(not panel) then return end - CALLBACK_MANAGER:FireCallbacks("LAM-RefreshPanel", panel) -end - -local function RefreshGroupMenuKeyboard() - if(not button) then return end - ZO_CheckButton_SetCheckState(button, saveData.enabled) -end - -local function RefreshGroupMenuGamepad(noUpdate) - if(not entry) then return end - entry:SetText(saveData.enabled and "Disable sending" or "Enable sending") - if(not noUpdate) then - GAMEPAD_GROUP_MENU:UpdateMenuList() - end -end - -local function InitializeGroupMenu() - if(not ZO_GroupMenu_Keyboard) then return end - -- keyboard - button = CreateControlFromVirtual("$(parent)_LibGroupSocketToggle", ZO_GroupMenu_Keyboard, "ZO_CheckButton_Text") - ZO_CheckButton_SetLabelText(button, "LibGroupSocket Sending:") - ZO_CheckButton_SetCheckState(button, saveData.enabled) - ZO_CheckButton_SetToggleFunction(button, function(control, checked) - if(checked ~= saveData.enabled) then - saveData.enabled = checked - RefreshSettingsPanel() - RefreshGroupMenuGamepad() - end - end) - button.label:ClearAnchors() - button.label:SetAnchor(TOPLEFT, ZO_GroupMenu_Keyboard, TOPLEFT, 10, 30) - button:SetAnchor(LEFT, button.label, RIGHT, -40, 0) - - -- gamepad - local menu = GAMEPAD_GROUP_MENU - local MENU_ENTRY_TYPE_LGS_TOGGLE = #menu.menuEntries + 1 - entry = ZO_GamepadEntryData:New("") - RefreshGroupMenuGamepad(NO_UPDATE) - entry.type = MENU_ENTRY_TYPE_LGS_TOGGLE - entry:SetHeader("LibGroupSocket") - menu.menuEntries[MENU_ENTRY_TYPE_LGS_TOGGLE] = entry - - local list = GAMEPAD_GROUP_MENU:GetMainList() - local originalCommit = list.Commit - list.Commit = function(self, ...) - list:AddEntryWithHeader("ZO_GamepadMenuEntryTemplate", entry) - originalCommit(self, ...) - end - - local InitializeKeybindDescriptors = menu.InitializeKeybindDescriptors - menu.InitializeKeybindDescriptors = function(self) - InitializeKeybindDescriptors(self) - - local primary = menu.keybindStripDescriptor[1] - local callback = primary.callback - primary.callback = function() - callback() - local type = list:GetTargetData().type - if type == MENU_ENTRY_TYPE_LGS_TOGGLE then - PlaySound(SOUNDS.DEFAULT_CLICK) - saveData.enabled = not saveData.enabled - RefreshSettingsPanel() - RefreshGroupMenuKeyboard() - RefreshGroupMenuGamepad() - end - end - end -end - -local function InitializeSettingsPanel() -- TODO: localization - local LAM = LibStub("LibAddonMenu-2.0", true) - if(LAM) then -- if LAM is not available, it is not the stand alone version of LGS. As we can't save anything in that case, we don't bother enforcing a dependency. - local function IsSendingDisabled() return not saveData.enabled end - - local panelData = { - type = "panel", - name = "LibGroupSocket", - author = "sirinsidiator", - version = "2", - website = "http://www.esoui.com/downloads/info1337-LibGroupSocket.html", - registerForRefresh = true, - registerForDefaults = true - } - panel = LAM:RegisterAddonPanel("LibGroupSocketOptions", panelData) - - local optionsData = {} - if(not lib.standalone) then -- the stand alone version contains a file that sets standalone = true - optionsData[#optionsData + 1] = { - type = "description", - text = "No stand alone installation detected. Settings won't be saved.", - reference = "LibGroupSocketStandAloneWarning" - } - end - - optionsData[#optionsData + 1] = { - type = "header", - name = "General", - } - optionsData[#optionsData + 1] = { - type = "checkbox", - name = "Enable Sending", - tooltip = "Controls if the library sends any data. It will still receive and process data.", - getFunc = function() return saveData.enabled end, - setFunc = function(value) - saveData.enabled = value - RefreshGroupMenuKeyboard() - RefreshGroupMenuGamepad() - end, - default = defaultData.enabled - } - optionsData[#optionsData + 1] = { - type = "checkbox", - name = "Disable On Group Left", - tooltip = "Automatically disables sending when you leave a group in order to prevent accidentally sending data to a new group.", - getFunc = function() return saveData.autoDisableOnGroupLeft end, - setFunc = function(value) saveData.autoDisableOnGroupLeft = value end, - default = defaultData.enabled - } - optionsData[#optionsData + 1] = { - type = "checkbox", - name = "Disable On Session Start", - tooltip = "Automatically disables sending when you start the game in order to prevent accidentally sending data to an existing group.", - getFunc = function() return saveData.autoDisableOnSessionStart end, - setFunc = function(value) saveData.autoDisableOnSessionStart = value end, - default = defaultData.enabled - } - - for handlerType, handler in pairs(handlers) do - if(handler.InitializeSettings) then - handler:InitializeSettings(optionsData, IsSendingDisabled) - end - end - LAM:RegisterOptionControls("LibGroupSocketOptions", optionsData) - end -end - -------------------------------------------------- OutgoingPacket Class ------------------------------------------------ - -local OutgoingPacket = ZO_Object:Subclass() - -function OutgoingPacket:New(messageType, data) - local object = ZO_Object.New(self) - object.messageType = messageType - object.header = lib:EncodeHeader(messageType, #data) - object.data = data - object.index = 0 - return object -end - -function OutgoingPacket:GetNext() - local next - if(self.index < 1) then - next = self.header - else - next = self.data[self.index] or 0 - end - self.index = self.index + 1 - return next -end - -function OutgoingPacket:GetNextCoordinates() - local stepSize = lib:GetStepSizeForUnit("player") - return lib:EncodeData(self:GetNext(), self:GetNext(), self:GetNext(), self:GetNext(), stepSize) -end - -function OutgoingPacket:HasMore() - return self.index <= #self.data -end - -------------------------------------------------- IncomingPacket Class ------------------------------------------------ - -local IncomingPacket = ZO_Object:Subclass() - -function IncomingPacket:New(unitTag) - local object = ZO_Object.New(self) - object.messageType = -1 - object.data = {} - object.length = 0 - object.stepSize = lib:GetStepSizeForUnit(unitTag) - return object -end - -function IncomingPacket:AddCoordinates(x, y) - local b0, b1, b2, b3 = lib:DecodeData(x, y, self.stepSize) - local data = self.data - if(self.messageType < 0) then - self.messageType, self.length = lib:DecodeHeader(b0) - else - data[#data + 1] = b0 - end - if(#data < self.length) then data[#data + 1] = b1 end - if(#data < self.length) then data[#data + 1] = b2 end - if(#data < self.length) then data[#data + 1] = b3 end -end - -function IncomingPacket:IsComplete() - return self.length > 0 and #self.data >= self.length -end - -local function IsValidMessageType(messageType) - return not (messageType < 0 or messageType > 31) -end - -function IncomingPacket:HasValidHeader() - return IsValidMessageType(self.messageType) and self.length > 0 and self.length < 8 -end - -function IncomingPacket:IsValid() - return self:HasValidHeader() and #self.data == self.length -end - ---------------------------------------------- Byte Manipulation Utilities --------------------------------------------- - ---- Reads a bit from the data stream and increments the index and bit index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to read from ---- bitIndex - the current bit inside the current byte (starts from 1) ---- returns the state of the bit, the next position in the data array and the next bitIndex -function lib:ReadBit(data, index, bitIndex) - local p = 2 ^ (bitIndex - 1) - local isSet = (data[index] % (p + p) >= p) - local nextIndex = (bitIndex >= 8 and index + 1 or index) - local nextBitIndex = (bitIndex >= 8 and 1 or bitIndex + 1) - return isSet, nextIndex, nextBitIndex -end - ---- Writes a bit to the data stream and increments the index and bit index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to write to ---- bitIndex - the current bit inside the current byte (starts from 1) ---- value - the new state of the bit ---- returns the next position in the data array and the next bitIndex -function lib:WriteBit(data, index, bitIndex, value) - local p = 2 ^ (bitIndex - 1) - local oldValue = data[index] or 0 - local isSet = (oldValue % (p + p) >= p) - if(isSet and not value) then - oldValue = oldValue - p - elseif(not isSet and value) then - oldValue = oldValue + p - end - data[index] = oldValue - local nextIndex = (bitIndex >= 8 and index + 1 or index) - local nextBitIndex = (bitIndex >= 8 and 1 or bitIndex + 1) - return nextIndex, nextBitIndex -end - ---- Reads a single byte from the data stream, converts it into a string character and increments the index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to read from ---- returns the character and the next position in the data array -function lib:ReadChar(data, index) - return string.char(data[index]), index + 1 -end - ---- Writes a single character to the data stream and increments the index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to write to ---- value - a single character or a string of characters ---- [charIndex] - optional index of the character that should be written to the data stream. Defaults to the first character ---- returns the next position in the data array -function lib:WriteChar(data, index, value, charIndex) - data[index] = value:byte(charIndex) - return index + 1 -end - ---- Reads a single byte from the data stream and increments the index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to read from ---- returns the 8-bit unsigned integer and the next position in the data array -function lib:ReadUint8(data, index) - return data[index], index + 1 -end - ---- Writes an 8-bit unsigned integer to the data stream and increments the index accordingly ---- The value is clamped and floored to match the data type. ---- data - an array of integers between 0 and 255 ---- index - the current position to write to ---- value - an 8-bit unsigned integer ---- returns the next position in the data array -function lib:WriteUint8(data, index, value) - data[index] = math.min(0xff, math.max(0x00, math.floor(value))) - return index + 1 -end - ---- Reads two byte from the data stream, converts them to one integer and increments the index accordingly ---- data - an array of integers between 0 and 255 ---- index - the current position to read from ---- returns the 16-bit unsigned integer and the next position in the data array -function lib:ReadUint16(data, index) - return (data[index] * 0x100 + data[index + 1]), index + 2 -end - ---- Writes a 16-bit unsigned integer to the data stream and increments the index accordingly ---- The value is clamped and floored to match the data type. ---- data - an array of integers between 0 and 255 ---- index - the current position to write to ---- value - a 16-bit unsigned integer ---- returns the next position in the data array -function lib:WriteUint16(data, index, value) - value = math.min(0xffff, math.max(0x0000, math.floor(value))) - data[index] = math.floor(value / 0x100) - data[index + 1] = value % 0x100 - return index + 2 -end - ---- Converts 4 bytes of data into coordinates for a map ping ---- b0 to b3 - integers between 0 and 255 ---- step size specifies the smallest possible increment for the coordinates on a map ---- returns normalized x and y coordinates -function lib:EncodeData(b0, b1, b2, b3, stepSize) - b0 = b0 or 0 - b1 = b1 or 0 - b2 = b2 or 0 - b3 = b3 or 0 - return (b0 * 0x100 + b1) * stepSize, (b2 * 0x100 + b3) * stepSize -end - ---- Converts normalized map ping coordinates into 4 bytes of data ---- step size specifies the smallest possible increment for the coordinates on a map ---- returns 4 integers between 0 and 255 -function lib:DecodeData(x, y, stepSize) - x = math.floor(x / stepSize + 0.5) -- round to next integer - y = math.floor(y / stepSize + 0.5) - local b0 = math.floor(x / 0x100) - local b1 = x % 0x100 - local b2 = math.floor(y / 0x100) - local b3 = y % 0x100 - return b0, b1, b2, b3 -end - ---- Packs a 5-bit messageType and a 3-bit length value into one byte of data ---- messageType - integer between 0 and 31 ---- length - integer between 0 and 7 ---- returns encoded header byte -function lib:EncodeHeader(messageType, length) - return messageType * 0x08 + length -end - ---- Unpacks a 5-bit messageType and a 3-bit length value from one byte of data ---- value - integer between 0 and 255 ---- returns messageType and length -function lib:DecodeHeader(value) - local messageType = math.floor(value / 0x08) - local length = value % 0x08 - return messageType, length -end - ---------------------------------------------------- Data Processing --------------------------------------------------- - -local function SetMapPingOnCommonMap(x, y) - local pingType = MAP_PIN_TYPE_PING - if(lib.debug and not IsUnitGrouped("player")) then - pingType = MAP_PIN_TYPE_PLAYER_WAYPOINT - end - LGPS:PushCurrentMap() - SetMapToMapListIndex(lib:GetMapIndexForUnit("player")) - LMP:SetMapPing(pingType, MAP_TYPE_LOCATION_CENTERED, x, y) - LGPS:PopCurrentMap() -end - -local function GetMapPingOnCommonMap(pingType, pingTag) - LGPS:PushCurrentMap() - SetMapToMapListIndex(lib:GetMapIndexForUnit(pingTag)) - local x, y = LMP:GetMapPing(pingType, pingTag) - LGPS:PopCurrentMap() - return x, y -end - -local function DoSend(isFirst) - local packet = lib.outgoing[1] - if(not packet) then Log("Tried to send when no data in queue") return end - lib.isSending = true - - local x, y = packet:GetNextCoordinates() - SetMapPingOnCommonMap(x, y) - - lib.hasMore = packet:HasMore() - if(not lib.hasMore) then - table.remove(lib.outgoing, 1) - lib.hasMore = (#lib.outgoing > 0) - end -end - -local function IsValidData(data) - if(#data > 7) then - Log("Tried to send %d of 7 allowed bytes", #data) - return false - end - for i = 1, #data do - local value = data[i] - if(type(value) ~= "number" or value < 0 or value > 255) then - Log("Invalid value '%s' at position %d in byte data", tostring(value), i) - return false - end - end - return true -end - ---- Queues up to seven byte of data of the selected messageType for broadcasting to all group members ---- messageType - the protocol that is used for encoding the sent data ---- data - up to 7 byte of custom data. if more than 3 bytes are passed, the data will take 2 map pins to arrive. ---- returns true if the data was successfully queued. Data won't be queued when the general sending setting is off or an invalid value was passed. -function lib:Send(messageType, data) - if(not saveData.enabled) then return false end - if(not IsValidMessageType(messageType)) then Log("tried to send invalid messageType %s", tostring(messageType)) return false end - if(not IsValidData(data)) then return false end - -- TODO like all other api functions, this one also has a message rate limit. We need to avoid sending too much or we risk getting kicked - lib.outgoing[#lib.outgoing + 1] = OutgoingPacket:New(messageType, data) - if(not lib.isSending) then - DoSend() - else - lib.hasMore = true - end - return true -end - -local function HandleDataPing(pingType, pingTag, x, y, isPingOwner) - x, y = GetMapPingOnCommonMap(pingType, pingTag) - if(not LMP:IsPositionOnMap(x, y)) then return false end - if(not lib.incoming[pingTag]) then - lib.incoming[pingTag] = IncomingPacket:New(pingTag) - end - local packet = lib.incoming[pingTag] - packet:AddCoordinates(x, y) - if(not packet:HasValidHeader()) then -- it might be a user set ping - lib.incoming[pingTag] = nil - return false - end - if(packet:IsComplete()) then - lib.incoming[pingTag] = nil - if(packet:IsValid()) then - lib.cm:FireCallbacks(packet.messageType, pingTag, packet.data, isPingOwner) - else - Log("received invalid packet from %s", GetUnitName(pingTag)) - return false - end - end - if(isPingOwner) then - if(lib.hasMore) then - if(not saveData.enabled) then return false end - DoSend() - else - lib.isSending = false - end - end - return true -end - --------------------------------------------------- Map Ping Handling -------------------------------------------------- -local function GetKey(pingType, pingTag) - return string.format("%d_%s", pingType, pingTag) -end - -local function SuppressPing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - if(not suppressedList[key]) then - LMP:SuppressPing(pingType, pingTag) - suppressedList[key] = true - end -end - -local function UnsuppressPing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - if(suppressedList[key]) then - LMP:UnsuppressPing(pingType, pingTag) - suppressedList[key] = false - end -end - -LMP:RegisterCallback("BeforePingAdded", function(pingType, pingTag, x, y, isPingOwner) - if(pingType == MAP_PIN_TYPE_PING or (lib.debug and not IsUnitGrouped("player") and pingType == MAP_PIN_TYPE_PLAYER_WAYPOINT)) then - if(HandleDataPing(pingType, pingTag, x, y, isPingOwner)) then -- it is a valid data ping - SuppressPing(pingType, pingTag) - else -- ping is set by player - UnsuppressPing(pingType, pingTag) - end - end -end) - -LMP:RegisterCallback("AfterPingRemoved", function(pingType, pingTag, x, y, isPingOwner) - UnsuppressPing(pingType, pingTag) -end) - ----------------------------------------------------- Data Handlers ---------------------------------------------------- - -lib.MESSAGE_TYPE_RESERVED = 0 --- reserved in case we ever have more than 31 message types. can also be used for local tests -lib.MESSAGE_TYPE_RESOURCES = 1 --- for exchanging stamina and magicka values -lib.MESSAGE_TYPE_COMBATSTATS = 2 --- for combat stats like heal, damage and time in combat - ---- Registers a handler module for a specific data type. ---- This module will keep everything related to data handling out of any single addon, ---- in order to let multiple addons use the same messageType. ---- messageType - The messageType the handler will take care of ---- handlerVersion - The loaded handler version. Works like the minor version in LibStub and prevents older instances from overwriting a newer one ---- returns the handler object and saveData for the messageType -function lib:RegisterHandler(messageType, handlerVersion) - if handlers[messageType] and handlers[messageType].version >= handlerVersion then - return false - else - handlers[messageType] = handlers[messageType] or {} - handlers[messageType].version = handlerVersion - saveData.handlers[messageType] = saveData.handlers[messageType] or {} - return handlers[messageType], saveData.handlers[messageType] - end -end - ---- Gives access to an already registered handler for addons. ---- messageType - The messageType of the handler ---- returns the handler object -function lib:GetHandler(messageType) - return handlers[messageType] -end - ---------------------------------------------------------- Misc -------------------------------------------------------- - ---- Register for unprocessed data of a messageType -function lib:RegisterCallback(messageType, callback) - self.cm:RegisterCallback(messageType, callback) -end - ---- Unregister for unprocessed data of a messageType -function lib:UnregisterCallback(messageType, callback) - self.cm:UnregisterCallback(messageType, callback) -end - ----------------------------------------------------- Initialization --------------------------------------------------- - -local function Unload() - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_PLAYER_ACTIVATED) - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_UNIT_DESTROYED) - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_ADD_ON_LOADED) - SLASH_COMMANDS["/lgs"] = nil -end - -local function Load() - EVENT_MANAGER:RegisterForEvent(LIB_IDENTIFIER, EVENT_UNIT_DESTROYED, function() - if(saveData.autoDisableOnGroupLeft and not IsUnitGrouped("player")) then - saveData.enabled = false - RefreshSettingsPanel() - RefreshGroupMenuKeyboard() - RefreshGroupMenuGamepad() - end - end) - - -- saved variables only become available when EVENT_ADD_ON_LOADED is fired for the library - EVENT_MANAGER:RegisterForEvent(LIB_IDENTIFIER, EVENT_ADD_ON_LOADED, function(_ ,addonName) - if(addonName == LIB_IDENTIFIER) then - LibGroupSocket_Data = LibGroupSocket_Data or {} - saveData = LibGroupSocket_Data[GetDisplayName()] or ZO_DeepTableCopy(defaultData) - LibGroupSocket_Data[GetDisplayName()] = saveData - - --if(saveData.version == 1) then - -- saveData.setting = defaultData.setting - -- saveData.version = 2 - --end - - for messageType in pairs(handlers) do - saveData.handlers[messageType] = saveData.handlers[messageType] or {} - end - - lib.cm:FireCallbacks("savedata-ready", saveData) - end - end) - - -- don't initialize the settings menu before we can be sure that it is the newest version of the lib - EVENT_MANAGER:RegisterForEvent(LIB_IDENTIFIER, EVENT_PLAYER_ACTIVATED, function(_, initial) - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_PLAYER_ACTIVATED) - if(saveData.autoDisableOnSessionStart and initial) then - saveData.enabled = false -- don't need to refresh the settings or group menu here, because they are not initialized yet - end - - InitializeSettingsPanel() - InitializeGroupMenu() - end) - - SLASH_COMMANDS["/lgs"] = function(value) - saveData.enabled = (value == "1") - Log("Data sending %s", saveData.enabled and "enabled" or "disabled") - RefreshSettingsPanel() - RefreshGroupMenuKeyboard() - RefreshGroupMenuGamepad() - end - - lib.Unload = Unload -end - -if(lib.Unload) then lib.Unload() end -Load() diff --git a/libs/LibMapPing/LICENSE b/libs/LibMapPing/LICENSE deleted file mode 100644 index 12b3fde..0000000 --- a/libs/LibMapPing/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2016 sirinsidiator - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/LibMapPing/LibMapPing.lua b/libs/LibMapPing/LibMapPing.lua deleted file mode 100644 index 8d53538..0000000 --- a/libs/LibMapPing/LibMapPing.lua +++ /dev/null @@ -1,448 +0,0 @@ -local LIB_IDENTIFIER = "LibMapPing" -local lib = LibStub:NewLibrary(LIB_IDENTIFIER, 7) - -if not lib then - return -- already loaded and no upgrade necessary -end - -local function Log(message, ...) - df("[%s] %s", LIB_IDENTIFIER, message:format(...)) -end - - --- emulate how the game calculates when a player should get kicked for sending too many pings and prevent it - -local DEFAULT_MODIFIER = 2.15 -local COMBAT_MODIFIER = 39 -local FILL_RATE = 0.512 -local BUCKET_SIZE = 100 -local SAFETY_THRESHOLD = 10 -local TIME_FRAME = 3 -local RESOLUTION = 10 - -local RollingAverage = ZO_Object:Subclass() - -function RollingAverage:New(...) - local obj = ZO_Object.New(self) - obj:Initialize(...) - return obj -end - -function RollingAverage:Initialize(timeframe, resolution) - self.timeframe = timeframe - self.resolution = resolution - self.count = timeframe * resolution - self.sumList = {} - self.lastIndex = self:GetCurrentIndex() - - for i = 1, self.count do - self.sumList[i] = 0 - end -end - -function RollingAverage:GetCurrentIndex() - return math.floor(self.resolution * GetGameTimeMilliseconds() / 1000) % self.count -end - -function RollingAverage:Increment() - local index = self:GetCurrentIndex() - while self.lastIndex ~= index do - self.lastIndex = (self.lastIndex + 1) % self.count - self.sumList[self.lastIndex] = 0 - end - self.sumList[index] = self.sumList[index] + 1 -end - -function RollingAverage:GetAverage() - local index = self:GetCurrentIndex() - local average = 0 - for i = 1, self.count do - if(i ~= index) then - average = average + self.sumList[i] - end - end - return math.floor(average / (self.count - 1) * self.resolution) -end - - -local LeakyBucket = ZO_Object:Subclass() - -function LeakyBucket:New(...) - local obj = ZO_Object.New(self) - obj:Initialize(...) - return obj -end - -function LeakyBucket:Initialize() - self.average = RollingAverage:New(TIME_FRAME, RESOLUTION) - self.size = BUCKET_SIZE - self.generatedTokens = 1 / FILL_RATE - self.safetyThreshold = SAFETY_THRESHOLD - - self.left = self.size - self.lastCheck = GetGameTimeMilliseconds() -end - -function LeakyBucket:GetTokensLeft() - local now = GetGameTimeMilliseconds() - local average = self.average:GetAverage() - local modifier = IsUnitInCombat("player") and COMBAT_MODIFIER or DEFAULT_MODIFIER - local burstRate = average * modifier - - local delta = (now - self.lastCheck) / 1000 - self.left = math.min(self.left + delta * self.generatedTokens, self.size); - self.lastCheck = now - return self.left -end - -function LeakyBucket:HasTokensLeft() - return self:GetTokensLeft() > self.safetyThreshold -end - -function LeakyBucket:Take() - if(self:HasTokensLeft()) then - self.left = self.left - 1 - self.average:Increment() - return true - end - return false -end - - -local MAP_PIN_TYPE_PLAYER_WAYPOINT = MAP_PIN_TYPE_PLAYER_WAYPOINT -local MAP_PIN_TYPE_PING = MAP_PIN_TYPE_PING -local MAP_PIN_TYPE_RALLY_POINT = MAP_PIN_TYPE_RALLY_POINT - -local MAP_PIN_TAG_PLAYER_WAYPOINT = "waypoint" -local MAP_PIN_TAG_RALLY_POINT = "rally" -local PING_CATEGORY = "pings" - -local PING_EVENT_WATCHDOG_TIME = 400 -- ms - -local MAP_PIN_TAG = { - [MAP_PIN_TYPE_PLAYER_WAYPOINT] = MAP_PIN_TAG_PLAYER_WAYPOINT, - --[MAP_PIN_TYPE_PING] = group pings have individual tags for each member - [MAP_PIN_TYPE_RALLY_POINT] = MAP_PIN_TAG_RALLY_POINT, -} - -local originalPingMap, originalRemovePlayerWaypoint, originalRemoveRallyPoint -local GET_MAP_PING_FUNCTION = {} -- is initialized in Load() -local REMOVE_MAP_PING_FUNCTION = {} -- also initialized in Load() - ---- MapPingState is an enumeration of the possible states of a map ping. -lib.MAP_PING_NOT_SET = 0 --- There is no ping. -lib.MAP_PING_NOT_SET_PENDING = 1 --- The ping has been removed, but EVENT_MAP_PING has not been processed. -lib.MAP_PING_SET_PENDING = 2 --- A ping was added, but EVENT_MAP_PING has not been processed. -lib.MAP_PING_SET = 3 --- There is a ping. - -lib.mutePing = lib.mutePing or {} -lib.suppressPing = lib.suppressPing or {} -lib.pingState = lib.pingState or {} -lib.pendingPing = lib.pendingPing or {} -lib.cm = lib.cm or ZO_CallbackObject:New() -lib.bucket = LeakyBucket:New() -local g_mapPinManager = lib.mapPinManager - -local function GetPingTagFromType(pingType) - return MAP_PIN_TAG[pingType] or GetGroupUnitTagByIndex(GetGroupIndexByUnitTag("player")) or "" -end - -local function GetKey(pingType, pingTag) - pingTag = pingTag or GetPingTagFromType(pingType) - return string.format("%d_%s", pingType, pingTag) -end - --- TODO keep an eye on worldmap.lua for changes --- TODO test if SetPlayerWaypointByWorldLocation does anything different -local function HandleMapPing(eventCode, pingEventType, pingType, pingTag, x, y, isPingOwner) - local key = GetKey(pingType, pingTag) - local data = lib.pendingPing[key] - if data and data[1] == pingEventType then - lib.pendingPing[key] = nil - end - if(pingEventType == PING_EVENT_ADDED) then - lib.cm:FireCallbacks("BeforePingAdded", pingType, pingTag, x, y, isPingOwner) - lib.pingState[key] = lib.MAP_PING_SET - g_mapPinManager:RemovePins(PING_CATEGORY, pingType, pingTag) - if(not lib:IsPingSuppressed(pingType, pingTag)) then - g_mapPinManager:CreatePin(pingType, pingTag, x, y) - if(isPingOwner and not lib:IsPingMuted(pingType, pingTag)) then - PlaySound(SOUNDS.MAP_PING) - end - end - lib.cm:FireCallbacks("AfterPingAdded", pingType, pingTag, x, y, isPingOwner) - elseif(pingEventType == PING_EVENT_REMOVED) then - lib.cm:FireCallbacks("BeforePingRemoved", pingType, pingTag, x, y, isPingOwner) - lib.pingState[key] = lib.MAP_PING_NOT_SET - g_mapPinManager:RemovePins(PING_CATEGORY, pingType, pingTag) - if (isPingOwner and not lib:IsPingSuppressed(pingType, pingTag) and not lib:IsPingMuted(pingType, pingTag)) then - PlaySound(SOUNDS.MAP_PING_REMOVE) - end - lib.cm:FireCallbacks("AfterPingRemoved", pingType, pingTag, x, y, isPingOwner) - end -end - -local function HandleMapPingEventNotFired() - EVENT_MANAGER:UnregisterForUpdate(LIB_IDENTIFIER) - for key, data in pairs(lib.pendingPing) do - local pingEventType, pingType, x, y, zoneIndex = unpack(data) - local pingTag = GetPingTagFromType(pingType) - -- The event is delayed and thus may not match the current map anymore. - if GetCurrentMapZoneIndex() ~= zoneIndex then - -- The coords do not match the current map. Do not draw a pin. - lib:SuppressPing(pingType, pingTag) -- Will be set to zero afterwards, see below. - end - HandleMapPing(0, pingEventType, pingType, pingTag, x, y, true) - lib.pendingPing[key] = nil - lib.mutePing[key] = 0 - lib.suppressPing[key] = 0 - end -end - -local function ResetEventWatchdog(key, ...) - lib.pendingPing[key] = {...} - EVENT_MANAGER:UnregisterForUpdate(LIB_IDENTIFIER) - EVENT_MANAGER:RegisterForUpdate(LIB_IDENTIFIER, PING_EVENT_WATCHDOG_TIME, HandleMapPingEventNotFired) -end - -local function CustomPingMap(pingType, mapType, x, y) - if(pingType == MAP_PIN_TYPE_PING and not IsUnitGrouped("player")) then return end - if(pingType == MAP_PIN_TYPE_PLAYER_WAYPOINT or lib.bucket:Take()) then - local key = GetKey(pingType) - lib.pingState[key] = lib.MAP_PING_SET_PENDING - ResetEventWatchdog(key, PING_EVENT_ADDED, pingType, x, y, GetCurrentMapZoneIndex()) - return originalPingMap(pingType, mapType, x, y) - end -end - -local function CustomGetMapPlayerWaypoint() - if(lib:IsPingSuppressed(MAP_PIN_TYPE_PLAYER_WAYPOINT, MAP_PIN_TAG_PLAYER_WAYPOINT)) then - return 0, 0 - end - return GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PLAYER_WAYPOINT]() -end - -local function CustomGetMapPing(pingTag) - if(lib:IsPingSuppressed(MAP_PIN_TYPE_PING, pingTag)) then - return 0, 0 - end - return GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PING](pingTag) -end - -local function CustomGetMapRallyPoint() - if(lib:IsPingSuppressed(MAP_PIN_TYPE_RALLY_POINT, MAP_PIN_TAG_RALLY_POINT)) then - return 0, 0 - end - return GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_RALLY_POINT]() -end - -local function CustomRemovePlayerWaypoint() - local key = GetKey(MAP_PIN_TYPE_PLAYER_WAYPOINT, MAP_PIN_TAG_PLAYER_WAYPOINT) - lib.pingState[key] = lib.MAP_PING_NOT_SET_PENDING - ResetEventWatchdog(key, PING_EVENT_REMOVED, MAP_PIN_TYPE_PLAYER_WAYPOINT, 0, 0, GetCurrentMapZoneIndex()) - return originalRemovePlayerWaypoint() -end - -local function CustomRemoveMapPing() - -- there is no such function for group pings, but we can set it to 0, 0 which effectively hides it - PingMap(MAP_PIN_TYPE_PING, MAP_TYPE_LOCATION_CENTERED, 0, 0) -end - -local function CustomRemoveRallyPoint() - local key = GetKey(MAP_PIN_TYPE_RALLY_POINT, MAP_PIN_TAG_RALLY_POINT) - lib.pingState[key] = lib.MAP_PING_NOT_SET_PENDING - ResetEventWatchdog(key, PING_EVENT_REMOVED, MAP_PIN_TYPE_RALLY_POINT, 0, 0) - originalRemoveRallyPoint() -end - ---- Wrapper for PingMap. ---- pingType is one of the three possible MapDisplayPinType for map pings (MAP_PIN_TYPE_PLAYER_WAYPOINT, MAP_PIN_TYPE_PING or MAP_PIN_TYPE_RALLY_POINT). ---- mapType is usually MAP_TYPE_LOCATION_CENTERED. ---- x and y are the normalized coordinates on the current map. -function lib:SetMapPing(pingType, mapType, x, y) - PingMap(pingType, mapType, x, y) -end - ---- Wrapper for the different ping removal functions. ---- For waypoints and rally points it calls their respective removal function ---- For group pings it just sets the position to 0, 0 as there is no function to clear them -function lib:RemoveMapPing(pingType) - if(REMOVE_MAP_PING_FUNCTION[pingType]) then - REMOVE_MAP_PING_FUNCTION[pingType]() - end -end - ---- Wrapper for the different get ping functions. Returns coordinates regardless of their suppression state. ---- The game API functions return 0, 0 when the ping type is suppressed. ---- pingType is the same as for SetMapPing. ---- pingTag is optionally used if another group member's MAP_PIN_TYPE_PING should be returned (possible values: group1 .. group24). -function lib:GetMapPing(pingType, pingTag) - local x, y = 0, 0 - if(GET_MAP_PING_FUNCTION[pingType]) then - x, y = GET_MAP_PING_FUNCTION[pingType](pingTag or GetPingTagFromType(pingType)) - end - return x, y -end - ---- Returns the MapPingState for the pingType and pingTag. -function lib:GetMapPingState(pingType, pingTag) - local key = GetKey(pingType, pingTag) - local state = lib.pingState[key] - if state == nil then - local x, y = lib:GetMapPing(pingType, pingTag) - state = (x ~= 0 or y ~= 0) and lib.MAP_PING_SET or lib.MAP_PING_NOT_SET - lib.pingState[key] = state - end - return lib.pingState[key] -end ---- Returns true if ping state is MAP_PING_SET_PENDING or MAP_PING_SET -function lib:HasMapPing(pingType, pingTag) - local state = lib:GetMapPingState(pingType, pingTag) - return state == lib.MAP_PING_SET_PENDING or state == lib.MAP_PING_SET -end - ---- Refreshes the pin icon for the pingType on the worldmap ---- Returns true if the pin has been refreshed. -function lib:RefreshMapPin(pingType, pingTag) - if(not g_mapPinManager) then - Log("PinManager not available. Using ZO_WorldMap_UpdateMap instead.") - ZO_WorldMap_UpdateMap() - return true - end - - pingTag = pingTag or GetPingTagFromType(pingType) - g_mapPinManager:RemovePins(PING_CATEGORY, pingType, pingTag) - - local x, y = lib:GetMapPing(pingType, pingTag) - if(lib:IsPositionOnMap(x, y)) then - g_mapPinManager:CreatePin(pingType, pingTag, x, y) - return true - end - return false -end - ---- Returns true if the normalized position is within 0 and 1. -function lib:IsPositionOnMap(x, y) - return not (x < 0 or y < 0 or x > 1 or y > 1 or (x == 0 and y == 0)) -end - ---- Mutes the map ping of the specified type, so it does not make a sound when it is set. ---- Do not forget to call UnmutePing later, otherwise the sound will be permanently muted! -function lib:MutePing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - local mute = lib.mutePing[key] or 0 - lib.mutePing[key] = mute + 1 -end - ---- Unmutes the map ping of the specified type. ---- Do not call this more often than you called MutePing, or you might interfere with other addons. ---- The sounds are played between the BeforePing* and AfterPing* callbacks are fired. -function lib:UnmutePing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - local mute = (lib.mutePing[key] or 0) - 1 - if(mute < 0) then mute = 0 end - lib.mutePing[key] = mute -end - ---- Returns true if the map ping has been muted -function lib:IsPingMuted(pingType, pingTag) - local key = GetKey(pingType, pingTag) - return lib.mutePing[key] and lib.mutePing[key] > 0 -end - ---- Suppresses the map ping of the specified type, so that it neither makes a sound nor shows up on the map. ---- This also makes the API functions return 0, 0 for that ping. ---- In order to access the actual coordinates lib:GetMapPing has to be used. ---- Do not forget to call UnsuppressPing later, otherwise map pings won't work anymore for the user and other addons! -function lib:SuppressPing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - local suppress = lib.suppressPing[key] or 0 - lib.suppressPing[key] = suppress + 1 -end - ---- Unsuppresses the map ping so it shows up again ---- Do not call this more often than you called SuppressPing, or you might interfere with other addons. -function lib:UnsuppressPing(pingType, pingTag) - local key = GetKey(pingType, pingTag) - local suppress = (lib.suppressPing[key] or 0) - 1 - if(suppress < 0) then suppress = 0 end - lib.suppressPing[key] = suppress -end - ---- Returns true if the map ping has been suppressed -function lib:IsPingSuppressed(pingType, pingTag) - local key = GetKey(pingType, pingTag) - return lib.suppressPing[key] and lib.suppressPing[key] > 0 -end - -local function InterceptMapPinManager() - if (g_mapPinManager) then return end - local orgRefreshCustomPins = ZO_WorldMapPins.RefreshCustomPins - function ZO_WorldMapPins:RefreshCustomPins() - g_mapPinManager = self - lib.mapPinManager = self - end - ZO_WorldMap_RefreshCustomPinsOfType() - ZO_WorldMapPins.RefreshCustomPins = orgRefreshCustomPins -end - ---- Register to callbacks from the library. ---- Valid events are BeforePingAdded, AfterPingAdded, BeforePingRemoved and AfterPingRemoved. ---- These are fired at certain points during handling EVENT_MAP_PING. -function lib:RegisterCallback(eventName, callback) - lib.cm:RegisterCallback(eventName, callback) -end - ---- Unregister from callbacks. See lib:RegisterCallback. -function lib:UnregisterCallback(eventName, callback) - lib.cm:UnregisterCallback(eventName, callback) -end - -local function Unload() - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_ADD_ON_LOADED) - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_MAP_PING) - PingMap = originalPingMap - GetMapPlayerWaypoint = GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PLAYER_WAYPOINT] - GetMapPing = GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PING] - GetMapRallyPoint = GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_RALLY_POINT] - RemovePlayerWaypoint = originalRemovePlayerWaypoint - RemoveRallyPoint = originalRemoveRallyPoint -end - -local function Load() - InterceptMapPinManager() - - originalPingMap = PingMap - PingMap = CustomPingMap - - GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PLAYER_WAYPOINT] = GetMapPlayerWaypoint - GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_PING] = GetMapPing - GET_MAP_PING_FUNCTION[MAP_PIN_TYPE_RALLY_POINT] = GetMapRallyPoint - GetMapPlayerWaypoint = CustomGetMapPlayerWaypoint - GetMapPing = CustomGetMapPing - GetMapRallyPoint = CustomGetMapRallyPoint - - -- we want to use the altered versions in the library in order to set the correct ping state - -- so we need to also save the originals - originalRemovePlayerWaypoint = RemovePlayerWaypoint - originalRemoveRallyPoint = RemoveRallyPoint - RemovePlayerWaypoint = CustomRemovePlayerWaypoint - RemoveRallyPoint = CustomRemoveRallyPoint - REMOVE_MAP_PING_FUNCTION[MAP_PIN_TYPE_PLAYER_WAYPOINT] = CustomRemovePlayerWaypoint - REMOVE_MAP_PING_FUNCTION[MAP_PIN_TYPE_PING] = CustomRemoveMapPing -- has no real api equivalent - REMOVE_MAP_PING_FUNCTION[MAP_PIN_TYPE_RALLY_POINT] = CustomRemoveRallyPoint - - EVENT_MANAGER:RegisterForEvent(LIB_IDENTIFIER, EVENT_ADD_ON_LOADED, function(_, addonName) - if(addonName == "ZO_Ingame") then - EVENT_MANAGER:UnregisterForEvent(LIB_IDENTIFIER, EVENT_ADD_ON_LOADED) - -- don't let worldmap do anything as we manage it instead - EVENT_MANAGER:UnregisterForEvent("ZO_WorldMap", EVENT_MAP_PING) - EVENT_MANAGER:RegisterForEvent(LIB_IDENTIFIER, EVENT_MAP_PING, HandleMapPing) - end - end) - - lib.Unload = Unload -end - -if(lib.Unload) then lib.Unload() end -Load() diff --git a/libs/LibUnits/LibUnits.lua b/libs/LibUnits2/LibUnits2.lua similarity index 62% rename from libs/LibUnits/LibUnits.lua rename to libs/LibUnits2/LibUnits2.lua index 5f17011..59d0300 100644 --- a/libs/LibUnits/LibUnits.lua +++ b/libs/LibUnits2/LibUnits2.lua @@ -1,9 +1,8 @@ -local MAJOR, MINOR = "LibUnits", 3 -local lib, oldminor = LibStub:NewLibrary(MAJOR, MINOR) -if not lib then return end --the same or newer version of this lib is already loaded into memory +local lib = {} +LibUnits2 = lib local function Log(message, ...) - --df("[LibUnits] %s", message:format(...)) + --df("[LibUnits2] %s", message:format(...)) end lib.Log = Log lib.cm = ZO_CallbackObject:New() @@ -62,31 +61,31 @@ end --------------------------------------------------------- Public ------------------------------------------------------ -function lib:GetUnitIdForName(unitName) +function lib.GetUnitIdForName(unitName) return lib.unitIds[unitName] or 0 end -function lib:GetUnitTagForUnitId(unitId) +function lib.GetUnitTagForUnitId(unitId) return lib.unitTags.group[unitId] or lib.unitTags.boss[unitId] or "" end -function lib:GetNameForUnitId(unitId) +function lib.GetNameForUnitId(unitId) return lib.units[unitId] or "" end -function lib:GetDisplayNameForUnitId(unitId) - return lib.displayNames[self:GetNameForUnitId(unitId)] or "" +function lib.GetDisplayNameForUnitId(unitId) + return lib.displayNames[lib.GetNameForUnitId(unitId)] or "" end ---------------------------------------------------- Initialization --------------------------------------------------- local function Unload() - EVENT_MANAGER:UnregisterForEvent("LibUnits", EVENT_GROUP_UPDATE) - EVENT_MANAGER:UnregisterForEvent("LibUnits", EVENT_UNIT_CREATED) - EVENT_MANAGER:UnregisterForEvent("LibUnits", EVENT_UNIT_DESTROYED) - EVENT_MANAGER:UnregisterForEvent("LibUnits_EffectChangedGroup", EVENT_EFFECT_CHANGED) - EVENT_MANAGER:UnregisterForEvent("LibUnits", EVENT_BOSSES_CHANGED) - EVENT_MANAGER:UnregisterForEvent("LibUnits_EffectChangedBoss", EVENT_EFFECT_CHANGED) + EVENT_MANAGER:UnregisterForEvent("LibUnits2", EVENT_GROUP_MEMBER_JOINED) + EVENT_MANAGER:UnregisterForEvent("LibUnits2", EVENT_GROUP_MEMBER_LEFT) + EVENT_MANAGER:UnregisterForEvent("LibUnits2", EVENT_GROUP_UPDATE) + EVENT_MANAGER:UnregisterForEvent("LibUnits2_EffectChangedGroup", EVENT_EFFECT_CHANGED) + EVENT_MANAGER:UnregisterForEvent("LibUnits2", EVENT_BOSSES_CHANGED) + EVENT_MANAGER:UnregisterForEvent("LibUnits2_EffectChangedBoss", EVENT_EFFECT_CHANGED) end local function Load() @@ -100,7 +99,6 @@ local function Load() -- During group invitation, we can receive a lot of event spam at once on a single invite when the -- involved players are at the same location. Add a delay so we only refresh once in cases like this. - -- (Shameless rip from ZOS) lib.delayedRebuildCounter = 0 local function DelayedRefreshData() lib.delayedRebuildCounter = lib.delayedRebuildCounter - 1 @@ -118,21 +116,20 @@ local function Load() end end - EVENT_MANAGER:RegisterForEvent("LibUnits", EVENT_GROUP_UPDATE, RegisterDelayedRefresh) - EVENT_MANAGER:RegisterForEvent("LibUnits", EVENT_UNIT_CREATED, RegisterDelayedRefreshOnUnitEvent) --Are these two needed or will they - EVENT_MANAGER:RegisterForEvent("LibUnits", EVENT_UNIT_DESTROYED, RegisterDelayedRefreshOnUnitEvent) --also be handled by GROUP_UPDATE? - --We are tracking when a group member blocks - EVENT_MANAGER:RegisterForEvent("LibUnits_EffectChangedGroup", EVENT_EFFECT_CHANGED, OnEffectChanged) - EVENT_MANAGER:AddFilterForEvent("LibUnits_EffectChangedGroup", EVENT_EFFECT_CHANGED, REGISTER_FILTER_UNIT_TAG_PREFIX, "group") --REGISTER_FILTER_ABILITY_ID, 14890) + EVENT_MANAGER:RegisterForEvent("LibUnits2", EVENT_GROUP_MEMBER_JOINED, RegisterDelayedRefreshOnUnitEvent) + EVENT_MANAGER:RegisterForEvent("LibUnits2", EVENT_GROUP_MEMBER_LEFT, RegisterDelayedRefreshOnUnitEvent) + EVENT_MANAGER:RegisterForEvent("LibUnits2", EVENT_GROUP_UPDATE, RegisterDelayedRefresh) + + EVENT_MANAGER:RegisterForEvent("LibUnits2_EffectChangedGroup", EVENT_EFFECT_CHANGED, OnEffectChanged) + EVENT_MANAGER:AddFilterForEvent("LibUnits2_EffectChangedGroup", EVENT_EFFECT_CHANGED, REGISTER_FILTER_UNIT_TAG_PREFIX, "group") -- Track Bosses - EVENT_MANAGER:RegisterForEvent("LibUnits", EVENT_BOSSES_CHANGED, function() lib.unitTags.boss = {} end) + EVENT_MANAGER:RegisterForEvent("LibUnits2", EVENT_BOSSES_CHANGED, function() lib.unitTags.boss = {} end) -- Seperate handle for bosses, no specific ability to monitor - EVENT_MANAGER:RegisterForEvent("LibUnits_EffectChangedBoss", EVENT_EFFECT_CHANGED, OnBossEffectChanged) - EVENT_MANAGER:AddFilterForEvent("LibUnits_EffectChangedBoss", EVENT_EFFECT_CHANGED, REGISTER_FILTER_UNIT_TAG_PREFIX, "boss") + EVENT_MANAGER:RegisterForEvent("LibUnits2_EffectChangedBoss", EVENT_EFFECT_CHANGED, OnBossEffectChanged) + EVENT_MANAGER:AddFilterForEvent("LibUnits2_EffectChangedBoss", EVENT_EFFECT_CHANGED, REGISTER_FILTER_UNIT_TAG_PREFIX, "boss") lib.Unload = Unload end -if(lib.Unload) then lib.Unload() end Load() diff --git a/libs/LibUnits2/LibUnits2.txt b/libs/LibUnits2/LibUnits2.txt new file mode 100644 index 0000000..081771e --- /dev/null +++ b/libs/LibUnits2/LibUnits2.txt @@ -0,0 +1,7 @@ +## Title: LibUnits2 +## APIVersion: 100030 +## Author: andy.s +## AddOnVersion: 100 +## IsLibrary: true + +LibUnits2.lua