diff --git a/Inventory.lua b/Inventory.lua index 341b3d0..03d5256 100644 --- a/Inventory.lua +++ b/Inventory.lua @@ -1,7 +1,7 @@ local SousChef = SousChef local u = SousChef.Utility local m = SousChef.Media -local LibSort = LibStub("LibSort-1.0", 1) +local LibSort = LibStub:GetLibrary("LibSort-1.0") function SousChef.AddRankToSlot(row, funcs) local idFunc = funcs[1] diff --git a/SousChef.txt b/SousChef.txt index 18e2fb6..8839dfc 100644 --- a/SousChef.txt +++ b/SousChef.txt @@ -1,8 +1,9 @@ ## Title: |cFFFFB0Sous Chef|r by |c00C000CrazyDutchGuy & Wobin|r ## Author: CrazyDutchGuy & Wobin -## Version: v2.0 +## Version: v2.1 ## APIVersion: 100007 ## SavedVariables: SousChef_Settings +## OptionalDependsOn: LibStub LibAddonMenu-1.0 LibSort-1.0 libs\LibStub\LibStub.lua libs\LibAddonMenu-1.0\LibAddonMenu-1.0.lua diff --git a/libs/LibSort/LibSort-1.0.lua b/libs/LibSort/LibSort-1.0.lua index f6bf309..00c385f 100644 --- a/libs/LibSort/LibSort-1.0.lua +++ b/libs/LibSort/LibSort-1.0.lua @@ -1,4 +1,4 @@ -local MAJOR, MINOR = "LibSort-1.0", 1 +local MAJOR, MINOR = "LibSort-1.0", 2 local LibSort, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not LibSort then return end --the same or newer version of this lib is already loaded into memory @@ -45,7 +45,7 @@ function LibSort:SetupArrows() LibSort.ItemSortGuild:SetDimensions(16, 32) LibSort.ItemSortGuild:SetAnchor(RIGHT, ZO_GuildBankSortByName, LEFT, -15) ZO_SortHeader_SetTooltip(LibSort.ItemSortGuild, "Sort", BOTTOMRIGHT, 0, 32) - ZO_SortHeader_InitializeArrowHeader(LibSort.ItemSortBank, "age", ZO_SORT_ORDER_DOWN) + ZO_SortHeader_InitializeArrowHeader(LibSort.ItemSortGuild, "age", ZO_SORT_ORDER_DOWN) PLAYER_INVENTORY.inventories[INVENTORY_GUILD_BANK].sortHeaders:AddHeader(ItemSortGuild) end diff --git a/libs/LibSort/LibStub.lua b/libs/LibSort/LibStub.lua deleted file mode 100644 index bfd96df..0000000 --- a/libs/LibSort/LibStub.lua +++ /dev/null @@ -1,34 +0,0 @@ --- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info --- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke --- LibStub developed for World of Warcraft by above members of the WowAce community. --- Ported to Elder Scrolls Online by Seerah - -local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 1 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS! -local LibStub = _G[LIBSTUB_MAJOR] - -local strformat = string.format -if not LibStub or LibStub.minor < LIBSTUB_MINOR then - LibStub = LibStub or {libs = {}, minors = {} } - _G[LIBSTUB_MAJOR] = LibStub - LibStub.minor = LIBSTUB_MINOR - - function LibStub:NewLibrary(major, minor) - assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)") - minor = assert(tonumber(zo_strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.") - - local oldminor = self.minors[major] - if oldminor and oldminor >= minor then return nil end - self.minors[major], self.libs[major] = minor, self.libs[major] or {} - return self.libs[major], oldminor - end - - function LibStub:GetLibrary(major, silent) - if not self.libs[major] and not silent then - error(("Cannot find a library instance of %q."):strformat(tostring(major)), 2) - end - return self.libs[major], self.minors[major] - end - - function LibStub:IterateLibraries() return pairs(self.libs) end - setmetatable(LibStub, { __call = LibStub.GetLibrary }) -end