Merge branch 'dev'

.luacheckrc

@@ -54,6 +54,7 @@ read_globals = {
 	"BLIZZARD_STORE",
 	"BreakUpLargeNumbers",
 	"BuffFrame",
+	"C_AddOns",
 	"C_AzeriteItem",
 	"C_CurrencyInfo",
 	"C_GossipInfo",
@@ -231,7 +232,6 @@ read_globals = {
 	"MainMenuBar",
 	"MainMenuBarBackpackButton",
 	"MainMenuBarVehicleLeaveButton",
-	"MawBuffsBelowMinimapFrame",
 	"MAX_REPUTATION_REACTION",
 	"MAX_TOTEMS",
 	"MaxDps",
@@ -316,7 +316,6 @@ read_globals = {
 	"TimeManagerClockTicker",
 	"TOOLTIP_UPDATE_TIME",
 	"TooltipDataProcessor",
-	"TooltipUtil",
 	"TotemFrame",
 	"UIParent",
 	"UnitAura",

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## Version 100100.01
+
+- Added 10.1.0 support.
+
+- Removed login message for good. It served its purpose.
+
+### Minimap
+
+- Fixed an issue where the difficulty flag's position wasn't adjusted when flipping the minimap.
+
 ## Version 100005.04
 
 - Fixed fading. Adding new stuff is never easy...

ls_UI/core/changelog.lua

@@ -6,5 +6,10 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-- Fixed fading. Adding new stuff is never easy...
+- Added 10.1.0 support.
+- Removed login message for good. It served its purpose.
+
+### Minimap
+
+- Fixed an issue where the difficulty flag's position wasn't adjusted when flipping the minimap.
 ]]

ls_UI/core/constants.lua

@@ -221,7 +221,7 @@ E.SCREEN_WIDTH = E:Round(UIParent:GetRight())
 E.SCREEN_SCALE = UIParent:GetScale()
 
 E.VER = {
-	string = _G.GetAddOnMetadata(addon, "Version")
+	string = C_AddOns.GetAddOnMetadata(addon, "Version")
 }
 E.VER.number = tonumber(E.VER.string:gsub("%D", ""), nil)
 

ls_UI/core/defaults.lua

@@ -527,7 +527,6 @@ D.global = {
 			vert = "LS",
 		},
 	},
-	login_message = true,
 }
 
 D.profile = {
@@ -2700,15 +2699,9 @@ D.profile = {
 			},
 			point = {"BOTTOM", "UIParent", "BOTTOM", 0, 226},
 		},
-		durability = {
-			point = {"TOPRIGHT", "UIParent", "TOPRIGHT", -4, -250},
-		},
 		gm = {
 			point = {"TOPRIGHT", "UIParent", "TOPRIGHT", -250, -240},
 		},
-		maw_buffs = {
-			point = {"TOPRIGHT", "UIParent", "TOPRIGHT", -250, -188},
-		},
 		talking_head = {
 			hide = false,
 		},
@@ -2786,18 +2779,12 @@ PrD.profile = {
 		digsite_bar = { -- ArcheologyDigsiteProgressBar
 			enabled = true,
 		},
-		durability = { -- DurabilityFrame
-			enabled = true
-		},
 		gm = { -- TicketStatusFrame
 			enabled = true
 		},
 		mail = {
 			enabled = false,
 		},
-		maw_buffs = { -- MawBuffsBelowMinimapFrame
-			enabled = true,
-		},
 		vehicle_seat = { -- VehicleSeatIndicator
 			enabled = true
 		},

ls_UI/core/modernize.lua

@@ -77,6 +77,13 @@ function P:Modernize(data, name, key)
 
 			data.version = 10000001
 		end
+
+		--> 100100.01
+		if data.version < 10010001 then
+			data.login_message = nil
+
+			data.version = 10010001
+		end
 	elseif key == "profile" then
 		--> 90001.05
 		if data.version < 9000105 then
@@ -781,6 +788,16 @@ function P:Modernize(data, name, key)
 
 			data.version = 10000503
 		end
+
+		--> 100100.01
+		if data.version < 10010001 then
+			if data.blizzard then
+				data.blizzard.durability = nil
+				data.blizzard.maw_buffs = nil
+			end
+
+			data.version = 10010001
+		end
 	elseif key == "private" then
 		--> 90001.05
 		if data.version < 9000105 then
@@ -886,5 +903,15 @@ function P:Modernize(data, name, key)
 
 			data.version = 10000001
 		end
+
+		--> 100100.01
+		if data.version < 10010001 then
+			if data.blizzard then
+				data.blizzard.durability = nil
+				data.blizzard.maw_buffs = nil
+			end
+
+			data.version = 10010001
+		end
 	end
 end

ls_UI/core/utils.lua

@@ -856,8 +856,6 @@ do
 		local enchant = ""
 		local gems, idx = {"", "", ""}, 1
 		for _, line in next, data.lines do
-			TooltipUtil.SurfaceArgs(line)
-
 			if line.enchantID then
 				enchant = line.leftText:match(ENCHANT_PATTERN)
 			elseif line.socketType then

ls_UI/init.lua

@@ -99,10 +99,6 @@ E:RegisterEvent("ADDON_LOADED", function(arg1)
 
 	PrC.db = LibStub("AceDB-3.0"):New("LS_UI_PRIVATE_CONFIG", PrD)
 
-	if C.db.global.login_message and (not C.db.global.version or C.db.global.version < E.VER.number) then
-		print(L["LOGIN_MSG"]:format(L["LS_UI"], E.VER.string, M.textures.icons_inline.DISCORD_32, L["INFORMATION"]))
-	end
-
 	addRefs()
 
 	if AdiButtonAuras and AdiButtonAuras.RegisterLAB then

ls_UI/locales/enUS.lua

@@ -296,8 +296,6 @@ L["LEFT_DOWN"] = "Left and Down"
 L["LEFT_UP"] = "Left and Up"
 L["LEVEL_TOOLTIP"] = "Level: |cffffffff%d|r"
 L["LOCK_BUTTONS"] = "Lock Buttons"
-L["LOGIN_MSG"] = "Welcome to %s version |cff1a9fc0%s|r. If you're in need of technical support or have suggestions on how to improve the addon you can join our %s |cff5865F2Discord|r server! Links can be found at |cff1a9fc0/lsui|r > %s."
-L["LOGIN_MSG_TOGGLE"] = "Login Message"
 L["LOOT_ALL"] = "Loot All"
 L["M_SS_THRESHOLD"] = "M:SS Threshold"
 L["M_SS_THRESHOLD_DESC"] = "The threshold (in seconds) below which the remaining time will be shown in the M:SS format. Set to 0 to disable."

ls_UI/locales/ruRU.lua

@@ -208,8 +208,6 @@ L["LEFT_DOWN"] = "Влево и вниз"
 L["LEFT_UP"] = "Влево и вверх"
 L["LEVEL_TOOLTIP"] = "Уровень: |cffffffff%d|r"
 L["LOCK_BUTTONS"] = "Заблокировать кнопки"
-L["LOGIN_MSG"] = "Добро пожаловать в %s версии |cff1a9fc0%s|r. Если Вы нуждаетесь в технической поддержке или у Вас есть предложения, как улучшить этот аддон, то Вы можете присоединиться к нашему %s |cff5865F2Discord|r серверу! Ссылки можно найти в |cff1a9fc0/lsui|r > %s."
-L["LOGIN_MSG_TOGGLE"] = "Сообщение при входе"
 L["LOOT_ALL"] = "Забрать всю добычу"
 L["M_SS_THRESHOLD"] = "Порог М:СС"
 L["M_SS_THRESHOLD_DESC"] = "Если оставшееся время восстановления ниже данного значения (в секундах), то оно будет показано в формате М:СС. Установите на 0, чтобы отключить."

ls_UI/ls_UI.toc

@@ -1,6 +1,6 @@
-## Interface: 100005
+## Interface: 100100
 ## Author: lightspark
-## Version: 100005.04
+## Version: 100100.01
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## SavedVariables: LS_UI_GLOBAL_CONFIG, LS_UI_PRIVATE_CONFIG

ls_UI/modules/blizzard/_blizzard.xml

@@ -5,7 +5,6 @@
 	<Script file="digsitebar.lua"/>
 	<Script file="gm.lua"/>
 	<Script file="mail.lua"/>
-	<Script file="mawbuffs.lua"/>
 	<Script file="talkinghead.lua"/>
 	<Script file="vehicleseat.lua"/>
 </Ui>

ls_UI/modules/blizzard/core.lua

@@ -16,7 +16,6 @@ function BLIZZARD:Init()
 		self:SetUpDigsiteBar()
 		self:SetUpGMFrame()
 		self:SetUpMail()
-		self:SetUpMawBuffs()
 		self:SetUpTalkingHead()
 		self:SetUpVehicleSeatFrame()
 

ls_UI/modules/minimap/minimap.lua

@@ -132,13 +132,17 @@ do
 
 			MinimapCluster.IndicatorFrame:ClearAllPoints()
 			MinimapCluster.IndicatorFrame:SetPoint("BOTTOMLEFT", MinimapCluster.Tracking, "TOPLEFT", -1, 2)
+
+			Minimap.DifficultyFlag:SetPoint("TOPRIGHT", MinimapCluster, "TOPRIGHT", -23, -16)
 		else
 			self:SetPoint("CENTER", MinimapCluster, "CENTER", 0, -8, true)
 
 			MinimapCluster.BorderTop:SetPoint("TOP", MinimapCluster, "TOP", 0, -1)
 
 			MinimapCluster.IndicatorFrame:ClearAllPoints()
 			MinimapCluster.IndicatorFrame:SetPoint("TOPLEFT", MinimapCluster.Tracking, "BOTTOMLEFT", -1, -2)
+
+			Minimap.DifficultyFlag:SetPoint("TOPRIGHT", MinimapCluster, "TOPRIGHT", -23, -32)
 		end
 
 		if HybridMinimap then
@@ -364,7 +368,6 @@ function MODULE:Init()
 		local difficultyFlag = Mixin(CreateFrame("Frame", nil, MinimapCluster), flag_proto)
 		difficultyFlag:SetFrameLevel(Minimap:GetFrameLevel() + 2)
 		difficultyFlag:SetScript("OnEvent", difficultyFlag.OnEvent)
-		difficultyFlag:SetPoint("TOPRIGHT", MinimapCluster, "TOPRIGHT", -23, -32)
 		difficultyFlag:SetSize(48, 48)
 		difficultyFlag:Hide()
 		Minimap.DifficultyFlag = difficultyFlag

ls_UI/modules/tooltips/tooltips.lua

@@ -214,8 +214,8 @@ function MODULE:Init()
 				tooltip:AddLine(" ")
 
 				local caster
-				if auraGetterToAPI[tooltip.info.getterName] then
-					caster = auraGetterToAPI[tooltip.info.getterName](tooltip.info.getterArgs)
+				if auraGetterToAPI[tooltip.processingInfo.getterName] then
+					caster = auraGetterToAPI[tooltip.processingInfo.getterName](tooltip.processingInfo.getterArgs)
 				end
 
 				if caster then

ls_UI_Options/blizzard.lua

@@ -118,25 +118,6 @@ function CONFIG:CreateBlizzardOptions(order)
 					end
 				end,
 			},
-			maw_buffs = {
-				order = inc(1),
-				type = "toggle",
-				name = L["MAW_BUFFS"],
-				disabled = isModuleDisabled,
-				set = function(_, value)
-					PrC.db.profile.blizzard.maw_buffs.enabled = value
-
-					if not BLIZZARD:HasMawBuffs() then
-						if value then
-							BLIZZARD:SetUpMawBuffs()
-						end
-					else
-						if not value then
-							CONFIG:ShowStaticPopup("RELOAD_UI")
-						end
-					end
-				end,
-			},
 			vehicle_seat = {
 				order = inc(1),
 				type = "toggle",

ls_UI_Options/init.lua

@@ -52,18 +52,6 @@ function CONFIG:Open()
 						ReloadUI()
 					end,
 				},
-				login_message = {
-					order = 5,
-					type = "toggle",
-					name = L["LOGIN_MSG_TOGGLE"],
-					width = 1.25,
-					get = function()
-						return C.db.global.login_message
-					end,
-					set = function(_, value)
-						C.db.global.login_message = value
-					end,
-				},
 				profiles = CONFIG:CreateProfilesPanel(100),
 				about = CONFIG:CreateAboutPanel(101),
 			},

ls_UI_Options/ls_UI_Options.toc

@@ -1,4 +1,4 @@
-## Interface: 100005
+## Interface: 100100
 ## Author: lightspark
 ## Title: LS: |cff1a9fc0UI|r |cff888987OptionsUI|r
 ## Notes: Options for LS: |cff1a9fc0UI|r.