Fix 11.1.5 error, update TOC

Fixes #15

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
 
       # we first have to clone the AddOn project, this is a required step
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # gets git history for changelogs
 
@@ -56,3 +56,9 @@ jobs:
         uses: BigWigsMods/packager@v2
         with:
           args: -g wrath -w 0
+
+      - name: Package and release for Cataclysm
+        uses: BigWigsMods/packager@v2
+        with:
+          args: -g cata -w 0
+  

Breakables.lua

@@ -34,6 +34,25 @@ if C_Container then
 	end
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
+		local info = C_Spell.GetSpellInfo(id)
+		if info then
+			return info.name, nil, info.iconID
+		end
+	end
+end
+
+local IsUsableSpell = IsUsableSpell
+if not IsUsableSpell and C_Spell and C_Spell.IsSpellUsable then
+	IsUsableSpell = C_Spell.IsSpellUsable
+end
+
 local EQUIPPED_LAST = EQUIPPED_LAST
 if not EQUIPPED_LAST then
 	EQUIPPED_LAST = INVSLOT_LAST_EQUIPPED
@@ -43,14 +62,17 @@ local WowVer = select(4, GetBuildInfo())
 local IsClassic = false
 local IsClassicBC = false
 local IsClassicWrath = false
+local IsClassicCataclysm = false
 if GetClassicExpansionLevel then
 	IsClassic = GetClassicExpansionLevel() == 0
 	IsClassicBC = GetClassicExpansionLevel() == 1
 	IsClassicWrath = GetClassicExpansionLevel() == 2
+	IsClassicCataclysm = GetClassicExpansionLevel() == 3
 else
 	IsClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
 	IsClassicBC = false
 	IsClassicWrath = false
+	IsClassicCataclysm = false
 	if WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
 		if not LE_EXPANSION_LEVEL_CURRENT or LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_BURNING_CRUSADE then
 			IsClassicBC = true
@@ -59,6 +81,8 @@ else
 		end
 	elseif WOW_PROJECT_WRATH_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC then
 		IsClassicWrath = true
+	elseif WOW_PROJECT_CATACLYSM_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC then
+		IsClassicCataclysm = true
 	end
 end
 
@@ -503,7 +527,11 @@ function Breakables:OnDisable()
 end
 
 function Breakables:OnSlashCommand(input)
-	InterfaceOptionsFrame_OpenToCategory(self.optionsFrame)
+	if InterfaceOptionsFrame_OpenToCategory then
+		InterfaceOptionsFrame_OpenToCategory(self.optionsFrame)
+	else
+		Settings.OpenToCategory("Breakables")
+	end
 end
 
 function Breakables:OnItemReceived(event, bag)
@@ -1120,11 +1148,32 @@ function Breakables:OnMouseUp(frame)
 	self.settings.buttonFrameTop[frameNum] = frame:GetTop()
 end
 
-local function IgnoreFunc(self, button, isDown)
-	if button == "RightButton" and isDown and not InCombatLockdown() then
-		Breakables.settings.ignoreList[self.itemId] = true
+StaticPopupDialogs["BREAKABLES_CONFIRM_IGNORE"] = {
+	text = L["This will add the chosen item to the ignore list so it no longer appears as breakable. Items can be removed from the ignore list in the Breakables settings.\n\nWould you like to ignore this item?"],
+	button1 = YES,
+	OnShow = function(self)
+		self:SetFrameStrata("TOOLTIP")
+	end,
+	OnHide = function(self)
+		self:SetFrameStrata("DIALOG")
+	end,
+	OnAccept = function(self, data)
+		Breakables.settings.ignoreList[data] = true
 		Breakables:FindBreakables()
 		LibStub("AceConfigRegistry-3.0"):NotifyChange("Breakables")
+	end,
+	button2 = NO,
+	timeout = 0,
+	whileDead = 1,
+	hideOnEscape = 0
+}
+
+local function IgnoreFunc(self, button, isDown)
+	if button == "RightButton" and isDown and not InCombatLockdown() then
+		local dlg = StaticPopup_Show("BREAKABLES_CONFIRM_IGNORE")
+		if dlg then
+			dlg.data = self.itemId
+		end
 	end
 end
 
@@ -1464,9 +1513,11 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
 		local tooltipData
 		if C_TooltipInfo then
 			tooltipData = C_TooltipInfo.GetBagItem(bagId, slotId)
-			TooltipUtil.SurfaceArgs(tooltipData)
-			for _, line in ipairs(tooltipData.lines) do
-				TooltipUtil.SurfaceArgs(line)
+			if TooltipUtil and TooltipUtil.SurfaceArgs then
+				TooltipUtil.SurfaceArgs(tooltipData)
+				for _, line in ipairs(tooltipData.lines) do
+					TooltipUtil.SurfaceArgs(line)
+				end
 			end
 		else
 			self.myTooltip:SetBagItem(bagId, slotId)
@@ -1567,9 +1618,13 @@ function Breakables:PlayerHasSkillToPickItem(bagId, slotId)
 		return true
 	end
 
-	TooltipUtil.SurfaceArgs(tooltipData)
+	if TooltipUtil and TooltipUtil.SurfaceArgs then
+		TooltipUtil.SurfaceArgs(tooltipData)
+	end
 	for _, line in ipairs(tooltipData.lines) do
-		TooltipUtil.SurfaceArgs(line)
+		if TooltipUtil and TooltipUtil.SurfaceArgs then
+			TooltipUtil.SurfaceArgs(line)
+		end
 		if line.leftText == LOCKED then
 			return not (line.leftColor and line.leftColor.r == 1 and line.leftColor.g < 0.2 and line.leftColor.b < 0.2)
 		end
@@ -1650,7 +1705,12 @@ function Breakables:IsInEquipmentSet(itemId)
 end
 
 function Breakables:GetItemIdFromLink(itemLink)
-	local _, foundItemId = strsplit(":", itemLink)
+	local _, num1, num2 = strsplit(":", itemLink)
+	local foundItemId = num1
+	-- support new item link format that adds a new : section in front
+	if not tonumber(foundItemId) then
+		foundItemId = num2
+	end
 	return tonumber(foundItemId)
 end
 
@@ -1675,7 +1735,7 @@ function Breakables:SortBreakables(foundBreakables)
 		local iId = self:GetItemIdFromLink(foundBreakables[i][IDX_LINK])
 		for j=i,#foundBreakables do
 			local jId = self:GetItemIdFromLink(foundBreakables[j][IDX_LINK])
-			if iId < jId then
+			if iId > jId then
 				local temp = foundBreakables[i]
 				foundBreakables[i] = foundBreakables[j]
 				foundBreakables[j] = temp

Breakables.toc

@@ -1,8 +1,9 @@
-## Interface: 100105
-## Interface-Retail: 100105
-## Interface-Classic: 11403
+## Interface: 110105
+## Interface-Retail: 110105
+## Interface-Classic: 11507
 ## Interface-BCC: 20504
-## Interface-Wrath: 30402
+## Interface-Wrath: 30403
+## Interface-Cata: 40402
 ## Author: Parnic
 ## Name: Breakables
 ## Title: Breakables |cff7fff7f-Ace3-|r
@@ -19,6 +20,17 @@
 ## X-Curse-Project-ID: 16629
 ## X-WoWI-ID: 17929
 ## X-Wago-ID: rkGrlA6y
+## Category-enUS: Professions
+## Category-deDE: Berufe
+## Category-esES: Profesiones
+## Category-esMX: Profesiones
+## Category-frFR: Métiers
+## Category-itIT: Professioni
+## Category-koKR: 전문 기술
+## Category-ptBR: Profissões
+## Category-ruRU: Профессии
+## Category-zhCN: 专业
+## Category-zhTW: 專業技能
 
 #@no-lib-strip@
 embeds.xml

changelog.txt

@@ -1,3 +1,80 @@
+v1.10.8:
+
+- Support WoW 11.1.5 (fixes #15)
+- Update TOC
+
+v1.10.7:
+
+- Update TOCs
+
+v1.10.6:
+
+- Update TOCs
+
+v1.10.5:
+
+- Update TOCs
+
+v1.10.4:
+
+- Update Cataclysm Classic TOC to 4.4.1
+- Update Classic-era TOC for 1.15.4
+- Update TWW TOC for 11.0.5
+
+v1.10.3:
+
+- Fix another error from 11.0.2
+
+v1.10.2:
+
+- Fix error from 11.0.2
+
+v1.10.1:
+
+- Update Classic-era TOC for 1.15.3
+- Update TOC for TWW
+
+v1.10.0:
+
+- Support The War Within/11.0
+
+v1.9.26:
+
+- Update Dragonflight TOC for 10.2.7
+
+v1.9.25:
+
+- Support Cataclysm Classic 4.4.0
+
+v1.9.24:
+
+- Update TOCs
+
+v1.9.23:
+
+- Update Dragonflight TOC for 10.2.5
+
+v1.9.22:
+
+- Update Classic-era TOC for 1.15.0
+
+v1.9.21:
+
+- Update Dragonflight TOC for 10.2.0
+
+v1.9.20:
+
+- Update Wrath-Classic TOC for 3.4.3
+
+v1.9.19:
+
+- Update Dragonflight TOC for 10.1.7
+- Update Classic-era TOC for 1.14.4
+
+v1.9.18:
+
+- Added a confirmation dialog when ignoring breakables, and updated the description to mention the ignore feature.
+
 v1.9.17:
 
 - Update Dragonflight TOC for 10.1.5

loc/enUS.lua

@@ -9,7 +9,7 @@ local L = LibStub("AceLocale-3.0"):NewLocale("Breakables", "enUS", true, debug)
 --@debug@
 L["Welcome"] = [[Thanks for using |cff33ff99Breakables|r! Use |cffffff78/brk|r to open this menu or |cffffff78/breakables|r to access the same options on the command line.
 
-Hold shift and drag the profession button to move the breakables bar around. You can also click directly on any breakable item button to break it without having to click the profession button first.
+Hold shift and drag the profession button to move the breakables bar around. You can also click directly on any breakable item button to break it without having to click the profession button first. Right-clicking a breakable button will add that item to the ignore list so it won't show up again. The ignore list can be managed from the configuration panel.
 
 If you have any feature requests or problems, please email |cff33ff99breakables@parnic.com|r or visit the |cffffff78curse.com|r or |cffffff78wowinterface.com|r page and leave a comment.]]
 --@end-debug@

readme.md

@@ -1,12 +1,14 @@
-### **Description**
+# Breakables
+
+## **Description**
 
 Displays a bar on screen that allows quick access to enchanting, jewelcrafting, and inscription professions by presenting a Disenchant/Prospect/Mill button and all of the breakable items you have for that profession next to it. Also displays a bar for any locked junkboxes in your inventory if you're a Rogue. This allows one-click access for breaking down items instead of finding the item in your bag, clicking the appropriate profession/skill button, and clicking the item for each and every item you want to break. For prospecting and milling, you will see the number of items you have alongside the number of times you can break it. In the prospecting screenshot on the right, the player has 169 total Saronite Ore in his bags which will allow for 33 total prospects.
 
-### **Usage**
+## **Usage**
 
-By default, if you have the appropriate profession and items in your inventory, a bar will appear with the profession ability followed by any items that are eligible for breaking. You can hold shift to drag the bar around if you want to move it. Clicking the profession button will activate that ability (disenchant/prospect/mill) and clicking an item will break it. You don't have to click the profession button first as simply clicking the item will automatically break it down.
+By default, if you have the appropriate profession and items in your inventory, a bar will appear with the profession ability followed by any items that are eligible for breaking. You can hold shift to drag the bar around if you want to move it. Clicking the profession button will activate that ability (disenchant/prospect/mill) and clicking an item will break it. You don't have to click the profession button first as simply clicking the item will automatically break it down. Right-clicking an item will place that item on the ignore list so it won't show up in the list again. The ignore list can be managed in the addon's configuration panel.
 
-### **Configuration**
+## **Configuration**
 
 Typing */brk* will open the configuration settings (or you can get to it from Blizzard's Interface options) which consist of:
 
@@ -14,6 +16,6 @@ Typing */brk* will open the configuration settings (or you can get to it from Bl
 * **Max number to display**: this controls the highest number of items that you will see next to your profession button. If this is 5 but you have 10 breakable items in your bags, you will only see 5 at a time.
 * **Show soulbound items**: aimed at enchanters, this controls whether or not you will see items that are soulbound as breakable items or not.
 
-### **Known issues**
+## **Known issues**
 
 * If you have more than 5 of a breakable item but split into stacks all smaller than 5, the game will say you do not have enough items to break. The default UI now has a built-in button to compress stacks that should solve this issue.