Merge pull request #148 from thurin/cata-update

Cata update

.pkgmeta

@@ -4,7 +4,9 @@ externals:
   Tukui/Libs/CallbackHandler-1.0: https://repos.curseforge.com/wow/callbackhandler/trunk/CallbackHandler-1.0
   Tukui/Libs/LibStub: https://repos.curseforge.com/wow/libstub/trunk
   Tukui/Libs/SortBags: https://github.com/shirsig/SortBags
-  Tukui/Libs/SortBags_Vanilla: https://github.com/shirsig/SortBags-vanilla
+  Tukui/Libs/SortBags_Vanilla:
+    url: https://github.com/shirsig/SortBags
+    branch: classic-era
   Tukui/Libs/TaintLess:
     url: https://www.townlong-yak.com/addons.git/taintless
     commit: default

Tukui/Core/Gui.lua

@@ -92,6 +92,8 @@ local CheckClient = function(self)
 
 	if Client == "RETAIL" and T.Retail then
 		return true
+	elseif Client == "CATA" and T.Cata then
+		return true
 	elseif Client == "WOTLK" and T.WotLK then
 		return true
 	elseif Client == "BCC" and T.BCC then

Tukui/Core/Init.lua

@@ -34,6 +34,7 @@ Engine[1].Retail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 Engine[1].BCC = (WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC) or (Toc >= 20000 and Toc < 30000)
 Engine[1].Classic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
 Engine[1].WotLK = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC) or (Toc >= 30000 and Toc < 40000)
+Engine[1].Cata = (WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC) or (Toc >= 40000 and Toc < 50000)
 Engine[1].DF = Toc >= 100000 and Toc < 110000
 Engine[1].WindowedMode = Windowed
 Engine[1].FullscreenMode = Fullscreen

Tukui/Core/Loading.lua

@@ -270,7 +270,7 @@ function Loading:OnEvent(event)
 		-- restore original stopwatch commands
 		SlashCmdList["STOPWATCH"] = Stopwatch_Toggle
 	elseif (event == "PLAYER_ENTERING_WORLD") then
-		if not T.WotLK then
+		if not T.WotLK and not T.Cata then
 			T["Miscellaneous"]["ObjectiveTracker"]:Enable()
 		end
 	elseif (event == "VARIABLES_LOADED") then

Tukui/Modules/ActionBars/Bar1.lua

@@ -8,7 +8,7 @@ function ActionBars:CreateBar1()
 	local Movers = T["Movers"]
 	local Size = C.ActionBars.NormalButtonSize
 	local Spacing = C.ActionBars.ButtonSpacing
-	local Druid, Rogue, Warrior, Priest = "", "", "", ""
+	local Druid, Rogue, Warrior, Priest, Warlock = "", "", "", "", ""
 	local ButtonsPerRow = C.ActionBars.Bar1ButtonsPerRow
 	local NumButtons = C.ActionBars.Bar1NumButtons
 	local VehicleBar = format("[vehicleui][possessbar] %d;", GetVehicleBarIndex and GetVehicleBarIndex()) or ""
@@ -36,7 +36,7 @@ function ActionBars:CreateBar1()
 	end
 
 	if (C.ActionBars.SwitchBarOnStance) then
-		if T.WotLK then
+		if T.WotLK or T.Cata then
 			Rogue = "[bonusbar:1] 7; [bonusbar:2] 8;"
 		else
 			Rogue = "[bonusbar:1] 7;"
@@ -50,6 +50,9 @@ function ActionBars:CreateBar1()
 
 		Warrior = "[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;"
 		Priest = "[bonusbar:1] 7;"
+		if T.Cata then
+			Warlock = "[form:1] 7;"
+		end
 	end
 
 	local DefaultPaging
@@ -65,6 +68,7 @@ function ActionBars:CreateBar1()
 		["ROGUE"] = Rogue,
 		["WARRIOR"] = Warrior,
 		["PRIEST"] = Priest,
+		["WARLOCK"] = Warlock,
 		["DEFAULT"] = DefaultPaging,
 	}
 

Tukui/Modules/ActionBars/BarStance.lua

@@ -23,7 +23,12 @@ function ActionBars:CreateStanceBar()
 
 	local Bar = CreateFrame("Frame", "TukuiStanceBar", T.PetHider, "SecureHandlerStateTemplate")
 	Bar:SetSize((PetSize * 10) + (Spacing * 11), PetSize + (Spacing * 2))
-	Bar:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", 28, 233)
+	-- Hunter in Cata has both stance and pet.  Offset stance so not on top of each other
+	if T.Cata and (T.MyClass == "HUNTER" or T.MyClass == "DEATHKNIGHT") then
+		Bar:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", 28, 277)
+	else
+		Bar:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", 28, 233)
+	end
 	Bar:SetFrameStrata("LOW")
 	Bar:SetFrameLevel(10)
 	Bar:RegisterEvent("UPDATE_SHAPESHIFT_COOLDOWN")

Tukui/Modules/ActionBars/Skin.lua

@@ -89,7 +89,7 @@ function ActionBars:SkinButton(button)
 				Button:UpdateState(Button)
 			end
 
-			if (T.Retail) or (T.Classic and T.WoWBuild >= 51146) or (T.WotLK and T.WoWBuild >= 46917) then
+			if (T.Retail) or (T.Classic and T.WoWBuild >= 51146) or (T.WotLK and T.WoWBuild >= 46917) or (T.Cata) then
 				Normal:SetParent(T.Hider)
 			end
 		end
@@ -200,7 +200,7 @@ function ActionBars:SkinPetAndShiftButton(Normal, Button, Icon, Name, Pet)
 	Flash:SetTexture("")
 
 	if Normal then
-		if (T.Retail) or (T.WotLK and T.WoWBuild >= 46917) then
+		if (T.Retail) or (T.WotLK and T.WoWBuild >= 46917) or (T.Cata) then
 			Normal:SetParent(T.Hider)
 		end
 

Tukui/Modules/ChatFrames/ChatFrames.lua

@@ -181,7 +181,11 @@ function Chat:StyleFrame(frame)
 		_G[format("ChatFrame%sTabSelectedMiddle", ID)]:Kill()
 		_G[format("ChatFrame%sTabSelectedRight", ID)]:Kill()
 
-		_G[format("ChatFrame%sButtonFrameMinimizeButton", ID)]:Kill()
+		if T.Cata then
+			_G[format("ChatFrame%sMinimizeButton", ID)]:Kill()
+		else
+			_G[format("ChatFrame%sButtonFrameMinimizeButton", ID)]:Kill()
+		end
 		_G[format("ChatFrame%sButtonFrame", ID)]:Kill()
 
 		_G[format("ChatFrame%sEditBoxLeft", ID)]:Kill()
@@ -340,7 +344,7 @@ function Chat:Reset()
 	FCF_SetLocked(ChatFrame5, 1)
 	FCF_DockFrame(ChatFrame5)
 
-	if T.Retail or T.WotLK then
+	if T.Retail or T.WotLK or T.Cata then
 		FCF_OpenNewWindow(COMMUNITIES_DEFAULT_CHANNEL_NAME)
 		FCF_SetLocked(ChatFrame6, 1)
 		FCF_DockFrame(ChatFrame6)
@@ -366,7 +370,7 @@ function Chat:Reset()
 
 	-- Remove everything in first 4 chat windows
 	for i = 1, 6 do
-		if (T.Retail and i ~= 2 and i ~= 3) or (T.BCC and i ~= 2 and i ~= 6) or (T.Classic and i ~= 2 and i ~= 6) or (T.WotLK and i ~= 2 and i ~= 3) then
+		if (T.Retail and i ~= 2 and i ~= 3) or (T.BCC and i ~= 2 and i ~= 6) or (T.Classic and i ~= 2 and i ~= 6) or (T.WotLK and i ~= 2 and i ~= 3) or (T.Cata and i ~= 2 and i ~= 3) then
 			local ChatFrame = _G["ChatFrame"..i]
 
 			ChatFrame_RemoveAllMessageGroups(ChatFrame)
@@ -447,7 +451,7 @@ function Chat:Reset()
 	-- ChatFrame 6 Setup --
 	-----------------------
 
-	if T.Retail or T.WotLK then
+	if T.Retail or T.WotLK or T.Cata then
 		for i = 1, #Channels do
 			ChatFrame_RemoveChannel(ChatFrame1, Channels[i])
 			ChatFrame_AddChannel(ChatFrame6, Channels[i])

Tukui/Modules/DataTexts/Elements/Time.lua

@@ -106,7 +106,7 @@ local OnMouseUp = function(button, click)
 			return
 		end
 
-		if T.Retail or T.WotLK then
+		if T.Retail or T.WotLK or T.Cata then
 			GameTimeFrame_OnClick()
 		else
 			Stopwatch_Toggle()

Tukui/Modules/Maps/Minimap.lua

@@ -291,7 +291,7 @@ function Minimap:EnableMouseWheelZoom()
 		if (delta > 0) then
 			ZoomIn:Click()
 		elseif (delta < 0) then
-			if T.Retail or T.WotLK then
+			if T.Retail or T.WotLK or T.Cata then
 				if Minimap:GetZoom() ~= 0 then
 					ZoomOut:Click()
 				end
@@ -423,7 +423,7 @@ function Minimap:UpdateZone()
 end
 
 function Minimap:EnableMouseOver()
-	local Tracking = (T.Retail or T.WotLK) and MiniMapTrackingButton or MiniMapTracking
+	local Tracking = (T.Retail or T.WotLK or T.Cata) and MiniMapTrackingButton or MiniMapTracking
 	local TrackingIcon = MiniMapTrackingIcon
 
 	self:HookScript("OnEnter", function(self)
@@ -507,7 +507,7 @@ function Minimap:SizeMinimap()
 end
 
 function Minimap:TaxiExitOnEvent(event)
-	if (T.Retail or T.WotLK) and CanExitVehicle() then
+	if (T.Retail or T.WotLK or T.Cata) and CanExitVehicle() then
 		if (UnitOnTaxi("player")) then
 			self.Text:SetText("|cffFF0000" .. TAXI_CANCEL .. "|r")
 		else
@@ -528,7 +528,7 @@ function Minimap:TaxiExitOnClick()
 	if (UnitOnTaxi("player")) then
 		TaxiRequestEarlyLanding()
 	else
-		if T.Retail or T.WotLK then
+		if T.Retail or T.WotLK or T.Cata then
 			VehicleExit()
 		end
 	end

Tukui/Modules/Miscellaneous/Core.lua

@@ -20,7 +20,7 @@ function Miscellaneous:Enable()
 	Miscellaneous["ItemLevel"]:Enable()
 	Miscellaneous["Alerts"]:Enable()
 
-	if T.Retail or T.WotLK then
+	if T.Retail or T.WotLK or T.Cata then
 		Miscellaneous["VehicleIndicator"]:Enable()
 	end
 

Tukui/Modules/Miscellaneous/MicroMenu.lua

@@ -148,7 +148,7 @@ function MicroMenu:GameMenu()
 
 	MicroMenu:SetFrameStrata("HIGH")
 	MicroMenu:SetFrameLevel(600)
-	MicroMenu:SetSize(250, T.Classic and 298 or T.WotLK and 372 or 408)
+	MicroMenu:SetSize(250, T.Classic and 298 or T.WotLK and 372 or T.Cata and 438 or 408)
 	MicroMenu:CreateBackdrop("Transparent")
 	MicroMenu:CreateShadow()
 	MicroMenu:SetPoint("CENTER", UIParent, "CENTER", 0, 0)

Tukui/Modules/UnitFrames/Classes/DeathKnight.lua

@@ -47,7 +47,7 @@ UnitFrames.AddClassFeatures["DEATHKNIGHT"] = function(self)
 	RunesBar.PostUpdate = UnitFrames.RunesPostUpdate
 	RunesBar.colorSpec = true
 
-	if T.WotLK then
+	if T.WotLK or T.Cata then
 		RunesBar.UpdateColor = UnitFrames.RunesUpdateColor
 	end
 

Tukui/Modules/UnitFrames/Units/Arena.lua

@@ -151,7 +151,7 @@ function UnitFrames:Arena()
 		self.Debuffs = Debuffs
 	end
 
-	if T.BCC or T.WotLK then
+	if T.BCC or T.WotLK or T.Cata then
 		local Trinket = CreateFrame("Frame", nil, self)
 		Trinket:SetSize(35, 35)
 		Trinket:SetPoint("BOTTOMRIGHT", self, "BOTTOMLEFT", -6, 0)