Update TOCs

This causes all items to display as disenchantable whether you have the skill for it or not. I have not yet found the correct way to access the player's Enchanting profession level to check against item level for disenchant validity.

.github/workflows/release.yml

@@ -0,0 +1,50 @@
+# description of this workflow, can be anything you want
+name: Package and release
+
+# we need to let GitHub know _when_ we want to release, typically only when we create a new tag.
+# this will target only tags, and not all pushes to the master branch.
+# this part can be heavily customized to your liking, like targeting only tags that match a certain word,
+# other branches or even pullrequests.
+on:
+  push:
+    tags:
+      - '**'
+
+# a workflow is built up as jobs, and within these jobs are steps
+jobs:
+
+  # "release" is a job, you can name it anything you want
+  release:
+
+    # we can run our steps on pretty much anything, but the "ubuntu-latest" image is a safe bet
+    runs-on: ubuntu-latest
+
+    # specify the environment variables used by the packager, matching the secrets from the project on GitHub
+    env:
+      CF_API_KEY: ${{ secrets.CF_API_KEY }}
+      WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
+      GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}  # "GITHUB_TOKEN" is a secret always provided to the workflow
+                                                 # for your own token, the name cannot start with "GITHUB_"
+
+    # "steps" holds a list of all the steps needed to package and release our AddOn
+    steps:
+
+      # we first have to clone the AddOn project, this is a required step
+      - name: Clone project
+        uses: actions/checkout@v1
+
+      # once cloned, we just run the GitHub Action for the packager project
+      - name: Package and release
+        uses: BigWigsMods/packager@master
+
+      # another example where we supply additional arguments, this example is specifically to release
+      # for the Classic version of the game
+      - name: Package and release for Classic
+        uses: BigWigsMods/packager@master
+        with:
+          args: -g classic -w 0
+
+      - name: Package and release for TBC
+        uses: BigWigsMods/packager@master
+        with:
+          args: -g bcc -w 0

.mailmap

@@ -1,3 +1,4 @@
 parnic <parnic@parnic.com> Parnic <chris@parnic.com>
+parnic <parnic@parnic.com> Parnic <parnic@parnic.com>
 parnic <parnic@parnic.com> Chris Pickett <cpickett@perniciousgames.com>
 parnic <parnic@parnic.com> root <root@parnic.com>

.pkgmeta

@@ -39,3 +39,5 @@ ignore:
     - readme.md
 
 manual-changelog: changelog.txt
+
+enable-nolib-creation: yes

Breakables.lua

@@ -5,6 +5,17 @@ local LBF = LibStub("Masque", true)
 
 local lbfGroup
 
+local IsArtifactRelicItem = IsArtifactRelicItem
+if not IsArtifactRelicItem then
+	IsArtifactRelicItem = function()
+		return false
+	end
+end
+
+local WowVer = select(4, GetBuildInfo())
+local IsClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
+local IsClassicBC = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
+
 local MillingId = 51005
 local MillingItemSubType = babbleInv["Herb"]
 local MillingItemSecondarySubType = babbleInv["Other"]
@@ -26,12 +37,44 @@ local AdditionalMillableItems = {
 	124105,
 	124106,
 	128304,
+	151565,
+	-- BfA herbs
+	152505,
+	152506,
+	152507,
+	152508,
+	152509,
+	152510,
+	152511,
+	168487,
+	-- Shadowlands herbs
+	168586, -- rising glory
+	168589, -- marrowroot
+	170554, -- vigil's torch
+	168583, -- widowbloom
+	169701, -- death blossom
+	171315, -- nightshade
+	187699, -- first flower, 9.2.0
 }
 
 local AdditionalProspectableItems = {
 	-- Legion ore
 	123918,
 	123919,
+	151564,
+	-- BfA ore
+	152512,
+	152513,
+	152579,
+	168185,
+	-- Shadowlands ore
+	171828, -- laestrite
+	171833, -- elethium
+	171829, -- solenium
+	171830, -- oxxein
+	171831, -- phaedrum
+	171832, -- sinvyr
+	187700, -- progenium ore, 9.2.0
 }
 
 local MassMilling = {
@@ -50,6 +93,15 @@ local MassMilling = {
 	[124105] = 209662,
 	[124106] = 209664,
 	[128304] = 210116,
+	[151565] = 247861,
+	-- shadowlands
+	[168586] = 311417,
+	[168589] = 311416,
+	[170554] = 311414,
+	[168583] = 311415,
+	[169701] = 311413,
+	[171315] = 311418,
+	[187699] = 359490,
 }
 
 local HerbCombineItems = {
@@ -67,6 +119,13 @@ local HerbCombineItems = {
 	109627, -- starflower petal
 	109628, -- nagrand arrowbloom petal
 	109629, -- talador orchid petal
+	-- shadowlands
+	169550, -- rising glory petal
+	168591, -- marrowroot petal
+	169699, -- vigil's torch petal
+	169698, -- widowbloom petal
+	169700, -- death blossom petal
+	169697, -- nightshade petal
 }
 
 local UnProspectableItems = {
@@ -81,6 +140,7 @@ local OreCombineItems = {
 	-- MoP
 	97512, -- ghost iron nugget
 	97546, -- kyparite fragment
+	90407, -- sparkling shard
 	-- WoD
 	109991, -- true iron nugget
 	109992, -- blackrock fragment
@@ -91,6 +151,10 @@ local DisenchantTypes = {babbleInv["Armor"], babbleInv["Weapon"]}
 local CanDisenchant = false
 local EnchantingProfessionId = 333
 
+local AdditionalDisenchantableItems = {
+	137195, -- highmountain armor
+}
+
 local PickLockId = 1804
 local PickableItems = {
 	16882, -- battered junkbox
@@ -118,6 +182,14 @@ local PickableItems = {
 	68729, -- elementium lockbox
 	88567, -- ghost iron lockbox
 	116920, -- true steel lockbox
+	121331, -- leystone lockbox
+	169475, -- barnacled lockbox
+	-- shadowlands
+	179311, -- venthyr
+	180532, -- maldraxxi
+	180533, -- kyrian
+	180522, -- night fae
+	186161, -- stygian lockbox, 9.1.0
 }
 local CanPickLock = false
 
@@ -177,9 +249,13 @@ function Breakables:OnInitialize()
 			hideEqManagerItems = true,
 			hide = false,
 			hideInCombat = false,
+			hideInPetBattle = true,
 			buttonScale = 1,
 			fontSize = 11,
 			growDirection = 2,
+			ignoreList = {},
+			showTooltipForBreakables = true,
+			showTooltipForProfession = true,
 		}
 	}
 	self.db = LibStub("AceDB-3.0"):New("BreakablesDB", self.defaults, true)
@@ -312,13 +388,18 @@ function Breakables:RegisterEvents()
 
 	self:RegisterEvent("MODIFIER_STATE_CHANGED", "FindBreakables")
 
-	if CanDisenchant then
+	if CanDisenchant and WowVer < 80000 then
 		self:RegisterEvent("TRADE_SKILL_UPDATE", "OnTradeSkillUpdate")
 	end
 
 	if CanPickLock then
 		self:RegisterEvent("CHAT_MSG_OPENING", "OnBagItemLockPicked")
 	end
+
+	if UnitCanPetBattle then
+		self:RegisterEvent("PET_BATTLE_OPENING_START", "PetBattleStarted")
+		self:RegisterEvent("PET_BATTLE_OVER", "PetBattleEnded")
+	end
 end
 
 function Breakables:OnModifierChanged()
@@ -384,7 +465,17 @@ function Breakables:OnTradeSkillUpdate()
 end
 
 function Breakables:OnBagItemLockPicked()
-	nextCheck[1] = GetTime() + BagUpdateCheckDelay
+	self:FindBreakables()
+end
+
+function Breakables:PetBattleStarted()
+	if self.settings.hideInPetBattle then
+		self:ToggleButtonFrameVisibility(false)
+	end
+end
+
+function Breakables:PetBattleEnded()
+	self:ToggleButtonFrameVisibility(true)
 end
 
 function Breakables:FindLevelOfProfessionIndex(idx)
@@ -395,19 +486,44 @@ function Breakables:FindLevelOfProfessionIndex(idx)
 end
 
 function Breakables:GetEnchantingLevel()
-	local prof1, prof2 = GetProfessions()
+	if GetProfessions then
+		local prof1, prof2 = GetProfessions()
 
-	local skillId, rank = self:FindLevelOfProfessionIndex(prof1)
-	if skillId ~= nil and skillId == EnchantingProfessionId then
-		self.EnchantingLevel = rank
-	else
-		skillId, rank = self:FindLevelOfProfessionIndex(prof2)
+		local skillId, rank = self:FindLevelOfProfessionIndex(prof1)
 		if skillId ~= nil and skillId == EnchantingProfessionId then
 			self.EnchantingLevel = rank
+		else
+			skillId, rank = self:FindLevelOfProfessionIndex(prof2)
+			if skillId ~= nil and skillId == EnchantingProfessionId then
+				self.EnchantingLevel = rank
+			end
 		end
 	end
 end
 
+local function GetIgnoreListOptions()
+	local ret = {}
+
+	for k,v in pairs(Breakables.settings.ignoreList) do
+		local name, _, _, _, _, _, _, _, _, texture = GetItemInfo(k)
+		if texture ~= nil and name ~= nil then
+			ret[k] = ("|T%s:0|t %s"):format(texture, name)
+		end
+	end
+
+	return ret
+end
+
+local function IsIgnoringAnything()
+	for k,v in pairs(Breakables.settings.ignoreList) do
+		if v ~= nil then
+			return true
+		end
+	end
+
+	return false
+end
+
 function Breakables:GetOptions()
 	local opts = {
 		name = L["Breakables"],
@@ -541,6 +657,69 @@ function Breakables:GetOptions()
 				end,
 				order = 7,
 			},
+			showTooltipForBreakables = {
+				type = "toggle",
+				name = L["Show tooltip on breakables"],
+				desc = L["Whether or not to show an item tooltip when hovering over a breakable item button."],
+				get = function(info)
+					return self.settings.showTooltipForBreakables
+				end,
+				set = function(info, v)
+					self.settings.showTooltipForBreakables = v
+					if info.uiType == "cmd" then
+						print("|cff33ff99Breakables|r: set |cffffff78showTooltipForBreakables|r to " .. tostring(self.settings.showTooltipForBreakables))
+					end
+				end,
+				order = 8,
+			},
+			showTooltipForProfession = {
+				type = "toggle",
+				name = L["Show tooltip on profession"],
+				desc = L["Whether or not to show an item tooltip when hovering over a profession button on the Breakables bar."],
+				get = function(info)
+					return self.settings.showTooltipForProfession
+				end,
+				set = function(info, v)
+					self.settings.showTooltipForProfession = v
+					if info.uiType == "cmd" then
+						print("|cff33ff99Breakables|r: set |cffffff78showTooltipForProfession|r to " .. tostring(self.settings.showTooltipForProfession))
+					end
+				end,
+				order = 9,
+			},
+			ignoreList = {
+				type = 'multiselect',
+				name = L["Ignore list"],
+				desc = L["Items that have been right-clicked to exclude from the breakable list. Un-check the box to remove the item from the ignore list."],
+				get = function(info, key)
+					return true
+				end,
+				set = function(info, key)
+					Breakables.settings.ignoreList[key] = nil
+					Breakables:FindBreakables()
+				end,
+				confirm = function()
+					return L["Are you sure you want to remove this item from the ignore list?"]
+				end,
+				values = GetIgnoreListOptions,
+				hidden = function() return not IsIgnoringAnything() end,
+				order = 30,
+			},
+			clearIgnoreList = {
+				type = 'execute',
+				func = function()
+					for k,v in pairs(Breakables.settings.ignoreList) do
+						Breakables.settings.ignoreList[k] = nil
+					end
+					Breakables:FindBreakables()
+				end,
+				name = L["Clear ignore list"],
+				confirm = function()
+					return L["Are you sure you want to clear the ignore list?"]
+				end,
+				hidden = function() return not IsIgnoringAnything() end,
+				order = 31,
+			},
 		},
 	}
 
@@ -561,40 +740,62 @@ function Breakables:GetOptions()
 			end,
 			order = 20,
 		}
-		opts.args.hideEqManagerItems = {
+		if GetNumEquipmentSets or C_EquipmentSet then
+			opts.args.hideEqManagerItems = {
+				type = "toggle",
+				name = L["Hide Eq. Mgr items"],
+				desc = L["Whether or not to hide items that are part of an equipment set in the game's equipment manager."],
+				get = function(info)
+					return self.settings.hideEqManagerItems
+				end,
+				set = function(info, v)
+					self.settings.hideEqManagerItems = v
+					if info.uiType == "cmd" then
+						print("|cff33ff99Breakables|r: set |cffffff78hideEqManagerItems|r to " .. tostring(self.settings.hideEqManagerItems))
+					end
+					self:FindBreakables()
+				end,
+				hidden = function()
+					return not self.settings.showSoulbound
+				end,
+				order = 21,
+			}
+		end
+		if WowVer >= 80000 then
+			opts.args.hideTabards = {
+				type = "toggle",
+				name = L["Hide Tabards"],
+				desc = L["Whether or not to hide tabards from the disenchantable items list."],
+				get = function(info)
+					return self.settings.hideTabards
+				end,
+				set = function(info, v)
+					self.settings.hideTabards = v
+					if info.uiType == "cmd" then
+						print("|cff33ff99Breakables|r: set |cffffff78hideTabards|r to " .. tostring(self.settings.hideTabards))
+					end
+					self:FindBreakables()
+				end,
+				order = 22,
+			}
+		end
+	end
+
+	if UnitCanPetBattle then
+		opts.args.hideInPetBattle = {
 			type = "toggle",
-			name = L["Hide Eq. Mgr items"],
-			desc = L["Whether or not to hide items that are part of an equipment set in the game's equipment manager."],
+			name = L["Hide during pet battles"],
+			desc = L["Whether or not to hide the breakables bar when you enter a pet battle."],
 			get = function(info)
-				return self.settings.hideEqManagerItems
+				return self.settings.hideInPetBattle
 			end,
 			set = function(info, v)
-				self.settings.hideEqManagerItems = v
+				self.settings.hideInPetBattle = v
 				if info.uiType == "cmd" then
-					print("|cff33ff99Breakables|r: set |cffffff78hideEqManagerItems|r to " .. tostring(self.settings.hideEqManagerItems))
+					print("|cff33ff99Breakables|r: set |cffffff78hideInPetBattle|r to " .. tostring(self.settings.hideInPetBattle))
 				end
-				self:FindBreakables()
 			end,
-			hidden = function()
-				return not self.settings.showSoulbound
-			end,
-			order = 21,
-		}
-		opts.args.hideTabards = {
-			type = "toggle",
-			name = L["Hide Tabards"],
-			desc = L["Whether or not to hide tabards from the disenchantable items list."],
-			get = function(info)
-				return self.settings.hideTabards
-			end,
-			set = function(info, v)
-				self.settings.hideTabards = v
-				if info.uiType == "cmd" then
-					print("|cff33ff99Breakables|r: set |cffffff78hideTabards|r to " .. tostring(self.settings.hideTabards))
-				end
-				self:FindBreakables()
-			end,
-			order = 22,
+			order = 3.5,
 		}
 	end
 
@@ -677,7 +878,7 @@ end
 function Breakables:GetSpellIdFromProfessionButton(itemType, itemId)
 	if itemType == BREAKABLE_HERB and itemId ~= nil then
 		if MassMilling[itemId] ~= nil and IsPlayerSpell(MassMilling[itemId]) then
-			return MassMilling[itemId]
+			--return MassMilling[itemId]
 		end
 	end
 
@@ -727,6 +928,14 @@ function Breakables:OnMouseUp(frame)
 	self.settings.buttonFrameTop[frameNum] = frame:GetTop()
 end
 
+local function IgnoreFunc(self, button)
+	if button == "RightButton" and not InCombatLockdown() then
+		Breakables.settings.ignoreList[self.itemId] = true
+		Breakables:FindBreakables()
+		LibStub("AceConfigRegistry-3.0"):NotifyChange("Breakables")
+	end
+end
+
 function Breakables:FindBreakables(bag)
 	if self.settings.hide then
 		return
@@ -774,7 +983,7 @@ function Breakables:FindBreakables(bag)
 			end
 
 			if (foundBreakables[i][IDX_BREAKABLETYPE] == self.buttonFrame[j].type or (foundBreakables[i][IDX_BREAKABLETYPE] == BREAKABLE_COMBINE and foundBreakables[i][IDX_COUNT] >= 10)) and numBreakableStacks[j] < self.settings.maxBreakablesToShow then
-				local isDisenchantable = self:BreakableIsDisenchantable(foundBreakables[i][IDX_TYPE], foundBreakables[i][IDX_LEVEL], foundBreakables[i][IDX_RARITY])
+				local isDisenchantable = self:BreakableIsDisenchantable(foundBreakables[i][IDX_TYPE], foundBreakables[i][IDX_LEVEL], foundBreakables[i][IDX_RARITY], foundBreakables[i][IDX_LINK])
 				local isLockedItem = foundBreakables[i][IDX_BREAKABLETYPE] == BREAKABLE_PICK
 
 				if (CanDisenchant and isDisenchantable) or (CanPickLock and isLockedItem) or (foundBreakables[i][IDX_COUNT] >= 5) then
@@ -796,7 +1005,7 @@ function Breakables:FindBreakables(bag)
 						btn:EnableMouse(true)
 						btn:RegisterForClicks("AnyUp")
 
-						btn:SetAttribute("type", "spell")
+						btn:SetAttribute("type1", "spell")
 
 						if not btn.text then
 							btn.text = btn:CreateFontString()
@@ -804,11 +1013,15 @@ function Breakables:FindBreakables(bag)
 						end
 						btn.text:SetFont(NumberFont_Outline_Med:GetFont(), self.settings.fontSize, "OUTLINE")
 
+						btn:HookScript("OnClick", IgnoreFunc)
+
 						if lbfGroup then
 							lbfGroup:AddButton(btn)
 						end
 					end
 
+					btn.itemId = self:GetItemIdFromLink(foundBreakables[i][IDX_LINK])
+
 					local attachFrom = "LEFT"
 					local attachTo = "RIGHT"
 					if self.settings.growDirection then
@@ -847,13 +1060,13 @@ function Breakables:FindBreakables(bag)
 						--or (foundBreakables[i][IDX_BREAKABLETYPE] == BREAKABLE_DE and DisenchantId)
 						--or PickLockId)
 					if BreakableAbilityName then
-						btn:SetAttribute("type", "spell")
+						btn:SetAttribute("type1", "spell")
 						btn:SetAttribute("spell", BreakableAbilityName)
 
 						btn:SetAttribute("target-bag", foundBreakables[i][IDX_BAG])
 						btn:SetAttribute("target-slot", foundBreakables[i][IDX_SLOT])
 					else
-						btn:SetAttribute("type", "item")
+						btn:SetAttribute("type1", "item")
 						btn:SetAttribute("item", "item:" .. self:GetItemIdFromLink(foundBreakables[i][IDX_LINK]))
 					end
 
@@ -912,7 +1125,7 @@ end
 
 function Breakables:OnEnterProfessionButton(btn)
 	local spellId = self:GetSpellIdFromProfessionButton(btn.type)
-	if spellId then
+	if spellId and self.settings.showTooltipForProfession then
 		GameTooltip:SetOwner(btn, "ANCHOR_BOTTOMLEFT")
 		GameTooltip:SetSpellByID(spellId)
 
@@ -927,18 +1140,24 @@ function Breakables:OnLeaveProfessionButton()
 end
 
 function Breakables:OnEnterBreakableButton(this)
-	GameTooltip:SetOwner(this, "ANCHOR_BOTTOMLEFT")
-	GameTooltip:SetBagItem(this.bag, this.slot)
+	if self.settings.showTooltipForBreakables then
+		GameTooltip:SetOwner(this, "ANCHOR_BOTTOMLEFT")
+		GameTooltip:SetBagItem(this.bag, this.slot)
 
-	GameTooltip:AddLine(" ")
-	GameTooltip:AddLine(L["You can click on this button to break this item without having to click on the profession button first."], 1, 1, 1, 1)
-	GameTooltip:Show()
-	showingTooltip = this
+		GameTooltip:AddLine(" ")
+		GameTooltip:AddLine(L["You can click on this button to break this item without having to click on the profession button first."], 1, 1, 1, 1)
+		GameTooltip:AddLine(" ")
+		GameTooltip:AddLine(L["You can right-click on this button to ignore this item. Items can be unignored from the options screen."], 1, 1, 1, 1)
+		GameTooltip:Show()
+		showingTooltip = this
+	end
 end
 
 function Breakables:OnLeaveBreakableButton()
-	GameTooltip:Hide()
-	showingTooltip = nil
+	if showingTooltip then
+		GameTooltip:Hide()
+		showingTooltip = nil
+	end
 end
 
 function Breakables:PostClickedBreakableButton(this)
@@ -977,12 +1196,17 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
 	local texture, itemCount, locked, quality, readable = GetContainerItemInfo(bagId, slotId)
 	if texture then
 		local itemLink = GetContainerItemLink(bagId, slotId)
+		local itemId = self:GetItemIdFromLink(itemLink)
+		if self.settings.ignoreList[itemId] then
+			return nil
+		end
+
 		local itemName, _, itemRarity, itemLevel, _, itemType, itemSubType, _, equipSlot, itemTexture, vendorPrice = GetItemInfo(itemLink)
 
 		self.myTooltip:SetBagItem(bagId, slotId)
 
 		if CanDisenchant and itemRarity and itemRarity >= RARITY_UNCOMMON and itemRarity < RARITY_HEIRLOOM
-			and self:BreakableIsDisenchantable(itemType, itemLevel, itemRarity) then
+			and self:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink, itemId) then
 			local i = 1
 			local soulbound = false
 			for i=1,15 do
@@ -997,7 +1221,7 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
 
 			local isInEquipmentSet = false
 			if self.settings.hideEqManagerItems then
-				isInEquipmentSet = self:IsInEquipmentSet(self:GetItemIdFromLink(itemLink))
+				isInEquipmentSet = self:IsInEquipmentSet(itemId)
 			end
 
 			local isTabard = false
@@ -1006,7 +1230,7 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
 			end
 
 			local shouldHideThisItem = (self.settings.hideEqManagerItems and isInEquipmentSet) or (self.settings.hideTabards and isTabard)
-				or equipSlot == nil or equipSlot == ""
+				or equipSlot == nil or (equipSlot == "" and not IsArtifactRelicItem(itemLink))
 
 			if (not soulbound or self.settings.showSoulbound) and not shouldHideThisItem then
 				return {itemLink, itemCount, itemType, itemTexture, bagId, slotId, itemSubType, itemLevel, BREAKABLE_DE, soulbound, itemName, itemRarity}
@@ -1030,7 +1254,6 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
 			end
 		end
 
-		local itemId = self:GetItemIdFromLink(itemLink)
 		if CanMill and not millable then
 			for i=1,#AdditionalMillableItems do
 				if AdditionalMillableItems[i] == itemId then
@@ -1132,13 +1355,26 @@ do
 end
 
 function Breakables:IsInEquipmentSet(itemId)
-	for setIdx=1, GetNumEquipmentSets() do
-		local set = GetEquipmentSetInfo(setIdx)
-		local itemArray = GetEquipmentSetItemIDs(set)
+	if WowVer < 80000 and GetNumEquipmentSets then
+		for setIdx=1, GetNumEquipmentSets() do
+			local set = GetEquipmentSetInfo(setIdx)
+			local itemArray = GetEquipmentSetItemIDs(set)
 
-		for i=1, EQUIPPED_LAST do
-			if itemArray[i] and itemArray[i] == itemId then
-				return true
+			for i=1, EQUIPPED_LAST do
+				if itemArray[i] and itemArray[i] == itemId then
+					return true
+				end
+			end
+		end
+	elseif C_EquipmentSet then
+		local sets = C_EquipmentSet.GetEquipmentSetIDs()
+		for k, v in ipairs(sets) do
+			local itemArray = C_EquipmentSet.GetItemIDs(v)
+
+			for i=1, EQUIPPED_LAST do
+				if itemArray[i] and itemArray[i] == itemId then
+					return true
+				end
 			end
 		end
 	end
@@ -1152,10 +1388,8 @@ function Breakables:GetItemIdFromLink(itemLink)
 end
 
 function Breakables:MergeBreakables(foundBreakable, breakableList)
-	local foundItemId = self:GetItemIdFromLink(foundBreakable[IDX_LINK])
 	for n=1,#breakableList do
-		local listItemId = self:GetItemIdFromLink(breakableList[n][IDX_LINK])
-		if foundItemId == listItemId then
+		if foundBreakable[IDX_LINK] == breakableList[n][IDX_LINK] then
 			-- always prefer the larger stack
 			if foundBreakable[IDX_COUNT] > breakableList[n][IDX_COUNT] then
 				breakableList[n][IDX_BAG] = foundBreakable[IDX_BAG]
@@ -1183,9 +1417,14 @@ function Breakables:SortBreakables(foundBreakables)
 	end
 end
 
-function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity)
+function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink, itemId)
 	for i=1,#DisenchantTypes do
-		if DisenchantTypes[i] == itemType then
+		if DisenchantTypes[i] == itemType or IsArtifactRelicItem(itemLink) then
+			-- temp hack for bfa until disenchant item level scales are identified. and for classic until finding the profession level api
+			if WowVer >= 80000 or IsClassic or IsClassicBC then
+				return true
+			end
+
 			-- account for WoD and higher no longer needing specific ilvl. numbers from http://wow.gamepedia.com/Item_level
 			if (itemRarity == RARITY_UNCOMMON and itemLevel >= 483)
 				or (itemRarity == RARITY_RARE and itemLevel >= 515)
@@ -1281,5 +1520,11 @@ function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity)
 		end
 	end
 
+	for i=1,#AdditionalDisenchantableItems do
+		if AdditionalDisenchantableItems[i] == itemId then
+			return true
+		end
+	end
+
 	return false
 end

Breakables.toc

@@ -1,12 +1,21 @@
-## Interface: 70000
+## Interface: 90205
+## Interface-Retail: 90205
+## Interface-Classic: 11403
+## Interface-BCC: 20504
 ## Author: Parnic
 ## Name: Breakables
 ## Title: Breakables |cff7fff7f-Ace3-|r
 ## Notes: Tracks herbs/ore/items that can be broken into component pieces
-## Version: @project-version@ (Revision: @project-revision@)
+#@debug@
+## Version: development
+#@end-debug@
+#@non-debug@
+# ## Version: @project-version@
+#@end-non-debug@
 ## SavedVariables: BreakablesDB
 ## OptionalDeps: Ace3, LibBabble-Inventory-3.0, Masque
-## X-Compatible-With: 60200
+## X-Curse-Project-ID: 16629
+## X-WoWI-ID: 17929
 
 #@no-lib-strip@
 embeds.xml

changelog.txt

@@ -1,3 +1,83 @@
+v1.8.4:
+
+- Updated TOCs
+
+v1.8.3:
+- Updated TOCs, added 9.1 and 9.2 herbs, ore, and lockboxes
+
+v1.8.2:
+- Updated TOCs for 9.1.5, Classic, and BCC
+
+v1.8.1:
+- Updated TOC for 9.1
+
+v1.8.0:
+- Classic-BC support
+- Added option to hide during pet battles, by request.
+
+v1.7.4:
+- Fix an issue when IsArtifactRelicItem is not defined
+
+v1.7.3:
+- Add option to suppress tooltips by request
+- Updated Classic TOC to 1.13.6
+
+v1.7.2:
+- Updated TOC for 9.0.5
+
+v1.7.1:
+- Updated TOC to latest
+
+v1.7.0:
+- Added Shadowlands herbs, ore, and lockboxes
+- Updated TOC for 9.0
+
+v1.6.4:
+- Updated TOC for 8.3
+
+v1.6.3:
+- (Classic) Made all items display as disenchantable whether you have the skill for it or not. I have not yet found the correct way to access the player's Enchanting profession level to check against item level for disenchant validity.
+
+v1.6.2:
+- Added 8.2's lockboxes
+
+v1.6.1:
+- Added patch 8.2's new herb and ore
+
+v1.6:
+- Updated TOC for 8.2
+
+v1.5.1:
+- Updated TOC for 8.1
+- Added Highmountain Armor as a disenchantable item
+
+v1.5:
+- Updated TOC for 8.0
+- Added BfA herbs and ore
+- Fixed separate items sometimes showing up as one breakable
+- Added Leystone Lockbox
+
+v1.4.9.1:
+- Added 7.3 herbs and ore
+
+v1.4.9:
+- Updated TOC for 7.3
+
+v1.4.8:
+- Fixed error in ignored items when the ignored item had not been loaded by the server since the last restart.
+- Updated TOC for 7.2
+
+v1.4.7:
+- Fixed up milling herbs that the player knows Mass Milling for. Since Mass Mill is a profession ability and not a player ability/"spell", the addon can't currently automatically cast Mass Milling.
+
+v1.4.6:
+- Added MoP Sparkling Shard as a combinable object.
+- Added support for registering artifact relics as disenchantable.
+- Added an ignore feature so certain items can be set to never show up as breakable.
+
+v1.4.5:
+- Updated TOC for 7.1
+
 v1.4.4:
 - Cap the disenchantable item rarity for Legion items at Epic (so we don't show the player's artifact weapon as disenchantable).
 - Automatically update the tooltip when the breakable list is updated while the player is hovering over a breakable item button.

embeds.xml

@@ -1,4 +1,5 @@
 <Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+<!--@non-debug@
   <Script file="libs\LibStub\LibStub.lua"/>
   <Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
   <Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
@@ -10,4 +11,5 @@
   <Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
   <Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
   <Include file="libs\LibBabble-Inventory-3.0\lib.xml"/>
-</Ui>
+@end-non-debug@-->
+</Ui>

readme.md

@@ -14,7 +14,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**
+
 * 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.
-* If you know Mass Milling for a specific type of herb, the current alpha will try to use this ability and fail. I am in the process of leveling a scribe up high enough to debug this problem.