C_Everywhere update

Author: Jaliborc

.gitmodules

@@ -1,12 +1,6 @@
-[submodule "libs/WildAddon-1.0"]
-	path = libs/WildAddon-1.0
-	url = https://github.com/Jaliborc/WildAddon-1.0.git
 [submodule "libs/MutexDelay-1.0"]
 	path = libs/MutexDelay-1.0
 	url = https://github.com/Jaliborc/MutexDelay-1.0.git
-[submodule "libs/C_Everywhere"]
-	path = libs/C_Everywhere
-	url = https://github.com/Jaliborc/C_Everywhere.git
 [submodule "libs/Unfit-1.0"]
 	path = libs/Unfit-1.0
 	url = https://github.com/Jaliborc/Unfit-1.0.git

Wildpants.lua

@@ -5,6 +5,7 @@
 
 local ADDON, Addon = ...
 local Addon = LibStub('WildAddon-1.0'):NewAddon(ADDON, Addon, 'LibItemCache-2.0')
+Addon.NumBags = NUM_TOTAL_EQUIPPED_BAG_SLOTS or NUM_BAG_SLOTS
 Addon.IsRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 Addon.IsClassic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
 Addon.Version = GetAddOnMetadata(ADDON, 'Version')

api/events.lua

@@ -13,6 +13,7 @@
 
 local ADDON, Addon = ...
 local Events = Addon:NewModule('Events')
+local C = LibStub('C_Everywhere').Container
 
 
 --[[ Events ]]--
@@ -67,7 +68,7 @@ end
 --[[ API ]]--
 
 function Events:UpdateBags()
-	for bag = 1, NUM_BAG_SLOTS do
+	for bag = 1, Addon.NumBags do
 		if not self:UpdateSize(bag) then
 			self:UpdateType(bag)
 		end
@@ -79,7 +80,7 @@ function Events:UpdateBags()
 end
 
 function Events:UpdateBankBags()
-	for bag = 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
+	for bag = 1, Addon.NumBags + NUM_BANKBAGSLOTS do
 		if not self:UpdateSize(bag) then
 			self:UpdateType(bag)
 		end
@@ -88,10 +89,10 @@ end
 
 function Events:UpdateSize(bag)
 	local old = self.sizes[bag]
-	local new = GetContainerNumSlots(bag) or 0
+	local new = C.GetContainerNumSlots(bag) or 0
 
 	if old ~= new then
-		local _, kind = GetContainerNumFreeSlots(bag)
+		local _, kind = C.GetContainerNumFreeSlots(bag)
 		self.types[bag] = kind
 		self.sizes[bag] = new
 		self.queue[bag] = nil
@@ -102,7 +103,7 @@ end
 
 function Events:UpdateType(bag)
 	local old = self.types[bag]
-	local _, new = GetContainerNumFreeSlots(bag)
+	local _, new = C.GetContainerNumFreeSlots(bag)
 
 	if old ~= new then
 		self.types[bag] = new

classes/bag.lua

@@ -80,18 +80,18 @@ end
 
 function Bag:OnClick(button)
 	if button == 'RightButton' and ContainerFrame1FilterDropDown then
-		if not self:IsReagents() and self:GetInfo().owned then
+		if not self:IsReagents() and self.info.owned then
 			ContainerFrame1FilterDropDown:SetParent(self)
 			PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON)
 			ToggleDropDownMenu(1, nil, ContainerFrame1FilterDropDown, self, 0, 0)
 		end
 	elseif self:IsPurchasable() then
 		self:Purchase()
-	elseif CursorHasItem() and not self:GetInfo().cached then
+	elseif CursorHasItem() and not self.info.cached then
 		if self:IsBackpack() then
 			PutItemInBackpack()
 		else
-			PutItemInBag(self:GetInfo().slot)
+			PutItemInBag(self.info.slot)
 		end
 	elseif self:CanToggle() then
 		self:Toggle()
@@ -101,9 +101,9 @@ function Bag:OnClick(button)
 end
 
 function Bag:OnDrag()
-	if self:IsCustomSlot() and not self:GetInfo().cached then
+	if self:IsCustomSlot() and not self.info.cached then
 		PlaySound(SOUNDKIT.IG_BACKPACK_OPEN)
-		PickupBagFromSlot(self:GetInfo().slot)
+		PickupBagFromSlot(self.info.slot)
 	end
 end
 
@@ -134,7 +134,7 @@ function Bag:RegisterEvents()
 		self:RegisterMessage('CACHE_BANK_CLOSED', 'RegisterEvents')
 	end
 
-	if not self:GetInfo().cached then
+	if not self.info.cached then
 		if self:IsReagents() then
 			self:RegisterEvent('REAGENTBANK_PURCHASED', 'Update')
 		elseif self:IsCustomSlot() then
@@ -162,21 +162,22 @@ end
 function Bag:Update()
 	local info = self:GetInfo()
 
+	self.info = info
 	self.FilterIcon:SetShown(not info.cached)
 	self.Count:SetText(info.free and info.free > 0 and info.free or '')
 	self:UpdateCursor()
 	self:UpdateToggle()
 	self:UpdateLock()
 
-  if self:IsBackpack() or self:IsBank() then
+	if self:IsBackpack() or self:IsBank() then
 		self:SetIcon('Interface/Buttons/Button-Backpack-Up')
 	elseif self:IsReagents() then
 		self:SetIcon('Interface/Icons/Achievement_GuildPerk_BountifulBags')
 	elseif self:IsKeyring() then
 		self:SetIcon('Interface/ContainerFrame/KeyRing-Bag-Icon')
 	else
 		self:SetIcon(info.icon or 'Interface/PaperDoll/UI-PaperDoll-Slot-Bag')
-	  self.link = info.link
+	  	self.link = info.link
 
 		if not info.icon then
 			self.Count:SetText('')
@@ -187,7 +188,7 @@ function Bag:Update()
 		local id = self:GetID()
 		for i, atlas in ipairs(self.FILTER_ICONS) do
 			local active = C_Container and (id > 0 and C_Container.GetBagSlotFlag(id, 2^i)) or
-										 GetBagSlotFlag and (self:IsBankBag() and GetBankBagSlotFlag(id - NUM_BAG_SLOTS, i) or GetBagSlotFlag(id, i))
+						   GetBagSlotFlag and (self:IsBankBag() and GetBankBagSlotFlag(id - NUM_BAG_SLOTS, i) or GetBagSlotFlag(id, i))
 			if active then
 				return self.FilterIcon.Icon:SetAtlas(atlas)
 			end
@@ -196,13 +197,13 @@ function Bag:Update()
 end
 
 function Bag:UpdateCursor()
-	if not self:IsCustomSlot() then
-		if CursorCanGoInSlot(self:GetInfo().slot) then
+	--[[if not self:IsCustomSlot() then
+		if CursorCanGoInSlot(self.info.slot) then
 			self:LockHighlight()
 		else
 			self:UnlockHighlight()
 		end
-	end
+	end--]]
 end
 
 function Bag:UpdateToggle()
@@ -223,7 +224,7 @@ function Bag:UpdateTooltip()
 		GameTooltip:SetText(self:IsReagents() and REAGENT_BANK or BANK_BAG_PURCHASE, 1, 1, 1)
 		GameTooltip:AddLine(L.TipPurchaseBag:format(L.Click))
 
-		SetTooltipMoney(GameTooltip, self:GetInfo().cost)
+		SetTooltipMoney(GameTooltip, self.info.cost)
 	elseif self:IsBackpack() then
 		GameTooltip:SetText(BACKPACK_TOOLTIP, 1,1,1)
 	elseif self:IsBank() then
@@ -232,10 +233,10 @@ function Bag:UpdateTooltip()
 		GameTooltip:SetText(REAGENT_BANK, 1,1,1)
 	elseif self:IsKeyring() then
 		GameTooltip:SetText(KEYRING, 1,1,1)
-	elseif self.link and self:GetInfo().cached then
+	elseif self.link and self.info.cached then
 		GameTooltip:SetHyperlink(self.link)
 	elseif self.link then
-		GameTooltip:SetInventoryItem('player', ContainerIDToInventoryID(self:GetID()))
+		GameTooltip:SetInventoryItem('player', self.info.slot)
 	elseif self:IsBankBag() then
 		GameTooltip:SetText(BANK_BAG, 1, 1, 1)
 	else
@@ -287,7 +288,7 @@ function Bag:SetFocus(focus)
 end
 
 function Bag:SetIcon(icon)
-	local color = self:GetInfo().owned and 1 or .1
+	local color = self.info.owned and 1 or .1
 	SetItemButtonTexture(self, icon)
 	SetItemButtonTextureVertexColor(self, 1, color, color)
 end
@@ -324,19 +325,18 @@ function Bag:IsCustomSlot()
 end
 
 function Bag:CanToggle()
-	return self:IsBackpack() or self:IsBank() or self:GetInfo().owned
+	return self:IsBackpack() or self:IsBank() or self.info.owned
 end
 
 
 --[[ Info ]]--
 
 function Bag:IsPurchasable()
-	local info = self:GetInfo()
-	return not info.cached and not info.owned
+	return not self.info.cached and not self.info.owned
 end
 
 function Bag:IsToggled()
-	return self:GetFrame():IsShowingBag(self:GetID()) and self:GetInfo().owned
+	return self:GetFrame():IsShowingBag(self:GetID()) and self.info.owned
 end
 
 function Bag:GetInfo()

classes/bank.lua

@@ -4,12 +4,13 @@
 --]]
 
 local ADDON, Addon = ...
+local C = LibStub('C_Everywhere').Container
 local Bank = Addon.Frame:NewClass('BankFrame')
 Bank.Title = LibStub('AceLocale-3.0'):GetLocale(ADDON).TitleBank
 Bank.Bags = {BANK_CONTAINER}
 
 for slot = 1, NUM_BANKBAGSLOTS do
-	tinsert(Bank.Bags, slot + (NUM_TOTAL_EQUIPPED_BAG_SLOTS or NUM_BAG_SLOTS))
+	tinsert(Bank.Bags, slot + Addon.NumBags)
 end
 
 function Bank:OnHide()
@@ -18,8 +19,8 @@ function Bank:OnHide()
 end
 
 function Bank:SortItems()
-	if SortBankBags then
-		SortBankBags()
+	if C.SortBankBags then
+		C.SortBankBags()
 
 		if self.SortReagents then
 			self:Delay(.3, 'SortReagents')
@@ -33,7 +34,7 @@ if REAGENTBANK_CONTAINER then
 	tinsert(Bank.Bags, REAGENTBANK_CONTAINER)
 
 	function Bank:SortReagents()
-		SortReagentBankBags()
+		C.SortReagentBankBags()
 	end
 
 	function Bank:IsShowingBag(bag)

classes/currency.lua

@@ -6,7 +6,7 @@
 
 
 local ADDON, Addon = ...
-local L = LibStub('AceLocale-3.0'):GetLocale(ADDON)
+local C = LibStub('C_Everywhere').CurrencyInfo
 local Currency = Addon.Tipped:NewClass('Currency', 'Button')
 
 function Currency:New(parent)
@@ -23,18 +23,18 @@ function Currency:Set(data)
 	self:SetText(format('%s|T%s:14:14:2:0%s|t  ', data.quantity, data.iconFileID, data.iconArgs or ''))
 	self.data = data
 	self:Show()
-  self:SetWidth(self:GetTextWidth() + 2)
+	self:SetWidth(self:GetTextWidth() + 2)
 end
 
 function Currency:OnClick()
 	if IsModifiedClick('CHATLINK') then
-		HandleModifiedItemClick((GetCurrencyLink or C_CurrencyInfo.GetCurrencyLink)(self.data.currencyTypesID, self.data.quantity))
+		HandleModifiedItemClick(C.GetCurrencyLink(self.data.currencyTypesID, self.data.quantity))
 	elseif not self:IsCached() then
 		ToggleCharacter('TokenFrame')
 	end
 end
 
 function Currency:OnEnter()
 	GameTooltip:SetOwner(self:GetTipAnchor())
-	GameTooltip:SetCurrencyTokenByID(self.data.currencyTypesID)
+	GameTooltip:SetBackpackToken(self.data.index)
 end

classes/currencyTracker.lua

@@ -4,7 +4,7 @@
 --]]
 
 local ADDON, Addon = ...
-local L = LibStub('AceLocale-3.0'):GetLocale(ADDON)
+local C = LibStub('C_Everywhere').CurrencyInfo
 local CurrencyTracker = Addon.Parented:NewClass('CurrencyTracker', 'Frame')
 
 if BackpackTokenFrame then
@@ -20,13 +20,13 @@ function CurrencyTracker:New(parent)
 	f:SetScript('OnShow', f.RegisterEvents)
 	f:SetScript('OnHide', f.UnregisterAll)
 	f:RegisterEvents()
-  f:SetHeight(24)
+	f:SetHeight(24)
 
-  hooksecurefunc(SetCurrencyBackpack and _G or C_CurrencyInfo, 'SetCurrencyBackpack', function()
-    if f:IsVisible() then
-        f:Update()
-    end
-  end)
+	C.hooksecurefunc('SetCurrencyBackpack', function()
+		if f:IsVisible() then
+			f:Update()
+		end
+	end)
 	return f
 end
 
@@ -45,14 +45,12 @@ function CurrencyTracker:Update()
 end
 
 local function getCurrency(i) -- temporary till bagbrother expansion
-	if GetBackpackCurrencyInfo then
-		local name, quantity, icon, id = GetBackpackCurrencyInfo(i)
-		return name and {
-			name = name, quantity = quantity, iconFileID = icon, currencyTypesID = id,
-			iconArgs = tContains(HONOR_POINT_TEXTURES, icon) and ':64:64:0:40:0:40'}
-	else
-		return C_CurrencyInfo.GetBackpackCurrencyInfo(i)
+	local data = C.GetBackpackCurrencyInfo(i)
+	if data then
+		data.iconArgs = HONOR_POINT_TEXTURES and tContains(HONOR_POINT_TEXTURES, data.iconFileID) and ':64:64:0:40:0:40'
+		data.index = i
 	end
+	return data
 end
 
 function CurrencyTracker:Layout()
@@ -63,15 +61,15 @@ function CurrencyTracker:Layout()
 	local w = 0
 	for i = 1, BackpackTokenFrame:GetMaxTokensWatched() do -- safety limit
 		local data = getCurrency(i)
-    if data then
+    	if data then
 			self.buttons[i] = self.buttons[i] or Addon.Currency(self)
 			self.buttons[i]:SetPoint('LEFT', self.buttons[i-1] or self, i > 1 and 'RIGHT' or 'LEFT')
 			self.buttons[i]:Set(data)
 
 			w = w + self.buttons[i]:GetWidth()
 		else
 			break
-    end
+    	end
   end
 
 	self:SetWidth(max(w, 2))

classes/inventory.lua

@@ -4,6 +4,7 @@
 --]]
 
 local ADDON, Addon = ...
+local C = LibStub('C_Everywhere').Container
 local Inventory = Addon.Frame:NewClass('InventoryFrame')
 Inventory.Title = LibStub('AceLocale-3.0'):GetLocale(ADDON).TitleBags
 Inventory.Bags = {}
@@ -46,8 +47,8 @@ function Inventory:HighlightMainMenu(checked)
 end
 
 function Inventory:SortItems()
-	if SortBags and Addon.sets.serverSort then
-		SortBags()
+	if C.SortBags and Addon.sets.serverSort then
+		C.SortBags()
 	else
 		self:Super(Inventory):SortItems(self)
 	end