Core: Selectively disabled expansion features to support Classic

This seems to be the standard way of guarding expansion-specific API calls. The original approach using WOW_PROJECT_ID is more difficult to maintain as new classic versions might be launched in the future.

Co-Authored-By: aSnejbjerg <[email protected]>

Author: rdw-software

.luacheckrc

@@ -60,6 +60,18 @@ globals = {
 	"C_Container",
 	"C_Item",
 	"Settings",
+	"LE_EXPANSION_LEVEL_CURRENT",
+	"LE_EXPANSION_CLASSIC",
+	"LE_EXPANSION_BURNING_CRUSADE",
+	"LE_EXPANSION_WRATH_OF_THE_LICH_KING",
+	"LE_EXPANSION_CATACLYSM",
+	"LE_EXPANSION_MISTS_OF_PANDARIA",
+	"LE_EXPANSION_WARLORDS_OF_DRAENOR",
+	"LE_EXPANSION_LEGION",
+	"LE_EXPANSION_BATTLE_FOR_AZEROTH",
+	"LE_EXPANSION_SHADOWLANDS",
+	"LE_EXPANSION_DRAGONFLIGHT",
+	"LE_EXPANSION_WAR_WITHIN",
 
 	"AuraUtil",
 	"BackdropTemplateMixin",

Core.lua

@@ -679,35 +679,36 @@ function R:IsAttemptAllowed(item)
 		Rarity:Debug(format("Attempts for item %s are disallowed (not a required dungeon: %d)", item.name, dungeonID))
 		return false
 	end
+	if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_SHADOWLANDS then
+		local activeCovenantID = C_Covenants.GetActiveCovenantID()
+		if item.requiresCovenant and item.requiredCovenantID and activeCovenantID ~= item.requiredCovenantID then
+			local activeCovenantData = C_Covenants.GetCovenantData(activeCovenantID)
+			local requiredCovenantData = C_Covenants.GetCovenantData(item.requiredCovenantID)
+
+			if not activeCovenantData then
+				Rarity:Debug(
+					format(
+						"Attempts for item %s are disallowed (Covenant %d/%s is required, but none is currently active)",
+						item.name,
+						item.requiredCovenantID,
+						requiredCovenantData.name
+					)
+				)
+				return false
+			end
 
-	local activeCovenantID = C_Covenants.GetActiveCovenantID()
-	if item.requiresCovenant and item.requiredCovenantID and activeCovenantID ~= item.requiredCovenantID then
-		local activeCovenantData = C_Covenants.GetCovenantData(activeCovenantID)
-		local requiredCovenantData = C_Covenants.GetCovenantData(item.requiredCovenantID)
-
-		if not activeCovenantData then
 			Rarity:Debug(
 				format(
-					"Attempts for item %s are disallowed (Covenant %d/%s is required, but none is currently active)",
+					"Attempts for item %s are disallowed (Covenant %d/%s is required, but active covenant is %d/%s)",
 					item.name,
 					item.requiredCovenantID,
-					requiredCovenantData.name
+					requiredCovenantData.name,
+					activeCovenantID,
+					activeCovenantData.name
 				)
 			)
 			return false
 		end
-
-		Rarity:Debug(
-			format(
-				"Attempts for item %s are disallowed (Covenant %d/%s is required, but active covenant is %d/%s)",
-				item.name,
-				item.requiredCovenantID,
-				requiredCovenantData.name,
-				activeCovenantID,
-				activeCovenantData.name
-			)
-		)
-		return false
 	end
 
 	-- If any prerequisite quests exist, check if they are all completed

Core/EventHandlers.lua

@@ -50,7 +50,7 @@ local GetStatistic = _G.GetStatistic
 local GetLootSourceInfo = _G.GetLootSourceInfo
 local C_Timer = _G.C_Timer
 local IsSpellKnown = _G.IsSpellKnown
-local GetCurrentRenownLevel = C_MajorFactions.GetCurrentRenownLevel
+local GetCurrentRenownLevel = C_MajorFactions and C_MajorFactions.GetCurrentRenownLevel
 
 -- Addon APIs
 local DebugCache = Rarity.Utils.DebugCache
@@ -83,7 +83,11 @@ function EventHandlers:Register()
 	self:RegisterEvent("ISLAND_COMPLETED", "OnIslandCompleted")
 	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "OnSpellcastSucceeded")
 	self:RegisterEvent("QUEST_TURNED_IN", "OnQuestTurnedIn")
-	self:RegisterEvent("SHOW_LOOT_TOAST", "OnShowLootToast")
+
+	if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_MISTS_OF_PANDARIA then
+		self:RegisterEvent("SHOW_LOOT_TOAST", "OnShowLootToast")
+	end
+
 	self:RegisterBucketEvent("UPDATE_INSTANCE_INFO", 1, "OnEvent")
 	self:RegisterBucketEvent("LFG_UPDATE_RANDOM_INFO", 1, "OnEvent")
 	self:RegisterBucketEvent("CALENDAR_UPDATE_EVENT_LIST", 1, "OnEvent")
@@ -238,6 +242,9 @@ function R:OnCurrencyUpdate(event)
 	-- Check if any coins were used
 	for k, v in pairs(self.coins) do
 		local currency = GetCurrencyInfo(k)
+		if currency == nil then
+			return
+		end
 		local name, currencyAmount = currency.name, currency.quantity
 		local diff = currencyAmount - (coinamounts[k] or 0)
 		coinamounts[k] = currencyAmount

Core/GUI/FauxAchievementPopup.lua

@@ -100,10 +100,15 @@ local function RarityAchievementAlertFrame_SetUp(frame, itemId, attempts)
 	return true
 end
 
+local FUNCTION_NEVER = function()
+	return false
+end
+local IsInPetBattle = C_PetBattles and C_PetBattles.IsInBattle or FUNCTION_NEVER
+
 local RarityAchievementAlertSystem =
 	AlertFrame:AddQueuedAlertFrameSubSystem("AchievementAlertFrameTemplate", RarityAchievementAlertFrame_SetUp, 2, 6)
 RarityAchievementAlertSystem:SetCanShowMoreConditionFunc(function()
-	return not C_PetBattles.IsInBattle()
+	return not IsInPetBattle()
 end)
 
 local Output = Rarity.Output

Core/GUI/MainWindow.lua

@@ -1093,11 +1093,12 @@ local function addGroup(group, requiresGroup)
 								status = colorize(L["Unavailable"], gray)
 							end
 						end
-
-						if v.requiresCovenant and v.requiredCovenantID ~= nil then
-							local activeCovenantID = C_Covenants.GetActiveCovenantID()
-							if activeCovenantID ~= v.requiredCovenantID then
-								status = colorize(L["Unavailable"], gray)
+						if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_SHADOWLANDS then
+							if v.requiresCovenant and v.requiredCovenantID ~= nil then
+								local activeCovenantID = C_Covenants.GetActiveCovenantID()
+								if activeCovenantID ~= v.requiredCovenantID then
+									status = colorize(L["Unavailable"], gray)
+								end
 							end
 						end
 

Modules/Options/Options.lua

@@ -60,21 +60,33 @@ local TIP_HIDDEN = "TIP_HIDDEN"
 
 -- Classes
 local classes = {
-	["DEATHKNIGHT"] = "|c" .. RAID_CLASS_COLORS["DEATHKNIGHT"]["colorStr"] .. L["Death Knight"] .. "|r",
-	["DEMONHUNTER"] = "|c" .. RAID_CLASS_COLORS["DEMONHUNTER"]["colorStr"] .. L["Demon Hunter"] .. "|r",
 	["DRUID"] = "|c" .. RAID_CLASS_COLORS["DRUID"]["colorStr"] .. L["Druid"] .. "|r",
 	["HUNTER"] = "|c" .. RAID_CLASS_COLORS["HUNTER"]["colorStr"] .. L["Hunter"] .. "|r",
 	["MAGE"] = "|c" .. RAID_CLASS_COLORS["MAGE"]["colorStr"] .. L["Mage"] .. "|r",
-	["MONK"] = "|c" .. RAID_CLASS_COLORS["MONK"]["colorStr"] .. L["Monk"] .. "|r",
 	["PALADIN"] = "|c" .. RAID_CLASS_COLORS["PALADIN"]["colorStr"] .. L["Paladin"] .. "|r",
 	["PRIEST"] = "|c" .. RAID_CLASS_COLORS["PRIEST"]["colorStr"] .. L["Priest"] .. "|r",
 	["ROGUE"] = "|c" .. RAID_CLASS_COLORS["ROGUE"]["colorStr"] .. L["Rogue"] .. "|r",
 	["SHAMAN"] = "|c" .. RAID_CLASS_COLORS["SHAMAN"]["colorStr"] .. L["Shaman"] .. "|r",
 	["WARLOCK"] = "|c" .. RAID_CLASS_COLORS["WARLOCK"]["colorStr"] .. L["Warlock"] .. "|r",
 	["WARRIOR"] = "|c" .. RAID_CLASS_COLORS["WARRIOR"]["colorStr"] .. L["Warrior"] .. "|r",
-	["EVOKER"] = "|c" .. RAID_CLASS_COLORS["EVOKER"]["colorStr"] .. L["Evoker"] .. "|r",
 }
 
+if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_WRATH_OF_THE_LICH_KING then
+	classes["DEATHKNIGHT"] = "|c" .. RAID_CLASS_COLORS["DEATHKNIGHT"]["colorStr"] .. L["Death Knight"] .. "|r"
+end
+
+if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_DRAGONFLIGHT then
+	classes["EVOKER"] = "|c" .. RAID_CLASS_COLORS["EVOKER"]["colorStr"] .. L["Evoker"] .. "|r"
+end
+
+if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_LEGION then
+	classes["DEMONHUNTER"] = "|c" .. RAID_CLASS_COLORS["DEMONHUNTER"]["colorStr"] .. L["Demon Hunter"] .. "|r"
+end
+
+if LE_EXPANSION_LEVEL_CURRENT >= LE_EXPANSION_MISTS_OF_PANDARIA then
+	classes["MONK"] = "|c" .. RAID_CLASS_COLORS["MONK"]["colorStr"] .. L["Monk"] .. "|r"
+end
+
 local red = Rarity.Enum.Colors.Red
 local blue = Rarity.Enum.Colors.Blue
 local green = Rarity.Enum.Colors.Green