file/folder restructure

FocusFrame.lua

@@ -1,5 +1,5 @@
 local _G = getfenv(0)
-local Focus = assert(_G.FocusData, "FocusData not loaded.")
+local Focus = assert(_G.FocusCore, "FocusCore not loaded.")
 local AurasUpdate
 
 FocusFrameDB = FocusFrameDB or { unlock = true, scale = 1 }
@@ -470,7 +470,7 @@ FocusFrame.cast.border = FocusFrame.cast:CreateTexture("FocusCastingBarBorder",
 FocusFrame.cast.border:SetPoint("TOPLEFT", -23, 20)
 FocusFrame.cast.border:SetPoint("TOPRIGHT", 23, 20)
 FocusFrame.cast.border:SetHeight(50)
-FocusFrame.cast.border:SetTexture("Interface\\AddOns\\FocusFrame\\media\\UI-CastingBar-Border-Small.blp")
+FocusFrame.cast.border:SetTexture("Interface\\AddOns\\FocusFrame\\Media\\UI-CastingBar-Border-Small.blp")
 
 FocusFrame.cast.text = FocusFrame.cast:CreateFontString("FocusCastingBarText", "OVERLAY")
 FocusFrame.cast.text:SetTextColor(1, 1, 1)
@@ -496,7 +496,7 @@ FocusFrame.cast.shield = FocusFrame.cast:CreateTexture("FocusCastingBarShield",
 FocusFrame.cast.shield:SetPoint("TOPLEFT", -28, 20)
 FocusFrame.cast.shield:SetPoint("TOPRIGHT", 18, 20)
 FocusFrame.cast.shield:SetHeight(50)
-FocusFrame.cast.shield:SetTexture("Interface\\AddOns\\FocusFrame\\media\\UI-CastingBar-Small-Shield.blp")
+FocusFrame.cast.shield:SetTexture("Interface\\AddOns\\FocusFrame\\Media\\UI-CastingBar-Small-Shield.blp")
 FocusFrame.cast.shield:Hide()
 
 -- Register events
@@ -549,7 +549,7 @@ SlashCmdList.FOCUSOPTIONS = function(msg)
 		FocusFrameDB.disableNameplateScan = not FocusFrameDB.disableNameplateScan
 		local x = FocusFrameDB.disableNameplateScan
 		Focus:ToggleNameplateScan(not x)
-		print("Nameplate scanning %s", x and "disabled" or "enabled")
+		print("Nameplate scanning %s.", x and "disabled" or "enabled")
 	elseif cmd == "reset" then
 		FocusFrameDB = { scale = 1, unlock = true }
 		FocusFrame:SetScale(1)

FocusFrame.toc

@@ -5,16 +5,15 @@
 ## Version: 1.2.0
 ## SavedVariables: FocusFrameDB
 
-libs\FocusData\buffs.lua
-libs\FocusData\spells.lua
-libs\FocusData\spellCastingCore.lua
-libs\FocusData\FocusData.lua
-libs\FocusData\FocusCmds.lua
+libs\FocusCore\SpellGlobals.lua
+libs\FocusCore\SpellCore.lua
+libs\FocusCore\FocusCore.lua
+libs\FocusCore\SlashCommands.lua
 
 FocusFrame.xml
 FocusFrame.lua
 
-mods\loader.lua
-mods\enemyFrames.lua
-mods\classPortraits.lua
-mods\clickcast.lua
+Plugins\Loader.lua
+Plugins\EnemyFrames.lua
+Plugins\ClassPortraits.lua
+Plugins\ClickCast.lua

mods/classPortraits.lua → Plugins/ClassPortraits.lua

@@ -1,11 +1,6 @@
 -- Adds support for ClassPortraits and ClassPortraits_Vanilla.
 local OnLoad = function(Focus, addonName)
-	local iconPath
-	if addonName == "ClassPortraits_Vanilla" then
-		iconPath = "Interface\\Addons\\ClassPortraits_Vanilla\\UI-CLASSES-CIRCLES"
-	else
-		iconPath = "Interface\\Addons\\ClassPortraits\\UI-CLASSES-CIRCLES"
-	end
+	local iconPath = "Interface\\Addons\\" .. addonName .. "\\UI-CLASSES-CIRCLES"
 
 	local CLASS_COORDS = {
 		["HUNTER"]	= { 0,			0.25,		0.25,	0.5  },
@@ -31,8 +26,9 @@ local OnLoad = function(Focus, addonName)
 		end
 	end
 
+	-- "post-hook" event functions used in FocusFrame.lua
 	Focus:OnEvent("FOCUS_UNITID_EXISTS", UpdatePortrait) -- on focus targeted
-	Focus:OnEvent("UNIT_PORTRAIT_UPDATE", UpdatePortrait) -- while focus is targeted
+	Focus:OnEvent("UNIT_PORTRAIT_UPDATE", UpdatePortrait) -- while focus is targeted only
 end
 
 Focus_Loader:Register("ClassPortraits", OnLoad)

Plugins/ClickCast.lua

@@ -0,0 +1,64 @@
+-- luna clickcasting support
+-- note: clique support is not possible afaik
+Focus_Loader:Register("LunaUnitFrames", function(Focus)
+	local orig_lufmo = SlashCmdList.LUFMO
+	local L = LunaUF and LunaUF.L
+	if not L or not LunaUF.Mouseover then return end
+
+	SlashCmdList.LUFMO = function(msg, editbox)
+		local frame = GetMouseFocus()
+
+		if msg and strfind(frame:GetName() or "", "FocusFrame") then
+			Focus:CastSpellByName(msg)
+		else
+			orig_lufmo(msg, editbox)
+		end
+	end
+
+	FocusFrame_OnClick = function(btn)
+		if btn == "UNKNOWN" then
+			btn = LunaUF.clickedButton
+		end
+
+		--[[if Luna_Custom_ClickFunction and Luna_Custom_ClickFunction(btn, "target") then
+			return
+		end]]
+
+		local button = (IsControlKeyDown() and "Ctrl-" or "") .. (IsShiftKeyDown() and "Shift-" or "") .. (IsAltKeyDown() and "Alt-" or "") .. L[btn]
+		local action = LunaUF.db.profile.clickcasting.bindings[button]
+
+		if not action then
+			return
+		elseif action == L["menu"] then
+			if SpellIsTargeting() then
+				return SpellStopTargeting()
+			end
+		elseif action == L["target"] then
+			if SpellIsTargeting() then
+				Focus:Call(SpellTargetUnit)
+			elseif CursorHasItem() then
+				Focus:Call(DropItemOnUnit)
+			else
+				Focus:TargetFocus()
+			end
+		else
+			Focus:TargetFocus()
+			LunaUF:Mouseover(action)
+			Focus:TargetPrevious()
+		end
+	end
+end)
+
+--[[Loader:Register("pfUI", function(Focus)
+	local orig_pfcast = SlashCmdList.PFCAST
+
+	SlashCmdList.PFCAST = function(arg1, arg2)
+		local frame = GetMouseFocus()
+
+		if arg1 and strfind(frame:GetName() or "", "FocusFrame") then
+			Focus:Call(CastSpellByName, arg1)
+		else
+			orig_PFCAST(arg1, arg2)
+		end
+	end
+end)]]

mods/enemyFrames.lua → Plugins/EnemyFrames.lua

@@ -2,7 +2,7 @@
 Focus_Loader:Register("enemyFrames", function(Focus)
 	if not CreateCooldown or not SPELLCASTINGCOREgetPrioBuff then return end
 
-	local getPrioBuff, floor, GetTime = SPELLCASTINGCOREgetPrioBuff, floor, GetTime
+	local getPrioBuff, floor, GetTime = SPELLCASTINGCOREgetPrioBuff, math.floor, GetTime
 
 	local portraitDebuff = CreateFrame("Frame", "FocusPortraitDebuff", FocusFrame)
 	portraitDebuff:SetFrameLevel(0)
@@ -40,6 +40,7 @@ Focus_Loader:Register("enemyFrames", function(Focus)
 	portraitDebuff.cd:SetAlpha(1)
 
 	local function Round(num, idp)
+		idp = idp or num > 3 and 0 or 1
 		local mult = 10^(idp or 0)
 
 		return floor(num * mult + 0.5) / mult
@@ -58,7 +59,7 @@ Focus_Loader:Register("enemyFrames", function(Focus)
 
 			local t = prioBuff.timeEnd - GetTime()
 			portraitDebuff.debuffText:SetTexture(prioBuff.icon)
-			portraitDebuff.duration:SetText(Round(t, t > 3 and 0 or 1))
+			portraitDebuff.duration:SetText(Round(t))
 			portraitDebuff.debuffText:Show()
 			portraitDebuff.cd:SetTimers(prioBuff.timeStart, prioBuff.timeEnd)
 			portraitDebuff.cd:Show()
@@ -77,19 +78,18 @@ Focus_Loader:Register("enemyFrames", function(Focus)
 	end
 
 	local refresh = 0
-	local f = CreateFrame("Frame")
-	f:SetScript("OnUpdate", function()
+	portraitDurationFrame:SetScript("OnUpdate", function()
 		refresh = refresh - arg1
 		if refresh < 0 then
-			if ENEMYFRAMESPLAYERDATA.targetPortraitDebuff and Focus:FocusExists() then
+			if ENEMYFRAMESPLAYERDATA.targetPortraitDebuff and CURR_FOCUS_TARGET then
 				UpdatePortraitDebuff()
 			else
 				--if portraitDebuff:IsVisible() then
 					portraitDebuff:Hide()
 					portraitDebuff.cd:Hide()
 					portraitDebuff.bgText:Hide()
 					portraitDebuff.debuffText:Hide()
-					portraitDebuff.duration:SetText(nil)
+					portraitDebuff.duration:SetText(nil) -- don't hide parent frame or else we cant reuse frame for OnUpdate
 				--end
 			end
 

mods/loader.lua → Plugins/Loader.lua

@@ -47,7 +47,7 @@ end
 function Loader:ADDON_LOADED(addonName)
 	local addon = self.addons[addonName]
 	if addon then
-		local success = pcall(addon.init, FocusData, addonName)
+		local success = pcall(addon.init, FocusCore, addonName)
 		addon.loaded = success
 		addon.hasRan = true
 

libs/FocusData/FocusData.lua → libs/FocusCore/FocusCore.lua

@@ -1,11 +1,11 @@
 ------------
 -- API documentation can be generated using LDoc or viewed here:
 -- https://wardz.github.io/FocusFrame/
--- @module FocusData
+-- @module FocusCore
 -- @author Wardz
 -- @license MIT
 local _G = getfenv(0)
-if _G.FocusData then return end
+if _G.FocusCore then return end
 
 -- Vars
 local Focus = {}
@@ -37,7 +37,6 @@ local GetCast = FSPELLCASTINGCOREgetCast
 --[[
 	@TODO
 	- optimize nameplate scanning
-	- add AceLibrary support if possible
 	- rewrite spellcastingcore completely
 	- update raid mark, leader icon etc on focus leave party and duel
 ]]
@@ -51,7 +50,7 @@ do
 
 		DEFAULT_CHAT_FRAME:AddMessage(string.format(str or "nil", arg1, arg2, arg3, arg4))
 	end
-	FocusData_Log = log
+	FocusCore_Log = log
 end
 
 --------------------------------
@@ -276,12 +275,12 @@ end
 do
 	local UnitBuff, UnitDebuff, UnitIsEnemy = UnitBuff, UnitDebuff, UnitIsEnemy
 
-	local scantip = CreateFrame("GameTooltip", "FocusDataScantip", nil, "GameTooltipTemplate")
+	local scantip = CreateFrame("GameTooltip", "FocusCoreScantip", nil, "GameTooltipTemplate")
 	scantip:SetOwner(UIParent, "ANCHOR_NONE")
 	scantip:SetFrameStrata("TOOLTIP")
 
-	local scantipTextLeft1 = _G["FocusDataScantipTextLeft1"]
-	local scantipTextRight1 = _G["FocusDataScantipTextRight1"]
+	local scantipTextLeft1 = _G["FocusCoreScantipTextLeft1"]
+	local scantipTextRight1 = _G["FocusCoreScantipTextRight1"]
 	local playersFaction = UnitFactionGroup("player")
 
 	-- Store buff into spellcastingcore db
@@ -1141,4 +1140,4 @@ do
 end
 
 -- Add to global namespace
-_G.FocusData = Focus
+_G.FocusCore = Focus

libs/FocusData/FocusCmds.lua → libs/FocusCore/SlashCommands.lua

@@ -2,7 +2,7 @@ if SlashCmdList.MFOCUS then return end
 
 -- Upvalues
 local _G = getfenv(0)
-local Focus = _G.FocusData
+local Focus = _G.FocusCore
 local strfind, strlower, gsub = string.find, string.lower, string.gsub
 local GetContainerNumSlots = GetContainerNumSlots
 
@@ -89,8 +89,8 @@ SlashCmdList.FITEM = function(msg)
 		return Focus:ShowError()
 	end
 
-	local scantip = _G.FocusDataScantip
-	local scantipTextLeft1 = _G.FocusDataScantipTextLeft1
+	local scantip = _G.FocusCoreScantip
+	local scantipTextLeft1 = _G.FocusCoreScantipTextLeft1
 
 	-- Loop through inventory (gear)
 	for i = 19, 1, -1 do

libs/FocusData/spellCastingCore.lua → libs/FocusCore/SpellCore.lua

@@ -427,7 +427,7 @@ local GainAfflict = function()
 		if FOCUS_BUFFS_TO_TRACK[s] then
 			if CURR_FOCUS_TARGET and CURR_FOCUS_TARGET == c then
 				local unit = Focus:GetData("unit")
-				if unit then return end -- buffs will be added in FocusData sync instead
+				if unit then return end -- buffs will be added in FocusCore sync instead
 			end
 
 			newbuff(c, s, 1, false)
@@ -468,7 +468,7 @@ local GainAfflict = function()
 			--else
 			if CURR_FOCUS_TARGET and CURR_FOCUS_TARGET == c then
 				local unit = Focus:GetData("unit")
-				if unit then return end -- buffs will be added in FocusData sync instead
+				if unit then return end -- buffs will be added in FocusCore sync instead
 			end
 				newbuff(c, s, st, false, nil, true)
 			--end
@@ -822,7 +822,10 @@ do
 	local function OnUpdate()
 		refresh = refresh - arg1
 		if refresh < 0 then
-			if FSPELLCASTINGCOREstrictAuras and not Focus:FocusExists() then return end
+			if FSPELLCASTINGCOREstrictAuras and not Focus:FocusExists() then
+				refresh = interval
+				return
+			end
 			tableMaintenance(false)
 			refresh = interval
 		end
@@ -839,7 +842,7 @@ do
 	events:RegisterEvent("VARIABLES_LOADED")
 	events:SetScript("OnEvent", function()
 		if event == "VARIABLES_LOADED" then
-			Focus = assert(FocusData, "FocusData not loaded.")
+			Focus = assert(FocusCore, "FocusCore not loaded.")
 			FSPELLCASTINGCOREstrictAuras = FocusFrameDB and FocusFrameDB.strictAuras
 			events:UnregisterEvent("VARIABLES_LOADED")
 			events:RegisterEvent("PLAYER_ENTERING_WORLD")