Fixed support for TWW version of TalentTreeViewer

Author: Numynum

core/IcyVeinsImport.lua

@@ -150,7 +150,7 @@ function IcyVeinsImport:ParseDataSegment(startingLevel, dataSegment, levelingOrd
             else
                 local entryIndex = nextChar == '1' and 2 or 1;
                 local nodeInfo = LibTT:GetNodeInfo(nodeID);
-                local entry = nodeInfo.type == Enum.TraitNodeType.Selection and nodeInfo.entryIDs and nodeInfo.entryIDs[entryIndex] or nil;
+                local entry = (nodeInfo.type == Enum.TraitNodeType.Selection or nodeInfo.type == Enum.TraitNodeType.SubTreeSelection) and nodeInfo.entryIDs and nodeInfo.entryIDs[entryIndex] or nil;
                 rankByNodeID[nodeID] = (rankByNodeID[nodeID] or 0) + 1;
 
                 --- @type TalentLoadoutManager_LevelingBuildEntry_withEntry

core/ImportExport.lua

@@ -261,7 +261,7 @@ function ImportExport:ConvertToImportLoadoutEntryInfo(treeID, loadoutContent)
 
         if (indexInfo.isNodeSelected) then
             local treeNode = LibTT:GetNodeInfo(treeNodeID);
-            local isChoiceNode = treeNode.type == Enum.TraitNodeType.Selection;
+            local isChoiceNode = treeNode.type == Enum.TraitNodeType.Selection or treeNode.type == Enum.TraitNodeType.SubTreeSelection;
             local choiceNodeSelection = indexInfo.isChoiceNode and indexInfo.choiceNodeSelection or nil;
             if indexInfo.isNodeSelected and isChoiceNode ~= indexInfo.isChoiceNode then
                 -- guard against corrupt import strings
@@ -398,7 +398,7 @@ function ImportExport:WriteLoadoutContent(exportStream, deserialized, treeID, cl
                 exportStream:AddValue(self.bitWidthRanksPurchased, info.rank);
             end
 
-            local isChoiceNode = nodeInfo and nodeInfo.type == Enum.TraitNodeType.Selection;
+            local isChoiceNode = nodeInfo and (nodeInfo.type == Enum.TraitNodeType.Selection or nodeInfo.type == Enum.TraitNodeType.SubTreeSelection);
             exportStream:AddValue(1, isChoiceNode and 1 or 0);
             if isChoiceNode then
                 local entryIndex = 0;

core/TalentLoadoutManager.lua

@@ -363,7 +363,7 @@ function TLM:IsChoiceNode(nodeID)
     if configID == nil or nodeID == nil then return; end
 
     local nodeInfo = C_Traits.GetNodeInfo(configID, nodeID);
-    return nodeInfo and Enum.TraitNodeType.Selection == nodeInfo.type;
+    return nodeInfo and (Enum.TraitNodeType.Selection == nodeInfo.type or Enum.TraitNodeType.SubTreeSelection == nodeInfo.type);
 end
 
 --- @return number incremented unique ID
@@ -603,15 +603,15 @@ function TLM:LoadoutInfoToEntryInfo(loadoutInfo)
             for _, entryID in pairs(nodeInfo.entryIDs) do
                 if entryID == loadoutNodeInfo.entryID then
                     nodeInfoExists = true;
-                    isChoiceNode = Enum.TraitNodeType.Selection == nodeInfo.type;
+                    isChoiceNode = Enum.TraitNodeType.Selection == nodeInfo.type or Enum.TraitNodeType.SubTreeSelection == nodeInfo.type;
                     break;
                 else
                     local nodeEntryInfo = C_Traits.GetEntryInfo(configID, entryID);
                     local definitionInfo = nodeEntryInfo and nodeEntryInfo.definitionID and C_Traits.GetDefinitionInfo(nodeEntryInfo.definitionID);
                     if definitionInfo and definitionInfo.spellID == loadoutNodeInfo.spellID then
                         nodeInfoExists = true;
                         loadoutNodeInfo.entryID = entryID;
-                        isChoiceNode = Enum.TraitNodeType.Selection == nodeInfo.type;
+                        isChoiceNode = Enum.TraitNodeType.Selection == nodeInfo.type or Enum.TraitNodeType.SubTreeSelection == nodeInfo.type;
                         break;
                     end
                 end

modules/SideBarMixin.lua

@@ -750,7 +750,10 @@ function SideBarMixin:OpenDropDownMenu(dropDown, frame, elementData)
         openInTTV = {
             text = "Open in TalentTreeViewer",
             notCheckable = true,
-            disabled = not (C_AddOns.GetAddOnEnableState('TalentTreeViewer', UnitName('player')) == 2),
+            disabled = C_AddOns.GetAddOnEnableState(
+                TalentViewerLoader and TalentViewerLoader:GetLodAddonName() or 'TalentTreeViewer',
+                UnitName('player')
+            ) ~= 2,
             func = function()
                 self:OpenInTalentTreeViewer(elementData);
             end,
@@ -896,7 +899,12 @@ function SideBarMixin:OpenInTalentTreeViewer(elementData)
     if not exportString then
         return;
     end
-    C_AddOns.LoadAddOn('TalentTreeViewer');
+    if TalentViewerLoader then
+        TalentViewerLoader:LoadTalentViewer();
+    else
+        C_AddOns.LoadAddOn('TalentTreeViewer');
+    end
+    local TalentViewer = TalentViewerLoader:GetTalentViewer() or _G.TalentViewer;
     if not TalentViewer or not TalentViewer.ImportLoadout then
         return;
     end

modules/TalentTreeViewerSidebar.lua

@@ -104,15 +104,11 @@ end
 
 function Module:GetBlizzMoveFrameTable()
     return {
-        ['TalentTreeViewer'] = {
+        [TalentViewerLoader and TalentViewerLoader:GetLodAddonName() or 'TalentTreeViewer'] = {
             ['TalentViewer_DF'] = {
-                MinVersion = 100000,
                 SubFrames = {
-                    ['TalentViewer_DF.Talents.ButtonsParent'] = {
-                        MinVersion = 100000,
-                    },
+                    ['TalentViewer_DF.Talents.ButtonsParent'] = {},
                     ["TLM-TTVSideBar"] = {
-                        MinVersion = 100000,
                         FrameReference = self.SideBar,
                         Detachable = true,
                     },