Version 2.55

dfherr · Oct 3, 2024 · 9d50f86 · 9d50f86
1 parent 1daa917
commit 9d50f86
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.55
+* update for classic 1.15.4 and cata 4.4.1
+* replaced EasyMenu with new Blizzard Menu API
+
 ## v2.54
 * update for classic 1.15.3
 

diff --git a/ThreatClassic2.toc b/ThreatClassic2.toc
@@ -1,5 +1,5 @@
-## Interface: 40400
-## Interface-Vanilla: 11502
+## Interface: 40401
+## Interface-Vanilla: 11504
 ## Interface-TBC: 20504
 ## Interface-Wrath: 30403
 ## Interface-Cata: 40400
@@ -9,7 +9,7 @@
 ## X-Curse-Project-ID: 355497
 ## X-WoWI-ID: 25966
 ## X-Wago-ID: pkNM1ONz
-## Version: 2.54
+## Version: 2.55
 ## SavedVariables: ThreatClassic2DB
 ## SavedVariablesPerCharacter: TC2_Options
 

diff --git a/ThreatClassic2_Cata.toc b/ThreatClassic2_Cata.toc
@@ -1,11 +1,11 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: ThreatClassic2
 ## Notes: Simple threat meter for WoW Classic to Cataclsym.
 ## Author: Dennis-Florian Herr (dfherr)
 ## X-Curse-Project-ID: 355497
 ## X-WoWI-ID: 25966
 ## X-Wago-ID: pkNM1ONz
-## Version: 2.54
+## Version: 2.55
 ## SavedVariables: ThreatClassic2DB
 ## SavedVariablesPerCharacter: TC2_Options
 

diff --git a/ThreatClassic2_TBC.toc b/ThreatClassic2_TBC.toc
@@ -5,7 +5,7 @@
 ## X-Curse-Project-ID: 355497
 ## X-WoWI-ID: 25966
 ## X-Wago-ID: pkNM1ONz
-## Version: 2.54
+## Version: 2.55
 ## SavedVariables: ThreatClassic2DB
 ## SavedVariablesPerCharacter: TC2_Options
 

diff --git a/ThreatClassic2_Vanilla.toc b/ThreatClassic2_Vanilla.toc
@@ -1,11 +1,11 @@
-## Interface: 11503
+## Interface: 11504
 ## Title: ThreatClassic2
 ## Notes: Simple threat meter for WoW Classic.
 ## Author: Dennis-Florian Herr (dfherr)
 ## X-Curse-Project-ID: 355497
 ## X-WoWI-ID: 25966
 ## X-Wago-ID: pkNM1ONz
-## Version: 2.54
+## Version: 2.55
 ## SavedVariables: ThreatClassic2DB
 ## SavedVariablesPerCharacter: TC2_Options
 

diff --git a/ThreatClassic2_Wrath.toc b/ThreatClassic2_Wrath.toc
@@ -5,7 +5,7 @@
 ## X-Curse-Project-ID: 355497
 ## X-WoWI-ID: 25966
 ## X-Wago-ID: pkNM1ONz
-## Version: 2.54
+## Version: 2.55
 ## SavedVariables: ThreatClassic2DB
 ## SavedVariablesPerCharacter: TC2_Options
 

diff --git a/core/core.lua b/core/core.lua
@@ -70,15 +70,6 @@ TC2.playerTarget = ""
 local AceComm = LibStub("AceComm-3.0")
 AceComm:Embed(TC2)
 
--- depreciation warning for ClassicThreatMeter
-C_Timer.After(3,
-  function()
-    if IsAddOnLoaded("ClassicThreatMeter") then
-      print("Please disable |cFFFBB709ClassicThreatMeter|cFFFF6060 to avoid unnecessary syncing that can negatively impact |cFFFBB709ThreatClassic2|cFFFF6060 and other addons.")
-    end
-  end
-)
-
 local LSM = LibStub("LibSharedMedia-3.0")
 -- Register some media
 LSM:Register("sound", "You Will Die!", [[Sound\Creature\CThun\CThunYouWillDie.ogg]])
@@ -286,7 +277,7 @@ function TC2:UpdateThreatBars()
     local igniteOwner = nil
     local hasActiveIgnite = false
     if C.bar.showIgniteIndicator or C.customBarColors.igniteEnabled then
-        igniteOwner = select(7, FindAuraByName(GetSpellInfo(12848), TC2.playerTarget, "HARMFUL"))
+        igniteOwner = select(7, FindAuraByName(C_Spell.GetSpellInfo(12848), TC2.playerTarget, "HARMFUL"))
     end
     -- update view
     for i = 1, C.bar.count do
@@ -923,7 +914,6 @@ function TC2:PLAYER_LOGIN()
     self:SetBarCount()
     self:SetupUnits()
     self:SetupFrame()
-    self:SetupMenu()
 
     -- Get Colors
     TC2.colorFallback = {0.8, 0, 0.8, C.bar.alpha}
@@ -993,7 +983,7 @@ function TC2:SetupFrame()
     self.frame.header = CreateStatusBar(self.frame, true)
     self.frame.header:SetScript("OnMouseUp", function(self, button)
         if button == "RightButton" then
-            EasyMenu(TC2.menuTable, TC2.menu, "cursor", 0, 0, "MENU")
+            MenuUtil.CreateContextMenu(TC2.frame.header, TC2.MenuGenerator)
         end
     end)
     self.frame.header:EnableMouse(true)
@@ -1005,26 +995,28 @@ function TC2:SetupFrame()
     self:UpdateFrame()
 end
 
-function TC2:SetupMenu()
-    self.menu = CreateFrame("Frame", self.addonName.."MenuFrame", UIParent, "UIDropDownMenuTemplate")
-
-    TC2.menuTable = {
-        {text = L.frame_lock, notCheckable = false, checked = function() return C.frame.locked end, func = function()
+function TC2.MenuGenerator(owner, rootDescription)
+    rootDescription:CreateCheckbox(L.frame_lock, function() return C.frame.locked end, 
+        function()
             C.frame.locked = not C.frame.locked
             TC2:UpdateFrame()
-        end},
-        {text = L.frame_test, notCheckable = false, checked = function() return C.frame.test end, func = function()
+        end
+    )
+    rootDescription:CreateCheckbox(L.frame_test, function() return C.frame.test end, 
+        function()
             C.frame.test = not C.frame.test
             if C.frame.test then
                 TC2:TestMode()
             else
                 CheckStatus()
             end
-        end},
-        {text = L.gui_config, notCheckable = true, func = function()
+        end
+    )
+    rootDescription:CreateButton(L.gui_config, 
+        function()
             LibStub("AceConfigDialog-3.0"):Open("ThreatClassic2")
-        end},
-    }
+        end
+    )
 end
 
 -----------------------------