Merge pull request #37 from mBlinkii/dev

Ver. 2.90

.vscode/settings.json

@@ -111,7 +111,8 @@
         "GameTooltip",
         "GetContainerItemInfo",
         "GetContainerNumSlots",
-        "GetCursorPosition"
+        "GetCursorPosition",
+        "TooltipDataProcessor"
     ],
     "Lua.diagnostics.disable": [
         "redundant-parameter",

CHANGELOG

@@ -2,12 +2,26 @@
 [Eng] - All changes to this project will be documented in this file. The latest changes are at the top.
 [Ger] - Alle Änderungen an diesem Projekt werden in dieser Datei dokumentiert. Die neuesten Änderungen stehen ganz oben.
 
+## [ver. 2.90] - 20.11.2022
+### Update
+- FIX mDock Talent Icon
+- FIX Teleports menu if no Profession is learned
+- FIX Datatext Systemmenu - fix menu entry for ElvUI options frame
+- FIX Tooltip Icons for Retail
+- FIX for !keys (post your M+ Key to Chat)
+- FIX Currencys Anima and Cataloged Research
+- ADD Evoker Interrupt Spell for Interrupt Check on Castbars
+- UPDATE removed Autographed Hearthstone Card from Teleports menu
+### Added
+- NEW Custom Class Colors (default is disabled)
+
 ## [ver. 2.89.1] - 16.11.2022
 ### Update
 - FIX Tooltips and Datatext
 - UPDATE Dropdpwn Text Update Bugfix
 - UPDATE Temporary disabled the tooltip icons for Retail
 - FIX Healthmarker Option, custom raneg is disabeld if Auto range is enabled
+- FIX for Dropdown Macro Buttons
 ### Added
 - NEW Statusbar Texture K31
 

ElvUI_mMediaTag.toc

@@ -1,7 +1,7 @@
 ## Interface: 100002
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.89.1
+## Version: 2.90
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

ElvUI_mMediaTag_Classic.toc

@@ -1,7 +1,7 @@
 ## Interface: 11403
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.89.1
+## Version: 2.90
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

ElvUI_mMediaTag_Mainline.toc

@@ -1,7 +1,7 @@
 ## Interface: 100002
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.89.1
+## Version: 2.90
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

ElvUI_mMediaTag_Wrath.toc

@@ -1,7 +1,7 @@
 ## Interface: 30400
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.89.1
+## Version: 2.90
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

core/init.lua

@@ -33,6 +33,29 @@ end
 
 -- addon laden
 function mMT:Initialize()
+	if E.db[mPlugin].mCustomClassColors.enable then
+		mMT:SetCustomColors()
+
+		function E:ClassColor(class, usePriestColor)
+			if not class then return end
+
+			local color = (E.db[mPlugin].mCustomClassColors.colors and E.db[mPlugin].mCustomClassColors.colors[class]) or (_G.CUSTOM_CLASS_COLORS and _G.CUSTOM_CLASS_COLORS[class]) or _G.RAID_CLASS_COLORS[class]
+			if type(color) ~= 'table' then return end
+
+			if not color.colorStr then
+				color.colorStr = E:RGBToHex(color.r, color.g, color.b, 'ff')
+			elseif strlen(color.colorStr) == 6 then
+				color.colorStr = 'ff'..color.colorStr
+			end
+
+			if usePriestColor and class == 'PRIEST' and tonumber(color.colorStr, 16) > tonumber(E.PriestColors.colorStr, 16) then
+				return E.PriestColors
+			else
+				return color
+			end
+		end
+	end
+
 	mMT:mMisc() -- module laden
 
 	if E.Retail then

core/mChangelog.lua

@@ -9,7 +9,7 @@ local format = format
 
 --Variables
 local ChangelogText =
-	"#### [ver. 2.89.1] - 16.11.2022\n\n### Update\n- |CFFFE7B2CFIX|r Tooltips and Datatext\n- |CFF58D68DUPDATE|r Dropdpwn Text Update Bugfix\n- |CFF58D68DUPDATE|r Temporary disabled the tooltip icons for Retail\n\n### Added\n- |CFF3498DBNEW|r Statusbar Texture K31"
+	"## [ver. 2.90] - 20.11.2022\n\n\n### Update\n\n- |CFFFE7B2CFIX|r mDock Talent Icon\n- |CFFFE7B2CFIX|r Teleports menu if no Profession is learned\n- |CFFFE7B2CFIX|r Datatext Systemmenu - fix menu entry for ElvUI options frame\n- |CFFFE7B2CFIX|r Tooltip Icons for Retail\n- |CFFFE7B2CFIX|r for !keys (post your M+ Key to Chat)\n- |CFFFE7B2CFIX|r Currencys Anima and Cataloged Research\n- |CFF58D68DADD|r Evoker Interrupt Spell for Interrupt Check on Castbars\n- |CFF58D68DUPDATE|r removed Autographed Hearthstone Card from Teleports menu\n\n### Added\n\n- |CFF3498DBNEW|r Custom Class Colors (default is disabled)"
 
 function mMT:Changelog(opt)
 	local Frame = CreateFrame("Frame", "mMediaTagChangelog", E.UIParent, "BackdropTemplate")
@@ -53,7 +53,7 @@ function mMT:Changelog(opt)
 		Frame:Hide()
 
 		if opt then
-			E:ToggleOptionsUI()
+			E:ToggleOptions()
 		end
 	end)
 
@@ -65,6 +65,6 @@ function mMT:Changelog(opt)
 	mSkin:HandleButton(Close)
 
 	if opt then
-		E:ToggleOptionsUI()
+		E:ToggleOptions()
 	end
 end

core/mDropdown.lua

@@ -82,8 +82,8 @@ function mMT:mDropDown(list, frame, menuparent, ButtonWidth, HideDelay)
 		if not frame.buttons[i] then
 			if list[i].macro then
 				frame.buttons[i] = CreateFrame("Button", "MacroButton", frame, "SecureActionButtonTemplate")
-				frame.buttons[i]:SetAttribute("type*", "macro")
-				--frame.buttons[i]:RegisterForClicks("LeftButtonUp", "RightButtonUp")
+				frame.buttons[i]:SetAttribute("type", "macro")
+				frame.buttons[i]:RegisterForClicks("LeftButtonUp", "LeftButtonDown")
 				frame.buttons[i]:SetAttribute("macrotext1", list[i].macro)
 			else
 				frame.buttons[i] = CreateFrame("Button", nil, frame)

core/mFunctions.lua

@@ -40,7 +40,7 @@ function mMT:mMisc()
 		mMT:mNamePlateBorderColor()
 	end
 
-	if E.db[mPlugin].mTIcon and not E.Retail then
+	if E.db[mPlugin].mTIcon then
 		mMT:TipIconSetup()
 	end
 

core/mOptions.lua

@@ -395,6 +395,13 @@ local function OptionsCore()
 						childGroups = "tab",
 						args = {},
 					},
+					customclasscolors = {
+						order = 6,
+						type = "group",
+						name = L["Custom Class colors"],
+						childGroups = "tab",
+						args = {},
+					},
 				},
 			},
 			about = {
@@ -847,6 +854,13 @@ local function OptionsCoreClassic()
 						childGroups = "tab",
 						args = {},
 					},
+					customclasscolors = {
+						order = 5,
+						type = "group",
+						name = L["Custom Class colors"],
+						childGroups = "tab",
+						args = {},
+					},
 				},
 			},
 			about = {

core/mSettings.lua

@@ -432,5 +432,23 @@ P[mPlugin] = {
 		["power"] = {["enable"] = false, ["texture"] = "mMediaTag M1"},
 		["castbar"] = {["enable"] = false, ["texture"] = "mMediaTag P4"}
 	},
-	["mCustomCombatIcons"] = 1
+	["mCustomCombatIcons"] = 1,
+	["mCustomClassColors"] = {
+		["enable"] = false, ["emediaenable"] = false,
+		["colors"] = {
+			["HUNTER"] = {["r"] = 0.67, ["g"] = 0.83, ["b"] = 0.45},
+			["WARLOCK"] = {["r"]  = 0.53,["g"]  = 0.53,["b"]  = 0.93},
+			["PRIEST"] = {["r"]  = 1.00,["g"]  = 1.00,["b"]  = 1.00},
+			["PALADIN"] = {["r"] = 0.96,["g"]  = 0.55,["b"]  = 0.73},
+			["MAGE"] = {["r"] = 0.20, ["g"] = 0.78, ["b"] = 0.92},
+			["ROGUE"] = {["r"]  = 1.00,["g"]  = 0.96,["b"]  = 0.41},
+			["DRUID"] = {["r"] = 1.00, ["g"] = 0.49, ["b"] = 0.04},
+			["SHAMAN"] = {["r"]  = 0.00,["g"]  = 0.44,["b"]  = 0.87},
+			["WARRIOR"] = {["r"]  = 0.78,["g"]  = 0.61,["b"]  = 0.43},
+			["DEATHKNIGHT"] = {["r"] = 0.77, ["g"] = 0.12, ["b"] = 0.23},
+			["MONK"] = {["r"] = 0.00, ["g"] = 1.00, ["b"] = 0.60},
+			["DEMONHUNTER"] = {["r"] = 0.64, ["g"] = 0.19, ["b"] = 0.79},
+			["EVOKER"] = {["r"] = 0.20, ["g"] = 0.58, ["b"] = 0.50},
+		}
+	},
 }

misc/CurrencyShadowlands/mAnima.lua

@@ -36,11 +36,12 @@ local function mBagCheck()
 	for bagID = BACKPACK_CONTAINER, NUM_BAG_SLOTS do
 		local slots = GetContainerNumSlots(bagID)
 		for slot = 1, slots do
-			local itemID = select(10, GetContainerItemInfo(bagID, slot))
-			local itemCount = select(2, GetContainerItemInfo(bagID, slot))
-			local _, spellID = GetItemSpell(itemID)
-			if spellID and Animas[spellID] then
-				mAmount = mAmount + (Animas[spellID] * itemCount)
+			local containerInfo = GetContainerItemInfo(bagID, slot)
+			if containerInfo then
+				local _, spellID = GetItemSpell(containerInfo.itemID)
+				if spellID and Animas[spellID] then
+					mAmount = mAmount + (Animas[spellID] * containerInfo.stackCount)
+				end
 			end
 		end
 	end

misc/CurrencyShadowlands/mCatalogedResearch.lua

@@ -11,11 +11,7 @@ local strjoin = strjoin
 
 --WoW API / Variables
 local _G = _G
-local GetContainerNumSlots = C_Container.GetContainerNumSlots
-local GetContainerItemInfo = C_Container.GetContainerItemInfo
-local GetItemSpell = GetItemSpell
 local C_CurrencyInfo = C_CurrencyInfo
-local IsAddOnLoaded = IsAddOnLoaded
 
 --Variables
 local displayString, lastPanel = "", nil
@@ -24,9 +20,7 @@ local mTextName = "mCatalogedResearch"
 local mCurrencyID = 1931
 local hideCurrency = false
 
-local function mBagCheck()
-	local mAmount = 0
-	local mResearch = {
+local mResearch = {
 		[186685] = 1,
 		[187322] = 8,
 		[187457] = 8,
@@ -56,7 +50,10 @@ local function mBagCheck()
 		[187350] = 300,
 		[187335] = 300,
 	}
+
+local function mBagCheck()
 	local mAmount = 0
+
 	for itemID, mValue in pairs(mResearch) do
 		local mCount = GetItemCount(itemID, true)
 		mAmount = mAmount + mCount * mValue
@@ -175,4 +172,4 @@ DT:RegisterDatatext(
 	OnLeave,
 	mText,
 	ValueColorUpdate
-)
+)

misc/Dock/mFPSMS.lua

@@ -169,7 +169,7 @@ local function OnClick(self, button)
 				HideUIPanel(GameMenuFrame)
 			end
 		else
-			E:ToggleOptionsUI()
+			E:ToggleOptions()
 		end
 	end
 end

misc/Dock/mMainMenu.lua

@@ -216,7 +216,7 @@ local function OnClick(self, button)
 			mMT:MuteVolume()
 		else
 			mMT:mOnClick(self, "CheckFrameMainMenu")
-			E:ToggleOptionsUI()
+			E:ToggleOptions()
 		end
 	end
 end

misc/Dock/mTalent.lua

@@ -190,23 +190,26 @@ local function OnClick(self, button)
 		end
 
 		if button == "LeftButton" then
-			if not _G.PlayerTalentFrame then
-				_G.LoadAddOn("Blizzard_TalentUI")
+			local frame = _G.ClassTalentFrame
+			if not frame then
+				LoadAddOn('Blizzard_ClassTalentUI')
+				frame = _G.ClassTalentFrame
 			end
-			if not _G.PlayerTalentFrame:IsShown() then
-				ShowUIPanel(_G.PlayerTalentFrame)
+
+			if frame:IsShown() then
+				HideUIPanel(frame)
 			else
-				HideUIPanel(_G.PlayerTalentFrame)
+				ShowUIPanel(frame)
 			end
 		elseif button == "MiddleButton" then
-			DT:SetEasyMenuAnchor(DT.EasyMenu, self)
-			_G.EasyMenu(specList, DT.EasyMenu, nil, nil, nil, "MENU")
+			E:SetEasyMenuAnchor(E.EasyMenu, self)
+			_G.EasyMenu(specList, E.EasyMenu, nil, nil, nil, "MENU")
 		else
 			local _, specName = GetSpecializationInfo(specIndex)
 			menuList[2].text = format(LOOT_SPECIALIZATION_DEFAULT, specName)
 
-			DT:SetEasyMenuAnchor(DT.EasyMenu, self)
-			_G.EasyMenu(menuList, DT.EasyMenu, nil, nil, nil, "MENU")
+			E:SetEasyMenuAnchor(E.EasyMenu, self)
+			_G.EasyMenu(menuList, E.EasyMenu, nil, nil, nil, "MENU")
 		end
 	end
 end

misc/load_misc.xml

@@ -5,6 +5,7 @@
 	<Script file="mCombatTime.lua"/>
 	<Script file="mCoordinatesX.lua"/>
 	<Script file="mCoordinatesY.lua"/>
+	<Script file="mCustomClassColors.lua"/>
 	<Script file="mBGTexture.lua"/>
 	<Script file="mCastbar.lua"/>
 	<Script file="mCombatIcon.lua"/>
@@ -18,7 +19,7 @@
 	<Script file="mProfessionMenu.lua"/>
 	<Script file="mSystemMenu.lua"/>
 	<Script file="mTags.lua"/>
-	<!-- <Script file="mTipIcon.lua"/> -->
+	<Script file="mTipIcon.lua"/>
 	<Script file="mTools.lua"/>
 	<Script file="mVolumeDisplay.lua"/>
 	<Script file="mRoleIcons.lua"/>

misc/load_misc_classic.xml

@@ -5,6 +5,7 @@
 	<Script file="mCombatTime.lua"/>
 	<Script file="mCoordinatesX.lua"/>
 	<Script file="mCoordinatesY.lua"/>
+	<Script file="mCustomClassColors.lua"/>
 	<Script file="mFunctionsMisc.lua"/>
 	<Script file="mSystemMenu.lua"/>
 	<Script file="mTags.lua"/>

misc/mCastbar.lua

@@ -66,6 +66,9 @@ local interruptSpellList = {
 	--DEMONHUNTER
 	[577] = 183752,
 	[581] = 183752,
+	--EVOKER
+	[1467] = 351338,
+	[1468] = 351338,
 }
 
 function mMT:mUpdateKick()