Merge pull request #42 from GovtGeek/paper-doll-icon-fix

Icon, libraries, and namespace fixes

Outfitter.lua

@@ -1218,6 +1218,13 @@ for vIndex, vSlotName in ipairs(Outfitter.cSlotNames) do
 	Outfitter.cSlotOrder[vSlotName] = vIndex
 end
 function Outfitter:OutfitterButtonAdjust()
+	if Outfitter:IsClassicEra() then
+		OutfitterButton:SetPoint("TOPRIGHT", PaperDollFrame, "TOPRIGHT", -28, -40)
+	end
+	if C_Seasons and C_Seasons.HasActiveSeason() and (C_Seasons.GetActiveSeason() == Enum.SeasonID.SeasonOfDiscovery) then
+		OutfitterButton:ClearAllPoints()
+		OutfitterButton:SetPoint("BOTTOMRIGHT", RuneFrameControlButton, "BOTTOMLEFT", 10, -4)
+	end
 	if not Outfitter:IsClassicCataclysm() then
 		--[[-- TODO? Use this for all adjustments - remove the EquipmentManagerAdjust
 		if cvar == "equipmentManager" and value == "1" then -- cvar values are strings
@@ -1239,10 +1246,6 @@ function Outfitter:OutfitterButtonAdjust()
 			OutfitterFrame:SetPoint("TOPLEFT", PaperDollFrame, "TOPRIGHT", -34, -48)
 		end
 		--]]--
-		if RuneFrameControlButton ~= nil then
-			OutfitterButton:ClearAllPoints()
-			OutfitterButton:SetPoint("BOTTOMRIGHT", RuneFrameControlButton, "BOTTOMLEFT", 10, -4)
-		end
 	else
 		OutfitterButton:SetPoint("TOPRIGHT", PaperDollFrame, "TOPRIGHT", 4, -28)
 	end
@@ -4376,7 +4379,12 @@ function Outfitter:GetPlayerAuraStates()
 	end
 
 	while true do
-		local vName, vTexture, _, _, _, _, _, _, _, vSpellID = UnitBuff("player", vBuffIndex)
+		--local vName, vTexture, _, _, _, _, _, _, _, vSpellID = UnitBuff("player", vBuffIndex)
+		local auraInfo = C_UnitAuras.GetBuffDataByIndex("player", vBuffIndex)
+		local vName, vTexture, vSpellID
+		if auraInfo then
+			vName, vTexture, vSpellID = auraInfo.name, auraInfo.icon, auraInfo.spellId
+		end
 
 		if not vName then
 			return self.AuraStates
@@ -5209,10 +5217,11 @@ function Outfitter:Initialize()
 	-- Season of Discovery handling
 	if C_Seasons and C_Seasons.HasActiveSeason() and (C_Seasons.GetActiveSeason() == Enum.SeasonID.SeasonOfDiscovery) then
 		self.EventLib:RegisterEvent("ENGRAVING_MODE_CHANGED", self.EngravingModeChanged, self)
-		Outfitter:OutfitterButtonAdjust()
 	end
-	--
 
+	-- Move the Outfitter button according to the version we're running
+	Outfitter:OutfitterButtonAdjust()
+
 	self:DispatchOutfitEvent("OUTFITTER_INIT")
 
 	self.SchedulerLib:ScheduleUniqueRepeatingTask(0.5, self.UpdateSwimming, self, nil, "Outfitter:UpdateSwimming")

Outfitter.toc

@@ -1,17 +1,16 @@
-## Interface: 40401, 30403, 20504, 11504
-
+## Interface: 40401, 30403, 20504, 11505
 ## Author: GovtGeek
 ## X-Original-Author: John Stephen
 ## X-Credits: Mundocani, Miv, Gogo, LemonDrake
 ## Title: Outfitter
-## Version: 4.4.1
+## Version: 4.4.1.1
 ## Notes: Clothing and weapon management and automated equipment changes
 ## OptionalDeps:
 ## RequiredDeps:
 ## SavedVariablesPerCharacter: gOutfitter_Settings
 ## SavedVariables: gOutfitter_GlobalSettings
 ## X-ReloadTag: 2
-## X-Curse-Project-ID:
+## X-Curse-Project-ID: 1011204
 
 Libraries/UTF8/utf8data.lua
 Libraries/UTF8/utf8.lua

OutfitterItemStats.lua

@@ -492,7 +492,7 @@ Outfitter._PawnScaleStatMetaTable = {__index = Outfitter._PawnScaleStat}
 -- Install Pawn scales
 ----------------------------------------
 
-if IsAddOnLoaded("Pawn") then
+if C_AddOns.IsAddOnLoaded("Pawn") then
 	table.insert(Outfitter.StatCategories, Outfitter.PawnScalesCategory)
 else
 	Outfitter.EventLib:RegisterEvent("ADDON_LOADED", function (pEventID, pAddOnName)
@@ -564,7 +564,7 @@ Outfitter._WeightsWatcherStatMetaTable = {__index = Outfitter._WeightsWatcherSta
 -- Install WeightsWatcher
 ----------------------------------------
 
-if IsAddOnLoaded("WeightsWatcher") then
+if C_AddOns.IsAddOnLoaded("WeightsWatcher") then
 	table.insert(Outfitter.StatCategories, Outfitter.WeightsWatcherCategory)
 else
 	Outfitter.EventLib:RegisterEvent("ADDON_LOADED", function (pEventID, pAddOnName)

Outfitter_Mainline.toc

@@ -3,7 +3,7 @@
 ## X-Original-Author: John Stephen
 ## X-Credits: Mundocani, Miv, Gogo, LemonDrake
 ## Title: Outfitter
-## Version: 4.4.0.5
+## Version: 4.4.1.1
 ## Notes: Clothing and weapon management and automated equipment changes
 ## AddonCompartmentFunc: Outfitter_OnAddonCompartmentClick
 #### AddonCompartmentFuncOnEnter:
@@ -14,7 +14,7 @@
 ## SavedVariablesPerCharacter: gOutfitter_Settings
 ## SavedVariables: gOutfitter_GlobalSettings
 ## X-ReloadTag: 2
-## X-Curse-Project-ID:
+## X-Curse-Project-ID: 1011204
 
 Libraries/UTF8/utf8data.lua
 Libraries/UTF8/utf8.lua