Skip to content

Commit bcd7415

Browse files
fixing OPie clash 2 - ported new namespace method to other clashes
1 parent 41396e6 commit bcd7415

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

firstInstall.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ local colorGreen = CreateColor(0, 1, 0)
66
local colorPurple = CreateColor(0.64, 0.3, 0.71)
77
local colorBrown = CreateColor(0.67, 0.41, 0)
88

9+
local addonName, ang = ...
10+
911
AngleurTutorial = {
1012
part = 1
1113
}
@@ -41,7 +43,7 @@ AngleurTutorial = {
4143
]]--
4244

4345
local function platerWarning()
44-
if C_AddOns.IsAddOnLoaded("Plater") then
46+
if ang.otherAddons.plater then
4547
print("----------------------------------------------------------------------------")
4648
print(T[colorBlu:WrapTextInColorCode("Angleur: ") .. colorYello:WrapTextInColorCode("Plater ") .. "detected."])
4749
print(T["Plater " .. colorYello:WrapTextInColorCode("-> ") .. "Advanced " .. colorYello:WrapTextInColorCode("-> ") .. "General Settings"

init.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ang.loadedPlugins.niche = false
1717
ang.otherAddons = {}
1818
ang.otherAddons.opie = false
1919
ang.otherAddons.plater = false
20-
ang.otherAddons.toyboxE = false
20+
ang.otherAddons.toyboxEnhanced = false
2121

2222
angleurDelayers = CreateFramePool("Frame", angleurDelayers, nil, function(framePool, frame)
2323
frame:ClearAllPoints()
@@ -684,7 +684,11 @@ function Angleur_EventLoader(self, event, unit, ...)
684684
-- Check if clashing addons have loaded
685685
ang.otherAddons.opie = C_AddOns.IsAddOnLoaded("OPie")
686686
ang.otherAddons.plater = C_AddOns.IsAddOnLoaded("Plater")
687-
ang.otherAddons.toyboxE = C_AddOns.IsAddOnLoaded("ToyBoxEnhanced")
687+
ang.otherAddons.toyboxEnhanced = C_AddOns.IsAddOnLoaded("ToyBoxEnhanced")
688+
Angleur_BetaPrint(0, colorBlu:WrapTextInColorCode("Angleur_Init: ") .. ": Clashing Addon Load Status:")
689+
Angleur_BetaPrint(0, colorGreen:WrapTextInColorCode("OPie: "), ang.otherAddons.opie)
690+
Angleur_BetaPrint(0, colorGreen:WrapTextInColorCode("Plater: "), ang.otherAddons.plater)
691+
Angleur_BetaPrint(0, colorGreen:WrapTextInColorCode("ToyBoxEnhanced: "), ang.otherAddons.toyboxEnhanced)
688692

689693
--__________________________________________________________________________
690694
-- Can't set Tab 2 on "ADDON_LOADED" because we need data from NicheOptions

platerClash.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ local colorBlu = CreateColor(0.61, 0.85, 0.92)
66
local colorGreen = CreateColor(0, 1, 0)
77
local colorRed = CreateColor(1, 0, 0)
88

9+
local addonName, ang = ...
10+
911
local firstCast = false
1012
function Angleur_FixPlater()
1113
if firstCast then return end
@@ -21,7 +23,7 @@ function Angleur_FixPlater()
2123
-- Also tell the player about the Plater interaction
2224
--__________________________________________________________________________________________________________________________________
2325
if not Angleur_TinyOptions.loginDisabled then
24-
if C_AddOns.IsAddOnLoaded("Plater") then
26+
if ang.otherAddons.plater then
2527
print("----------------------------------------------------------------------------------------------------------------------------------")
2628
print(T[colorBlu:WrapTextInColorCode("Angleur: ") .. colorYello:WrapTextInColorCode("Plater ") .. "detected."])
2729
print(T["Plater " .. colorYello:WrapTextInColorCode("-> ") .. "Advanced " .. colorYello:WrapTextInColorCode("-> ")

toys/toys_base.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ function Angleur_ToyBoxOverlay_Activate(self, overlay)
169169
end
170170
CollectionsJournal_SetTab(CollectionsJournal, 3)
171171

172-
if C_AddOns.IsAddOnLoaded("ToyBoxEnhanced") then
172+
if ang.otherAddons.toyboxEnhanced then
173173
if not ToyBox.EnhancedLayer then return end
174174
ToyBox.EnhancedLayer:Hide()
175175
end
@@ -183,7 +183,7 @@ function Angleur_ToyBoxOverlay_Activate(self, overlay)
183183
if angleurToys.toyBoxCloseHookSet == false then
184184
ToyBox:HookScript("OnHide", function()
185185
Angleur.toyBoxOverlay:Hide()
186-
if C_AddOns.IsAddOnLoaded("ToyBoxEnhanced") then
186+
if ang.otherAddons.toyboxEnhanced then
187187
if not ToyBox.EnhancedLayer then return end
188188
if ToyBox.EnhancedLayer:IsShown() then return end
189189
ToyBox.EnhancedLayer:Show()

0 commit comments

Comments
 (0)