From b2f352c76e879f61dce4ea34d5fa121fe894aba2 Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 20 Feb 2021 14:47:23 +0100 Subject: [PATCH] Freeze to import needed parts from stopped LibGUID --- LibCombatlog_data.lua | 30 +++++++++++++++++++----------- LibCombatlog_data.toc | 4 +++- Libs/LibGUID | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/LibCombatlog_data.lua b/LibCombatlog_data.lua index 3f0a7d7..1aec4cf 100644 --- a/LibCombatlog_data.lua +++ b/LibCombatlog_data.lua @@ -1,6 +1,6 @@ local lib = LibStub:NewLibrary("LibCombatLog_data", 1) if not lib then return end -local isGUID = LibStub("LibGUID").isGUID +local LibGUID = LibStub("LibGUID"):Embed() local mixins = {'CreateDataObject'} local data_methods = data_methods or {} lib.mixinTargets = lib.mixinTargets or {} @@ -16,35 +16,43 @@ function lib:CreateDataObject(data, prefix, suffix) end end end +function data_methods:Get(key) + return self['db'][key] +end +function data_methods:Set(key, value) + self['db'][key] = value +end function data_methods:HasSource() - return isGUID(self[5]) + return LibGUID:IsGUID(self[5]) end function data_methods:HasDestination() - return isGUID(self[9]) + return LibGUID:IsGUID(self[9]) end function data_methods:HasExtraSource() - return isGUID(self[16]) + return LibGUID:IsGUID(self[16]) end function data_methods:GetSource() if(self:HasSource()) then - return { data[5], data[6], data[7] } + return { self[5], self[6], self[7] } end end function data_methods:GetDestination() if(self:HasDestination()) then - return { data[9], data[10], data[11] } + return { self[9], self[10], self[11] } end end function data_methods:GetExtraSource() if(self:HasExtraSource()) then - return { data[16], data[17], data[18] } + return { self[16], self[17], self[18] } end end function lib:Embed(target) - for _,name in pairs(mixins) do - target[name] = lib[name] - end - lib.mixinTargets[target] = true + target = target or CreateFrame("FRAME") + for _,name in pairs(mixins) do + target[name] = lib[name] + end + lib.mixinTargets[target] = true + return target end for target, _ in pairs(lib.mixinTargets) do lib:Embed(target) diff --git a/LibCombatlog_data.toc b/LibCombatlog_data.toc index 0e296c8..d69689b 100644 --- a/LibCombatlog_data.toc +++ b/LibCombatlog_data.toc @@ -1,5 +1,7 @@ ## Interface: 90002 ## Name: LibCombatlog_data ## Description: Manage combatlog events -## OptionalDeps: LibCombatlog +## OptionalDeps: LibCombatlog, LibGUID +Libs\LibStub\LibStub.lua +Libs\LibGUID\LibGUID.lua LibCombatlog_data.lua \ No newline at end of file diff --git a/Libs/LibGUID b/Libs/LibGUID index b08e75f..62d18c0 160000 --- a/Libs/LibGUID +++ b/Libs/LibGUID @@ -1 +1 @@ -Subproject commit b08e75faa6a04d781ddfbae53fbca5fde947b7a0 +Subproject commit 62d18c09b0dd4ec28067942ca30543b2d2b9bd33