From 0c78ab21b3217e2b7751980d2e46991551ad1d93 Mon Sep 17 00:00:00 2001 From: Phanx Date: Fri, 22 Jul 2016 23:40:36 -0700 Subject: [PATCH] Update for 7.0 --- !ClassColors.toc | 4 ++-- .gitignore | 13 ------------- CHANGELOG.md | 4 ++++ ClassColors.lua | 4 ++-- ClassColorsBlizz.lua | 22 +++++++++++----------- LICENSE.txt | 3 +-- Localization.lua | 2 +- 7 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 .gitignore diff --git a/!ClassColors.toc b/!ClassColors.toc index 1b20112..2251d63 100644 --- a/!ClassColors.toc +++ b/!ClassColors.toc @@ -1,4 +1,4 @@ -## Interface: 60200 +## Interface: 70000 ## Version: @project-version@ ## Title: Class Colors @@ -11,7 +11,7 @@ ## Author: Phanx ## X-Email: addons@phanx.net -## X-Copyright: Copyright (c) 2009-2015 Phanx. All rights reserved. +## X-Copyright: Copyright (c) 2009-2016 Phanx. All rights reserved. ## X-CompatibleLocales: enUS, deDE, esES, esMX, frFR, itIT, koKR, ptBR, ruRU, zhCN, zhTW ## X-Localizations: enUS, deDE, esES, esMX, ptBR, ruRU ## X-Website: https://github.com/Phanx/ClassColors diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f719ca0..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Miscellaneous ------------------------------------------------------------# - -*.bak -*.bat -*.ods -.svn/ -Libs/ - -# Windows garbage ----------------------------------------------------------# - -Desktop.ini -ehthumbs.db -Thumbs.db \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3639c7f..351a0b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### Version 7.0.3.0 + +* Updated for WoW 7.0 (Legion) + ### Version 6.2.2.0 * Updated for WoW 6.2.2 diff --git a/ClassColors.lua b/ClassColors.lua index a235da7..df29845 100644 --- a/ClassColors.lua +++ b/ClassColors.lua @@ -1,7 +1,7 @@ --[[-------------------------------------------------------------------- !ClassColors Change class colors without breaking the Blizzard UI. - Copyright (c) 2009-2015 Phanx . All rights reserved. + Copyright (c) 2009-2016 Phanx . All rights reserved. http://www.wowinterface.com/downloads/info12513-ClassColors.html http://www.curse.com/addons/wow/classcolors ----------------------------------------------------------------------]] @@ -488,4 +488,4 @@ do end end ------------------------------------------------------------------------- \ No newline at end of file +------------------------------------------------------------------------ diff --git a/ClassColorsBlizz.lua b/ClassColorsBlizz.lua index f11c0d6..b47f456 100644 --- a/ClassColorsBlizz.lua +++ b/ClassColorsBlizz.lua @@ -1,7 +1,7 @@ --[[-------------------------------------------------------------------- !ClassColors Change class colors without breaking the Blizzard UI. - Copyright (c) 2009-2015 Phanx . All rights reserved. + Copyright (c) 2009-2016 Phanx . All rights reserved. http://www.wowinterface.com/downloads/info12513-ClassColors.html http://www.curse.com/addons/wow/classcolors ----------------------------------------------------------------------]] @@ -656,22 +656,22 @@ end -- Blizzard_TradeSkillUI.lua addonFuncs["Blizzard_TradeSkillUI"] = function() - local TRADE_SKILL_GUILD_CRAFTERS_DISPLAYED = TRADE_SKILL_GUILD_CRAFTERS_DISPLAYED - local FauxScrollFrame_GetOffset, TradeSkillGuildCraftersFrame = FauxScrollFrame_GetOffset, TradeSkillGuildCraftersFrame - local GetGuildRecipeInfoPostQuery, GetGuildRecipeMember = GetGuildRecipeInfoPostQuery, GetGuildRecipeMember + hooksecurefunc(TradeSkillFrame.DetailsFrame.GuildFrame, "Refresh", function(self) + if self.waitingOnData then return end - hooksecurefunc(TradeSkillGuilCraftersFrame_Update and "TradeSkillGuilCraftersFrame_Update" or "TradeSkillGuildCraftersFrame_Update", function() local _, _, numMembers = GetGuildRecipeInfoPostQuery() - local offset = FauxScrollFrame_GetOffset(TradeSkillGuildCraftersFrame) - for i = 1, TRADE_SKILL_GUILD_CRAFTERS_DISPLAYED do - if i > numMembers then + local offset = FauxScrollFrame_GetOffset(self.Container.ScrollFrame) + for i, craftersButton in ipairs(self.Container.ScrollFrame.buttons) do + local dataIndex = offset + i + if dataIndex > numMembers then break end - local _, class, online = GetGuildRecipeMember(i + offset) + + local _, _, class, online = GetGuildRecipeMember(i + offset) if class and online then local color = CUSTOM_CLASS_COLORS[class] if color then - _G["TradeSkillGuildCrafter"..i.."Text"]:SetTextColor(color.r, color.g, color.b) + craftersButton.Text:SetTextColor(color.r, color.g, color.b) end end end @@ -706,4 +706,4 @@ if numAddons > 0 then self:SetScript("OnEvent", nil) end end) -end \ No newline at end of file +end diff --git a/LICENSE.txt b/LICENSE.txt index 82451d7..905503f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -13,8 +13,7 @@ Permission is granted for anyone to aggregate this software with other works not derived from this software for the purpose of creating a user interface replacement (commonly referred to as a "compilation" or "addon pack") for the "World of Warcraft" game client, and to distribute such collective works on -websites operated by Curse Inc or ZAM Network LLC (including curse.com, -curseforge.com, wowace.com and wowinterface.com) as long as the software is +the websites at Curse.com and WoWInterface.com, as long as the software is not modified in any way, including by modifying or removing any files. This software may not be redistributed by itself or in any other way, in whole diff --git a/Localization.lua b/Localization.lua index ca0fa78..e0fb211 100644 --- a/Localization.lua +++ b/Localization.lua @@ -1,7 +1,7 @@ --[[-------------------------------------------------------------------- !ClassColors Change class colors without breaking the Blizzard UI. - Copyright (c) 2009-2015 Phanx . All rights reserved. + Copyright (c) 2009-2016 Phanx . All rights reserved. http://www.wowinterface.com/downloads/info12513-ClassColors.html http://www.curse.com/addons/wow/classcolors ----------------------------------------------------------------------]]