Merge pull request #9 from nanderson11/v3

V3

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release Addon
+
+on:
+  push:
+    tags:
+      - '**'
+
+env:
+  CF_API_KEY: ${{ secrets.CF_API_KEY }}
+  GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone project
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: kemayo/actions-recent-changelog@v1
+        with:
+          input: CHANGELOG.md
+          output: RECENT_CHANGES.md
+
+      - name: Package and release
+        uses: BigWigsMods/packager@v2

.pkgmeta

@@ -0,0 +1,6 @@
+manual-changelog:
+  filename: RECENT_CHANGES.md
+  markup-type: markdown
+
+ignore:
+  - RECENT_CHANGES.md

.vscode/settings.json

@@ -45,6 +45,7 @@
 		"AtlasNoSearch",
 		"AtlasLoot",
 		"ElvPrivateDB",
-		"ChatEdit_InsertLink"
+		"ChatEdit_InsertLink",
+		"ACHIEVEMENT_TOOLTIP_COMPLETE"
 	]
-}
+}

Atlas.toc

@@ -1,8 +1,69 @@
-# This file is used to show unsupported game client message.
-# Supported client flavors load their own TOC file and unsupported ones fall back to this one.
-# Check expansion specific TOC files for the correct data.
-## Interface: 00000
-## Title: Atlas|cFFFF0000 game client not supported|r
-## Notes: This version of Atlas only supports Classic Era and Retail
-
-WrongVersion.lua
+## Interface: 110002
+## Title: Atlas
+## Title-deDE: Atlas
+## Title-esES: Atlas
+## Title-esMX: Atlas
+## Title-frFR: Atlas
+## Title-koKR: Atlas
+## Title-ptBR: Atlas
+## Title-ruRU: Atlas
+## Title-zhCN: Atlas
+## Title-zhTW: Atlas
+## Notes: Instance Map Browser
+## Notes-deDE: Instanzkarten-Browser
+## Notes-esES: Navegador de Mapas de Mazmorras
+## Notes-esMX: Navegador de Mapas de Mazmorras
+## Notes-frFR: Navigateur de cartes d'instances
+## Notes-koKR: 인스턴스 지도 탐색기
+## Notes-ptBR: Buscador de Mapas de Instância
+## Notes-ruRU: Обозреватель подземелий
+## Notes-zhCN: |cff00CC33副本地图浏览器|r
+## Notes-zhTW: |cff00CC33Atlas 地圖集主程式|r
+## Author: nanderson11
+## Version: @project-version@
+## X-Website: https://github.com/nanderson11/Atlas
+## X-Category: Map
+## X-License: GPLv2
+## X-Credits: Forked from Atlas
+## X-Localizations: enUS, deDE, esES, esMX, frFR, ruRU, zhTW, zhCN, ptBR, koKR
+## X-Curse-Project-ID: 1115649
+## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibBabble-Boss-3.0, LibBabble-SubZone-3.0, LibBabble-Faction-3.0, LibDBIcon-1.0, LibDialog-1.0, LibUIDropDownMenu
+## AddonCompartmentFunc: Atlas_Toggle
+## IconTexture: Interface\WorldMap\WorldMap-Icon
+## SavedVariables: AtlasDB
+
+Data\Constants.lua
+Data\AreaIDs.lua
+Libs\Libs.xml
+Locale\Locales.xml
+
+Core\FontsTemplates.xml
+Core\Templates.lua
+Core\Templates.xml
+Core\IngameLocales.lua
+
+# Core
+Core\Atlas.lua
+Core\AtlasFrame.lua
+Core\Atlas.xml
+Core\Config.lua
+
+Data\Maps_Association.lua
+Data\DropDownConfig.lua
+
+# Integration functions
+Integration\EJIntegration.lua
+Integration\EJLoot.xml
+Integration\WorldMap.xml
+Integration\WorldMap.lua
+Integration\Achievements.lua
+Integration\AtlasLootIntegration.lua
+
+Data\Classic-Retail.lua
+Data\BurningCrusade-Retail.lua
+Data\WrathoftheLichKing-Retail.lua
+Data\Cataclysm-Retail.lua
+Data\MistsofPandaria-Retail.lua
+Data\WarlordsofDraenor-Retail.lua
+Data\Legion-Retail.lua
+Data\BattleforAzeroth-Retail.lua

Atlas_Mainline.toc → Atlas_Cata.toc

@@ -1,9 +1,10 @@
-## Interface: 110002
+## Interface: 40400
 ## Title: Atlas
 ## Title-deDE: Atlas
 ## Title-esES: Atlas
 ## Title-esMX: Atlas
 ## Title-frFR: Atlas
+## Title-itIT: Atlas
 ## Title-koKR: Atlas
 ## Title-ptBR: Atlas
 ## Title-ruRU: Atlas
@@ -14,25 +15,25 @@
 ## Notes-esES: Navegador de Mapas de Mazmorras
 ## Notes-esMX: Navegador de Mapas de Mazmorras
 ## Notes-frFR: Navigateur de cartes d'instances
+## Notes-itIT: Instance Map Browser
 ## Notes-koKR: 인스턴스 지도 탐색기
 ## Notes-ptBR: Buscador de Mapas de Instância
 ## Notes-ruRU: Обозреватель подземелий
 ## Notes-zhCN: |cff00CC33副本地图浏览器|r
-## Notes-zhTW: |cff00CC33Atlas 地圖集主程式|r
+## Notes-zhTW: Atlas 地圖集主程式
 ## Author: nanderson11
-## Version: 2.0.2
+## Version: @project-version@
 ## X-Website: https://github.com/nanderson11/Atlas
 ## X-Category: Map
 ## X-License: GPLv2
 ## X-Credits: Forked from Atlas
 ## X-Localizations: enUS, deDE, esES, esMX, frFR, ruRU, zhTW, zhCN, ptBR, koKR
+## X-Curse-Project-ID: 1115649
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibBabble-Boss-3.0, LibBabble-SubZone-3.0, LibBabble-Faction-3.0, LibDBIcon-1.0, LibDialog-1.0, LibUIDropDownMenu
-## AddonCompartmentFunc: Atlas_Toggle
-## IconTexture: Interface\WorldMap\WorldMap-Icon
 ## SavedVariables: AtlasDB
 
 Data\Constants.lua
-Data\AreaIDs.lua
+Data\AreaIDs_ClassicEra.lua
 Libs\Libs.xml
 Locale\Locales.xml
 
@@ -57,3 +58,8 @@ Integration\WorldMap.xml
 Integration\WorldMap.lua
 Integration\Achievements.lua
 Integration\AtlasLootIntegration.lua
+
+Data\Classic-Retail.lua
+Data\BurningCrusade-Classic.lua
+Data\WrathoftheLichKing-Retail.lua
+Data\Cataclysm-Retail.lua

Atlas_Vanilla.toc

@@ -22,12 +22,13 @@
 ## Notes-zhCN: |cff00CC33副本地图浏览器|r
 ## Notes-zhTW: Atlas 地圖集主程式
 ## Author: nanderson11
-## Version: 2.0.2
+## Version: @project-version@
 ## X-Website: https://github.com/nanderson11/Atlas
 ## X-Category: Map
 ## X-License: GPLv2
 ## X-Credits: Forked from Atlas
 ## X-Localizations: enUS, deDE, esES, esMX, frFR, ruRU, zhTW, zhCN, ptBR, koKR
+## X-Curse-Project-ID: 1115649
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibBabble-Boss-3.0, LibBabble-SubZone-3.0, LibBabble-Faction-3.0, LibDBIcon-1.0, LibDialog-1.0, LibUIDropDownMenu
 ## SavedVariables: AtlasDB
 
@@ -57,3 +58,5 @@ Integration\WorldMap.xml
 Integration\WorldMap.lua
 Integration\Achievements.lua
 Integration\AtlasLootIntegration.lua
+
+Data\Classic-ClassicEra.lua

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.0.0 - October 17, 2024
+
+### Added
+
+- Added Cataclysm Classic support
+
+### Changed
+
+- Maps from the Atlas expansion addons have been merged into Atlas (fork) itself and can be uninstalled. While this increases the minimum download size, it greatly simplifies installation and maintainability, and also lets me add Cataclysm support without forking all the expansion addons. The other addons, like Battlegrounds or Dungeon Locations, aren't merged in but will still work if they are installed.
+
 ## 2.0.2 - October 7, 2024
 
 ### Fixed

Core/Atlas.lua

@@ -24,26 +24,22 @@
 --]]
 
 -- Determine WoW TOC Version
-local WoWClassicEra, WoWClassicTBC, WoWWOTLKC, WoWRetail
+local WoWClassicEra, WoWClassic, WoWRetail
 local wowversion = select(4, GetBuildInfo())
 if wowversion < 20000 then
 	WoWClassicEra = true
-elseif wowversion < 30000 then
-	WoWClassicTBC = true
-elseif wowversion < 40000 then
-	WoWWOTLKC = true
+elseif wowversion > 30000 and wowversion < 90000 then
+	WoWClassic = true
 elseif wowversion > 90000 then
 	WoWRetail = true
-else
 end
 
 -- ----------------------------------------------------------------------------
 -- AddOn namespace.
 -- ----------------------------------------------------------------------------
 local FOLDER_NAME, private = ...
-
-local LibStub = _G.LibStub
 local addon = LibStub("AceAddon-3.0"):NewAddon(private.addon_name, "AceConsole-3.0")
+
 addon.constants = private.constants
 addon.Templates = private.Templates
 addon.constants.addon_name = private.addon_name
@@ -57,7 +53,6 @@ local BZ = Atlas_GetLocaleLibBabble("LibBabble-SubZone-3.0")
 local BB = Atlas_GetLocaleLibBabble("LibBabble-Boss-3.0")
 local LibDialog = LibStub("LibDialog-1.0")
 local AceDB = LibStub("AceDB-3.0")
--- UIDropDownMenu
 local LibDD = LibStub:GetLibrary("LibUIDropDownMenu-4.0")
 
 local profile
@@ -247,7 +242,7 @@ local function bossButtonCleanUp(button)
 end
 
 local function bossButtonUpdate(button, encounterID, instanceID, b_iconImage, moduleData)
-	if (WoWClassicEra or WoWClassicTBC or WoWWOTLKC) then
+	if (WoWClassicEra or WoWClassic) then
 		return
 	end
 
@@ -490,8 +485,28 @@ function addon:PopulateDropdowns()
 end
 
 local function process_Deprecated()
-	local Deprecated_List = addon.constants.deprecatedList
+	-- Check to see if a module that is now bundled with Atlas is enabled and if so, recommend disabling it
+	local includedModulePresent = false;
+	local includedModules = {
+		"Atlas_ClassicWoW",
+		"Atlas_BurningCrusade",
+		"Atlas_WrathoftheLichKing",
+		"Atlas_Cataclysm",
+		"Atlas_MistsofPandaria",
+		"Atlas_WarlordsofDraenor",
+		"Atlas_Legion",
+		"Atlas_BattleforAzeroth"
+	};
+	for index, module in ipairs(includedModules) do
+		if (C_AddOns.GetAddOnEnableState(module) ~= 0) then
+			includedModulePresent = true;
+		end
+	end
+	if (includedModulePresent == true) then
+		DEFAULT_CHAT_FRAME:AddMessage(L["ATLAS_INCLUDED_MODULES"]);
+	end
 
+	local Deprecated_List = addon.constants.deprecatedList
 	-- Check for outdated modules, build a list of them, then disable them and tell the player
 	local OldList = {}
 	for k, v in pairs(Deprecated_List) do
@@ -513,6 +528,7 @@ local function process_Deprecated()
 			end
 		end
 	end
+
 	if #OldList > 0 then
 		local textList = ""
 		for k, v in pairs(OldList) do
@@ -640,7 +656,7 @@ function addon:GetDungeonDifficultyColor(minRecLevel)
 	end
 
 	local greenLevel
-	if (WoWClassicEra or WoWClassicTBC or WoWWOTLKC) then
+	if (WoWClassicEra or WoWClassic) then
 		greenLevel = GetQuestGreenRange()
 	else
 		greenLevel = UnitQuestTrivialLevelRange('player')
@@ -1330,15 +1346,14 @@ function Atlas_MapRefresh(mapID)
 		AtlasFrameSizeUpButton:Hide()
 		AtlasFrameSmallSizeUpButton:Hide()
 	end
-
 	-- Searching for the map path from Atlas or from plugins
 	local AtlasMapPath
 	for k, v in pairs(Atlas_CoreMapsKey) do
 		-- If selected map is Atlas' core map
 		if (zoneID == v) then
 			if (base.Module) then
 				-- if the map belong to a module, set the path to module
-				AtlasMapPath = "Interface\\AddOns\\"..base.Module.."\\Images\\"
+				AtlasMapPath = "Interface\\AddOns\\Atlas\\Images\\"..base.Module.."\\"
 				break
 			end
 		end
@@ -1373,28 +1388,8 @@ function Atlas_MapRefresh(mapID)
 	AtlasMap_Text:SetPoint("CENTER", "AtlasFrame", "LEFT", 256, -32)
 	AtlasMapS_Text:SetPoint("CENTER", "AtlasFrameSmall", "LEFT", 256, -32)
 	-- Check if the map image is available, if not replace with black and Map Not Found text
-	if (base.Module) then
-		local loadable = select(4, C_AddOns.GetAddOnInfo(base.Module))
-		local enabled = C_AddOns.GetAddOnEnableState(base.Module, UnitName("player"))
-		if ((enabled == 0) or (not loadable)) then
-			AtlasMap:SetColorTexture(0, 0, 0, 0);
-			AtlasMap_Text:SetText(L["MapsNotFound"].."\n\n"..L["PossibleMissingModule"].."\n|cff6666ff"..base.Module)
-			AtlasMapSmall:SetColorTexture(0, 0, 0, 0);
-			AtlasMapS_Text:SetText(L["MapsNotFound"].."\n\n"..L["PossibleMissingModule"].."\n|cff6666ff"..base.Module)
-			if (not AtlasMap_Text:IsShown()) then
-				AtlasMap_Text:Show()
-			end
-			if (not AtlasMapS_Text:IsShown()) then
-				AtlasMapS_Text:Show()
-			end
-		else
-			AtlasMap_Text:SetText("")
-			AtlasMapS_Text:SetText("")
-		end
-	else
-		AtlasMap_Text:SetText("")
-		AtlasMapS_Text:SetText("")
-	end
+	AtlasMap_Text:SetText("")
+	AtlasMapS_Text:SetText("")
 
 	-- Large Atlas map
 	if (base.LargeMap) then
@@ -1671,7 +1666,7 @@ function Atlas_AutoSelect()
 end
 
 function addon:DungeonMinGearLevelToolTip(self)
-	if (WoWClassicEra or WoWClassicTBC or WoWWOTLKC) then return end
+	if (WoWClassicEra or WoWClassic) then return end
 	local currGearLevel = GetAverageItemLevel()
 	local str = format(ITEM_LEVEL, currGearLevel)
 
@@ -1881,8 +1876,8 @@ function addon:OnEnable()
 		registerModule(k)
 	end
 
-	-- On Classic Era, fix the close button
-	if (WoWClassicEra) then
+	-- On Classic and Classic Era, fix the close button size
+	if (WoWClassicEra or WoWClassic) then
 		AtlasFrameCloseButton:SetSize(32, 32);
 		AtlasFrameCloseButton:SetPoint("TOPRIGHT", "AtlasFrame", "TOPRIGHT", 5, -7);
 		AtlasFrameLockButton:SetSize(32, 32);