Bump TOC for 1.15.7

Refatoring and removed deprecations

Author: Ketho

.vscode/settings.json

@@ -25,7 +25,8 @@
 		"SetTooltipMoney",
 		"WOW_PROJECT_WRATH_CLASSIC",
 		"WOW_PROJECT_ID",
-		"WOW_PROJECT_CLASSIC"
+		"WOW_PROJECT_CLASSIC",
+		"WOW_PROJECT_MISTS_CLASSIC"
 	],
 	"Lua.runtime.version": "Lua 5.1",
 	"Lua.runtime.builtin": {
@@ -40,6 +41,6 @@
 		"utf8": "disable"
 	},
 	"Lua.workspace.library": [
-		"~\\.vscode\\extensions\\ketho.wow-api-0.17.6\\Annotations"
+		"~\\.vscode\\extensions\\ketho.wow-api-0.20.8\\Annotations\\Core"
 	]
 }

Compat.lua

@@ -1,21 +1,13 @@
 local VP = VendorPrice
 
-if not VP.isVanilla and not VP.isCata and not VP.isMop then
+if VP.isRetail then
 	return
 end
 
 local function SetPrice(tt, count, item)
 	VP:SetPrice(tt, false, "Compat", count, item, true)
 end
 
-local function GetMouseFoc()
-	if GetMouseFoci then
-		return GetMouseFoci()[1]
-	elseif GetMouseFocus then
-		return GetMouseFocus()
-	end
-end
-
 function VP:IsShown(frame)
 	return frame and frame:IsVisible() and frame:IsMouseOver()
 end
@@ -61,7 +53,7 @@ GameTooltip:HookScript("OnTooltipSetItem", function(tt)
 	elseif AtlasLoot and VP:IsShown(_G["AtlasLoot_GUI-Frame"]) then
 		SetPrice(tt)
 	else -- Chatter, Prat: check for active chat windows
-		local mouseFocus = GetMouseFoc()
+		local mouseFocus = GetMouseFoci()[1]
 		if mouseFocus and mouseFocus:GetObjectType() == "FontString" then
 			for i = 1, FCF_GetNumActiveChatFrames() do
 				if _G["ChatFrame"..i]:IsMouseOver() then

VendorPrice.lua

@@ -1,26 +1,25 @@
 VendorPrice = {}
 local VP = VendorPrice
 
+VP.isRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 VP.isVanilla = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
-VP.isCata = WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC
 VP.isMop = WOW_PROJECT_ID == WOW_PROJECT_MISTS_CLASSIC
 
-if not VP.isVanilla and not VP.isCata and not VP.isMop then
+if VP.isRetail then
 	return
 end
 
-local GetItemInfo = GetItemInfo or C_Item.GetItemInfo
-
 local SELL_PRICE_TEXT = format("%s:", SELL_PRICE)
 local overridePrice
 
 local CharacterBags = {}
--- CONTAINER_BAG_OFFSET is 19 on classic and 30 on retail
--- but classic uses slot 31 to 34 for bags
+
+-- on vanilla and mists invslotid 31 to 34
 for i = 31, 34 do
 	CharacterBags[i] = true
 end
 
+-- on vanilla invslotid 88-93, on mists 88-94
 local firstBankBag = C_Container.ContainerIDToInventoryID(NUM_BAG_SLOTS + 1)
 local lastBankBag = C_Container.ContainerIDToInventoryID(NUM_BAG_SLOTS + NUM_BANKBAGSLOTS)
 for i = firstBankBag, lastBankBag do
@@ -66,19 +65,19 @@ GameTooltip:HookScript("OnHide", function()
 	overridePrice = nil
 end)
 
-function VP:SetPrice(tt, hasCataTooltip, source, count, item, isOnTooltipSetItem)
+function VP:SetPrice(tt, hasMopTooltip, source, count, item, isOnTooltipSetItem)
 	if ShouldShowPrice(tt, source) then
 		count = count or 1
 		item = item or select(2, tt:GetItem())
 		if item then
-			local sellPrice, classID = select(11, GetItemInfo(item))
+			local sellPrice, classID = select(11, C_Item.GetItemInfo(item))
 			if sellPrice and sellPrice > 0 and not CheckRecipe(tt, classID, isOnTooltipSetItem) then
 				local isShift = IsShiftKeyDown() and count > 1
 				local displayPrice = isShift and sellPrice or sellPrice * count
 				if self.isVanilla then
 					SetTooltipMoney(tt, displayPrice, nil, SELL_PRICE_TEXT)
-				elseif self.isCata or self.isMop then
-					if hasCataTooltip then
+				elseif self.isMop then
+					if hasMopTooltip then
 						if isShift then
 							overridePrice = displayPrice
 						end
@@ -199,7 +198,7 @@ end
 ItemRefTooltip:HookScript("OnTooltipSetItem", function(tt)
 	local item = select(2, tt:GetItem())
 	if item then
-		local sellPrice, classID = select(11, GetItemInfo(item))
+		local sellPrice, classID = select(11, C_Item.GetItemInfo(item))
 		if sellPrice and sellPrice > 0 and not CheckRecipe(tt, classID, true) then
 			SetTooltipMoney(tt, sellPrice, nil, SELL_PRICE_TEXT)
 		end

VendorPrice.toc

@@ -1,4 +1,4 @@
-## Interface: 11504, 40400, 50500
+## Interface: 11507, 50500
 ## Version: @project-version@
 ## Title: Vendor Price
 ## Notes: Displays the price of an item when not at a vendor