bags

2/3/4/5/6/7/ElvUI/Core/Config.lua

@@ -256,7 +256,7 @@ function E:CreateMoverPopup()
 		E:ToggleConfigMode(true)
 
 		if(IsAddOnLoaded("ElvUI_Config")) then
-			LibStub("AceConfigDialog-3.0-ElvUI"):Open("ElvUI")
+			LibStub("AceConfigDialog-3.0"):Open("ElvUI")
 		end
 
 		selectedValue = "ALL"

2/3/4/5/6/7/ElvUI/Modules/Bags/BagBar.lua

@@ -0,0 +1,159 @@
+local E, L, V, P, G = unpack(ElvUI)
+local B = E:GetModule("Bags")
+
+local _G = _G
+local unpack = unpack
+local tinsert = table.insert
+
+local CreateFrame = CreateFrame
+local NUM_BAG_FRAMES = NUM_BAG_FRAMES
+
+local TOTAL_BAGS = NUM_BAG_FRAMES + 2
+
+local ElvUIKeyRing = CreateFrame("CheckButton", "ElvUIKeyRingButton", UIParent, "ItemButtonTemplate")
+ElvUIKeyRing:RegisterForClicks("anyUp")
+ElvUIKeyRing:StripTextures()
+ElvUIKeyRing:SetScript("OnClick", function() if CursorHasItem() then PutKeyInKeyRing() else ToggleKeyRing() end end)
+ElvUIKeyRing:SetScript("OnReceiveDrag", function() if CursorHasItem() then PutKeyInKeyRing() end end)
+ElvUIKeyRing:SetScript("OnEnter", function(self) GameTooltip:SetOwner(self, "ANCHOR_LEFT") local color = HIGHLIGHT_FONT_COLOR GameTooltip:SetText(KEYRING, color.r, color.g, color.b) GameTooltip:AddLine() end)
+ElvUIKeyRing:SetScript("OnLeave", function() GameTooltip:Hide() end)
+_G[ElvUIKeyRing:GetName().."IconTexture"]:SetTexture("Interface\\ContainerFrame\\KeyRing-Bag-Icon")
+_G[ElvUIKeyRing:GetName().."IconTexture"]:SetTexCoord(unpack(E.TexCoords))
+
+local function OnEnter()
+	if not E.db.bags.bagBar.mouseover then return end
+	E:UIFrameFadeOut(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 1)
+end
+
+local function OnLeave()
+	if not E.db.bags.bagBar.mouseover then return end
+	E:UIFrameFadeOut(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 0)
+end
+
+function B:SkinBag(bag)
+	local icon = _G[bag:GetName().."IconTexture"]
+	bag.oldTex = icon:GetTexture()
+
+	bag:StripTextures()
+	bag:CreateBackdrop("Default", true)
+	bag.backdrop:SetAllPoints()
+	bag:StyleButton(true)
+	icon:SetTexture(bag.oldTex)
+	icon:SetInside()
+	icon:SetTexCoord(unpack(E.TexCoords))
+end
+
+function B:SizeAndPositionBagBar()
+	if not ElvUIBags then return end
+
+	local buttonSpacing = E.db.bags.bagBar.spacing
+	local backdropSpacing = E.db.bags.bagBar.backdropSpacing
+	local bagBarSize = E.db.bags.bagBar.size
+	local showBackdrop = E.db.bags.bagBar.showBackdrop
+	local growthDirection = E.db.bags.bagBar.growthDirection
+	local sortDirection = E.db.bags.bagBar.sortDirection
+
+	if E.db.bags.bagBar.mouseover then
+		ElvUIBags:SetAlpha(0)
+	else
+		ElvUIBags:SetAlpha(1)
+	end
+
+	if showBackdrop then
+		ElvUIBags.backdrop:Show()
+	else
+		ElvUIBags.backdrop:Hide()
+	end
+
+	ElvUIKeyRingButton:Size(bagBarSize)
+	ElvUIKeyRingButton:ClearAllPoints()
+
+	for i = 1, #ElvUIBags.buttons do
+		local button = ElvUIBags.buttons[i]
+		local prevButton = ElvUIBags.buttons[i-1]
+		button:Size(E.db.bags.bagBar.size)
+		button:ClearAllPoints()
+		button:Show()
+
+		if growthDirection == "HORIZONTAL" and sortDirection == "ASCENDING" then
+			if i == 1 then
+				button:Point("LEFT", ElvUIBags, "LEFT", (showBackdrop and (backdropSpacing + E.Border) or 0), 0)
+			elseif prevButton then
+				button:Point("LEFT", prevButton, "RIGHT", buttonSpacing, 0)
+			end
+		elseif growthDirection == "VERTICAL" and sortDirection == "ASCENDING" then
+			if i == 1 then
+				button:Point("TOP", ElvUIBags, "TOP", 0, -(showBackdrop and (backdropSpacing + E.Border) or 0))
+			elseif prevButton then
+				button:Point("TOP", prevButton, "BOTTOM", 0, -buttonSpacing)
+			end
+		elseif growthDirection == "HORIZONTAL" and sortDirection == "DESCENDING" then
+			if i == 1 then
+				button:Point("RIGHT", ElvUIBags, "RIGHT", -(showBackdrop and (backdropSpacing + E.Border) or 0), 0)
+			elseif prevButton then
+				button:Point("RIGHT", prevButton, "LEFT", -buttonSpacing, 0)
+			end
+		else
+			if i == 1 then
+				button:Point("BOTTOM", ElvUIBags, "BOTTOM", 0, (showBackdrop and (backdropSpacing + E.Border) or 0))
+			elseif prevButton then
+				button:Point("BOTTOM", prevButton, "TOP", 0, buttonSpacing)
+			end
+		end
+	end
+
+	if growthDirection == "HORIZONTAL" then
+		ElvUIBags:Width(bagBarSize*(TOTAL_BAGS) + buttonSpacing*(TOTAL_BAGS-1) + ((showBackdrop == true and (E.Border + backdropSpacing) or E.Spacing)*2))
+		ElvUIBags:Height(bagBarSize + ((showBackdrop and (E.Border + backdropSpacing) or E.Spacing)*2))
+	else
+		ElvUIBags:Height(bagBarSize*(TOTAL_BAGS) + buttonSpacing*(TOTAL_BAGS-1) + ((showBackdrop == true and (E.Border + backdropSpacing) or E.Spacing)*2))
+		ElvUIBags:Width(bagBarSize + ((showBackdrop and (E.Border + backdropSpacing) or E.Spacing)*2))
+	end
+end
+
+function B:LoadBagBar()
+	if not E.private.bags.bagBar then return end
+
+	local ElvUIBags = CreateFrame("Frame", "ElvUIBags", E.UIParent)
+	ElvUIBags:SetPoint("TOPRIGHT", RightChatPanel, "TOPLEFT", -4, 0)
+	ElvUIBags.buttons = {}
+	ElvUIBags:CreateBackdrop()
+	ElvUIBags.backdrop:SetAllPoints()
+	ElvUIBags:EnableMouse(true)
+	ElvUIBags:SetScript("OnEnter", OnEnter)
+	ElvUIBags:SetScript("OnLeave", OnLeave)
+
+	MainMenuBarBackpackButton:SetParent(ElvUIBags)
+	MainMenuBarBackpackButton.SetParent = E.dummy
+	MainMenuBarBackpackButton:ClearAllPoints()
+	MainMenuBarBackpackButtonCount:FontTemplate(nil, 10)
+	MainMenuBarBackpackButtonCount:ClearAllPoints()
+	MainMenuBarBackpackButtonCount:Point("BOTTOMRIGHT", MainMenuBarBackpackButton, "BOTTOMRIGHT", -1, 4)
+	MainMenuBarBackpackButton:HookScript("OnEnter", OnEnter)
+	MainMenuBarBackpackButton:HookScript("OnLeave", OnLeave)
+	tinsert(ElvUIBags.buttons, MainMenuBarBackpackButton)
+	self:SkinBag(MainMenuBarBackpackButton)
+
+	for i = 0, NUM_BAG_FRAMES - 1 do
+		local b = _G["CharacterBag"..i.."Slot"]
+		b:SetParent(ElvUIBags)
+		b.SetParent = E.dummy
+		b:HookScript("OnEnter", OnEnter)
+		b:HookScript("OnLeave", OnLeave)
+
+		self:SkinBag(b)
+		tinsert(ElvUIBags.buttons, b)
+	end
+
+	ElvUIKeyRingButton:SetTemplate()
+	ElvUIKeyRingButton:StyleButton(true)
+	_G[ElvUIKeyRingButton:GetName().."IconTexture"]:SetInside()
+	ElvUIKeyRingButton:SetParent(ElvUIBags)
+	ElvUIKeyRingButton.SetParent = E.dummy
+	ElvUIKeyRingButton:HookScript("OnEnter", OnEnter)
+	ElvUIKeyRingButton:HookScript("OnLeave", OnLeave)
+	tinsert(ElvUIBags.buttons, ElvUIKeyRingButton)
+
+	self:SizeAndPositionBagBar()
+	E:CreateMover(ElvUIBags, "BagsMover", L["Bags"])
+end

2/3/4/5/6/7/ElvUI/Modules/Bags/Load_Bags.xml

@@ -0,0 +1,3 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="Bags.lua"/>
+</Ui>

2/3/4/5/6/7/ElvUI/Modules/Bags/Sort.lua

@@ -0,0 +1,864 @@
+local E, L, V, P, G = unpack(ElvUI)
+local B = E:GetModule("Bags")
+
+local Search = LibStub("LibItemSearch-1.2")
+
+local ipairs, pairs, tonumber, select, unpack = ipairs, pairs, tonumber, select, unpack
+local tinsert, tremove, tsort, twipe = table.insert, table.remove, table.sort, table.wipe
+local floor = math.floor
+local band = bit.band
+local match, gmatch, find = string.match, string.gmatch, string.find
+
+local GetTime = GetTime
+local InCombatLockdown = InCombatLockdown
+local GetItemInfo = GetItemInfo
+local GetAuctionItemClasses = GetAuctionItemClasses
+local GetAuctionItemSubClasses = GetAuctionItemSubClasses
+local GetGuildBankItemInfo = GetGuildBankItemInfo
+local GetContainerItemInfo = GetContainerItemInfo
+local GetGuildBankItemLink = GetGuildBankItemLink
+local GetContainerItemLink = GetContainerItemLink
+local PickupGuildBankItem = PickupGuildBankItem
+local PickupContainerItem = PickupContainerItem
+local SplitGuildBankItem = SplitGuildBankItem
+local SplitContainerItem = SplitContainerItem
+local GetGuildBankTabInfo = GetGuildBankTabInfo
+local GetContainerNumSlots = GetContainerNumSlots
+local GetContainerNumFreeSlots = GetContainerNumFreeSlots
+local ContainerIDToInventoryID = ContainerIDToInventoryID
+local GetInventoryItemLink = GetInventoryItemLink
+local GetItemFamily = GetItemFamily
+local GetCursorInfo = GetCursorInfo
+local QueryGuildBankTab = QueryGuildBankTab
+local GetCurrentGuildBankTab = GetCurrentGuildBankTab
+local ARMOR, ENCHSLOT_WEAPON = ARMOR, ENCHSLOT_WEAPON
+
+local guildBags = {51,52,53,54,55,56,57,58}
+local bankBags = {BANK_CONTAINER}
+local MAX_MOVE_TIME = 1.25
+
+for i = NUM_BAG_SLOTS + 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
+	tinsert(bankBags, i)
+end
+
+local playerBags = {}
+for i = 0, NUM_BAG_SLOTS do
+	tinsert(playerBags, i)
+end
+
+local allBags = {}
+for _,i in ipairs(playerBags) do
+	tinsert(allBags, i)
+end
+for _,i in ipairs(bankBags) do
+	tinsert(allBags, i)
+end
+
+for _,i in ipairs(guildBags) do
+	tinsert(allBags, i)
+end
+
+local coreGroups = {
+	guild = guildBags,
+	bank = bankBags,
+	bags = playerBags,
+	all = allBags,
+}
+
+local bagCache = {}
+local bagIDs = {}
+local bagQualities = {}
+local bagStacks = {}
+local bagMaxStacks = {}
+local bagGroups = {}
+local initialOrder = {}
+local itemTypes, itemSubTypes
+local bagSorted, bagLocked = {}, {}
+local bagRole
+local moves = {}
+local targetItems = {}
+local sourceUsed = {}
+local targetSlots = {}
+local specialtyBags = {}
+local emptySlots = {}
+
+local moveRetries = 0
+local lastItemID, lockStop, lastDestination, lastMove
+local moveTracker = {}
+
+local inventorySlots = {
+	INVTYPE_AMMO = 0,
+	INVTYPE_HEAD = 1,
+	INVTYPE_NECK = 2,
+	INVTYPE_SHOULDER = 3,
+	INVTYPE_BODY = 4,
+	INVTYPE_CHEST = 5,
+	INVTYPE_ROBE = 5,
+	INVTYPE_WAIST = 6,
+	INVTYPE_LEGS = 7,
+	INVTYPE_FEET = 8,
+	INVTYPE_WRIST = 9,
+	INVTYPE_HAND = 10,
+	INVTYPE_FINGER = 11,
+	INVTYPE_TRINKET = 12,
+	INVTYPE_CLOAK = 13,
+	INVTYPE_WEAPON = 14,
+	INVTYPE_SHIELD = 15,
+	INVTYPE_2HWEAPON = 16,
+	INVTYPE_WEAPONMAINHAND = 18,
+	INVTYPE_WEAPONOFFHAND = 19,
+	INVTYPE_HOLDABLE = 20,
+	INVTYPE_RANGED = 21,
+	INVTYPE_THROWN = 22,
+	INVTYPE_RANGEDRIGHT = 23,
+	INVTYPE_RELIC = 24,
+	INVTYPE_TABARD = 25,
+}
+
+local safe = {
+	[BANK_CONTAINER] = true,
+	[0] = true
+}
+
+local frame = CreateFrame("Frame")
+local t, WAIT_TIME = 0, 0.05
+frame:SetScript("OnUpdate", function(_, elapsed)
+	t = t + (elapsed or 0.01)
+	if t > WAIT_TIME then
+		t = 0
+		B:DoMoves()
+	end
+end)
+frame:Hide()
+B.SortUpdateTimer = frame
+
+local function IsGuildBankBag(bagid)
+	return (bagid > 50 and bagid <= 58)
+end
+
+local function BuildSortOrder()
+	itemTypes = {}
+	itemSubTypes = {}
+	for i, iType in ipairs({GetAuctionItemClasses()}) do
+		itemTypes[iType] = i
+		itemSubTypes[iType] = {}
+		for ii, isType in ipairs({GetAuctionItemSubClasses(i)}) do
+			itemSubTypes[iType][isType] = ii
+		end
+	end
+end
+
+local function UpdateLocation(from, to)
+	if (bagIDs[from] == bagIDs[to]) and (bagStacks[to] < bagMaxStacks[to]) then
+		local stackSize = bagMaxStacks[to]
+		if (bagStacks[to] + bagStacks[from]) > stackSize then
+			bagStacks[from] = bagStacks[from] - (stackSize - bagStacks[to])
+			bagStacks[to] = stackSize
+		else
+			bagStacks[to] = bagStacks[to] + bagStacks[from]
+			bagStacks[from] = nil
+			bagIDs[from] = nil
+			bagQualities[from] = nil
+			bagMaxStacks[from] = nil
+		end
+	else
+		bagIDs[from], bagIDs[to] = bagIDs[to], bagIDs[from]
+		bagQualities[from], bagQualities[to] = bagQualities[to], bagQualities[from]
+		bagStacks[from], bagStacks[to] = bagStacks[to], bagStacks[from]
+		bagMaxStacks[from], bagMaxStacks[to] = bagMaxStacks[to], bagMaxStacks[from]
+	end
+end
+
+local function PrimarySort(a, b)
+	local aName, _, _, aLvl, _, _, _, _, _, _, aPrice = GetItemInfo(bagIDs[a])
+	local bName, _, _, bLvl, _, _, _, _, _, _, bPrice = GetItemInfo(bagIDs[b])
+
+	if aLvl ~= bLvl and aLvl and bLvl then
+		return aLvl > bLvl
+	end
+	if aPrice ~= bPrice and aPrice and bPrice then
+		return aPrice > bPrice
+	end
+
+	if aName and bName then
+		return aName < bName
+	end
+end
+
+local function DefaultSort(a, b)
+	local aID = bagIDs[a]
+	local bID = bagIDs[b]
+
+	if (not aID) or (not bID) then return aID end
+
+	local aOrder, bOrder = initialOrder[a], initialOrder[b]
+
+	if aID == bID then
+		local aCount = bagStacks[a]
+		local bCount = bagStacks[b]
+		if aCount and bCount and aCount == bCount then
+			return aOrder < bOrder
+		elseif aCount and bCount then
+			return aCount < bCount
+		end
+	end
+
+	local _, _, aRarity, _, _, aType, aSubType, _, aEquipLoc = GetItemInfo(aID)
+	local _, _, bRarity, _, _, bType, bSubType, _, bEquipLoc = GetItemInfo(bID)
+
+	aRarity = bagQualities[a]
+	bRarity = bagQualities[b]
+
+	if aRarity ~= bRarity and aRarity and bRarity then
+		return aRarity > bRarity
+	end
+
+	if itemTypes[aType] ~= itemTypes[bType] then
+		return (itemTypes[aType] or 99) < (itemTypes[bType] or 99)
+	end
+
+	if aType == ARMOR or aType == ENCHSLOT_WEAPON then
+		local aEquipLoc = inventorySlots[aEquipLoc] or -1
+		local bEquipLoc = inventorySlots[bEquipLoc] or -1
+		if aEquipLoc == bEquipLoc then
+			return PrimarySort(a, b)
+		end
+
+		if aEquipLoc and bEquipLoc then
+			return aEquipLoc < bEquipLoc
+		end
+	end
+	if aSubType == bSubType then
+		return PrimarySort(a, b)
+	end
+
+	return ((itemSubTypes[aType] or {})[aSubType] or 99) < ((itemSubTypes[bType] or {})[bSubType] or 99)
+end
+
+local function ReverseSort(a, b)
+	return DefaultSort(b, a)
+end
+
+local function UpdateSorted(source, destination)
+	for i, bs in pairs(bagSorted) do
+		if bs == source then
+			bagSorted[i] = destination
+		elseif bs == destination then
+			bagSorted[i] = source
+		end
+	end
+end
+
+local function ShouldMove(source, destination)
+	if destination == source then return end
+
+	if not bagIDs[source] then return end
+	if bagIDs[source] == bagIDs[destination] and bagStacks[source] == bagStacks[destination] then return end
+
+	return true
+end
+
+local function IterateForwards(bagList, i)
+	i = i + 1
+	local step = 1
+	for _,bag in ipairs(bagList) do
+		local slots = B:GetNumSlots(bag, bagRole)
+		if i > slots + step then
+			step = step + slots
+		else
+			for slot = 1, slots do
+				if step == i then
+					return i, bag, slot
+				end
+				step = step + 1
+			end
+		end
+	end
+	bagRole = nil
+end
+
+local function IterateBackwards(bagList, i)
+	i = i + 1
+	local step = 1
+	for ii = #bagList, 1, -1 do
+		local bag = bagList[ii]
+		local slots = B:GetNumSlots(bag, bagRole)
+		if i > slots + step then
+			step = step + slots
+		else
+			for slot=slots, 1, -1 do
+				if step == i then
+					return i, bag, slot
+				end
+				step = step + 1
+			end
+		end
+	end
+	bagRole = nil
+end
+
+function B.IterateBags(bagList, reverse, role)
+	bagRole = role
+	return (reverse and IterateBackwards or IterateForwards), bagList, 0
+end
+
+function B:GetItemID(bag, slot)
+	local link = self:GetItemLink(bag, slot)
+	return link and tonumber(match(link, "item:(%d+)"))
+end
+
+function B:GetItemInfo(bag, slot)
+	if IsGuildBankBag(bag) then
+		return GetGuildBankItemInfo(bag - 50, slot)
+	else
+		return GetContainerItemInfo(bag, slot)
+	end
+end
+
+function B:GetItemLink(bag, slot)
+	if IsGuildBankBag(bag) then
+		return GetGuildBankItemLink(bag - 50, slot)
+	else
+		return GetContainerItemLink(bag, slot)
+	end
+end
+
+function B:PickupItem(bag, slot)
+	if IsGuildBankBag(bag) then
+		return PickupGuildBankItem(bag - 50, slot)
+	else
+		return PickupContainerItem(bag, slot)
+	end
+end
+
+function B:SplitItem(bag, slot, amount)
+	if IsGuildBankBag(bag) then
+		return SplitGuildBankItem(bag - 50, slot, amount)
+	else
+		return SplitContainerItem(bag, slot, amount)
+	end
+end
+
+function B:GetNumSlots(bag, role)
+	if IsGuildBankBag(bag) then
+		if not role then role = "deposit" end
+		local name, _, canView, canDeposit, numWithdrawals = GetGuildBankTabInfo(bag - 50)
+		if name and canView --[[and ((role == "withdraw" and numWithdrawals ~= 0) or (role == "deposit" and canDeposit) or (role == "both" and numWithdrawals ~= 0 and canDeposit))]] then
+			return 98
+		end
+	else
+		return GetContainerNumSlots(bag)
+	end
+
+	return 0
+end
+
+local function ConvertLinkToID(link)
+	if(not link) then return end
+
+	if(tonumber(match(link, "item:(%d+)"))) then
+		return tonumber(match(link, "item:(%d+)"))
+	end
+end
+
+local function DefaultCanMove()
+	return true
+end
+
+function B:Encode_BagSlot(bag, slot)
+	return (bag*100) + slot
+end
+
+function B:Decode_BagSlot(int)
+	return floor(int/100), int % 100
+end
+
+function B:IsPartial(bag, slot)
+	local bagSlot = B:Encode_BagSlot(bag, slot)
+	return ((bagMaxStacks[bagSlot] or 0) - (bagStacks[bagSlot] or 0)) > 0
+end
+
+function B:EncodeMove(source, target)
+	return (source * 10000) + target
+end
+
+function B:DecodeMove(move)
+	local s = floor(move/10000)
+	local t = move%10000
+	s = (t>9000) and (s+1) or s
+	t = (t>9000) and (t-10000) or t
+	return s, t
+end
+
+function B:AddMove(source, destination)
+	UpdateLocation(source, destination)
+	tinsert(moves, 1, B:EncodeMove(source, destination))
+end
+
+function B:ScanBags()
+	for _, bag, slot in B.IterateBags(allBags) do
+		local bagSlot = B:Encode_BagSlot(bag, slot)
+		local itemID = ConvertLinkToID(B:GetItemLink(bag, slot))
+		if(itemID) then
+			bagMaxStacks[bagSlot] = select(8, GetItemInfo(itemID))
+			bagIDs[bagSlot] = itemID
+			bagQualities[bagSlot] = select(3, GetItemInfo(B:GetItemLink(bag, slot)))
+			bagStacks[bagSlot] = select(2, B:GetItemInfo(bag, slot))
+		end
+	end
+end
+
+function B:IsSpecialtyBag(bagID)
+	if safe[bagID] or IsGuildBankBag(bagID) then return false end
+
+	local inventorySlot = ContainerIDToInventoryID(bagID)
+	if not inventorySlot then return false end
+
+	local bag = GetInventoryItemLink("player", inventorySlot)
+	if not bag then return false end
+
+	local family = GetItemFamily(bag)
+	if family == 0 or family == nil then return false end
+
+	return family
+end
+
+function B:CanItemGoInBag(bag, slot, targetBag)
+	if IsGuildBankBag(targetBag) then return true end
+
+	local item = bagIDs[B:Encode_BagSlot(bag, slot)]
+	local itemFamily = GetItemFamily(item)
+	if itemFamily and itemFamily > 0 then
+		local equipSlot = select(9, GetItemInfo(item))
+		if equipSlot == "INVTYPE_BAG" then
+			itemFamily = 1
+		end
+	end
+	local bagFamily = select(2, GetContainerNumFreeSlots(targetBag))
+	if itemFamily then
+		return (bagFamily == 0) or band(itemFamily, bagFamily) > 0
+	else
+		return false
+	end
+end
+
+function B.Compress(...)
+	for i=1, select("#", ...) do
+		local bags = select(i, ...)
+		B.Stack(bags, bags, B.IsPartial)
+	end
+end
+
+function B.Stack(sourceBags, targetBags, canMove)
+	if not canMove then canMove = DefaultCanMove end
+	for _, bag, slot in B.IterateBags(targetBags, nil, "deposit") do
+		local bagSlot = B:Encode_BagSlot(bag, slot)
+		local itemID = bagIDs[bagSlot]
+
+		if itemID and (bagStacks[bagSlot] ~= bagMaxStacks[bagSlot]) then
+			targetItems[itemID] = (targetItems[itemID] or 0) + 1
+			tinsert(targetSlots, bagSlot)
+		end
+	end
+
+	for _, bag, slot in B.IterateBags(sourceBags, true, "withdraw") do
+		local sourceSlot = B:Encode_BagSlot(bag, slot)
+		local itemID = bagIDs[sourceSlot]
+		if itemID and targetItems[itemID] and canMove(itemID, bag, slot) then
+			for i = #targetSlots, 1, -1 do
+				local targetedSlot = targetSlots[i]
+				if bagIDs[sourceSlot] and bagIDs[targetedSlot] == itemID and targetedSlot ~= sourceSlot and not (bagStacks[targetedSlot] == bagMaxStacks[targetedSlot]) and not sourceUsed[targetedSlot] then
+					B:AddMove(sourceSlot, targetedSlot)
+					sourceUsed[sourceSlot] = true
+
+					if bagStacks[targetedSlot] == bagMaxStacks[targetedSlot] then
+						targetItems[itemID] = (targetItems[itemID] > 1) and (targetItems[itemID] - 1) or nil
+					end
+					if bagStacks[sourceSlot] == 0 then
+						targetItems[itemID] = (targetItems[itemID] > 1) and (targetItems[itemID] - 1) or nil
+						break
+					end
+					if not targetItems[itemID] then break end
+				end
+			end
+		end
+	end
+
+	twipe(targetItems)
+	twipe(targetSlots)
+	twipe(sourceUsed)
+end
+
+local blackListedSlots = {}
+local blackList = {}
+local blackListQueries = {}
+
+local function buildBlacklist(...)
+	for entry in pairs(...) do
+		local itemName = GetItemInfo(entry)
+		if(itemName) then
+			blackList[itemName] = true
+		elseif(entry ~= "") then
+			if(find(entry, "%[") and find(entry, "%]")) then
+				entry = match(entry, "%[(.*)%]")
+			end
+			blackListQueries[#blackListQueries+1] = entry
+		end
+	end
+end
+
+function B.Sort(bags, sorter, invertDirection)
+	if not sorter then sorter = invertDirection and ReverseSort or DefaultSort end
+	if not itemTypes then BuildSortOrder() end
+
+	twipe(blackList)
+	twipe(blackListQueries)
+	twipe(blackListedSlots)
+
+	buildBlacklist(B.db.ignoredItems)
+	buildBlacklist(E.global.bags.ignoredItems)
+
+	for i, bag, slot in B.IterateBags(bags, nil, "both") do
+		local bagSlot = B:Encode_BagSlot(bag, slot)
+		local link = B:GetItemLink(bag, slot)
+
+		if(link) then
+			if(blackList[GetItemInfo(link)]) then
+				blackListedSlots[bagSlot] = true
+			end
+
+			if(not blackListedSlots[bagSlot]) then
+				for _,itemsearchquery in pairs(blackListQueries) do
+					local success, result = pcall(Search.Matches, Search, link, itemsearchquery)
+					if(success and result) then
+						blackListedSlots[bagSlot] = blackListedSlots[bagSlot] or result
+						break
+					end
+				end
+			end
+		end
+
+		if not blackListedSlots[bagSlot] then
+			initialOrder[bagSlot] = i
+			tinsert(bagSorted, bagSlot)
+		end
+	end
+
+	tsort(bagSorted, sorter)
+
+	local passNeeded = true
+	while passNeeded do
+		passNeeded = false
+		local i = 1
+		for _, bag, slot in B.IterateBags(bags, nil, "both") do
+			local destination = B:Encode_BagSlot(bag, slot)
+			local source = bagSorted[i]
+
+			if not blackListedSlots[destination] then
+				if ShouldMove(source, destination) then
+					if not (bagLocked[source] or bagLocked[destination]) then
+						B:AddMove(source, destination)
+						UpdateSorted(source, destination)
+						bagLocked[source] = true
+						bagLocked[destination] = true
+					else
+						passNeeded = true
+					end
+				end
+				i = i + 1
+			end
+		end
+		twipe(bagLocked)
+	end
+
+	twipe(bagSorted)
+	twipe(initialOrder)
+end
+
+function B.FillBags(from, to)
+	B.Stack(from, to)
+	for _, bag in ipairs(to) do
+		if B:IsSpecialtyBag(bag) then
+			tinsert(specialtyBags, bag)
+		end
+	end
+	if #specialtyBags > 0 then
+		B:Fill(from, specialtyBags)
+	end
+
+	B.Fill(from, to)
+	twipe(specialtyBags)
+end
+
+function B.Fill(sourceBags, targetBags, reverse, canMove)
+	if not canMove then canMove = DefaultCanMove end
+
+	twipe(blackList)
+	twipe(blackListedSlots)
+
+	buildBlacklist(B.db.ignoredItems)
+	buildBlacklist(E.global.bags.ignoredItems)
+
+	for _, bag, slot in B.IterateBags(targetBags, reverse, "deposit") do
+		local bagSlot = B:Encode_BagSlot(bag, slot)
+		if not bagIDs[bagSlot] then
+			tinsert(emptySlots, bagSlot)
+		end
+	end
+
+	for _, bag, slot in B.IterateBags(sourceBags, not reverse, "withdraw") do
+		if #emptySlots == 0 then break end
+		local bagSlot = B:Encode_BagSlot(bag, slot)
+		local targetBag = B:Decode_BagSlot(emptySlots[1])
+		local link = B:GetItemLink(bag, slot)
+
+		if(link and blackList[GetItemInfo(link)]) then
+			blackListedSlots[bagSlot] = true
+		end
+
+		if(bagIDs[bagSlot] and B:CanItemGoInBag(bag, slot, targetBag) and canMove(bagIDs[bagSlot], bag, slot) and not blackListedSlots[bagSlot]) then
+			B:AddMove(bagSlot, tremove(emptySlots, 1))
+		end
+	end
+	twipe(emptySlots)
+end
+
+function B.SortBags(...)
+	for i=1, select("#", ...) do
+		local bags = select(i, ...)
+		for _, slotNum in ipairs(bags) do
+			local bagType = B:IsSpecialtyBag(slotNum)
+			if bagType == false then bagType = "Normal" end
+			if not bagCache[bagType] then bagCache[bagType] = {} end
+			tinsert(bagCache[bagType], slotNum)
+		end
+
+		for bagType, sortedBags in pairs(bagCache) do
+			if bagType ~= "Normal" then
+				B.Stack(sortedBags, sortedBags, B.IsPartial)
+				B.Stack(bagCache["Normal"], sortedBags)
+				B.Fill(bagCache["Normal"], sortedBags, B.db.sortInverted)
+				B.Sort(sortedBags, nil, B.db.sortInverted)
+				twipe(sortedBags)
+			end
+		end
+
+		if bagCache["Normal"] then
+			B.Stack(bagCache["Normal"], bagCache["Normal"], B.IsPartial)
+			B.Sort(bagCache["Normal"], nil, B.db.sortInverted)
+			twipe(bagCache["Normal"])
+		end
+		twipe(bagCache)
+		twipe(bagGroups)
+	end
+end
+
+function B:StartStacking()
+	twipe(bagMaxStacks)
+	twipe(bagStacks)
+	twipe(bagIDs)
+	twipe(bagQualities)
+	twipe(moveTracker)
+
+	if #moves > 0 then
+		self.SortUpdateTimer:Show()
+	else
+		B:StopStacking()
+	end
+end
+
+function B:StopStacking(message)
+	twipe(moves)
+	twipe(moveTracker)
+	moveRetries, lastItemID, lockStop, lastDestination, lastMove = 0, nil, nil, nil, nil
+
+	self.SortUpdateTimer:Hide()
+	if message then
+		E:Print(message)
+	end
+end
+
+function B:DoMove(move)
+	if GetCursorInfo() == "item" then
+		return false, "cursorhasitem"
+	end
+
+	local source, target = B:DecodeMove(move)
+	local sourceBag, sourceSlot = B:Decode_BagSlot(source)
+	local targetBag, targetSlot = B:Decode_BagSlot(target)
+
+	local _, sourceCount, sourceLocked = B:GetItemInfo(sourceBag, sourceSlot)
+	local _, targetCount, targetLocked = B:GetItemInfo(targetBag, targetSlot)
+
+	if sourceLocked or targetLocked then
+		return false, "source/target_locked"
+	end
+
+	local sourceItemID = self:GetItemID(sourceBag, sourceSlot)
+	local targetItemID = self:GetItemID(targetBag, targetSlot)
+
+	if not sourceItemID then
+		if moveTracker[source] then
+			return false, "move incomplete"
+		else
+			return B:StopStacking(L["Confused.. Try Again!"])
+		end
+	end
+
+	local stackSize = select(8, GetItemInfo(sourceItemID))
+	if (sourceItemID == targetItemID) and (targetCount ~= stackSize) and ((targetCount + sourceCount) > stackSize) then
+		B:SplitItem(sourceBag, sourceSlot, stackSize - targetCount)
+	else
+		B:PickupItem(sourceBag, sourceSlot)
+	end
+
+	if GetCursorInfo() == "item" then
+		B:PickupItem(targetBag, targetSlot)
+	end
+
+	local sourceGuild = IsGuildBankBag(sourceBag)
+	local targetGuild = IsGuildBankBag(targetBag)
+
+	if sourceGuild then
+		QueryGuildBankTab(sourceBag - 50)
+	end
+	if targetGuild then
+		QueryGuildBankTab(targetBag - 50)
+	end
+
+	return true, sourceItemID, source, targetItemID, target, sourceGuild or targetGuild
+end
+
+function B:DoMoves()
+	if InCombatLockdown() then
+		return B:StopStacking(L["Confused.. Try Again!"])
+	end
+
+	local cursorType, cursorItemID = GetCursorInfo()
+	if cursorType == "item" and cursorItemID then
+		if lastItemID ~= cursorItemID then
+			return B:StopStacking(L["Confused.. Try Again!"])
+		end
+
+		if moveRetries < 100 then
+			local targetBag, targetSlot = self:Decode_BagSlot(lastDestination)
+			local _, _, targetLocked = self:GetItemInfo(targetBag, targetSlot)
+			if not targetLocked then
+				self:PickupItem(targetBag, targetSlot)
+				WAIT_TIME = 0.1
+				lockStop = GetTime()
+				moveRetries = moveRetries + 1
+				return
+			end
+		end
+	end
+
+	if lockStop then
+		for slot, itemID in pairs(moveTracker) do
+			local actualItemID = self:GetItemID(self:Decode_BagSlot(slot))
+			if(actualItemID ~= itemID) then
+				WAIT_TIME = 0.1
+				if (GetTime() - lockStop) > MAX_MOVE_TIME then
+					if lastMove and moveRetries < 100 then
+						local success, moveID, moveSource, targetID, moveTarget, wasGuild = self:DoMove(lastMove)
+						WAIT_TIME = wasGuild and 0.5 or 0.1
+
+						if not success then
+							lockStop = GetTime()
+							moveRetries = moveRetries + 1
+							return
+						end
+
+						moveTracker[moveSource] = targetID
+						moveTracker[moveTarget] = moveID
+						lastDestination = moveTarget
+						--lastMove = moves[i]
+						lastItemID = moveID
+						--tremove(moves, i)
+						return
+					end
+
+					B:StopStacking()
+					return
+				end
+				return --give processing time to happen
+			end
+			moveTracker[slot] = nil
+		end
+	end
+
+	lastItemID, lockStop, lastDestination, lastMove = nil, nil, nil, nil
+	twipe(moveTracker)
+
+	local success, moveID, targetID, moveSource, moveTarget, wasGuild
+	if #moves > 0 then
+		for i = #moves, 1, -1 do
+			success, moveID, moveSource, targetID, moveTarget, wasGuild = B:DoMove(moves[i])
+			if not success then
+				WAIT_TIME = wasGuild and 0.3 or 0.1
+				lockStop = GetTime()
+				return
+			end
+			moveTracker[moveSource] = targetID
+			moveTracker[moveTarget] = moveID
+			lastDestination = moveTarget
+			lastMove = moves[i]
+			lastItemID = moveID
+			tremove(moves, i)
+
+			if moves[i-1] then
+				WAIT_TIME = wasGuild and 0.3 or 0
+				return
+			end
+		end
+	end
+	B:StopStacking()
+end
+
+function B:GetGroup(id)
+	if match(id, "^[-%d,]+$") then
+		local bags = {}
+		for b in gmatch(id, "-?%d+") do
+			tinsert(bags, tonumber(b))
+		end
+		return bags
+	end
+	return coreGroups[id]
+end
+
+function B:CommandDecorator(func, groupsDefaults)
+	local bagGroups = {}
+
+	return function(groups)
+		if self.SortUpdateTimer:IsShown() then
+			E:Print(L["Already Running.. Bailing Out!"])
+			B:StopStacking()
+			return
+		end
+
+		twipe(bagGroups)
+		if not groups or #groups == 0 then
+			groups = groupsDefaults
+		end
+		for bags in (groups or ""):gmatch("[^%s]+") do
+			if bags == "guild" then
+				bags = B:GetGroup(bags)
+				if bags then
+					tinsert(bagGroups, {bags[GetCurrentGuildBankTab()]})
+				end
+			else
+				bags = B:GetGroup(bags)
+				if bags then
+					tinsert(bagGroups, bags)
+				end
+			end
+		end
+
+		B:ScanBags()
+		if func(unpack(bagGroups)) == false then
+			return
+		end
+		twipe(bagGroups)
+		B:StartStacking()
+	end
+end

2/3/4/5/6/7/ElvUI/Modules/Load_Modules.xml

@@ -7,6 +7,7 @@
 	<Include file="Maps\Load_Maps.xml"/>
 	<Include file="Misc\Load_Misc.xml"/>
 	<Include file="Chat\Load_Chat.xml"/>
+	<Include file="Bags\Load_Bags.xml"/>
 	<Include file="Skins\Load_Skins.xml"/>
 	<Include file="DataBars\Load_DataBars.xml"/>
 </Ui>

2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua

@@ -167,6 +167,14 @@ function TT:SetUnit(tt, unit)
 	self:UPDATE_MOUSEOVER_UNIT(nil, unit)
 end
 
+function TT:SetItemRef(link)
+	if string.find(link, "^item:") then
+		local id = tonumber(string.match(link, "(%d+)"))
+		ItemRefTooltip:AddLine(string.format("|cFFCA3C3C%s|r %d", ID, id))
+		ItemRefTooltip:Show()
+	end
+end
+
 function TT:CheckBackdropColor()
 	if not GameTooltip:IsShown() then return end
 
@@ -239,6 +247,7 @@ function TT:Initialize()
 	self:SetTooltipFonts()
 
 	self:SecureHook("GameTooltip_SetDefaultAnchor")
+	self:SecureHook("SetItemRef")
 	self:SecureHook(GameTooltip, "SetUnit")
 	self:RegisterEvent("UPDATE_MOUSEOVER_UNIT")
 end

2/3/4/5/6/7/ElvUI/Settings/Private.lua

@@ -14,6 +14,11 @@ V["general"] = {
 	},
 }
 
+V["bags"] = {
+	["enable"] = true,
+	["bagBar"] = false,
+}
+
 V["auras"] = {
 	["enable"] = true,
 	["disableBlizzard"] = true,

2/3/4/5/6/7/ElvUI/Settings/Profile.lua

@@ -276,6 +276,39 @@ P["tooltip"] = {
 	}
 }
 
+P["bags"] = {
+	["sortInverted"] = true,
+	["bagSize"] = 34,
+	["bankSize"] = 34,
+	["bagWidth"] = 406,
+	["bankWidth"] = 406,
+	["currencyFormat"] = "ICON_TEXT",
+	["moneyFormat"] = "SMART",
+	["moneyCoins"] = true,
+	["ignoredItems"] = {},
+	["itemLevel"] = true,
+	["itemLevelThreshold"] = 1,
+	["itemLevelFont"] = "Homespun",
+	["itemLevelFontSize"] = 10,
+	["itemLevelFontOutline"] = "MONOCHROMEOUTLINE",
+	["countFont"] = "Homespun",
+	["countFontSize"] = 10,
+	["countFontOutline"] = "MONOCHROMEOUTLINE",
+	["countFontColor"] = {r = 1, g = 1, b = 1},
+	["clearSearchOnClose"] = false,
+	["disableBagSort"] = false,
+	["disableBankSort"] = false,
+	["bagBar"] = {
+		["growthDirection"] = "VERTICAL",
+		["sortDirection"] = "ASCENDING",
+		["size"] = 30,
+		["spacing"] = 4,
+		["backdropSpacing"] = 4,
+		["showBackdrop"] = false,
+		["mouseover"] = false
+	}
+};
+
 --UnitFrame
 P["unitframe"] = {
 	["smoothbars"] = false,