diff --git a/.gitignore b/.gitignore
index bc31345e..95e80e4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/GPUCache
/Cache
/Data
/Errors
@@ -7,6 +8,29 @@
/Utils
/WTF
+# Ignore addons
+/Interface/Addons
+
+# But don't ignore NeavUI addons
+# This allows you to install any other addons you want to and they wont be tracked by git
+# Any addon you want to be a part of NeavUI and be tracked by git, add to this list
+!/Interface/Addons/!BeautyCase
+!/Interface/Addons/!Colorz
+!/Interface/Addons/evl_RaidStatus
+!/Interface/Addons/nBuff
+!/Interface/Addons/nCore
+!/Interface/Addons/nMainbar
+!/Interface/Addons/nMinimap
+!/Interface/Addons/nPlates
+!/Interface/Addons/nPower
+!/Interface/Addons/nTooltip
+!/Interface/Addons/oUF
+!/Interface/Addons/oUF_Neav
+!/Interface/Addons/oUF_NeavRaid
+
+.curseclient
+.flavor.info
+
.build.info
.patch.result
diff --git a/Interface/AddOns/!Beautycase/!Beautycase.toc b/Interface/AddOns/!Beautycase/!Beautycase.toc
index d87e5d2d..ae778494 100644
--- a/Interface/AddOns/!Beautycase/!Beautycase.toc
+++ b/Interface/AddOns/!Beautycase/!Beautycase.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: !Beautycase
core.lua
diff --git a/Interface/AddOns/!Colorz/!Colorz.lua b/Interface/AddOns/!Colorz/!Colorz.lua
index d87cbe24..a9328f4b 100644
--- a/Interface/AddOns/!Colorz/!Colorz.lua
+++ b/Interface/AddOns/!Colorz/!Colorz.lua
@@ -42,35 +42,31 @@ hooksecurefunc("ReputationFrame_Update", function(showLFGPulse)
local factionIndex = factionOffset + i
local factionBar = _G["ReputationBar"..i.."ReputationBar"]
+ -- Classic: fallback
+ if factionBar == nil then
+ factionBar = _G["ReputationBar"..i]
+ end
+
if factionIndex <= numFactions then
local name, description, standingID = GetFactionInfo(factionIndex)
-
local colorIndex = standingID
- local friendID = GetFriendshipReputation(factionID)
-
- if friendID ~= nil then
- colorIndex = 5 -- always color friendships green
- end
-
local color = CUSTOM_FACTION_BAR_COLORS[colorIndex]
factionBar:SetStatusBarColor(color.r, color.g, color.b)
end
end
end)
-hooksecurefunc(ReputationBarMixin, "Update", function(self)
- local name, reaction, minBar, maxBar, value, factionID = GetWatchedFactionInfo();
- local colorIndex = reaction;
- local friendshipID = GetFriendshipReputation(factionID);
-
- if friendshipID then
- colorIndex = 5; -- always color friendships green
- end
+-- Classic: 'ReputationBarMixin' is not available
+if ReputationBarMixin then
+ hooksecurefunc(ReputationBarMixin, "Update", function(self)
+ local name, reaction, minBar, maxBar, value, factionID = GetWatchedFactionInfo();
+ local colorIndex = reaction;
- local color = CUSTOM_FACTION_BAR_COLORS[colorIndex];
- self:SetBarColor(color.r, color.g, color.b, 1);
-end)
+ local color = CUSTOM_FACTION_BAR_COLORS[colorIndex];
+ self:SetBarColor(color.r, color.g, color.b, 1);
+ end)
+end
-- Override the default GameTooltip_UnitColor function.
diff --git a/Interface/AddOns/!Colorz/!Colorz.toc b/Interface/AddOns/!Colorz/!Colorz.toc
index 3185b8ce..257e8513 100644
--- a/Interface/AddOns/!Colorz/!Colorz.toc
+++ b/Interface/AddOns/!Colorz/!Colorz.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: !Colorz
## Notes: Custom colors
diff --git a/Interface/AddOns/evl_RaidStatus/evl_RaidStatus.toc b/Interface/AddOns/evl_RaidStatus/evl_RaidStatus.toc
index 480f8784..89bf9100 100644
--- a/Interface/AddOns/evl_RaidStatus/evl_RaidStatus.toc
+++ b/Interface/AddOns/evl_RaidStatus/evl_RaidStatus.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: Evl's Raid Status
## Author: Evl
diff --git a/Interface/AddOns/nBuff/core.lua b/Interface/AddOns/nBuff/core.lua
index fbcdea5c..17bcb8ab 100644
--- a/Interface/AddOns/nBuff/core.lua
+++ b/Interface/AddOns/nBuff/core.lua
@@ -62,10 +62,11 @@ TempEnchant2:SetPoint("TOPRIGHT", TempEnchant1, "TOPLEFT", -cfg.paddingX, 0)
local function UpdateFirstButton(self)
if self and self:IsShown() then
self:ClearAllPoints()
- if UnitHasVehicleUI("player") then
- self:SetPoint("TOPRIGHT", TempEnchant1)
- return
- else
+ -- Classic TODO: Doesn't have vehilces, can this be updated to still work with Retail?
+ -- if UnitHasVehicleUI("player") then
+ -- self:SetPoint("TOPRIGHT", TempEnchant1)
+ -- return
+ -- else
if BuffFrame.numEnchants > 0 then
self:SetPoint("TOPRIGHT", _G["TempEnchant"..BuffFrame.numEnchants], "TOPLEFT", -cfg.paddingX, 0)
return
@@ -73,7 +74,7 @@ local function UpdateFirstButton(self)
self:SetPoint("TOPRIGHT", TempEnchant1)
return
end
- end
+ -- end
end
end
diff --git a/Interface/AddOns/nBuff/nBuff.toc b/Interface/AddOns/nBuff/nBuff.toc
index 101e79fd..603274e0 100644
--- a/Interface/AddOns/nBuff/nBuff.toc
+++ b/Interface/AddOns/nBuff/nBuff.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rBuff
config.lua
diff --git a/Interface/AddOns/nChat/core.lua b/Interface/AddOns/nChat/core.lua
index f28c2dd4..68785372 100644
--- a/Interface/AddOns/nChat/core.lua
+++ b/Interface/AddOns/nChat/core.lua
@@ -68,15 +68,18 @@ end
-- Quick Join Button Options
-if cfg.enableQuickJoinButton then
- ChatAlertFrame:ClearAllPoints()
- ChatAlertFrame:SetPoint("BOTTOMLEFT", ChatFrame1Tab, "TOPLEFT", 0, 0)
- QuickJoinToastButton:ClearAllPoints()
- QuickJoinToastButton:SetPoint("BOTTOMLEFT", ChatAlertFrame, "TOPLEFT", 0, 0)
-else
- QuickJoinToastButton:SetAlpha(0)
- QuickJoinToastButton:EnableMouse(false)
- QuickJoinToastButton:UnregisterAllEvents()
+-- Classic: QuickJoinToastButton doesn't exist so add check
+if QuickJoinToastButton then
+ if cfg.enableQuickJoinButton then
+ ChatAlertFrame:ClearAllPoints()
+ ChatAlertFrame:SetPoint("BOTTOMLEFT", ChatFrame1Tab, "TOPLEFT", 0, 0)
+ QuickJoinToastButton:ClearAllPoints()
+ QuickJoinToastButton:SetPoint("BOTTOMLEFT", ChatAlertFrame, "TOPLEFT", 0, 0)
+ else
+ QuickJoinToastButton:SetAlpha(0)
+ QuickJoinToastButton:EnableMouse(false)
+ QuickJoinToastButton:UnregisterAllEvents()
+ end
end
-- Voice Chat Buttons
@@ -261,6 +264,34 @@ local function ModChat(self)
chat.AddMessage = FCF_AddMessage
end
+ -- Classic: Brought over hiding the chat scroll buttons from a previous version
+ local buttonUp = _G[self..'ButtonFrameUpButton']
+ if buttonUp ~= nil then
+ buttonUp:SetAlpha(0)
+ buttonUp:EnableMouse(false)
+ end
+
+ local buttonDown = _G[self..'ButtonFrameDownButton']
+ if buttonDown ~= nil then
+ buttonDown:SetAlpha(0)
+ buttonDown:EnableMouse(false)
+ end
+
+ local buttonBottom = _G[self..'ButtonFrameBottomButton']
+ if buttonBottom ~= nil then
+ if (cfg.enableBottomButton) then
+ buttonBottom:Hide()
+ buttonBottom:ClearAllPoints()
+ buttonBottom:SetPoint('BOTTOMLEFT', chat, -1, -3)
+ buttonBottom:HookScript('OnClick', function(self)
+ self:Hide()
+ end)
+ else
+ buttonBottom:SetAlpha(0)
+ buttonBottom:EnableMouse(false)
+ end
+ end
+
for _, texture in pairs({
"ButtonFrameBackground",
"ButtonFrameTopLeftTexture",
@@ -272,12 +303,21 @@ local function ModChat(self)
"ButtonFrameBottomTexture",
"ButtonFrameTopTexture",
}) do
- _G[self..texture]:SetTexture(nil)
+ -- Classic: These textures don't exist
+ if _G[self..texture] then
+ _G[self..texture]:SetTexture(nil)
+ end
end
-- Modify the editbox
- for k = 3, 8 do
+ --[[
+ Classic: Tried to find an elegent solution to SetTexture not being available on regions [3-8],
+ but I could only get this to work if the loop to work if only regions [3-5] were done.
+
+ Could be due to my limited WoW and Lua knowledge :s
+ ]]--
+ for k = 3, 5 do
select(k, _G[self.."EditBox"]:GetRegions()):SetTexture(nil)
end
diff --git a/Interface/AddOns/nChat/nChat.toc b/Interface/AddOns/nChat/nChat.toc
index 52f15faa..05b180ce 100644
--- a/Interface/AddOns/nChat/nChat.toc
+++ b/Interface/AddOns/nChat/nChat.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rChat
## RequiredDeps: !Beautycase
diff --git a/Interface/AddOns/nCore/modules/archaeology.lua b/Interface/AddOns/nCore/modules/archaeology.lua
index ba2c16a0..624e8cfd 100644
--- a/Interface/AddOns/nCore/modules/archaeology.lua
+++ b/Interface/AddOns/nCore/modules/archaeology.lua
@@ -49,6 +49,9 @@ function nCore:ArchaeologyHelper()
if not mapID then return end
+ -- Classic: Doesn't support Archaeology
+ if ArchaeologyMapUpdateAll == nil then return end
+
if ArchaeologyMapUpdateAll(mapID) > 0 and CanScanResearchSite() and GetSpellCooldown(SURVEY_SPELL_ID) == 0 and not IsEquippedItemType(FISHING_POLE) then
if GetNumLootItems() == 0 and previousClickTime then
local doubleClickTime = GetTime() - previousClickTime
diff --git a/Interface/AddOns/nCore/modules/coords.lua b/Interface/AddOns/nCore/modules/coords.lua
index 81e3913f..da2e22b0 100644
--- a/Interface/AddOns/nCore/modules/coords.lua
+++ b/Interface/AddOns/nCore/modules/coords.lua
@@ -4,7 +4,11 @@ function nCore:MapCoords()
local unpack = unpack
-- Temp fix until Blizzard removed the ! icon from the global string.
- local _, MOUSE_LABEL = strsplit("1", MOUSE_LABEL, 2)
+ -- Extended this to support Classic as 'strsplit' won't work on MOUSE_LABEL as it doesn't have the ! icon
+ local _, mouseLabel = strsplit("1", MOUSE_LABEL, 2)
+ if ( mouseLabel == nil ) then
+ mouseLabel = MOUSE_LABEL
+ end
local cfg = {
location = {"BOTTOMLEFT", WorldMapFrame, "BOTTOMLEFT", 10, 0},
@@ -56,7 +60,7 @@ function nCore:MapCoords()
if cx then
if cx >= 0 and cy >= 0 and cx <= 1 and cy <= 1 then
- self.Mouse.Text:SetFormattedText("%s: %.1f x %.1f", MOUSE_LABEL, cx * 100, cy * 100)
+ self.Mouse.Text:SetFormattedText("%s: %.1f x %.1f", mouseLabel, cx * 100, cy * 100)
else
self.Mouse.Text:SetText("")
end
diff --git a/Interface/AddOns/nCore/modules/dressroom.lua b/Interface/AddOns/nCore/modules/dressroom.lua
index 17bb78cf..558971b7 100644
--- a/Interface/AddOns/nCore/modules/dressroom.lua
+++ b/Interface/AddOns/nCore/modules/dressroom.lua
@@ -5,7 +5,12 @@ function nCore:Dressroom()
DressUpFrameCancelButton:SetText("Naked")
DressUpFrameCancelButton:SetScript("OnClick", function()
- DressUpModel:Undress()
+ -- Classic: Use DressUpModelFrame instead
+ if DressUpModelFrame then
+ DressUpModelFrame:Undress()
+ else
+ DressUpModel:Undress()
+ end
end)
DressUpFrameResetButton:SetText("Clothed")
end
\ No newline at end of file
diff --git a/Interface/AddOns/nCore/modules/durability.lua b/Interface/AddOns/nCore/modules/durability.lua
index bf615517..fb46194e 100644
--- a/Interface/AddOns/nCore/modules/durability.lua
+++ b/Interface/AddOns/nCore/modules/durability.lua
@@ -30,8 +30,16 @@ function nCore:Durability()
local charString = CharacterLevelText
charString:SetFont(STANDARD_TEXT_FONT, 14)
- local tab = CreateFrame("Button", "PaperDollFrameDurabilityTab", PaperDollSidebarTab1, "CharacterFrameTabButtonTemplate")
- tab:SetPoint("TOP", PaperDollFrame, "BOTTOM", 170, 2)
+ -- For retail use PaperDollSidebarTab1, Classic use PaperDollItemsFrame
+ local tab = nil
+ if PaperDollSidebarTab1 then
+ tab = CreateFrame('Button', 'PaperDollFrameDurabilityTab', PaperDollSidebarTab1, 'CharacterFrameTabButtonTemplate')
+ tab:SetPoint('TOP', PaperDollFrame, 'BOTTOM', 170, 2)
+ else
+ tab = CreateFrame('Button', 'PaperDollFrameDurabilityTab', PaperDollItemsFrame, 'CharacterFrameTabButtonTemplate')
+ tab:SetPoint('TOP', PaperDollFrame, 'BOTTOM', 103, 78)
+ end
+
tab:Disable()
tab:EnableMouse(false)
tab:SetFrameStrata("BACKGROUND")
diff --git a/Interface/AddOns/nCore/modules/objectivetracker.lua b/Interface/AddOns/nCore/modules/objectivetracker.lua
index 01fe783b..04259e2d 100644
--- a/Interface/AddOns/nCore/modules/objectivetracker.lua
+++ b/Interface/AddOns/nCore/modules/objectivetracker.lua
@@ -2,6 +2,9 @@ local _, nCore = ...
local L = nCore.L
function nCore:ObjectiveTracker()
+ -- Classic: 'ObjectiveTrackerFrame' isn't available? Have commented out the config option for now
+ if ( not ObjectiveTrackerFrame ) then return end
+
if ( not nCoreDB.ObjectiveTracker ) then return end
local objectiveTrackerFrame = _G["ObjectiveTrackerFrame"]
diff --git a/Interface/AddOns/nCore/modules/questtracker.lua b/Interface/AddOns/nCore/modules/questtracker.lua
index 4a8517ee..a1525883 100644
--- a/Interface/AddOns/nCore/modules/questtracker.lua
+++ b/Interface/AddOns/nCore/modules/questtracker.lua
@@ -3,8 +3,11 @@ local _, nCore = ...
function nCore:QuestTracker()
local function UpdateQuestText()
local _, numQuests = GetNumQuestLogEntries()
- WorldMapFrameTitleText:SetFormattedText("%s - %d/%s", MAP_AND_QUEST_LOG, numQuests, MAX_QUESTS)
- WorldMapFrameTitleText:Show()
+ -- Classic TODO: 'WorldMapFrameTitleText' doesn't appear to exist, is there an alternative?
+ -- Have commented out the config option for now
+
+ -- WorldMapFrameTitleText:SetFormattedText("%s - %d/%s", MAP_AND_QUEST_LOG, numQuests, MAX_QUESTS)
+ -- WorldMapFrameTitleText:Show()
end
UpdateQuestText()
@@ -21,8 +24,8 @@ function nCore:QuestTracker()
if nCoreDB.QuestTracker then
UpdateQuestText()
else
- WorldMapFrameTitleText:SetText(MAP_AND_QUEST_LOG)
- WorldMapFrameTitleText:Show()
+ -- WorldMapFrameTitleText:SetText(MAP_AND_QUEST_LOG)
+ -- WorldMapFrameTitleText:Show()
end
end)
end
diff --git a/Interface/AddOns/nCore/modules/vignette.lua b/Interface/AddOns/nCore/modules/vignette.lua
index 4a53f307..bfb27958 100644
--- a/Interface/AddOns/nCore/modules/vignette.lua
+++ b/Interface/AddOns/nCore/modules/vignette.lua
@@ -3,6 +3,8 @@ local _, nCore = ...
-- Forked from rVignette by zork - 2014
function nCore:VignetteAlert()
+ -- Classic: 'C_VignetteInfo' isn't available, have commented out the config option for now
+ if (not C_VignetteInfo) then return end
local addon = CreateFrame("Frame")
diff --git a/Interface/AddOns/nCore/nCore.toc b/Interface/AddOns/nCore/nCore.toc
index d3aa0999..206085c9 100644
--- a/Interface/AddOns/nCore/nCore.toc
+++ b/Interface/AddOns/nCore/nCore.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rCore
## OptionalDeps: !Beautycase, Recount, Omen, DBM, PitBull4, Skada, TinyDPS
## SavedVariables: nCoreDB
diff --git a/Interface/AddOns/nCore/nCore.xml b/Interface/AddOns/nCore/nCore.xml
index 301ab34b..0fcfdde1 100644
--- a/Interface/AddOns/nCore/nCore.xml
+++ b/Interface/AddOns/nCore/nCore.xml
@@ -3,7 +3,12 @@
-
+
+
diff --git a/Interface/AddOns/nCore/options.lua b/Interface/AddOns/nCore/options.lua
index 80f58f94..17061226 100644
--- a/Interface/AddOns/nCore/options.lua
+++ b/Interface/AddOns/nCore/options.lua
@@ -73,14 +73,14 @@ Options:SetScript("OnShow", function()
relativeTo = OptionsLabel,
offsetY = -12,
},
- {
- type = "CheckBox",
- name = "ArchaeologyHelper",
- parent = Options,
- label = L.ArchaeologyHelper,
- tooltip = L.ArchaeologyHelperTooltip,
- var = "ArchaeologyHelper",
- },
+ -- {
+ -- type = "CheckBox",
+ -- name = "ArchaeologyHelper",
+ -- parent = Options,
+ -- label = L.ArchaeologyHelper,
+ -- tooltip = L.ArchaeologyHelperTooltip,
+ -- var = "ArchaeologyHelper",
+ -- },
{
type = "CheckBox",
name = "AutoGreed",
@@ -140,15 +140,15 @@ Options:SetScript("OnShow", function()
tooltip = L.MapCoordsTooltip,
var = "MapCoords",
},
- {
- type = "CheckBox",
- name = "ObjectiveTracker",
- parent = Options,
- label = L.ObjectiveTracker,
- tooltip = L.ObjectiveTrackerTooltip,
- var = "ObjectiveTracker",
- needsRestart = true,
- },
+ -- {
+ -- type = "CheckBox",
+ -- name = "ObjectiveTracker",
+ -- parent = Options,
+ -- label = L.ObjectiveTracker,
+ -- tooltip = L.ObjectiveTrackerTooltip,
+ -- var = "ObjectiveTracker",
+ -- needsRestart = true,
+ -- },
{
type = "CheckBox",
name = "MoveTalkingHeads",
@@ -158,14 +158,14 @@ Options:SetScript("OnShow", function()
var = "MoveTalkingHeads",
needsRestart = true,
},
- {
- type = "CheckBox",
- name = "QuestTracker",
- parent = Options,
- label = L.QuestTracker,
- tooltip = L.QuestTrackerTooltip,
- var = "QuestTracker",
- },
+ -- {
+ -- type = "CheckBox",
+ -- name = "QuestTracker",
+ -- parent = Options,
+ -- label = L.QuestTracker,
+ -- tooltip = L.QuestTrackerTooltip,
+ -- var = "QuestTracker",
+ -- },
{
type = "CheckBox",
name = "Skins",
@@ -182,15 +182,16 @@ Options:SetScript("OnShow", function()
label = L.SpellID,
tooltip = L.SpellIDTooltip,
var = "SpellID",
- },
- {
- type = "CheckBox",
- name = "VignetteAlert",
- parent = Options,
- label = L.VignetteAlert,
- tooltip = L.VignetteAlertTooltip,
- var = "VignetteAlert",
}
+ --,
+ -- {
+ -- type = "CheckBox",
+ -- name = "VignetteAlert",
+ -- parent = Options,
+ -- label = L.VignetteAlert,
+ -- tooltip = L.VignetteAlertTooltip,
+ -- var = "VignetteAlert",
+ -- }
}
for i, control in pairs(UIControls) do
diff --git a/Interface/AddOns/nMainbar/Libs/LibActionButton-1.0-ElvUI/LibActionButton-1.0.lua b/Interface/AddOns/nMainbar/Libs/LibActionButton-1.0-ElvUI/LibActionButton-1.0.lua
index 740e6472..fd2c906e 100644
--- a/Interface/AddOns/nMainbar/Libs/LibActionButton-1.0-ElvUI/LibActionButton-1.0.lua
+++ b/Interface/AddOns/nMainbar/Libs/LibActionButton-1.0-ElvUI/LibActionButton-1.0.lua
@@ -711,7 +711,6 @@ function InitializeEventHandler()
lib.eventFrame:RegisterEvent("ACTIONBAR_SLOT_CHANGED")
lib.eventFrame:RegisterEvent("UPDATE_BINDINGS")
lib.eventFrame:RegisterEvent("UPDATE_SHAPESHIFT_FORM")
- lib.eventFrame:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR")
lib.eventFrame:RegisterEvent("PLAYER_MOUNT_DISPLAY_CHANGED")
lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_STATE")
@@ -720,22 +719,15 @@ function InitializeEventHandler()
lib.eventFrame:RegisterEvent("PLAYER_TARGET_CHANGED")
lib.eventFrame:RegisterEvent("TRADE_SKILL_SHOW")
lib.eventFrame:RegisterEvent("TRADE_SKILL_CLOSE")
- lib.eventFrame:RegisterEvent("ARCHAEOLOGY_CLOSED")
lib.eventFrame:RegisterEvent("PLAYER_ENTER_COMBAT")
lib.eventFrame:RegisterEvent("PLAYER_LEAVE_COMBAT")
lib.eventFrame:RegisterEvent("START_AUTOREPEAT_SPELL")
lib.eventFrame:RegisterEvent("STOP_AUTOREPEAT_SPELL")
- lib.eventFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
- lib.eventFrame:RegisterEvent("UNIT_EXITED_VEHICLE")
- lib.eventFrame:RegisterEvent("COMPANION_UPDATE")
lib.eventFrame:RegisterEvent("UNIT_INVENTORY_CHANGED")
lib.eventFrame:RegisterEvent("LEARNED_SPELL_IN_TAB")
lib.eventFrame:RegisterEvent("PET_STABLE_UPDATE")
lib.eventFrame:RegisterEvent("PET_STABLE_SHOW")
- lib.eventFrame:RegisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_SHOW")
- lib.eventFrame:RegisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_HIDE")
lib.eventFrame:RegisterEvent("SPELL_UPDATE_CHARGES")
- lib.eventFrame:RegisterEvent("UPDATE_SUMMONPETS_ACTION")
lib.eventFrame:RegisterEvent("SPELL_UPDATE_ICON")
-- With those two, do we still need the ACTIONBAR equivalents of them?
@@ -746,6 +738,19 @@ function InitializeEventHandler()
lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_ADDED")
lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_UPDATE")
+ --[[
+ Classic TODO: These events don't exist, is there a way to keep these so it still works with Retail?
+
+ lib.eventFrame:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR")
+ lib.eventFrame:RegisterEvent("ARCHAEOLOGY_CLOSED")
+ lib.eventFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
+ lib.eventFrame:RegisterEvent("UNIT_EXITED_VEHICLE")
+ lib.eventFrame:RegisterEvent("COMPANION_UPDATE")
+ lib.eventFrame:RegisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_SHOW")
+ lib.eventFrame:RegisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_HIDE")
+ lib.eventFrame:RegisterEvent("UPDATE_SUMMONPETS_ACTION")
+ ]]--
+
lib.eventFrame:Show()
lib.eventFrame:SetScript("OnUpdate", OnUpdate)
end
diff --git a/Interface/AddOns/nMainbar/config.lua b/Interface/AddOns/nMainbar/config.lua
index 35c21579..19a9815b 100644
--- a/Interface/AddOns/nMainbar/config.lua
+++ b/Interface/AddOns/nMainbar/config.lua
@@ -38,6 +38,7 @@ nMainbar.Config = {
},
MainMenuBar = {
+ useShortBar = true,
moveableExtraBars = true,
hideGryphons = false,
},
diff --git a/Interface/AddOns/nMainbar/modules/ActionButtonSkin.lua b/Interface/AddOns/nMainbar/modules/ActionButtonSkin.lua
index daca0bcf..1ee22917 100644
--- a/Interface/AddOns/nMainbar/modules/ActionButtonSkin.lua
+++ b/Interface/AddOns/nMainbar/modules/ActionButtonSkin.lua
@@ -27,8 +27,8 @@ local function SkinButton(button, icon, borderOffset, shadowOffset)
if not InCombatLockdown() then
if cooldown then
cooldown:ClearAllPoints()
- PixelUtil.SetPoint(cooldown, "TOPRIGHT", button, "TOPRIGHT", -2, -2)
- PixelUtil.SetPoint(cooldown, "BOTTOMLEFT", button, "BOTTOMLEFT", 1, 1)
+ cooldown:SetPoint("TOPRIGHT", button, "TOPRIGHT", -2, -2)
+ cooldown:SetPoint("BOTTOMLEFT", button, "BOTTOMLEFT", 1, 1)
end
end
@@ -37,14 +37,14 @@ local function SkinButton(button, icon, borderOffset, shadowOffset)
if not button.Skinned then
if icon then
icon:SetTexCoord(0.05, 0.95, 0.05, 0.95)
- PixelUtil.SetPoint(icon, "TOPRIGHT", button, "TOPRIGHT", -1, -1)
- PixelUtil.SetPoint(icon, "BOTTOMLEFT", button, "BOTTOMLEFT", 1, 1)
+ icon:SetPoint("TOPRIGHT", button, "TOPRIGHT", -1, -1)
+ icon:SetPoint("BOTTOMLEFT", button, "BOTTOMLEFT", 1, 1)
end
if normalTexture then
normalTexture:ClearAllPoints()
- PixelUtil.SetPoint(normalTexture, "TOPRIGHT", button, "TOPRIGHT", borderOffset, borderOffset)
- PixelUtil.SetPoint(normalTexture, "BOTTOMLEFT", button, "BOTTOMLEFT", -borderOffset, -borderOffset)
+ normalTexture:SetPoint("TOPRIGHT", button, "TOPRIGHT", borderOffset, borderOffset)
+ normalTexture:SetPoint("BOTTOMLEFT", button, "BOTTOMLEFT", -borderOffset, -borderOffset)
normalTexture:SetVertexColor(Color.Normal:GetRGBA())
button:SetCheckedTexture(MEDIA_PATH.."textureChecked")
@@ -67,8 +67,8 @@ local function SkinButton(button, icon, borderOffset, shadowOffset)
if not button.Background then
button.Background = button:CreateTexture(nil, "BACKGROUND", nil, -8)
button.Background:SetTexture(MEDIA_PATH.."textureBackground")
- PixelUtil.SetPoint(button.Background, "TOPRIGHT", button, "TOPRIGHT", 14, 12)
- PixelUtil.SetPoint(button.Background, "BOTTOMLEFT", button, "BOTTOMLEFT", -14, -16)
+ button.Background:SetPoint("TOPRIGHT", button, "TOPRIGHT", 14, 12)
+ button.Background:SetPoint("BOTTOMLEFT", button, "BOTTOMLEFT", -14, -16)
end
if floatingBG then
@@ -80,8 +80,8 @@ local function SkinButton(button, icon, borderOffset, shadowOffset)
button.Shadow = button:CreateTexture("$parentFloatingBG", "BACKGROUND")
button.Shadow:SetTexture(MEDIA_PATH.."textureShadow")
button.Shadow:SetVertexColor(0.0, 0.0, 0.0, 1.0)
- PixelUtil.SetPoint(button.Shadow, "TOPRIGHT", normalTexture, "TOPRIGHT", shadowOffset, shadowOffset)
- PixelUtil.SetPoint(button.Shadow, "BOTTOMLEFT", normalTexture, "BOTTOMLEFT", -shadowOffset, -shadowOffset)
+ button.Shadow:SetPoint("TOPRIGHT", normalTexture, "TOPRIGHT", shadowOffset, shadowOffset)
+ button.Shadow:SetPoint("BOTTOMLEFT", normalTexture, "BOTTOMLEFT", -shadowOffset, -shadowOffset)
end
button.Skinned = true
@@ -92,6 +92,9 @@ local function UpdateVehicleButton()
for i = 1, NUM_OVERRIDE_BUTTONS do
local button = _G["OverrideActionBarButton"..i]
local hotkey = _G["OverrideActionBarButton"..i.."HotKey"]
+
+ if not button and not hotkey then return end
+
if cfg.button.showVehicleKeybinds then
hotkey:SetFont(cfg.button.hotkeyFont, cfg.button.hotkeyFontsize + 3, "OUTLINE")
hotkey:SetVertexColor(Color.HotKeyText:GetRGB())
@@ -183,17 +186,18 @@ hooksecurefunc("ActionButton_Update", function(self)
end
end)
-hooksecurefunc("ExtraActionBar_Update", function(self)
- local bar = ExtraActionBarFrame
- if HasExtraActionBar() and not bar.Skinned then
- local button = bar.button
- button.style:Hide()
+-- Classic: ExtraActionBar_Update doesn't exist
+-- hooksecurefunc("ExtraActionBar_Update", function(self)
+-- local bar = ExtraActionBarFrame
+-- if HasExtraActionBar() and not bar.Skinned then
+-- local button = bar.button
+-- button.style:Hide()
- SkinButton(button, button.icon, 4, 5)
+-- SkinButton(button, button.icon, 4, 5)
- bar.Skinned = true
- end
-end)
+-- bar.Skinned = true
+-- end
+-- end)
hooksecurefunc("ActionButton_UpdateCount", function(self)
local text = self.Count
@@ -297,16 +301,17 @@ hooksecurefunc("StanceBar_UpdateState", function(self)
end
end)
-hooksecurefunc("PossessBar_UpdateState", function()
- local button, icon
+-- -- Classic: PossessBar_UpdateState doesn't exist
+-- hooksecurefunc("PossessBar_UpdateState", function()
+-- local button, icon
- for i=1, NUM_POSSESS_SLOTS do
- button = _G["PossessButton"..i]
- icon = _G["PossessButton"..i.."Icon"]
+-- for i=1, NUM_POSSESS_SLOTS do
+-- button = _G["PossessButton"..i]
+-- icon = _G["PossessButton"..i.."Icon"]
- SkinButton(button, icon, 1.5, 4)
- end
-end)
+-- SkinButton(button, icon, 1.5, 4)
+-- end
+-- end)
-- Hide Possess Frame Background
diff --git a/Interface/AddOns/nMainbar/modules/Bags.lua b/Interface/AddOns/nMainbar/modules/Bags.lua
index ea593a40..519238ef 100644
--- a/Interface/AddOns/nMainbar/modules/Bags.lua
+++ b/Interface/AddOns/nMainbar/modules/Bags.lua
@@ -31,8 +31,11 @@ CharacterBag1Slot:SetPoint("RIGHT", CharacterBag0Slot, "LEFT", 0, 0)
CharacterBag2Slot:SetPoint("RIGHT", CharacterBag1Slot, "LEFT", 0, 0)
CharacterBag3Slot:SetPoint("RIGHT", CharacterBag2Slot, "LEFT", 0, 0)
-MicroButtonAndBagsBar.MicroBagBar:ClearAllPoints()
-MicroButtonAndBagsBar.MicroBagBar:Hide()
+-- Classic: MicroButtonAndBagsBar doesn't exist
+if MicroButtonAndBagsBar then
+ MicroButtonAndBagsBar.MicroBagBar:ClearAllPoints()
+ MicroButtonAndBagsBar.MicroBagBar:Hide()
+end
CharacterMicroButton:ClearAllPoints()
CharacterMicroButton:SetPoint("BOTTOMLEFT", UIParent, 9000, 9000)
diff --git a/Interface/AddOns/nMainbar/modules/FakeBottomRightBar.lua b/Interface/AddOns/nMainbar/modules/FakeBottomRightBar.lua
index 0b855434..0aa17f53 100644
--- a/Interface/AddOns/nMainbar/modules/FakeBottomRightBar.lua
+++ b/Interface/AddOns/nMainbar/modules/FakeBottomRightBar.lua
@@ -105,14 +105,14 @@ local function StyleButton(self)
if icon then
icon:SetTexCoord(0.05, 0.95, 0.05, 0.95)
- PixelUtil.SetPoint(icon, "TOPRIGHT", self, "TOPRIGHT", -1, -1)
- PixelUtil.SetPoint(icon, "BOTTOMLEFT", self, "BOTTOMLEFT", 1, 1)
+ icon:SetPoint("TOPRIGHT", self, "TOPRIGHT", -1, -1)
+ icon:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 1, 1)
end
if normal then
normal:ClearAllPoints()
- PixelUtil.SetPoint(normal, "TOPRIGHT", self, "TOPRIGHT", 1, 1)
- PixelUtil.SetPoint(normal, "BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
+ normal:SetPoint("TOPRIGHT", self, "TOPRIGHT", 1, 1)
+ normal:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
normal:SetVertexColor(Color.Normal:GetRGBA())
self:SetNormalTexture(MEDIA_PATH.."textureNormal")
@@ -136,21 +136,21 @@ local function StyleButton(self)
if cooldown and not nMainbar:IsTaintable() then
cooldown:ClearAllPoints()
- PixelUtil.SetPoint(cooldown, "TOPRIGHT", self, "TOPRIGHT", -2, -2.5)
- PixelUtil.SetPoint(cooldown, "BOTTOMLEFT", self, "BOTTOMLEFT", 2, 2)
+ cooldown:SetPoint("TOPRIGHT", self, "TOPRIGHT", -2, -2.5)
+ cooldown:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 2, 2)
end
if not self.Background then
self.Background = self:CreateTexture(nil, "BACKGROUND", nil, -8)
self.Background:SetTexture(MEDIA_PATH.."textureBackground")
- PixelUtil.SetPoint(self.Background, "TOPRIGHT", self, "TOPRIGHT", 14, 12)
- PixelUtil.SetPoint(self.Background, "BOTTOMLEFT", self, "BOTTOMLEFT", -14, -16)
+ self.Background:SetPoint("TOPRIGHT", self, "TOPRIGHT", 14, 12)
+ self.Background:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", -14, -16)
end
if not floatingBG then
self.floatingBG = self:CreateTexture("$parentFloatingBG", "BACKGROUND")
- PixelUtil.SetPoint(self.floatingBG, "TOPRIGHT", normal, "TOPRIGHT", 4, 4)
- PixelUtil.SetPoint(self.floatingBG, "BOTTOMLEFT", normal, "BOTTOMLEFT", -4, -4)
+ self.floatingBG:SetPoint("TOPRIGHT", normal, "TOPRIGHT", 4, 4)
+ self.floatingBG:SetPoint("BOTTOMLEFT", normal, "BOTTOMLEFT", -4, -4)
self.floatingBG:SetTexture(MEDIA_PATH.."textureShadow")
self.floatingBG:SetVertexColor(0.0, 0.0, 0.0, 1.0)
end
@@ -193,7 +193,7 @@ local function CheckFakeStatus()
end
end
-hooksecurefunc(MainMenuBar, "ChangeMenuBarSizeAndPosition", CheckFakeStatus)
+-- hooksecurefunc(MainMenuBar, "ChangeMenuBarSizeAndPosition", CheckFakeStatus)
hooksecurefunc("MultiActionBar_Update", CheckFakeStatus)
-- Disable bottom right bar checkbox during combat.
@@ -214,8 +214,8 @@ local function CreateBar(id)
local bar = CreateFrame("Frame", "FakeMultiBarBottomRight"..id, MainMenuBar, "SecureHandlerStateTemplate")
bar:SetFrameRef("MainMenuBarArtFrame", MainMenuBarArtFrame)
bar:SetFrameStrata("MEDIUM")
- PixelUtil.SetPoint(bar, "BOTTOMLEFT", MultiBarBottomLeftButton1, "TOPLEFT", 0, 6)
- PixelUtil.SetSize(bar, 510, 40)
+ bar:SetPoint("BOTTOMLEFT", MultiBarBottomLeftButton1, "TOPLEFT", 0, 6)
+ bar:SetSize(510, 40)
if not cfg.useFakeBottomRightBar or bottomRightShown then
bar:Hide()
diff --git a/Interface/AddOns/nMainbar/modules/Short.lua b/Interface/AddOns/nMainbar/modules/Short.lua
new file mode 100644
index 00000000..fc32c088
--- /dev/null
+++ b/Interface/AddOns/nMainbar/modules/Short.lua
@@ -0,0 +1,213 @@
+local _, nMainbar = ...
+local cfg = nMainbar.Config
+
+if (not cfg.MainMenuBar.useShortBar) then
+ return
+end
+
+ -- disable the automatic frame position
+
+do
+ for _, frame in pairs({
+ 'MultiBarLeft',
+ 'MultiBarRight',
+ 'MultiBarBottomRight',
+
+ --'StanceBarFrame',
+ 'PossessBarFrame',
+
+ 'MULTICASTACTIONBAR_YPOS',
+ 'MultiCastActionBarFrame',
+
+ 'PETACTIONBAR_YPOS',
+ }) do
+ UIPARENT_MANAGED_FRAME_POSITIONS[frame] = nil
+ end
+end
+
+ -- hide unwanted objects
+
+for i = 2, 3 do
+ for _, object in pairs({
+ _G['ActionBarUpButton'],
+ _G['ActionBarDownButton'],
+
+ _G['KeyRingButton'],
+
+ _G['MainMenuBarTexture'..i],
+ _G['MainMenuMaxLevelBar'..i],
+ -- Classic textures are index differently
+ -- _G['MainMenuXPBarTexture'..i],
+
+ _G['ReputationWatchBarTexture'..i],
+ _G['ReputationXPBarTexture'..i],
+
+ _G['MainMenuBarPageNumber'],
+
+ _G['SlidingActionBarTexture0'],
+ _G['SlidingActionBarTexture1'],
+
+ _G['StanceBarLeft'],
+ _G['StanceBarMiddle'],
+ _G['StanceBarRight'],
+
+ _G['PossessBackground1'],
+ _G['PossessBackground2'],
+ }) do
+ if (object:IsObjectType('Frame') or object:IsObjectType('Button')) then
+ object:UnregisterAllEvents()
+ object:SetScript('OnEnter', nil)
+ object:SetScript('OnLeave', nil)
+ object:SetScript('OnClick', nil)
+ end
+
+ hooksecurefunc(object, 'Show', function(self)
+ self:Hide()
+ end)
+
+ object:Hide()
+ end
+end
+
+-- Classic: textures are index differently so hide the ones we don't care about
+MainMenuXPBarTexture0:Hide()
+MainMenuXPBarTexture3:Hide()
+
+ -- reduce the size of some main menu bar objects
+
+for _, object in pairs({
+ _G['MainMenuBar'],
+ _G['MainMenuExpBar'],
+ _G['MainMenuBarMaxLevelBar'],
+}) do
+ object:SetWidth(512)
+end
+
+ReputationWatchBar:SetWidth(512)
+ReputationWatchBar.StatusBar:SetWidth(512)
+
+ReputationWatchBar.StatusBar.WatchBarTexture0:SetWidth(256)
+ReputationWatchBar.StatusBar.WatchBarTexture1:SetWidth(256)
+ReputationWatchBar.StatusBar.WatchBarTexture2:SetTexture(nil)
+ReputationWatchBar.StatusBar.WatchBarTexture3:SetTexture(nil)
+
+-- Classic doesn't have this
+if ArtifactWatchBar then
+ ArtifactWatchBar:SetWidth(512)
+ ArtifactWatchBar.StatusBar:SetWidth(512)
+ ArtifactWatchBar.StatusBar.WatchBarTexture0:SetWidth(256)
+ ArtifactWatchBar.StatusBar.WatchBarTexture1:SetWidth(256)
+ ArtifactWatchBar.StatusBar.WatchBarTexture2:SetTexture(nil)
+ ArtifactWatchBar.StatusBar.WatchBarTexture3:SetTexture(nil)
+end
+
+-- Classic doesn't have this
+if HonorWatchBar then
+ HonorWatchBar:SetWidth(512)
+ HonorWatchBar.StatusBar:SetWidth(512)
+ HonorWatchBar.StatusBar.WatchBarTexture0:SetWidth(256)
+ HonorWatchBar.StatusBar.WatchBarTexture1:SetWidth(256)
+ HonorWatchBar.StatusBar.WatchBarTexture2:SetTexture(nil)
+ HonorWatchBar.StatusBar.WatchBarTexture3:SetTexture(nil)
+end
+
+-- Only shown when tracker is in place of MainMenuExpBar.
+ReputationWatchBar.StatusBar.XPBarTexture0:SetWidth(256)
+ReputationWatchBar.StatusBar.XPBarTexture1:SetWidth(256)
+ReputationWatchBar.StatusBar.XPBarTexture2:SetTexture(nil)
+ReputationWatchBar.StatusBar.XPBarTexture3:SetTexture(nil)
+
+-- Classic doesn't have this
+if ArtifactWatchBar then
+ ArtifactWatchBar.StatusBar.XPBarTexture0:SetWidth(256)
+ ArtifactWatchBar.StatusBar.XPBarTexture1:SetWidth(256)
+ ArtifactWatchBar.StatusBar.XPBarTexture2:SetTexture(nil)
+ ArtifactWatchBar.StatusBar.XPBarTexture3:SetTexture(nil)
+end
+
+-- Classic doesn't have this
+if HonorWatchBar then
+ HonorWatchBar.StatusBar.XPBarTexture0:SetWidth(256)
+ HonorWatchBar.StatusBar.XPBarTexture1:SetWidth(256)
+ HonorWatchBar.StatusBar.XPBarTexture2:SetTexture(nil)
+ HonorWatchBar.StatusBar.XPBarTexture3:SetTexture(nil)
+end
+
+ -- remove divider
+
+for i = 1, 19, 2 do
+ for _, object in pairs({
+ _G['MainMenuXPBarDiv'..i],
+ }) do
+ hooksecurefunc(object, 'Show', function(self)
+ self:Hide()
+ end)
+
+ object:Hide()
+ end
+end
+
+if _G['MainMenuXPBarDiv2'] then
+ hooksecurefunc(_G['MainMenuXPBarDiv2'], 'Show', function(self)
+ local divWidth = MainMenuExpBar:GetWidth() / 10
+ local xpos = divWidth - 4.5
+
+ for i = 2, 19, 2 do
+ local texture = _G['MainMenuXPBarDiv'..i]
+ local xalign = floor(xpos)
+ texture:SetPoint('LEFT', xalign, 1)
+ xpos = xpos + divWidth
+ end
+ end)
+
+ _G['MainMenuXPBarDiv2']:Show()
+end
+
+ -- fix the exp bar size when exiting vehicle
+
+-- XXX: Not need anymore?
+--MainMenuExpBar:HookScript('OnSizeChanged', function(self, width, height)
+-- if (math.floor(width) == EXP_DEFAULT_WIDTH) then
+-- securecall(MainMenuExpBar_SetWidth, 512)
+-- CharacterMicroButton:ClearAllPoints()
+-- CharacterMicroButton:SetPoint('BOTTOMLEFT', UIParent, 9000, 9000)
+-- end
+--end)
+
+ -- the bottom right bar needs a better place, above the bottom left bar
+
+MultiBarBottomRight:EnableMouse(false)
+
+MultiBarBottomRightButton1:ClearAllPoints()
+MultiBarBottomRightButton1:SetPoint('BOTTOMLEFT', MultiBarBottomLeftButton1, 'TOPLEFT', 0, 6)
+
+ -- reposition some objects
+
+MainMenuBarTexture0:SetPoint('BOTTOM', MainMenuBarArtFrame, -128, 0)
+MainMenuBarTexture1:SetPoint('BOTTOM', MainMenuBarArtFrame, 128, 0)
+MainMenuMaxLevelBar0:SetPoint('BOTTOM', MainMenuBarMaxLevelBar, 'TOP', -128, 0)
+
+MainMenuBarLeftEndCap:SetPoint('BOTTOM', MainMenuBarArtFrame, -289, 0)
+MainMenuBarLeftEndCap.SetPoint = function() end
+
+MainMenuBarRightEndCap:SetPoint('BOTTOM', MainMenuBarArtFrame, 289, 0)
+MainMenuBarRightEndCap.SetPoint = function() end
+
+-- -- reposit the micromenu
+
+-- CharacterMicroButton:ClearAllPoints()
+-- CharacterMicroButton:SetPoint('BOTTOMLEFT', UIParent, 9000, 9000)
+
+-- hooksecurefunc('MoveMicroButtons', function(anchor, achorTo, relAnchor, x, y, isStacked)
+-- if (not isStacked) then
+-- CharacterMicroButton:ClearAllPoints()
+-- CharacterMicroButton:SetPoint('BOTTOMLEFT', UIParent, 9000, 9000)
+-- end
+-- end)
+
+ -- a new place for the exit vehicle button
+
+hooksecurefunc("MainMenuBarVehicleLeaveButton_Update", function()
+ MainMenuBarVehicleLeaveButton:ClearAllPoints()
+ MainMenuBarVehicleLeaveButton:SetPoint('LEFT', MainMenuBar, 'RIGHT', 10, 75)
+end)
diff --git a/Interface/AddOns/nMainbar/modules/WatchBarCode.lua b/Interface/AddOns/nMainbar/modules/WatchBarCode.lua
index 78cad2b9..17bacff3 100644
--- a/Interface/AddOns/nMainbar/modules/WatchBarCode.lua
+++ b/Interface/AddOns/nMainbar/modules/WatchBarCode.lua
@@ -3,57 +3,72 @@ local cfg = nMainbar.Config
-- Experience Bar
-hooksecurefunc(ExpBarMixin, "OnLoad", function(self)
- self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
- self.OverlayFrame.Text:SetShadowOffset(0, 0)
-end)
+-- Classic: ExpBarMixin doesn't exist
+if ExpBarMixin then
+ hooksecurefunc(ExpBarMixin, "OnLoad", function(self)
+ self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
+ self.OverlayFrame.Text:SetShadowOffset(0, 0)
+ end)
+end
-- Azerite Bar
-hooksecurefunc(AzeriteBarMixin, "OnLoad", function(self)
- self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
- self.OverlayFrame.Text:SetShadowOffset(0, 0)
-end)
+-- Classic: AzeriteBarMixin doesn't exist
+if AzeriteBarMixin then
+ hooksecurefunc(AzeriteBarMixin, "OnLoad", function(self)
+ self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
+ self.OverlayFrame.Text:SetShadowOffset(0, 0)
+ end)
+end
-- Reputation Bar
-hooksecurefunc(ReputationBarMixin, "OnLoad", function(self)
- self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
- self.OverlayFrame.Text:SetShadowOffset(0, 0)
+-- Classic: ReputationBarMixin doesn't exist
+if ReputationBarMixin then
+ hooksecurefunc(ReputationBarMixin, "OnLoad", function(self)
+ self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
+ self.OverlayFrame.Text:SetShadowOffset(0, 0)
- self:SetScript("OnMouseDown", function(self, button)
- if not nMainbar:IsTaintable() and IsAltKeyDown() then
- ToggleCharacter("ReputationFrame")
- end
+ self:SetScript("OnMouseDown", function(self, button)
+ if not nMainbar:IsTaintable() and IsAltKeyDown() then
+ ToggleCharacter("ReputationFrame")
+ end
+ end)
end)
-end)
+end
-- Honor Bar
-hooksecurefunc(HonorBarMixin, "OnLoad", function(self)
- self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
- self.OverlayFrame.Text:SetShadowOffset(0, 0)
+-- Classic: ReputationBarMixin doesn't exist
+if HonorBarMixin then
+ hooksecurefunc(HonorBarMixin, "OnLoad", function(self)
+ self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
+ self.OverlayFrame.Text:SetShadowOffset(0, 0)
- self:SetScript("OnMouseDown", function(self, button)
- if not nMainbar:IsTaintable() and IsAltKeyDown() then
- ToggleTalentFrame(PVP_TALENTS_TAB)
- end
+ self:SetScript("OnMouseDown", function(self, button)
+ if not nMainbar:IsTaintable() and IsAltKeyDown() then
+ ToggleTalentFrame(PVP_TALENTS_TAB)
+ end
+ end)
end)
-end)
+end
-- Legion Artifact Bar
-hooksecurefunc(ArtifactBarMixin, "OnLoad", function(self)
- self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
- self.OverlayFrame.Text:SetShadowOffset(0, 0)
+-- Classic: ReputationBarMixin doesn't exist
+if ArtifactBarMixin then
+ hooksecurefunc(ArtifactBarMixin, "OnLoad", function(self)
+ self.OverlayFrame.Text:SetFont(cfg.button.watchbarFont, cfg.button.watchbarFontsize, "OUTLINE")
+ self.OverlayFrame.Text:SetShadowOffset(0, 0)
- self:SetScript("OnMouseDown", function(self, button)
- if not nMainbar:IsTaintable() and IsAltKeyDown() then
- if not ArtifactFrame or not ArtifactFrame:IsShown() then
- ShowUIPanel(SocketInventoryItem(16))
- elseif ArtifactFrame and ArtifactFrame:IsShown() then
- HideUIPanel(ArtifactFrame)
+ self:SetScript("OnMouseDown", function(self, button)
+ if not nMainbar:IsTaintable() and IsAltKeyDown() then
+ if not ArtifactFrame or not ArtifactFrame:IsShown() then
+ ShowUIPanel(SocketInventoryItem(16))
+ elseif ArtifactFrame and ArtifactFrame:IsShown() then
+ HideUIPanel(ArtifactFrame)
+ end
end
- end
+ end)
end)
-end)
+end
diff --git a/Interface/AddOns/nMainbar/modules/core.lua b/Interface/AddOns/nMainbar/modules/core.lua
index e4a17c70..fde974fb 100644
--- a/Interface/AddOns/nMainbar/modules/core.lua
+++ b/Interface/AddOns/nMainbar/modules/core.lua
@@ -57,7 +57,10 @@ end
-- Update Action Bars
-OverrideActionBar:SetScale(cfg.vehicleBar.scale)
+-- Classic: OverrideActionBar doesn't exist
+if OverrideActionBar then
+ OverrideActionBar:SetScale(cfg.vehicleBar.scale)
+end
hooksecurefunc("MultiActionBar_Update", function(self)
if nMainbar:IsTaintable() then
@@ -81,29 +84,35 @@ end)
-- Extra Action Button
-local ExtraActionBarFrameLocation = {"CENTER", UIParent, "CENTER", -300, -150}
-local ExtraActionBarFrameAnchor = nMainbar:CreateAnchor("EAB", ExtraActionButton1:GetWidth(), ExtraActionButton1:GetHeight(), ExtraActionBarFrameLocation)
+-- Classic: ExtraActionButton1 doesn't exist
+if ExtraActionButton1 then
+ local ExtraActionBarFrameLocation = {"CENTER", UIParent, "CENTER", -300, -150}
+ local ExtraActionBarFrameAnchor = nMainbar:CreateAnchor("EAB", ExtraActionButton1:GetWidth(), ExtraActionButton1:GetHeight(), ExtraActionBarFrameLocation)
-SlashCmdList["nMainbar_MoveExtraActionBar"] = function()
- if InCombatLockdown() then
- print("|cffCC3333n|rMainbar: "..ERR_NOT_IN_COMBAT)
- return
- end
- if not ExtraActionBarFrameAnchor:IsShown() then
- ExtraActionBarFrameAnchor:Show()
- else
- ExtraActionBarFrameAnchor:Hide()
+ SlashCmdList["nMainbar_MoveExtraActionBar"] = function()
+ if InCombatLockdown() then
+ print("|cffCC3333n|rMainbar: "..ERR_NOT_IN_COMBAT)
+ return
+ end
+ if not ExtraActionBarFrameAnchor:IsShown() then
+ ExtraActionBarFrameAnchor:Show()
+ else
+ ExtraActionBarFrameAnchor:Hide()
+ end
end
-end
-SLASH_nMainbar_MoveExtraActionBar1 = "/moveextraactionbar"
+ SLASH_nMainbar_MoveExtraActionBar1 = "/moveextraactionbar"
-ExtraActionButton1:ClearAllPoints()
-ExtraActionButton1:SetPoint("CENTER", ExtraActionBarFrameAnchor)
+ ExtraActionButton1:ClearAllPoints()
+ ExtraActionButton1:SetPoint("CENTER", ExtraActionBarFrameAnchor)
+end
-- Possess Bar
-PossessBarFrame:SetScale(cfg.possessBar.scale)
-PossessBarFrame:SetAlpha(cfg.possessBar.alpha)
+-- Classic: PossessBarFrame doesn't exist
+if PossessBarFrame then
+ PossessBarFrame:SetScale(cfg.possessBar.scale)
+ PossessBarFrame:SetAlpha(cfg.possessBar.alpha)
+end
-- Stance Bar
diff --git a/Interface/AddOns/nMainbar/modules/picomenu.lua b/Interface/AddOns/nMainbar/modules/picomenu.lua
index f93ab069..c64bd375 100644
--- a/Interface/AddOns/nMainbar/modules/picomenu.lua
+++ b/Interface/AddOns/nMainbar/modules/picomenu.lua
@@ -52,15 +52,6 @@ local menuList = {
notCheckable = true,
fontObject = Game13Font,
},
- {
- text = ACHIEVEMENT_BUTTON,
- icon = "Interface\\AddOns\\nMainbar\\Media\\picomenu\\picomenuAchievement",
- func = function()
- ToggleAchievementFrame()
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
{
text = QUESTLOG_BUTTON,
icon = "Interface\\GossipFrame\\ActiveQuestIcon",
@@ -89,33 +80,6 @@ local menuList = {
notCheckable = true,
fontObject = Game13Font,
},
- {
- text = PLAYER_V_PLAYER,
- icon = "Interface\\MINIMAP\\TRACKING\\BattleMaster",
- func = function()
- TogglePVPUI()
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = DUNGEONS_BUTTON,
- icon = "Interface\\LFGFRAME\\BattleNetWorking0",
- func = function()
- ToggleLFDParentFrame()
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = CHALLENGES,
- icon = "Interface\\BUTTONS\\UI-GroupLoot-DE-Up",
- func = function()
- PVEFrame_ToggleFrame("ChallengesFrame",nil)
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
{
text = RAID,
icon = "Interface\\TARGETINGFRAME\\UI-TargetingFrame-Skull",
@@ -125,80 +89,6 @@ local menuList = {
notCheckable = true,
fontObject = Game13Font,
},
- {
- text = MOUNTS,
- icon = "Interface\\MINIMAP\\TRACKING\\StableMaster",
- func = function()
- if not nMainbar:IsTaintable() then
- ToggleCollectionsJournal(1)
- else
- UIErrorsFrame:AddMessage(BLOCKED_IN_COMBAT, 1, 0, 0)
- end
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = PETS,
- icon = "Interface\\MINIMAP\\TRACKING\\StableMaster",
- func = function()
- if not nMainbar:IsTaintable() then
- ToggleCollectionsJournal(2)
- else
- UIErrorsFrame:AddMessage(BLOCKED_IN_COMBAT, 1, 0, 0)
- end
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = TOY_BOX,
- icon = "Interface\\MINIMAP\\TRACKING\\Reagents",
- func = function()
- if not nMainbar:IsTaintable() then
- ToggleCollectionsJournal(3)
- else
- UIErrorsFrame:AddMessage(BLOCKED_IN_COMBAT, 1, 0, 0)
- end
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = HEIRLOOMS,
- icon = "Interface\\PaperDollInfoFrame\\UI-EquipmentManager-Toggle",
- func = function()
- if not nMainbar:IsTaintable() then
- ToggleCollectionsJournal(4)
- else
- UIErrorsFrame:AddMessage(BLOCKED_IN_COMBAT, 1, 0, 0)
- end
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = WARDROBE,
- icon = "Interface\\PaperDollInfoFrame\\UI-EquipmentManager-Toggle",
- func = function()
- if not nMainbar:IsTaintable() then
- ToggleCollectionsJournal(5)
- else
- UIErrorsFrame:AddMessage(BLOCKED_IN_COMBAT, 1, 0, 0)
- end
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
- {
- text = ENCOUNTER_JOURNAL,
- icon = "Interface\\MINIMAP\\TRACKING\\Profession",
- func = function()
- ToggleEncounterJournal()
- end,
- notCheckable = true,
- fontObject = Game13Font,
- },
{
text = GM_EMAIL_NAME,
icon = "Interface\\CHATFRAME\\UI-ChatIcon-Blizz",
@@ -493,13 +383,22 @@ picoMenu:SetFrameStrata("MEDIUM")
picoMenu:SetFrameLevel(3)
picoMenu:SetToplevel(true)
picoMenu:SetSize(30, 30)
-picoMenu:SetPoint("BOTTOM", MainMenuBarArtFrame.RightEndCap, 0, 8)
+
+if MainMenuBarRightEndCap then
+ picoMenu:SetPoint('BOTTOM', MainMenuBarRightEndCap, -13, 20)
+else
+ picoMenu:SetPoint("BOTTOM", MainMenuBarArtFrame.RightEndCap, 0, 8)
+end
+
picoMenu:RegisterForClicks("Anyup")
picoMenu:RegisterEvent("ADDON_LOADED")
picoMenu:RegisterEvent("PLAYER_ENTERING_WORLD")
picoMenu:RegisterEvent("PLAYER_LEVEL_UP")
-picoMenu:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
-picoMenu:RegisterEvent("PLAYER_TALENT_UPDATE")
+
+-- Classic: PLAYER_SPECIALIZATION_CHANGED and PLAYER_TALENT_UPDATE don't exist
+-- TODO: Not sure if there's a way to keep this so it still works with Retail?
+-- picoMenu:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
+-- picoMenu:RegisterEvent("PLAYER_TALENT_UPDATE")
picoMenu:SetNormalTexture("Interface\\AddOns\\nMainbar\\Media\\picomenu\\picomenuNormal")
picoMenu:GetNormalTexture():SetSize(30, 30)
@@ -516,7 +415,7 @@ picoMenu:SetScript("OnEvent", function(self, event, ...)
if event == "ADDON_LOADED" then
UpdateAddOnTable(arg1)
elseif event == "PLAYER_ENTERING_WORLD" or event == "PLAYER_LEVEL_UP" or event == "PLAYER_SPECIALIZATION_CHANGED" or event == "PLAYER_TALENT_UPDATE" then
- if UnitLevel("player") >= SHOW_TALENT_LEVEL and GetNumUnspentTalents() > 0 then
+ if UnitLevel("player") >= SHOW_TALENT_LEVEL and UnitCharacterPoints('player') > 0 then
alertFrame:Show()
else
alertFrame:Hide()
diff --git a/Interface/AddOns/nMainbar/nMainbar.toc b/Interface/AddOns/nMainbar/nMainbar.toc
index f7e3a086..bf2e29d0 100644
--- a/Interface/AddOns/nMainbar/nMainbar.toc
+++ b/Interface/AddOns/nMainbar/nMainbar.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rMainbar
## Notes: nMainBar
## SavedVariables: BagsShown
diff --git a/Interface/AddOns/nMainbar/nMainbar.xml b/Interface/AddOns/nMainbar/nMainbar.xml
index bc3ac5c7..f30355d6 100644
--- a/Interface/AddOns/nMainbar/nMainbar.xml
+++ b/Interface/AddOns/nMainbar/nMainbar.xml
@@ -16,6 +16,7 @@
-->
+
diff --git a/Interface/AddOns/nMinimap/calendar.lua b/Interface/AddOns/nMinimap/calendar.lua
index 362ce27f..deba48c8 100644
--- a/Interface/AddOns/nMinimap/calendar.lua
+++ b/Interface/AddOns/nMinimap/calendar.lua
@@ -19,31 +19,33 @@ GameTimeFrame:SetHitRectInsets(0, 0, 0, 0)
GameTimeFrame:ClearAllPoints()
GameTimeFrame:SetPoint("TOPRIGHT", Minimap, -3.5, -3.5)
-GameTimeFrame:GetFontString():SetFont(STANDARD_TEXT_FONT, 15, "OUTLINE")
-GameTimeFrame:GetFontString():SetShadowOffset(0, 0)
-GameTimeFrame:GetFontString():SetPoint("TOPRIGHT", GameTimeFrame)
-
-for _, texture in pairs({
- GameTimeCalendarEventAlarmTexture,
- GameTimeCalendarInvitesTexture,
- GameTimeCalendarInvitesGlow,
- TimeManagerAlarmFiredTexture,
-}) do
- texture:SetTexture(nil)
-
- local classColor = RAID_CLASS_COLORS[select(2, UnitClass("player"))]
-
- if texture:IsShown() then
- GameTimeFrame:GetFontString():SetTextColor(1, 0, 1)
- else
- GameTimeFrame:GetFontString():SetTextColor(classColor.r, classColor.g, classColor.b)
- end
-
- hooksecurefunc(texture, "Show", function()
- GameTimeFrame:GetFontString():SetTextColor(1, 0, 1)
- end)
-
- hooksecurefunc(texture, "Hide", function()
- GameTimeFrame:GetFontString():SetTextColor(classColor.r, classColor.g, classColor.b)
- end)
-end
+-- Classic TODO: GetFontString doesn't seem to be available, how can this be resolved to be usable by Retail? Couldn't figure out an alternative :(
+
+-- GameTimeFrame:GetFontString():SetFont(STANDARD_TEXT_FONT, 15, "OUTLINE")
+-- GameTimeFrame:GetFontString():SetShadowOffset(0, 0)
+-- GameTimeFrame:GetFontString():SetPoint("TOPRIGHT", GameTimeFrame)
+
+-- for _, texture in pairs({
+-- GameTimeCalendarEventAlarmTexture,
+-- GameTimeCalendarInvitesTexture,
+-- GameTimeCalendarInvitesGlow,
+-- TimeManagerAlarmFiredTexture,
+-- }) do
+-- texture:SetTexture(nil)
+
+-- local classColor = RAID_CLASS_COLORS[select(2, UnitClass("player"))]
+
+-- if texture:IsShown() then
+-- GameTimeFrame:GetFontString():SetTextColor(1, 0, 1)
+-- else
+-- GameTimeFrame:GetFontString():SetTextColor(classColor.r, classColor.g, classColor.b)
+-- end
+
+-- hooksecurefunc(texture, "Show", function()
+-- GameTimeFrame:GetFontString():SetTextColor(1, 0, 1)
+-- end)
+
+-- hooksecurefunc(texture, "Hide", function()
+-- GameTimeFrame:GetFontString():SetTextColor(classColor.r, classColor.g, classColor.b)
+-- end)
+-- end
diff --git a/Interface/AddOns/nMinimap/clock.lua b/Interface/AddOns/nMinimap/clock.lua
index 51318973..e8a42321 100644
--- a/Interface/AddOns/nMinimap/clock.lua
+++ b/Interface/AddOns/nMinimap/clock.lua
@@ -68,21 +68,23 @@ TimeManagerClockButton:SetScript("OnEnter" ,function(self)
end
-- World Boss Lockout Info
- local savedWorldBosses = GetNumSavedWorldBosses()
- if savedWorldBosses > 0 then
- for index=1, savedWorldBosses do
- local instanceName, _, _ = GetSavedWorldBossInfo(index)
- worldbossLockouts[index] = { name = instanceName }
- end
+ if GetNumSavedWorldBosses ~= nil then
+ local savedWorldBosses = GetNumSavedWorldBosses()
+ if savedWorldBosses > 0 then
+ for index=1, savedWorldBosses do
+ local instanceName, _, _ = GetSavedWorldBossInfo(index)
+ worldbossLockouts[index] = { name = instanceName }
+ end
- if next(worldbossLockouts) ~= nil then
- sort(worldbossLockouts, sort_func)
+ if next(worldbossLockouts) ~= nil then
+ sort(worldbossLockouts, sort_func)
- GameTooltip:AddLine(" ")
- GameTooltip:AddLine(RAID_INFO_WORLD_BOSS)
+ GameTooltip:AddLine(" ")
+ GameTooltip:AddLine(RAID_INFO_WORLD_BOSS)
- for i, boss in ipairs(worldbossLockouts) do
- GameTooltip:AddLine(boss.name, 1.0, 1.0, 1.0)
+ for i, boss in ipairs(worldbossLockouts) do
+ GameTooltip:AddLine(boss.name, 1.0, 1.0, 1.0)
+ end
end
end
end
diff --git a/Interface/AddOns/nMinimap/core.lua b/Interface/AddOns/nMinimap/core.lua
index f9c42c6b..b03e74a8 100644
--- a/Interface/AddOns/nMinimap/core.lua
+++ b/Interface/AddOns/nMinimap/core.lua
@@ -8,6 +8,14 @@ local find = string.find
Minimap:SetBlipTexture("Interface\\Minimap\\ObjectIconsAtlas")
+ -- Hide the Minimap toggle button
+
+if MinimapToggleButton then
+ MinimapToggleButton:Hide()
+ MinimapToggleButton:EnableMouse(false)
+ MinimapToggleButton:UnregisterAllEvents()
+end
+
-- A "new" mail notification
MiniMapMailFrame:SetSize(14, 14)
@@ -34,37 +42,41 @@ end)
-- Modify the lfg frame
-QueueStatusMinimapButton:ClearAllPoints()
-QueueStatusMinimapButton:SetPoint("TOPLEFT", Minimap, 4, -4)
-QueueStatusMinimapButton:SetSize(14, 14)
-QueueStatusMinimapButton:SetHighlightTexture(nil)
+if QueueStatusMinimapButton then
+ QueueStatusMinimapButton:ClearAllPoints()
+ QueueStatusMinimapButton:SetPoint("TOPLEFT", Minimap, 4, -4)
+ QueueStatusMinimapButton:SetSize(14, 14)
+ QueueStatusMinimapButton:SetHighlightTexture(nil)
-QueueStatusMinimapButtonBorder:SetTexture()
-QueueStatusMinimapButton.Eye:Hide()
+ QueueStatusMinimapButtonBorder:SetTexture()
+ QueueStatusMinimapButton.Eye:Hide()
-hooksecurefunc("EyeTemplate_StartAnimating", function(self)
- self:SetScript("OnUpdate", nil)
-end)
+ hooksecurefunc("EyeTemplate_StartAnimating", function(self)
+ self:SetScript("OnUpdate", nil)
+ end)
-QueueStatusMinimapButton.Text = QueueStatusMinimapButton:CreateFontString(nil, "OVERLAY")
-QueueStatusMinimapButton.Text:SetFont(STANDARD_TEXT_FONT, 15, "OUTLINE")
-QueueStatusMinimapButton.Text:SetPoint("TOP", QueueStatusMinimapButton)
-QueueStatusMinimapButton.Text:SetTextColor(1, 0.4, 0)
-QueueStatusMinimapButton.Text:SetText("Q")
+ QueueStatusMinimapButton.Text = QueueStatusMinimapButton:CreateFontString(nil, "OVERLAY")
+ QueueStatusMinimapButton.Text:SetFont(STANDARD_TEXT_FONT, 15, "OUTLINE")
+ QueueStatusMinimapButton.Text:SetPoint("TOP", QueueStatusMinimapButton)
+ QueueStatusMinimapButton.Text:SetTextColor(1, 0.4, 0)
+ QueueStatusMinimapButton.Text:SetText("Q")
+end
-- Garrison button
-GarrisonLandingPageMinimapButton:SetSize(36, 36)
-GarrisonLandingPageMinimapButton:ClearAllPoints()
-GarrisonLandingPageMinimapButton:SetPoint("BOTTOMLEFT", Minimap, 0, 0)
+if GarrisonLandingPageMinimapButton then
+ GarrisonLandingPageMinimapButton:SetSize(36, 36)
+ GarrisonLandingPageMinimapButton:ClearAllPoints()
+ GarrisonLandingPageMinimapButton:SetPoint("BOTTOMLEFT", Minimap, 0, 0)
-hooksecurefunc("GarrisonLandingPageMinimapButton_UpdateIcon", function(self)
- if C_Garrison.GetLandingPageGarrisonType() == LE_GARRISON_TYPE_8_0 then
- GarrisonLandingPageMinimapButton:SetScale(.70)
- else
- GarrisonLandingPageMinimapButton:SetScale(1)
- end
-end)
+ hooksecurefunc("GarrisonLandingPageMinimapButton_UpdateIcon", function(self)
+ if C_Garrison.GetLandingPageGarrisonType() == LE_GARRISON_TYPE_8_0 then
+ GarrisonLandingPageMinimapButton:SetScale(.70)
+ else
+ GarrisonLandingPageMinimapButton:SetScale(1)
+ end
+ end)
+end
-- Hide all unwanted things
@@ -89,8 +101,10 @@ MinimapZoneTextButton:UnregisterAllEvents()
-- Hide the tracking button
-MiniMapTracking:UnregisterAllEvents()
-MiniMapTracking:Hide()
+if MiniMapTracking then
+ MiniMapTracking:UnregisterAllEvents()
+ MiniMapTracking:Hide()
+end
-- Hide the durability frame (the armored man)
@@ -99,7 +113,9 @@ DurabilityFrame:UnregisterAllEvents()
-- Smaller Vehicle/Mount Seat Indicator
-VehicleSeatIndicator:SetScale(.75)
+if VehicleSeatIndicator then
+ VehicleSeatIndicator:SetScale(.75)
+end
-- Bigger minimap
diff --git a/Interface/AddOns/nMinimap/difficulty.lua b/Interface/AddOns/nMinimap/difficulty.lua
index 68057842..c6c2a68d 100644
--- a/Interface/AddOns/nMinimap/difficulty.lua
+++ b/Interface/AddOns/nMinimap/difficulty.lua
@@ -68,13 +68,15 @@ function nMinimapDifficulty_OnLoad(self)
end
end
-hooksecurefunc("MiniMapInstanceDifficulty_Update", function(self, event, ...)
- if event == "GUILD_PARTY_STATE_UPDATED" then
- local isGuild = ...
- if isGuild ~= isGuildGroup then
- isGuildGroup = isGuild
+if MiniMapInstanceDifficulty then
+ hooksecurefunc("MiniMapInstanceDifficulty_Update", function(self, event, ...)
+ if event == "GUILD_PARTY_STATE_UPDATED" then
+ local isGuild = ...
+ if isGuild ~= isGuildGroup then
+ isGuildGroup = isGuild
+ end
end
- end
- HideDifficultyFrame()
- nMinimapDifficulty.Overlay.Text:SetText(GetDifficultyText())
-end)
+ HideDifficultyFrame()
+ nMinimapDifficulty.Overlay.Text:SetText(GetDifficultyText())
+ end)
+end
diff --git a/Interface/AddOns/nMinimap/nMinimap.toc b/Interface/AddOns/nMinimap/nMinimap.toc
index 9f6bfddc..a26c5f06 100644
--- a/Interface/AddOns/nMinimap/nMinimap.toc
+++ b/Interface/AddOns/nMinimap/nMinimap.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rMinimap
## RequiredDeps: !Beautycase
diff --git a/Interface/AddOns/nMinimap/tab.lua b/Interface/AddOns/nMinimap/tab.lua
index 869dfb3d..b417a885 100644
--- a/Interface/AddOns/nMinimap/tab.lua
+++ b/Interface/AddOns/nMinimap/tab.lua
@@ -410,6 +410,17 @@ function nMinimap_UpdateFriendButton(entry)
level = tonumber(level)
levelc = GetQuestDifficultyColor(level)
+ --[[
+ Classic:
+ If 'class' and 'classc' are nil at this point we're looking at a class that Classic
+ doesn't know about, e.g. Death Knight, Monk, Demon Hunter etc, so lets give it a
+ default of FRIENDS_BNET_NAME_COLOR.
+ ]]--
+ if not classc then
+ characterName = characterName..'-UnknownClass';
+ classc = FRIENDS_BNET_NAME_COLOR;
+ end
+
level = WrapTextInColorCode(level, CreateColor(levelc.r, levelc.g, levelc.b, 1):GenerateHexColor())
characterName = WrapTextInColorCode(characterName, classc:GenerateHexColor())
@@ -647,11 +658,8 @@ function nMinimap_UpdateMemoryButton(entry)
if value ~= 0 then
entry.LeftText:SetText(name)
- if value > 1000 then
- entry.RightText:SetFormattedText("%.2f MB", value/1000)
- else
- entry.RightText:SetFormattedText("%.0f KB", value)
- end
+ entry.RightText:SetText(FormatMemoryValue(value))
+ entry.RightText:SetTextColor(RGBGradient(value / 1024))
end
minWidth = math.max(minWidth, entry.LeftText:GetWidth()+entry.RightText:GetWidth()+75)
@@ -749,7 +757,7 @@ function nMinimapTab_Info_ShowTooltip(self)
-- Memory
GameTooltip:AddLine(" ")
- GameTooltip:AddLine(format(TOTAL_MEM_MB_ABBR, totalMem/1000), 1.0, 1.0, 1.0)
+ GameTooltip:AddDoubleLine("AddOn Memory:", FormatMemoryValue(totalMem), nil, nil, nil, RGBGradient(totalMem / (1024*10)))
if NUM_ADDONS_TO_DISPLAY > 0 then
nMinimapTab_Memory_UpdateScrollFrame()
@@ -759,6 +767,14 @@ function nMinimapTab_Info_ShowTooltip(self)
GameTooltip:Show()
end
+function FormatMemoryValue(i)
+ if (i > 1024) then
+ return format('%.2f |cffffffffMB|r', i/1024)
+ else
+ return format('%.2f |cffffffffkB|r', i)
+ end
+end
+
--// Minimap Scripts
if not cfg.tab.showAlways then
diff --git a/Interface/AddOns/nMinimap/tab.xml b/Interface/AddOns/nMinimap/tab.xml
index 3761ffa2..0a893d34 100644
--- a/Interface/AddOns/nMinimap/tab.xml
+++ b/Interface/AddOns/nMinimap/tab.xml
@@ -118,7 +118,7 @@
- ToggleGuildFrame()
+ ToggleFriendsFrame(3)
nMinimapTab_Guild_ShowTooltip(self)
diff --git a/Interface/AddOns/nTooltip/core.lua b/Interface/AddOns/nTooltip/core.lua
index 340b98ac..fe2d14cb 100644
--- a/Interface/AddOns/nTooltip/core.lua
+++ b/Interface/AddOns/nTooltip/core.lua
@@ -110,8 +110,9 @@ for _, tooltip in pairs({
LibDBIconTooltip,
SmallTextTooltip,
LibItemUpdateInfoTooltip,
- QuestScrollFrame.StoryTooltip,
- QuestScrollFrame.WarCampaignTooltip,
+ -- Classic: These don't exist
+ -- QuestScrollFrame.StoryTooltip,
+ -- QuestScrollFrame.WarCampaignTooltip,
NamePlateTooltip,
}) do
ApplyTooltipStyle(tooltip)
@@ -356,7 +357,8 @@ GameTooltip:HookScript("OnTooltipSetUnit", function(self, ...)
-- Role
- if cfg.showUnitRole then
+ -- Classic: UnitGroupRolesAssigned doesn't exist so added check
+ if UnitGroupRolesAssigned ~= nil and cfg.showUnitRole then
self:AddLine(GetUnitRoleString(unit), 1, 1, 1)
end
@@ -515,28 +517,31 @@ GameTooltip:SetScript("OnEvent", function(self, event, GUID)
return
end
- local _, _, _, icon = GetSpecializationInfoByID(GetInspectSpecialization(unit))
- local now = GetTime()
+ -- Classic: GetInspectSpecialization doesn't exist to wrap this in a check
+ if GetInspectSpecialization ~= nil then
+ local _, _, _, icon = GetSpecializationInfoByID(GetInspectSpecialization(unit))
+ local now = GetTime()
- local iconMarkup = CreateTextureMarkup(icon, 64,64, 12,12, 0.10,.90,0.10,0.90, 0,0)
+ local iconMarkup = CreateTextureMarkup(icon, 64,64, 12,12, 0.10,.90,0.10,0.90, 0,0)
- local matchFound
- for index, _ in pairs(self.inspectCache) do
- local inspectCache = self.inspectCache[index]
- if inspectCache.GUID == GUID then
- inspectCache.specIcon = icon and " "..iconMarkup or ""
- inspectCache.lastUpdate = floor(now)
- matchFound = true
+ local matchFound
+ for index, _ in pairs(self.inspectCache) do
+ local inspectCache = self.inspectCache[index]
+ if inspectCache.GUID == GUID then
+ inspectCache.specIcon = icon and " "..iconMarkup or ""
+ inspectCache.lastUpdate = floor(now)
+ matchFound = true
+ end
end
- end
- if not matchFound then
- local GUIDInfo = {
- ["GUID"] = GUID,
- ["specIcon"] = icon and " "..iconMarkup or "",
- ["lastUpdate"] = floor(now)
- }
- table.insert(self.inspectCache, GUIDInfo)
+ if not matchFound then
+ local GUIDInfo = {
+ ["GUID"] = GUID,
+ ["specIcon"] = icon and " "..iconMarkup or "",
+ ["lastUpdate"] = floor(now)
+ }
+ table.insert(self.inspectCache, GUIDInfo)
+ end
end
if #self.inspectCache > 30 then
diff --git a/Interface/AddOns/nTooltip/nTooltip.toc b/Interface/AddOns/nTooltip/nTooltip.toc
index 04160e89..2e33db02 100644
--- a/Interface/AddOns/nTooltip/nTooltip.toc
+++ b/Interface/AddOns/nTooltip/nTooltip.toc
@@ -1,4 +1,4 @@
-## Interface: 80200
+## Interface: 11302
## Title: |cffCC3333 n|rTooltip
## OptionalDeps: !Beautycase