Merge pull request #1 from Tyrsenus/9.1-Update

9.1 update, added TradeSkillMaster filtering.

Author: Tyrsenus

WardrobeTools/WardrobeTools.toc

@@ -1,9 +1,9 @@
-## Interface: 80000
+## Interface: 90100
 ## Title: WardrobeTools
-## Notes: Quickly soulbind items for collecting their appearance and mail them to other characters
+## Notes: A simple addon to streamline transmog/appearance collection.
 ## SavedVariables: WardrobeToolsADB
 ## SavedVariablesPerCharacter: WardrobeToolsCDB
-## Version: 0.9.9
+## Version: 1.0.0
 
 ## OptionalDeps: sUI
 ## X-SezzADB: WardrobeToolsADB

WardrobeTools/wardrobe/accountwide_outfits.lua

@@ -50,8 +50,9 @@ addon.OnEnable = function(self)
 
 	if (not S.InGame) then
 		self:RegisterEvent("PLAYER_LOGIN");
-	else
-		self:SyncOutfits();
+	--else
+		--self:SyncOutfits();
+		--self:SyncOutfits();
 	end
 end
 
@@ -73,16 +74,18 @@ addon.SyncOutfits = function(self)
 
 	-- fetch outfits from server
 	local serverOutfits = {};
-	for _, outfit in pairs(GetOutfits()) do
-		local appearanceSources, mainHandEnchant, offHandEnchant = GetOutfitSources(outfit.outfitID);
+	for _, outfit in ipairs(C_TransmogCollection.GetOutfits()) do
 
+		local appearanceSources, mainHandEnchant, offHandEnchant = C_TransmogCollection.GetOutfitSources(outfit);
+
 		serverOutfits[outfit.name] = {
 			id = outfit.outfitID,
 			icon = outfit.icon,
 			appearanceSources = appearanceSources,
 			mainHandEnchant = mainHandEnchant,
 			offHandEnchant = offHandEnchant,
 		};
+
 	end
 
 	-- compare outfits
@@ -167,7 +170,7 @@ addon.SyncOutfits = function(self)
 end
 
 addon.PLAYER_LOGIN = function(self, event)
-	self:SyncOutfits();
+	--self:SyncOutfits();
 	self:UnregisterEvent(event);
 end
 
@@ -196,29 +199,29 @@ hooksecurefunc(C_TransmogCollection, "DeleteOutfit", function(outfitID)
 	end
 end);
 
-hooksecurefunc(C_TransmogCollection, "SaveOutfit", function(name, appearanceSources, mainHandEnchant, offHandEnchant, icon)
-	-- We cannot use the passed arguments because they are different to C_TransmogCollection.GetOutfitSources() return values
-	if (not addon.enabledState or syncing) then return; end
-
-	local found = false;
-	for _, outfit in pairs(GetOutfits()) do
-		if (outfit.name == name) then
-			found = true;
-
-			local appearanceSources, mainHandEnchant, offHandEnchant = GetOutfitSources(outfit.outfitID);
-			addon.outfits[name] = {
-				id = outfit.outfitID,
-				appearanceSources = appearanceSources,
-				mainHandEnchant = mainHandEnchant,
-				offHandEnchant = offHandEnchant,
-				icon = icon,
-				modifiedBy = myCharacter,
-			};
-			break;
-		end
-	end
-
-	if (not found) then
-		addon:PrintError(strformat("Recently saved outfit %s not found on server!", name));
-	end
-end);
+-- hooksecurefunc(C_TransmogCollection, "SaveOutfit", function(name, appearanceSources, mainHandEnchant, offHandEnchant, icon)
+	-- -- We cannot use the passed arguments because they are different to C_TransmogCollection.GetOutfitSources() return values
+	-- if (not addon.enabledState or syncing) then return; end
+
+	-- local found = false;
+	-- for _, outfit in pairs(GetOutfits()) do
+		-- if (outfit.name == name) then
+			-- found = true;
+
+			-- local appearanceSources, mainHandEnchant, offHandEnchant = GetOutfitSources(outfit.outfitID);
+			-- addon.outfits[name] = {
+				-- id = outfit.outfitID,
+				-- appearanceSources = appearanceSources,
+				-- mainHandEnchant = mainHandEnchant,
+				-- offHandEnchant = offHandEnchant,
+				-- icon = icon,
+				-- modifiedBy = myCharacter,
+			-- };
+			-- break;
+		-- end
+	-- end
+
+	-- if (not found) then
+		-- addon:PrintError(strformat("Recently saved outfit %s not found on server!", name));
+	-- end
+-- end);

WardrobeTools/wardrobe/appearance_collector.lua

@@ -277,9 +277,10 @@ addon.OnDisable = function(self)
 	DeleteAppearanceCollectorEquipmentSet();
 end
 
-addon.BindMouseWheel = function(self)
-	SetOverrideBindingClick(self, true, "MOUSEWHEELUP", self:GetName());
-	SetOverrideBindingClick(self, true, "MOUSEWHEELDOWN", self:GetName());
+addon.BindMouseWheel = function(self)	
+	--SetOverrideBindingClick(self, true, "MOUSEWHEELUP", self:GetName());
+	--SetOverrideBindingClick(self, true, "MOUSEWHEELDOWN", self:GetName());
+	return;
 end
 
 addon.UnbindMouseWheel = function(self)

WardrobeTools/wardrobe/core.lua

@@ -39,6 +39,7 @@
 
 		Returns values:
 			isTradable (boolean)
+			
 
 --]]
 
@@ -125,6 +126,7 @@ local PlayerHasApperanceSource = function(item)
 	return false;
 end
 
+
 local PlayerHasTransmog = function(item, checkSource, forceRefresh)
 	if (not item or (checkSource and not S.ItemIsValidTransmogrifySource(item))) then return; end
 	model:SetUnit("player");
@@ -146,9 +148,25 @@ local PlayerHasTransmog = function(item, checkSource, forceRefresh)
 			local itemID = type(item) == "string" and tonumber(strmatch(item, "item:(%d+)")) or item;
 			isCollected = C_TransmogCollection.PlayerHasTransmog(itemID);
 		else
-			model:TryOn(item);
-
-			local appearanceSourceID = model:GetSlotTransmogSources(equipSlotIDs[equipSlot]);
+			model:TryOn(item,slot);
+
+			--local appearanceSourceID = model:GetSlotTransmogSources(equipSlotIDs[equipSlot]);
+			
+			-- Credit to TorelTwiddler (CanIMogIt)
+			
+			local transmogInfo = model:GetItemTransmogInfo(equipSlotIDs[equipSlot]);
+			if transmogInfo and 
+				transmogInfo.appearanceID ~= nil and
+				transmogInfo.appearanceID ~= 0 then
+				-- Yes, that's right, we are setting `appearanceID` to the `sourceID`. Blizzard messed
+				-- up the DressUpModel functions, so _they_ don't even know what they do anymore.
+				-- The `appearanceID` field from `DressUpModel:GetItemTransmogInfo` is actually its
+				-- source ID, not it's appearance ID.
+				appearanceSourceID = transmogInfo.appearanceID				
+			end
+			
+			--
+			
 			if (appearanceSourceID == 0 and (equipSlotIDs[equipSlot] == 16 or equipSlotIDs[equipSlot] == 17)) then
 				-- Even though the model is undressed it sometimes puts weapons into the offhand slot instead of the mainhand slot,
 				-- especially when equipping 2 similar items (like two Baleful weapons with different attributes)
@@ -219,6 +237,7 @@ local PlayerHasTransmog = function(item, checkSource, forceRefresh)
 	return isCollected, isCollectedSource;
 end
 
+
 S.PlayerHasTransmog = PlayerHasTransmog;
 
 -----------------------------------------------------------------------------
@@ -231,7 +250,11 @@ local ItemIsValidTransmogrifySource = function(itemLink)
 	if (itemClassID == LE_ITEM_CLASS_ARMOR and itemSubClassID == LE_ITEM_ARMOR_COSMETIC) then return true; end -- C_Transmog.GetItemInfo() doesn't like cosmetic armor
 
 	local isDressable = IsDressableItem(itemID);
-	local _, _, canBeSource, noSourceReason = C_Transmog.GetItemInfo(itemID);
+	-- message(itemID)
+	
+	-- local _, _, canBeSource, noSourceReason = C_Transmog.GetItemInfo(itemID);
+	local _, _, canBeSource, noSourceReason = select(1, C_Transmog.CanTransmogItem(itemID))
+	
 	if (not isDressable or not canBeSource) then return false, noSourceReason; end
 
 	if (equipSlot == "INVTYPE_NECK" or equipSlot == "INVTYPE_FINGER" or equipSlot == "INVTYPE_TRINKET") then return false; end