Skip to content

Commit

Permalink
Merge pull request #62 from Gennoken/dev
Browse files Browse the repository at this point in the history
2.89
  • Loading branch information
Gennoken authored Aug 20, 2024
2 parents 7bbb445 + 8530cdb commit a868bdf
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 33 deletions.
2 changes: 1 addition & 1 deletion ElvUI_GennUI/ElvUI_GennUI.toc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Interface: 110002
## Title: |cff1784d1ElvUI |cffc31f3bGennUI
## Author: Gennoken
## Version: 2.87
## Version: 2.89
## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken.
## RequiredDeps: ElvUI
## DefaultState: Enabled
Expand Down
2 changes: 1 addition & 1 deletion ElvUI_GennUI/ElvUI_GennUI_Cata.toc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Interface: 40400
## Title: |cff1784d1ElvUI |cffc31f3bGennUI |cff1784d1Wrath
## Author: Gennoken
## Version: 2.87
## Version: 2.89
## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken.
## RequiredDeps: ElvUI
## DefaultState: Enabled
Expand Down
2 changes: 1 addition & 1 deletion ElvUI_GennUI/ElvUI_GennUI_Classic.toc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Interface: 11503
## Title: |cff1784d1ElvUI |cffc31f3bGennUI |cff1784d1Classic
## Author: Gennoken
## Version: 2.87
## Version: 2.89
## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken.
## RequiredDeps: ElvUI
## DefaultState: Enabled
Expand Down
1 change: 1 addition & 0 deletions ElvUI_GennUI/addons/BattleGroundEnemies.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
local E, L, V, P, G = unpack(ElvUI);
local GNUI = E:GetModule("GennUI");
local IsAddOnLoaded = C_AddOns.IsAddOnLoaded

function GNUI:LoadBGEProfile()

Expand Down
46 changes: 46 additions & 0 deletions ElvUI_GennUI/addons/WarpDeplete.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
local E, L, V, P, G = unpack(ElvUI);
local GNUI = E:GetModule("GennUI");

function GNUI:LoadWDProfile()
WarpDepleteDB = {
["profileKeys"] = {
},
["profiles"] = {
["Default"] = {
["barHeight"] = 8,
["bar1TextureColor"] = "ffffd931",
["forcesTexture"] = "GennUI B",
["frameX"] = -10.00022125244141,
["forcesGlowColor"] = "ffffffff",
["keyDetailsFontSize"] = 14,
["timerFont"] = "GennUI",
["bar3Font"] = "GennUI",
["keyDetailsColor"] = "ff00d9ff",
["forcesGlowThickness"] = 1,
["demoForcesGlow"] = true,
["bar3TextureColor"] = "ffffd931",
["objectivesFont"] = "GennUI",
["keyColor"] = "ff00d9ff",
["keyDetailsFont"] = "GennUI",
["forcesFont"] = "GennUI",
["deathLogStyle"] = "count",
["deathsFont"] = "GennUI",
["tooltipCountFormat"] = "+:percent:",
["bar2Texture"] = "GennUI B",
["bar2TextureColor"] = "ffffd931",
["forcesOverlayTexture"] = "GennUI B",
["bar3Texture"] = "GennUI B",
["objectivesFontSize"] = 12,
["bar1Font"] = "GennUI",
["forcesOverlayTextureColor"] = "ffff811e",
["bar2Font"] = "GennUI",
["forcesTextureColor"] = "ffff811e",
["forcesColor"] = "ffffffff",
["deathsColor"] = "ffff2b2f",
["frameY"] = 210.0000762939453,
["bar1Texture"] = "GennUI B",
["keyFont"] = "GennUI",
},
},
}
end
5 changes: 5 additions & 0 deletions ElvUI_GennUI/addons/addons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ if IsAddOnLoaded('Plater') then
GNUI:LoadPlaterProfile()
E:Print(L["'Plater' profile has been set. Note: ElvUI NamePlates have been disabled"])
end
-- WarpDeplete
if IsAddOnLoaded('WarpDeplete') then
GNUI:LoadWDProfile()
E:Print(L["'WarpDeplete' profile has been set."])
end

-- Update ElvUI
E:StaggeredUpdateAll(nil, true)
Expand Down
1 change: 1 addition & 0 deletions ElvUI_GennUI/addons/addons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<Script file="OmniBar.lua"/>
<Script file="OmniCD.lua"/>
<Script file="Plater.lua"/>
<Script file="WarpDeplete.lua"/>
</Ui>
5 changes: 4 additions & 1 deletion ElvUI_GennUI/changelog.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Changelog

**v2.89 [20/08/2024]**
- More 11.0.2 fixes
- AddOns profiles updated: Plater.

**v2.88 [14/08/2024]**
- Quick 11.0.2 fixes

**v2.87 [13/08/2024]**
- Bring back "GennUI B" texture. (Old one "GennUI M" still available)
- AddOns profiles updated: OmniCD, Plater.
- AddOns support removed: WarpDeplete.
- Chat installer fix.
- TWW/Cata/SoD TOC updates.

Expand Down
25 changes: 16 additions & 9 deletions ElvUI_GennUI/core/extra/WT.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ E.db["movers"]["WTExtraItemsBar1Mover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-
E.db["movers"]["WTExtraItemsBar2Mover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,492,372"
E.db["movers"]["WTGameBarAnchor"] = "TOP,ElvUIParent,TOP,0,-4"
E.db["movers"]["WTRaidMarkersBarAnchor"] = "BOTTOM,ElvUIParent,BOTTOM,-340,280"
E.db["WT"]["announcement"]["goodbye"]["enable"] = false
E.db["WT"]["announcement"]["interrupt"]["enable"] = false
E.db["WT"]["announcement"]["interrupt"]["player"]["channel"]["instance"] = "SAY"
E.db["WT"]["announcement"]["interrupt"]["player"]["channel"]["party"] = "SAY"
Expand Down Expand Up @@ -62,6 +61,10 @@ E.db["WT"]["item"]["inspect"]["statsText"]["size"] = 10
E.db["WT"]["item"]["itemLevel"]["enable"] = false
E.db["WT"]["item"]["trade"]["enable"] = false
E.db["WT"]["item"]["trade"]["thanksButton"] = false
E.db["WT"]["maps"]["eventTracker"]["bigDig"]["enable"] = false
E.db["WT"]["maps"]["eventTracker"]["communityFeast"]["sound"] = true
E.db["WT"]["maps"]["eventTracker"]["researchersUnderFire"]["sound"] = true
E.db["WT"]["maps"]["eventTracker"]["siegeOnDragonbaneKeep"]["sound"] = true
E.db["WT"]["misc"]["gameBar"]["additionalText"]["font"]["name"] = "GennUI"
E.db["WT"]["misc"]["gameBar"]["backdrop"] = false
E.db["WT"]["misc"]["gameBar"]["home"]["right"] = "140192"
Expand All @@ -81,28 +84,35 @@ E.db["WT"]["social"]["friendList"]["nameFont"]["size"] = 12
E.db["WT"]["social"]["friendList"]["textures"]["factionIcon"] = true
E.db["WT"]["social"]["friendList"]["textures"]["status"] = "default"
E.db["WT"]["social"]["smartTab"]["enable"] = false
E.db["WT"]["tooltips"]["groupInfo"]["enable"] = false
E.db["WT"]["tooltips"]["elvUITweaks"]["raceIcon"] = false
E.db["WT"]["tooltips"]["elvUITweaks"]["specIcon"] = false
E.private["WT"]["maps"]["minimapButtons"]["backdrop"] = false
E.private["WT"]["maps"]["minimapButtons"]["backdropSpacing"] = 0
E.private["WT"]["maps"]["minimapButtons"]["buttonSize"] = 20
E.private["WT"]["maps"]["minimapButtons"]["buttonsPerRow"] = 8
E.private["WT"]["maps"]["superTracker"]["waypointParse"]["enable"] = false
E.private["WT"]["maps"]["worldMap"]["scale"]["enable"] = false
E.private["WT"]["misc"]["lfgList"]["icon"]["pack"] = "SUNUI"
E.private["WT"]["misc"]["lfgList"]["line"]["tex"] = "GennUI"
E.private["WT"]["misc"]["lfgList"]["line"]["height"] = 1
E.private["WT"]["misc"]["lfgList"]["line"]["tex"] = "GennUI B"
E.private["WT"]["misc"]["lfgList"]["rightPanel"]["enable"] = false
E.private["WT"]["misc"]["moveSpeed"] = true
E.private["WT"]["quest"]["objectiveTracker"]["cosmeticBar"]["border"] = "ONEPIXEL"
E.private["WT"]["quest"]["objectiveTracker"]["cosmeticBar"]["height"] = 1
E.private["WT"]["quest"]["objectiveTracker"]["cosmeticBar"]["offsetY"] = -13
E.private["WT"]["quest"]["objectiveTracker"]["cosmeticBar"]["texture"] = "GennUI B"
E.private["WT"]["quest"]["objectiveTracker"]["cosmeticBar"]["width"] = 230
E.private["WT"]["quest"]["objectiveTracker"]["header"]["color"]["b"] = 0.93333333333333
E.private["WT"]["quest"]["objectiveTracker"]["header"]["color"]["g"] = 0.52156862745098
E.private["WT"]["quest"]["objectiveTracker"]["header"]["color"]["r"] = 0.32941176470588
E.private["WT"]["quest"]["objectiveTracker"]["header"]["color"]["g"] = 0.65882354974747
E.private["WT"]["quest"]["objectiveTracker"]["header"]["color"]["r"] = 0
E.private["WT"]["quest"]["objectiveTracker"]["header"]["size"] = 12
E.private["WT"]["quest"]["objectiveTracker"]["menuTitle"]["classColor"] = false
E.private["WT"]["quest"]["objectiveTracker"]["title"]["size"] = 12
E.private["WT"]["quest"]["objectiveTracker"]["titleColor"]["classColor"] = true
E.private["WT"]["quest"]["objectiveTracker"]["titleColor"]["customColorHighlight"]["b"] = 0.9843137254902
E.private["WT"]["quest"]["objectiveTracker"]["titleColor"]["customColorHighlight"]["g"] = 0.85882352941176
E.private["WT"]["quest"]["objectiveTracker"]["titleColor"]["customColorHighlight"]["r"] = 0.28235294117647
E.private["WT"]["quest"]["objectiveTracker"]["titleColor"]["customColorNormal"]["g"] = 0.65882352941176
E.private["WT"]["skins"]["addons"]["weakAuras"] = false
E.private["WT"]["skins"]["ime"]["label"]["name"] = "GennUI"
E.private["WT"]["skins"]["rollResult"]["name"] = "GennUI"
E.private["WT"]["skins"]["shadow"] = false
Expand All @@ -120,15 +130,12 @@ E.private["WT"]["skins"]["widgets"]["treeGroupButton"]["enable"] = false
E.private["WT"]["skins"]["widgets"]["treeGroupButton"]["selected"]["backdropClassColor"] = true
E.private["WT"]["skins"]["widgets"]["treeGroupButton"]["selected"]["borderClassColor"] = true
E.private["WT"]["skins"]["widgets"]["treeGroupButton"]["selected"]["texture"] = "GennUI B"
E.private["WT"]["tooltips"]["covenant"] = false
E.private["WT"]["tooltips"]["dominationRank"] = false
E.private["WT"]["tooltips"]["factionIcon"] = false
E.private["WT"]["tooltips"]["icon"] = false
E.private["WT"]["tooltips"]["petIcon"] = false
E.private["WT"]["tooltips"]["petId"] = false
E.private["WT"]["tooltips"]["progression"]["enable"] = false
E.private["WT"]["tooltips"]["progression"]["header"] = "TEXT"
E.private["WT"]["tooltips"]["progression"]["special"]["Shadowlands Keystone Master: Season One"] = true
E.private["WT"]["tooltips"]["tierSet"] = false

end
Expand Down
43 changes: 23 additions & 20 deletions ElvUI_GennUI/modules/tooltipicon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ local IsAddOnLoaded = C_AddOns.IsAddOnLoaded
local MyPluginName = "GennUI"
local GNUI = E:GetModule("GennUI");
local GetAddOnMetadata = C_AddOns and C_AddOns.GetAddOnMetadata or GetAddOnMetadata
local GetSpellInfo = C_Spell.GetSpellInfo

--[[ Credit: brykrys, Alason, Freddy, Amavana, Resike, Merathilis ]]--
local VERSION = 1.90
local VERSION = 1.92
local VERSIONINFO = "X-Release"

local NEWTOOLTIPS = (TooltipDataProcessor and TooltipDataProcessor.AddTooltipPostCall) and true or false
local NEWTOOLTIPS = (C_TooltipInfo and TooltipUtil and TooltipDataProcessor and TooltipDataProcessor.AddTooltipPostCall) and true or false

--------------------------------------------------------------------------------
-- VARIABLES
Expand Down Expand Up @@ -42,15 +43,28 @@ local strmatch = strmatch
local strfind = strfind
local strsub = strsub
local next = next
local GetItemIcon = GetItemIcon
local GetSpellInfo = GetSpellInfo
local GetItemIcon = C_Item.GetItemIconByID or GetItemIcon
local GetAchievementInfo = GetAchievementInfo
local GetSpellTexture
-- ### Hybrid GetSpellTexture until C_Spell.GetSpellTexture is migrated to all clients
if C_Spell.GetSpellTexture then
GetSpellTexture = C_Spell.GetSpellTexture
elseif GetSpellInfo then
GetSpellTexture = function(...)
local _, _, texture = GetSpellInfo(...)
return texture
end
end


local GetDisplayedItem, GetDisplayedSpell
if TooltipUtil then
-- These are replacements for tooltip:GetItem and tooltip:GetSpell in 10.0.2
GetDisplayedItem = TooltipUtil.GetDisplayedItem
GetDisplayedSpell = TooltipUtil.GetDisplayedSpell
else
GetDisplayedItem = function(tooltip) return tooltip:GetItem() end
GetDisplayedSpell = function(tooltip) return tooltip:GetSpell() end
end

--------------------------------------------------------------------------------
Expand Down Expand Up @@ -211,7 +225,7 @@ local function GetTextureFromLink(link)
return
elseif linkType == "spell" or linkType == "enchant" then
if options.spell then
local _, _, tpath = GetSpellInfo(id)
local tpath = GetSpellTexture(id)
return tpath
end
return
Expand Down Expand Up @@ -432,21 +446,14 @@ end
-- Hook for when we know the frame contains an item
-- (OnTooltipSetItem)
local function HookItem(frame)
local text
if not options.item then
return
end
local data = IconDataTable[frame]
if not data or data.disable or data.shown then
return
end
if GetDisplayedItem then
local _, t = GetDisplayedItem(frame)
text = t
else
local _, t = frame:GetItem()
text = t
end
local _, text = GetDisplayedItem(frame)
if text then
text = GetItemIcon(text)
if text then
Expand Down Expand Up @@ -513,13 +520,9 @@ local function HookSpell(frame)
if not data or data.disable or data.shown then
return
end
if GetDisplayedSpell then
name, spellID = GetDisplayedSpell(frame)
else
name, spellID = frame:GetSpell()
end
name, spellID = GetDisplayedSpell(frame)
if name then
local _, _, text = GetSpellInfo(spellID)
local text = GetSpellTexture(spellID)
if text then
DisplayIconDispatch(data, text)
end
Expand Down Expand Up @@ -631,7 +634,7 @@ local function HookMacro(frame, datatable)
if not options.spell then
return
end
local _, _, icon = GetSpellInfo(tooltipID)
local icon = GetSpellTexture(tooltipID)
if icon then
DisplayIconDispatch(data, icon)
end
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
- OmniCD
- Plater
- ProjectAzilroka
- WarpDeplete

# « Special Thanks »
- Skullflower and Naowh for inspiration.
Expand Down

0 comments on commit a868bdf

Please sign in to comment.