Merge pull request #15 from h2oboi89/develop

Develop

.gitignore

@@ -1 +1,2 @@
-Release/
+Release/
+.vscode/

src/Core.lua

@@ -1,24 +1,91 @@
-TradeSkillReagents = LibStub("AceAddon-3.0"):NewAddon("TradeSkillReagents", "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0", "AceTimer-3.0")
+TradeSkillReagents = LibStub("AceAddon-3.0"):NewAddon("TradeSkillReagents",
+                                                      "AceConsole-3.0",
+                                                      "AceEvent-3.0",
+                                                      "AceHook-3.0",
+                                                      "AceTimer-3.0")
 
 local defaults = {
     global = {
         version = false,
         options = {
-            debug = false
+            debug = false,
+            tooltip = {
+                useSingleColor = true,
+                singleColor = {r = 0, g = 1, b = 1, a = 1},
+                tradeSkills = {}
+            }
         },
         reagents = {}
     }
 }
 
-local function deepcopy(orig)
+local options = {
+    name = "Trade Skill Reagents",
+    type = "group",
+    handler = TradeSkillReagents,
+    args = {
+        colors = {
+            name = "Colors",
+            type = "group",
+            inline = true,
+            args = {
+                useSingleColor = {
+                    name = "Use single color for trade skills in tooltips",
+                    desc = "Uncheck to use different colors for each trade skill",
+                    type = "toggle",
+                    set = "SetOptionsSingleColorToggle",
+                    get = "GetOptionsSingleColorToggle"
+                },
+                singleColor = {
+                    name = "Single Color",
+                    type = "color",
+                    set = "SetOptionsSingleColor",
+                    get = "GetOptionsSingleColor"
+                },
+                tradeSkills = {
+                    name = "Trade Skill Colors",
+                    type = "group",
+                    inline = true,
+                    disabled = "GetOptionsTradeSkillsColorsDisabled",
+                    order = -1,
+                    args = {}
+                }
+            }
+        },
+        debug = {
+            name = "Debug",
+            desc = "Enables debug print statements",
+            descStyle = "inline",
+            type = "toggle",
+            set = "SetOptionsDebug",
+            get = "GetOptionsDebug",
+            order = -1
+        }
+    }
+}
+
+local function dictInsert(dict, key, value)
+    if dict[key] then return end
+
+    dict[key] = value
+end
+
+local function listInsert(list, value)
+    local exists = false
+    for _, v in ipairs(list) do if v == value then exists = true end end
+
+    if not exists then table.insert(list, value) end
+end
+
+local function deepCopy(orig)
     local orig_type = type(orig)
     local copy
     if orig_type == 'table' then
         copy = {}
         for orig_key, orig_value in next, orig, nil do
-            copy[deepcopy(orig_key)] = deepcopy(orig_value)
+            copy[deepCopy(orig_key)] = deepCopy(orig_value)
         end
-        setmetatable(copy, deepcopy(getmetatable(orig)))
+        setmetatable(copy, deepCopy(getmetatable(orig)))
     else
         copy = orig
     end
@@ -29,10 +96,11 @@ local function dump(o)
     if type(o) == 'table' then
         local s = '{ '
 
-        for k,v in pairs(o) do
-            if type(k) ~= 'number' then k = '"'..k..'"' end
+        for k, v in pairs(o) do
+            if type(k) == 'table' then k = dump(k) end
+            if type(k) ~= 'number' then k = '"' .. k .. '"' end
 
-            s = s .. '['..k..'] = ' .. dump(v) .. ','
+            s = s .. '[' .. k .. '] = ' .. dump(v) .. ','
         end
 
         return s .. '} '
@@ -41,14 +109,18 @@ local function dump(o)
     end
 end
 
-local function addOnVersion() return tonumber(GetAddOnMetadata("TradeSkillReagents", "Version")) end
+local function addOnVersion()
+    return tonumber(GetAddOnMetadata("TradeSkillReagents", "Version"))
+end
 
 local function isVersionNewer(db, version)
     -- no version set (1.0 or fresh DB)
     if not db.global.version then return true end
-    
+
     -- major version change
-    if (math.floor(version) - math.floor(db.global.version) >= 1) then return true end
+    if (math.floor(version) - math.floor(db.global.version) >= 1) then
+        return true
+    end
 
     return false
 end
@@ -64,40 +136,69 @@ function TradeSkillReagents:OnInitialize()
 
     if isVersionNewer(self.db, version) then
         if self.db.global.version then
-            self:Print("newer version detected ( v" .. self.db.global.version .. " -> v" .. version .. " ), resetting database")
+            self:Print("newer version detected ( v" .. self.db.global.version ..
+                           " -> v" .. version .. " ), resetting database")
         else
-            self:Print("no version detected, starting new database ( v" .. version .. " )")
+            self:Print("no version detected, starting new database ( v" ..
+                           version .. " )")
         end
 
         self.db.global.version = version
-        self.db.global.options = deepcopy(defaults.global.options)
-        self.db.global.reagents = deepcopy(defaults.global.reagents)
+        self.db.global.options = deepCopy(defaults.global.options)
+        self.db.global.reagents = deepCopy(defaults.global.reagents)
     end
 
     self.db = self.db.global
 
-    self.db.options.debug = true
+    self:AddTradeSkillColorOptions()
+
+    LibStub("AceConfig-3.0"):RegisterOptionsTable("TradeSkillReagents", options)
+    LibStub("AceConfigDialog-3.0"):AddToBlizOptions("TradeSkillReagents",
+                                                    "Trade Skill Reagents")
 end
 
+function TradeSkillReagents:AddTradeSkillColorOptions()
+    local tradeSkillOptions = options.args.colors.args.tradeSkills.args
+
+    for tradeSkill, _ in pairs(self.db.options.tooltip.tradeSkills) do
+        tradeSkillOptions[tradeSkill] = {
+            name = tradeSkill,
+            type = "color",
+            set = "SetOptionsTradeSkillColor",
+            get = "GetOptionsTradeSkillColor"
+        }
+    end
+end
+
+-- HACK to get GameTooltip:GetItem to work in TradeSkill UI for recipe reagents
+-- local GameTooltipSetRecipeReagentItem = GameTooltip.SetRecipeReagentItem
+-- function GameTooltip:SetRecipeReagentItem(...)
+--     local link = C_TradeSkillUI.GetRecipeReagentItemLink(...)
+--     if link then return self:SetHyperlink(link) end
+--     return GameTooltipSetRecipeReagentItem(self, ...)
+-- end
+
 function TradeSkillReagents:OnEnable()
     self:RegisterEvent("TRADE_SKILL_LIST_UPDATE")
 
-    self:RawHookScript(GameTooltip, "OnTooltipSetItem", "AttachTooltip")
-    self:RawHookScript(ItemRefTooltip, "OnTooltipSetItem", "AttachTooltip")
+    self:HookScript(GameTooltip, "OnToolTipSetItem", "AddTradeSkillTooltipInfo")
+    self:HookScript(ItemRefTooltip, "OnToolTipSetItem",
+                    "AddTradeSkillTooltipInfo")
 end
 
 function TradeSkillReagents:TRADE_SKILL_LIST_UPDATE()
     if self.ScanTimer then return end
 
-    self.ScanTimer = self:ScheduleTimer(function () self:ProcessRecipes() end, 1)
+    self.ScanTimer = self:ScheduleTimer(function() self:ProcessRecipes() end, 1)
 end
 
 local function getTradeSkillName()
-    local _, skillLineDisplayName, _, _, _, _, parentSkillLineDisplayName = C_TradeSkillUI.GetTradeSkillLine()
-
+    local _, skillLineDisplayName, _, _, _, _, parentSkillLineDisplayName =
+        C_TradeSkillUI.GetTradeSkillLine()
+
     local tradeSkillName = nil
 
-    if not skillLineDisplayName then 
+    if not skillLineDisplayName then
         return
     else
         tradeSkillName = skillLineDisplayName
@@ -112,7 +213,7 @@ end
 
 local function getTradeSkillCategories()
     local categories = {}
-    
+
     for _, categoryID in pairs({C_TradeSkillUI.GetCategories()}) do
         categories[categoryID] = C_TradeSkillUI.GetCategoryInfo(categoryID).name
     end
@@ -131,77 +232,121 @@ local function getTradeSkillCategoryName(categories, categoryID)
     return categoryName
 end
 
-local function addIfNew(tbl, value)
-    local exists = false
-    for _, v in ipairs(tbl) do
-        if v == value then exists = true end
-    end
-
-    if not exists then table.insert(tbl, value) end
-end
-
 function TradeSkillReagents:ProcessRecipes()
     self.ScanTimer = nil
 
     local tradeSkill = getTradeSkillName()
-
-    if not tradeSkill or not C_TradeSkillUI.IsTradeSkillReady() then 
-        return 
-    end
 
-    self:Debug("Scanning " .. tradeSkill)
+    if not tradeSkill or not C_TradeSkillUI.IsTradeSkillReady() then return end
 
-    local db = self.db.reagents
+    self:Debug("Scanning " .. tradeSkill)
 
     local categories = getTradeSkillCategories()
-    
+
     local recipeIDs = C_TradeSkillUI.GetAllRecipeIDs()
     local recipeCount = 0
     local reagentCount = 0
 
     for _, recipeID in ipairs(recipeIDs) do
         local recipeInfo = C_TradeSkillUI.GetRecipeInfo(recipeID)
 
-        local category = getTradeSkillCategoryName(categories, recipeInfo.categoryID)
+        local category = getTradeSkillCategoryName(categories,
+                                                   recipeInfo.categoryID)
 
         for reagentIndex = 1, C_TradeSkillUI.GetRecipeNumReagents(recipeID) do
-            local reagentName = C_TradeSkillUI.GetRecipeReagentInfo(recipeID, reagentIndex)
-
-            if reagentName then 
-                db[reagentName] = db[reagentName] or {}
-                db[reagentName][tradeSkill] = db[reagentName][tradeSkill] or {}
-                addIfNew(db[reagentName][tradeSkill], category)
-
+            local reagentName = C_TradeSkillUI.GetRecipeReagentInfo(recipeID,
+                                                                    reagentIndex)
+
+            if reagentName then
+                dictInsert(self.db.reagents, reagentName, {})
+                dictInsert(self.db.reagents[reagentName], tradeSkill, {})
+                listInsert(self.db.reagents[reagentName][tradeSkill], category)
+
                 reagentCount = reagentCount + 1
             end
         end
 
         recipeCount = recipeCount + 1
     end
 
-    self:Debug("Done scanning " .. tradeSkill .. " ( " .. recipeCount .. " recipes | " .. reagentCount .. " reagents )")
+    if reagentCount > 0 then
+        dictInsert(self.db.options.tooltip.tradeSkills, tradeSkill,
+                   deepCopy(defaults.global.options.tooltip.singleColor))
+    end
+
+    self:Debug("Done scanning " .. tradeSkill .. " ( " .. recipeCount ..
+                   " recipes | " .. reagentCount .. " reagents )")
 end
 
-function TradeSkillReagents:AttachTooltip(tooltip, ...)
-    if IsShiftKeyDown() then return end
+function TradeSkillReagents:GetTooltipColor(tradeSkill)
+    if self.db.options.tooltip.useSingleColor then
+        return self.db.options.tooltip.singleColor
+    else
+        return self.db.options.tooltip.tradeSkills[tradeSkill]
+    end
+end
 
-    local itemName, _ = tooltip:GetItem();
+function TradeSkillReagents:AddTradeSkillTooltipInfo(tooltip)
+    if IsShiftKeyDown() then return end
 
-    local db = self.db.reagents
+    local itemName, itemLink = tooltip:GetItem()
 
-    if not db[itemName] then return end
+    if not self.db.reagents[itemName] then return end
 
     local lines = {}
 
-    for tradeSkill, categories in pairs(db[itemName]) do
+    for tradeSkill, categories in pairs(self.db.reagents[itemName]) do
         for _, category in ipairs(categories) do
-            table.insert(lines, tradeSkill .. " - " .. category)
+            table.insert(lines, {
+                text = tradeSkill .. " - " .. category,
+                tradeSkill = tradeSkill
+            })
         end
     end
 
-    table.sort(lines)
+    table.sort(lines, function(a, b) return a.text < b.text end)
 
     for _, line in ipairs(lines) do
-        tooltip:AddLine(line , 0, 1, 1)
+        local color = self:GetTooltipColor(line.tradeSkill)
+        tooltip:AddLine(line.text, color.r, color.g, color.b)
     end
 end
+
+function TradeSkillReagents:SetOptionsDebug(info, value)
+    self.db.options.debug = value
+end
+
+function TradeSkillReagents:GetOptionsDebug(info) return self.db.options.debug end
+
+function TradeSkillReagents:SetOptionsSingleColorToggle(info, value)
+    self.db.options.tooltip.useSingleColor = value
+end
+
+function TradeSkillReagents:GetOptionsSingleColorToggle(info)
+    return self.db.options.tooltip.useSingleColor
+end
+
+function TradeSkillReagents:SetOptionsSingleColor(info, r, g, b, a)
+    self.db.options.tooltip.singleColor = {r = r, g = g, b = b, a = a}
+end
+
+function TradeSkillReagents:GetOptionsSingleColor(info)
+    local color = self.db.options.tooltip.singleColor
+    return color.r, color.g, color.b, color.a
+end
+
+function TradeSkillReagents:GetOptionsTradeSkillsColorsDisabled(info)
+    return self.db.options.tooltip.useSingleColor
+end
+
+function TradeSkillReagents:SetOptionsTradeSkillColor(info, r, g, b, a)
+    local tradeSkill = info[#info]
+    self.db.options.tooltip.tradeSkills[tradeSkill] =
+        {r = r, g = g, b = b, a = a}
+end
+
+function TradeSkillReagents:GetOptionsTradeSkillColor(info)
+    local tradeSkill = info[#info]
+    local color = self.db.options.tooltip.tradeSkills[tradeSkill]
+    return color.r, color.g, color.b, color.a
+end

src/embeds.xml

@@ -2,6 +2,8 @@
   <Script file="Libs\LibStub\LibStub.lua"/>
   <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
   <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
+  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
+  <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
   <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
   <Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
   <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml"/>