From 676099b2375f8cc67c4ab1ab78d2cdf4b0de8388 Mon Sep 17 00:00:00 2001
From: wavebend <wavebend1@gmail.com>
Date: Tue, 19 Nov 2024 21:47:07 -0500
Subject: [PATCH 1/5] Handle registry scan errors; Fix for mod manager not
 closing; Shader compilation fix

---
 FrostyModSupport/FrostyModExecutor.cs         | 10 ++++
 .../Controls/FrostyHandledExceptionBox.cs     | 48 +++++++++++++++++++
 FrostyPlugin/FrostyCore.csproj                |  1 +
 FrostyPlugin/Themes/Generic.xaml              | 33 +++++++++++++
 .../Windows/FrostyProfileSelectWindow.xaml.cs | 21 +++++---
 5 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 FrostyPlugin/Controls/FrostyHandledExceptionBox.cs

diff --git a/FrostyModSupport/FrostyModExecutor.cs b/FrostyModSupport/FrostyModExecutor.cs
index 39cf8497c..de1212d03 100644
--- a/FrostyModSupport/FrostyModExecutor.cs
+++ b/FrostyModSupport/FrostyModExecutor.cs
@@ -1426,6 +1426,16 @@ public int Run(FileSystemManager inFs, CancellationToken cancelToken, ILogger in
                     }
                 }
 
+                // if there is a gamedir/shader_cache folder, symlink it
+                if (Directory.Exists(Path.Combine(m_fs.BasePath, "shader_cache")))
+                {
+                    DirectoryInfo shaderCacheLink = new DirectoryInfo(Path.Combine(modDataPath, "shader_cache"));
+                    if (!shaderCacheLink.Exists)
+                    {
+                        cmdArgs.Add(new SymLinkStruct(Path.Combine(modDataPath, "shader_cache"), Path.Combine(m_fs.BasePath, "shader_cache"), true));
+                    }
+                }
+
                 // add cas files to link
                 foreach (string catalog in m_fs.Catalogs)
                 {
diff --git a/FrostyPlugin/Controls/FrostyHandledExceptionBox.cs b/FrostyPlugin/Controls/FrostyHandledExceptionBox.cs
new file mode 100644
index 000000000..ffcca0074
--- /dev/null
+++ b/FrostyPlugin/Controls/FrostyHandledExceptionBox.cs
@@ -0,0 +1,48 @@
+using Frosty.Controls;
+using System.Windows;
+
+namespace Frosty.Core.Controls
+{
+    public class FrostyHandledExceptionBox : FrostyDockableWindow
+    {
+        #region -- Properties --
+
+        #region -- WarningText --
+        public static readonly DependencyProperty WarningTextProperty = DependencyProperty.Register("WarningText", typeof(string), typeof(FrostyHandledExceptionBox), new PropertyMetadata(""));
+        public string WarningText {
+            get => (string)GetValue(WarningTextProperty);
+            set => SetValue(WarningTextProperty, value);
+        }
+        #endregion
+
+        #endregion
+
+        public FrostyHandledExceptionBox()
+        {
+            Title = "Warning";
+            Topmost = true;
+            ShowInTaskbar = false;
+
+            Height = 180;
+            Width = 400;
+
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            Window mainWin = Application.Current.MainWindow;
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+        }
+
+        public static MessageBoxResult Show(string warning)
+        {
+            FrostyHandledExceptionBox window = new FrostyHandledExceptionBox
+            {
+                WarningText = warning
+            };
+
+            return (window.ShowDialog() == true) ? MessageBoxResult.OK : MessageBoxResult.Cancel;
+        }
+    }
+}
diff --git a/FrostyPlugin/FrostyCore.csproj b/FrostyPlugin/FrostyCore.csproj
index b6a6eb234..764bab647 100644
--- a/FrostyPlugin/FrostyCore.csproj
+++ b/FrostyPlugin/FrostyCore.csproj
@@ -136,6 +136,7 @@
     <Compile Include="Attributes\RegisterUserShaderAttribute.cs" />
     <Compile Include="CodingStandards\FrostyCodingStandards.cs" />
     <Compile Include="Controls\FrostyBaseAssetEditor.cs" />
+    <Compile Include="Controls\FrostyHandledExceptionBox.cs" />
     <Compile Include="Controls\FrostyExceptionBox.cs" />
     <Compile Include="Controls\FrostyNotification.cs" />
     <Compile Include="Controls\VirtualizingTilePanel.cs" />
diff --git a/FrostyPlugin/Themes/Generic.xaml b/FrostyPlugin/Themes/Generic.xaml
index b8a271e04..d7eb6bb7a 100644
--- a/FrostyPlugin/Themes/Generic.xaml
+++ b/FrostyPlugin/Themes/Generic.xaml
@@ -1419,4 +1419,37 @@
         </Setter>
     </Style>
 
+    <!-- FrostyHandledExceptionBox -->
+    <Style TargetType="{x:Type local:FrostyHandledExceptionBox}">
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <DataTemplate.Resources>
+                        <ctrl:WindowCloseCommand x:Key="CloseCommand"/>
+                    </DataTemplate.Resources>
+                    <Grid Background="{StaticResource ListBackground}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="26"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="38"/>
+                        </Grid.RowDefinitions>
+                        
+                        <!-- Warning text -->
+                        <TextBlock Grid.Row="0" Text="Warning" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource FontColor}" FontFamily="Global User Interface" FontSize="14" FontWeight="Bold"/>
+                        
+                        <!-- Crash text -->
+                        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="8,0,8,0" BorderThickness="1" Padding="4">
+                            <TextBlock Text="{Binding WarningText, RelativeSource={RelativeSource AncestorType={x:Type local:FrostyHandledExceptionBox}}}" TextWrapping="Wrap" Foreground="White" FontFamily="Global User Interface" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </ScrollViewer>
+                        
+                        <!-- Ok button -->
+                        <StackPanel Grid.Row="2" Margin="8" FlowDirection="RightToLeft" Orientation="Horizontal">
+                            <Button Content="Ok" Width="75" Command="{StaticResource CloseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
+                        </StackPanel>
+                    </Grid>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>
diff --git a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
index 012e064b3..95e220d09 100644
--- a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
+++ b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using Frosty.Controls;
+using Frosty.Core.Controls;
 using FrostySdk;
 using Microsoft.Win32;
 
@@ -65,15 +66,22 @@ private void SelectConfiguration()
         
         private async void ScanGames()
         {
-            await Task.Run((() =>
+            try
             {
-                using (RegistryKey lmKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node"))
+                await Task.Run((() =>
                 {
-                    int totalCount = 0;
+                    using (RegistryKey lmKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node"))
+                    {
+                        int totalCount = 0;
 
-                    IterateSubKeys(lmKey, ref totalCount);
-                }
-            }));
+                        IterateSubKeys(lmKey, ref totalCount);
+                    }
+                }));
+            }
+            catch
+            {
+                FrostyHandledExceptionBox.Show("An error occurred while scanning for games. \n\nPlease manually set the game executable(s).");
+            }
         }
         
         private void IterateSubKeys(RegistryKey subKey, ref int totalCount)
@@ -90,6 +98,7 @@ private void IterateSubKeys(RegistryKey subKey, ref int totalCount)
                 }
             }
 
+
             foreach (string subKeyValue in subKey.GetValueNames())
             {
                 if (subKeyValue.IndexOf("Install Dir", StringComparison.OrdinalIgnoreCase) != -1)

From f00619e8f6dc8bc1de34257ef4a96911791acfe1 Mon Sep 17 00:00:00 2001
From: wavebend <wavebend1@gmail.com>
Date: Tue, 19 Nov 2024 21:47:07 -0500
Subject: [PATCH 2/5] Handle registry scan errors; Fix for mod manager not
 closing; Shader compilation fix

---
 FrostyModSupport/FrostyModExecutor.cs         | 10 +++++
 .../Windows/FrostyProfileSelectWindow.xaml    | 18 +++++++-
 .../Windows/FrostyProfileSelectWindow.xaml.cs | 44 ++++++++++++++++---
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/FrostyModSupport/FrostyModExecutor.cs b/FrostyModSupport/FrostyModExecutor.cs
index 39cf8497c..de1212d03 100644
--- a/FrostyModSupport/FrostyModExecutor.cs
+++ b/FrostyModSupport/FrostyModExecutor.cs
@@ -1426,6 +1426,16 @@ public int Run(FileSystemManager inFs, CancellationToken cancelToken, ILogger in
                     }
                 }
 
+                // if there is a gamedir/shader_cache folder, symlink it
+                if (Directory.Exists(Path.Combine(m_fs.BasePath, "shader_cache")))
+                {
+                    DirectoryInfo shaderCacheLink = new DirectoryInfo(Path.Combine(modDataPath, "shader_cache"));
+                    if (!shaderCacheLink.Exists)
+                    {
+                        cmdArgs.Add(new SymLinkStruct(Path.Combine(modDataPath, "shader_cache"), Path.Combine(m_fs.BasePath, "shader_cache"), true));
+                    }
+                }
+
                 // add cas files to link
                 foreach (string catalog in m_fs.Catalogs)
                 {
diff --git a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml
index 340c54b35..68cbc57c6 100644
--- a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml
+++ b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml
@@ -3,6 +3,7 @@
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                            xmlns:ctrl="clr-namespace:Frosty.Controls;assembly=FrostyControls"
+                           xmlns:local="clr-namespace:Frosty.Core.Windows"
                            xmlns:core="clr-namespace:Frosty.Core.Controls;assembly=FrostyCore"
                            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                            mc:Ignorable="d"
@@ -14,6 +15,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="2"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="38"/>
         </Grid.RowDefinitions>
         
@@ -54,7 +56,20 @@
             </ListBox>
         </Grid>
 
-        <Grid Grid.Row="3" Background="{StaticResource ListBackground}" >
+        <TextBlock Grid.Row="3" Text="Notice: Game scan was unsuccessful." Foreground="White" Background="#292929" TextAlignment="Center" HorizontalAlignment="Stretch" Padding="5,3,5,3">
+            <TextBlock.Style>
+                <Style TargetType="TextBlock">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding ScanSuccessful, RelativeSource={RelativeSource AncestorType={x:Type local:FrostyProfileSelectWindow}}}" Value="False">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        
+        <Grid Grid.Row="4" Background="{StaticResource ListBackground}" >
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button Content="Refresh" Padding="12,0" Margin="6,6,0,6" Click="RefreshButton_OnClicked"/>
                 <Button x:Name="AddConfigurationButton" Content="Add" Padding="12,0" Margin="6,6,0,6" Click="AddConfigurationButton_OnClick"/>
@@ -63,5 +78,6 @@
             
             <Button x:Name="CancelButton" Content="Cancel" HorizontalAlignment="Left" Padding="12,0" Margin="6,6,0,6" Click="CancelButton_OnClick"/>
         </Grid>
+
     </Grid>
 </ctrl:FrostyDockableWindow>
diff --git a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
index 012e064b3..6118761b4 100644
--- a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
+++ b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
@@ -1,26 +1,47 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Frosty.Controls;
+using Frosty.Core.Controls;
 using FrostySdk;
 using Microsoft.Win32;
 
 namespace Frosty.Core.Windows
 {
-    public partial class FrostyProfileSelectWindow
+    public partial class FrostyProfileSelectWindow : INotifyPropertyChanged
     {
         private readonly List<FrostyConfiguration> configurations = new List<FrostyConfiguration>();
         private string selectedProfileName;
+        private bool scanSuccessful = true;
         
         public FrostyProfileSelectWindow()
         {
             InitializeComponent();
         }
 
+        public bool ScanSuccessful {
+            get => scanSuccessful;
+            set {
+                if (scanSuccessful != value)
+                {
+                    scanSuccessful = value;
+                    OnPropertyChanged(nameof(ScanSuccessful));
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
         private void ProfileSelectWindow_Loaded(object sender, RoutedEventArgs e)
         {
             RefreshConfigurationList();
@@ -48,6 +69,7 @@ private void RefreshConfigurationList()
                 }
             }
 
+            ConfigurationListView.ItemsSource = null;
             ConfigurationListView.ItemsSource = configurations;
         }
 
@@ -65,15 +87,22 @@ private void SelectConfiguration()
         
         private async void ScanGames()
         {
-            await Task.Run((() =>
+            try
             {
-                using (RegistryKey lmKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node"))
+                await Task.Run((() =>
                 {
-                    int totalCount = 0;
+                    using (RegistryKey lmKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node"))
+                    {
+                        int totalCount = 0;
 
-                    IterateSubKeys(lmKey, ref totalCount);
-                }
-            }));
+                        IterateSubKeys(lmKey, ref totalCount);
+                    }
+                }));
+            }
+            catch
+            {
+                ScanSuccessful = false;
+            }
         }
         
         private void IterateSubKeys(RegistryKey subKey, ref int totalCount)
@@ -90,6 +119,7 @@ private void IterateSubKeys(RegistryKey subKey, ref int totalCount)
                 }
             }
 
+
             foreach (string subKeyValue in subKey.GetValueNames())
             {
                 if (subKeyValue.IndexOf("Install Dir", StringComparison.OrdinalIgnoreCase) != -1)

From 7cbe1649981024770630981a2ba2fe81cb8ebda0 Mon Sep 17 00:00:00 2001
From: Aashu Krishnan <gpstore31@gmail.com>
Date: Tue, 19 Nov 2024 23:01:52 -0600
Subject: [PATCH 3/5] Profile Selection Window cleanup

---
 FrostyHash/FrostyHash.vcxproj                 |  2 +-
 .../Windows/FrostyProfileSelectWindow.xaml.cs | 37 +++++++++++--------
 Shaders/FrostyShaders.vcxproj                 |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/FrostyHash/FrostyHash.vcxproj b/FrostyHash/FrostyHash.vcxproj
index 45383818d..2f861ad50 100644
--- a/FrostyHash/FrostyHash.vcxproj
+++ b/FrostyHash/FrostyHash.vcxproj
@@ -40,7 +40,7 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>FrostyHash</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Developer - Debug|Win32'" Label="Configuration">
diff --git a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
index 95e220d09..aef75f6f9 100644
--- a/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
+++ b/FrostyPlugin/Windows/FrostyProfileSelectWindow.xaml.cs
@@ -5,6 +5,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Threading;
 using Frosty.Controls;
 using Frosty.Core.Controls;
 using FrostySdk;
@@ -14,7 +15,7 @@ namespace Frosty.Core.Windows
 {
     public partial class FrostyProfileSelectWindow
     {
-        private readonly List<FrostyConfiguration> configurations = new List<FrostyConfiguration>();
+        private  List<FrostyConfiguration> configurations = new List<FrostyConfiguration>();
         private string selectedProfileName;
         
         public FrostyProfileSelectWindow()
@@ -22,34 +23,38 @@ public FrostyProfileSelectWindow()
             InitializeComponent();
         }
 
-        private void ProfileSelectWindow_Loaded(object sender, RoutedEventArgs e)
+        private async void ProfileSelectWindow_Loaded(object sender, RoutedEventArgs e)
         {
             RefreshConfigurationList();
             
             // TODO: @techdebt only call this once or when needed
-            ScanGames();
+            await ScanGames();
 
             RefreshConfigurationList();
         }
         
         private void RefreshConfigurationList()
         {
-            configurations.Clear();
-
-            foreach (string profile in Config.GameProfiles)
+            Dispatcher.Invoke(() =>
             {
-                try
-                {
-                    configurations.Add(new FrostyConfiguration(profile));
-                }
-                catch (System.IO.FileNotFoundException)
+
+                configurations.Clear();
+
+                foreach (string profile in Config.GameProfiles)
                 {
-                    Config.RemoveGame(profile); // couldn't find the exe, so remove it from the profile list
-                    Config.Save();
+                    try
+                    {
+                        configurations.Add(new FrostyConfiguration(profile));
+                    }
+                    catch (System.IO.FileNotFoundException)
+                    {
+                        Config.RemoveGame(profile); // couldn't find the exe, so remove it from the profile list
+                        Config.Save();
+                    }
                 }
-            }
 
-            ConfigurationListView.ItemsSource = configurations;
+                ConfigurationListView.ItemsSource = configurations;
+            });
         }
 
         private void SelectConfiguration()
@@ -64,7 +69,7 @@ private void SelectConfiguration()
             }
         }
         
-        private async void ScanGames()
+        private async Task ScanGames()
         {
             try
             {
diff --git a/Shaders/FrostyShaders.vcxproj b/Shaders/FrostyShaders.vcxproj
index 5c1e0ee0c..4591fbb87 100644
--- a/Shaders/FrostyShaders.vcxproj
+++ b/Shaders/FrostyShaders.vcxproj
@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{CB97B27B-6604-43CE-97AA-8B349617928E}</ProjectGuid>
     <RootNamespace>FrostyShaders</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

From 4d84e3b33acb62dab8fb6f7d8c492ade777e60b2 Mon Sep 17 00:00:00 2001
From: Aashu Krishnan <gpstore31@gmail.com>
Date: Tue, 19 Nov 2024 23:29:13 -0600
Subject: [PATCH 4/5] Implemented refactored data explorer (reduced lag)

---
 FrostyEditor/Windows/MainWindow.xaml.cs     |   4 +-
 FrostyPlugin/Controls/FrostyDataExplorer.cs | 257 ++++++++++++++------
 FrostyPlugin/Themes/Generic.xaml            |   9 +-
 3 files changed, 186 insertions(+), 84 deletions(-)

diff --git a/FrostyEditor/Windows/MainWindow.xaml.cs b/FrostyEditor/Windows/MainWindow.xaml.cs
index eb1ba392e..171b8ef68 100644
--- a/FrostyEditor/Windows/MainWindow.xaml.cs
+++ b/FrostyEditor/Windows/MainWindow.xaml.cs
@@ -967,8 +967,8 @@ private void contextMenuRevert_Click(object sender, RoutedEventArgs e)
 
             FrostyTaskWindow.Show("Reverting Asset", "", (task) => { App.AssetManager.RevertAsset(entry, suppressOnModify: false); });
 
-            dataExplorer.RefreshAll();
-            legacyExplorer.RefreshAll();
+            dataExplorer.RefreshAll(true);
+            legacyExplorer.RefreshAll(true);
         }
 
         private void contextMenuImportAsset_Click(object sender, RoutedEventArgs e)
diff --git a/FrostyPlugin/Controls/FrostyDataExplorer.cs b/FrostyPlugin/Controls/FrostyDataExplorer.cs
index b19e7dd14..6993cdd0f 100644
--- a/FrostyPlugin/Controls/FrostyDataExplorer.cs
+++ b/FrostyPlugin/Controls/FrostyDataExplorer.cs
@@ -13,6 +13,7 @@
 using Frosty.Core.Commands;
 using System.Windows.Data;
 using FrostySdk.Managers.Entries;
+using System.Runtime.CompilerServices;
 
 namespace Frosty.Core.Controls
 {
@@ -58,7 +59,7 @@ public double ItemHeight
         //}
     }
 
-    internal class AssetPath
+    public class AssetPath : INotifyPropertyChanged
     {
         private static readonly ImageSource ClosedImage = new ImageSourceConverter().ConvertFromString("pack://application:,,,/FrostyEditor;component/Images/CloseFolder.png") as ImageSource;
         private static readonly ImageSource OpenImage = new ImageSourceConverter().ConvertFromString("pack://application:,,,/FrostyEditor;component/Images/OpenFolder.png") as ImageSource;
@@ -67,17 +68,38 @@ internal class AssetPath
         public string PathName { get; private set; }
         public string FullPath { get; }
         public AssetPath Parent { get; }
-        public List<AssetPath> Children { get; } = new List<AssetPath>();
-        public bool IsSelected { get; set; }
+        public List<AssetPath> Children { get; private set; } = new List<AssetPath>();
+        public bool IsSelected {
+            get => selected;
+            set {
+                selected = value;
+                OnPropertyChanged();
+            }
+        }
+        private bool selected;
         public bool IsRoot { get; }
 
         public bool IsExpanded 
         { 
             get => expanded && Children.Count != 0;
-            set => expanded = value;
+            set {
+                expanded = value;
+                OnPropertyChanged();
+            }
         }
         private bool expanded;
 
+        public List<AssetEntry> Entries { get; set; } = new List<AssetEntry>();
+
+        public AssetPath Clone;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void OnPropertyChanged([CallerMemberName] string name = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+        }
+
         public AssetPath(string inName, string path, AssetPath inParent, bool bInRoot = false)
         {
             PathName = inName;
@@ -86,10 +108,81 @@ public AssetPath(string inName, string path, AssetPath inParent, bool bInRoot =
             Parent = inParent;
         }
 
+        public AssetPath Copy(bool keepVisualState = false)
+        {
+            AssetPath path = (AssetPath)MemberwiseClone();
+            path.Children = new List<AssetPath>();
+            path.Entries = new List<AssetEntry>();
+
+            if (keepVisualState && Clone != null)
+            {
+                // The base object will never have expanded/selected set to true.
+                // The clone object is displayed on the UI & bound to the treeview
+                // so if we keep visual state, we need to take it from the previous clone.
+                path.IsExpanded = Clone.IsExpanded;
+                path.IsSelected = Clone.IsSelected;
+            }
+
+            Clone = path;
+
+            return path;
+        }
+
         public void UpdatePathName(string newName)
         {
             PathName = newName;
         }
+
+        public AssetPath Search(Func<AssetEntry, bool> entryFilterFunction, bool keepVisualState = false)
+        {
+            // Recursively search the Children and Entries of each node.
+            // Make a copy of the node so that the original data is never modified.
+            // The copied nodes are then displayed on the UI.
+            List<AssetPath> filteredChildNodes = null;
+            List<AssetEntry> filteredEntries = null;
+
+
+            // If the node has children, recursively call each child to filter
+            if (Children != null && Children.Count > 0)
+            {
+                filteredChildNodes = Children
+                    .Select(i => i.Search(entryFilterFunction, keepVisualState))
+                    .Where(i => i != null).ToList();
+            }
+
+            if (Entries != null && Entries.Count > 0)
+            {
+                filteredEntries = Entries.Where(entry => entryFilterFunction(entry)).ToList();
+            }
+
+            // If any of this node's entries pass the filter, or if any child of this node's entries pass the filter,
+            // then this node must pass the filter. Make a copy of this node and add all children & entries that passed the filter
+            bool hasChildNodes = filteredChildNodes != null && filteredChildNodes.Any();
+            bool hasEntries = filteredEntries != null && filteredEntries.Any();
+
+            if (hasChildNodes || hasEntries)
+            {
+                AssetPath result = Copy(keepVisualState);
+
+                if (hasChildNodes)
+                    result.Children.AddRange(filteredChildNodes);
+
+                if (hasEntries)
+                    result.Entries.AddRange(filteredEntries);
+
+                return result;
+            }
+            else
+            {
+                // If nothing passes the filter, return null to ensure it doesn't display
+                return null;
+            }
+        }
+
+        public int GetEntryCount()
+        {
+            return Entries.Count + Children.Aggregate(0, (acc, i) => acc + i.GetEntryCount());
+        }
     }
 
     public class AssetDoubleClickedEventArgs : RoutedEventArgs
@@ -110,6 +203,8 @@ public class FrostyDataExplorer : Control
     {
         public string FilteredText { get => m_filterTextBox.Text; }
 
+        public Func<AssetEntry, bool> EntryFilterFunction { get; set; } = null;
+
         private const string PART_ShowOnlyModifiedCheckBox = "PART_ShowOnlyModifiedCheckBox";
         private const string PART_FilterTextBox = "PART_FilterTextBox";
         private const string PART_AssetTreeView = "PART_AssetTreeView";
@@ -154,7 +249,7 @@ private static void OnItemsSourceChanged(DependencyObject o, DependencyPropertyC
             FrostyDataExplorer ctrl = o as FrostyDataExplorer;
             ctrl.m_assetPathMapping.Clear();
             ctrl.SelectedAsset = null;
-            ctrl.UpdateTreeView();
+            ctrl.CreateAssetPathMapping();
         }
         #endregion
 
@@ -391,7 +486,11 @@ public override void OnApplyTemplate()
             if (MultiSelect)
                 m_assetListView.SelectionMode = SelectionMode.Extended;
 
-            UpdateTreeView();
+            if (m_assetPathMapping.Count == 0 && ItemsSource != null)
+            {
+                CreateAssetPathMapping();
+                UpdateTreeView();
+            }
 
             if (IsVisible && m_bookmarkContext != null)
             {
@@ -468,8 +567,8 @@ public void SelectAsset(AssetEntry entry)
                     }
 
                     tvi = (tvi == null)
-                        ? (TreeViewItem)m_assetTreeView.ItemContainerGenerator.ContainerFromItem(path)
-                        : (TreeViewItem)tvi.ItemContainerGenerator.ContainerFromItem(path);
+                        ? (TreeViewItem)m_assetTreeView.ItemContainerGenerator.ContainerFromItem(path?.Clone)
+                        : (TreeViewItem)tvi.ItemContainerGenerator.ContainerFromItem(path?.Clone);
                 }
                 if (tvi != null)
                 {
@@ -479,8 +578,8 @@ public void SelectAsset(AssetEntry entry)
             }
             else
             {
-                TreeViewItem tvi = m_assetTreeView.ItemContainerGenerator.ContainerFromItem(selectedPath) as TreeViewItem;
-                if(tvi != null)
+                TreeViewItem tvi = m_assetTreeView.ItemContainerGenerator.ContainerFromItem(selectedPath?.Clone) as TreeViewItem;
+                if (tvi != null)
                 {
                     tvi.BringIntoView();
                     tvi.IsSelected = true;
@@ -508,9 +607,17 @@ public void RefreshItems()
 
         }
 
-        public void RefreshAll()
+        public void RefreshAll(bool keepVisualState = false)
         {
-            UpdateTreeView();
+            UpdateTreeView(keepVisualState);
+
+            if (SelectedAssets != null)
+            {
+                foreach (var item in SelectedAssets)
+                {
+                    m_assetListView.SelectedItems.Add(item);
+                }
+            }
         }
 
         public void FocusFilter()
@@ -521,7 +628,7 @@ public void FocusFilter()
         private void assetTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
             m_selectedPath = m_assetTreeView.SelectedItem as AssetPath;
-            SelectedPath = string.IsNullOrEmpty(m_selectedPath.FullPath) ? "" : m_selectedPath.FullPath.Remove(0, 1);
+            SelectedPath = string.IsNullOrEmpty(m_selectedPath?.FullPath) ? "" : m_selectedPath.FullPath.Remove(0, 1);
 
             UpdateListView(m_selectedPath);
         }
@@ -579,78 +686,76 @@ private void assetListViewColumn_Click(object sender, RoutedEventArgs e)
             m_lastSortDirection = sortDir;
         }
 
-        private void UpdateTreeView()
+        private void CreateAssetPathMapping()
         {
-            if (m_assetTreeView == null)
-                return;
+            if (m_assetTreeView == null) return;
 
-            if (m_selectedPath != null)
-                m_selectedPath.IsSelected = false;
+            AssetPath parent = new AssetPath("", "", null);
+            AssetPath root = new AssetPath("![root]", "", null, true);
+            parent.Children.Add(root);
 
-            if (ItemsSource == null)
-                return;
+            m_assetPathMapping.Add("__root__", parent);
+            m_assetPathMapping.Add("/", root);
 
-            AssetPath root = new AssetPath("", "", null);
             foreach (AssetEntry entry in ItemsSource)
             {
-                if (ShowOnlyModified && !entry.IsModified)
-                    continue;
-
-                if (!FilterText(entry.Name, entry))
-                    continue;
+                if (EntryFilterFunction != null && !EntryFilterFunction(entry)) { continue; }
 
                 string[] arr = entry.Path.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-                AssetPath next = root;
+                AssetPath next = arr.Length > 0 ? parent : root;
 
                 foreach (string path in arr)
                 {
-                    bool bFound = false;
-                    foreach (AssetPath child in next.Children)
-                    {
-                        if (child.PathName.Equals(path, StringComparison.OrdinalIgnoreCase))
-                        {
-                            if (path.ToCharArray().Any(char.IsUpper))
-                                child.UpdatePathName(path);
+                    string fullPath = next.FullPath + "/" + path;
+                    AssetPath newPath = null;
 
-                            next = child;
-                            bFound = true;
-                            break;
-                        }
+                    if (!m_assetPathMapping.ContainsKey(fullPath))
+                    {
+                        newPath = new AssetPath(path, fullPath, next);
+                        m_assetPathMapping.Add(fullPath, newPath);
+                        next.Children.Add(newPath);
                     }
-
-                    if (!bFound)
+                    else
                     {
-                        string fullPath = next.FullPath + "/" + path;
-                        AssetPath newPath = null;
+                        newPath = m_assetPathMapping[fullPath];
 
-                        if (!m_assetPathMapping.ContainsKey(fullPath))
-                        {
-                            newPath = new AssetPath(path, fullPath, next);
-                            m_assetPathMapping.Add(fullPath, newPath);
-                        }
-                        else
-                        {
-                            newPath = m_assetPathMapping[fullPath];
-                            newPath.Children.Clear();
-
-                            if (newPath == m_selectedPath)
-                                m_selectedPath.IsSelected = true;
-                        }
-
-                        next.Children.Add(newPath);
-                        next = newPath;
+                        if (newPath == m_selectedPath)
+                            m_selectedPath.IsSelected = true;
                     }
+
+                    next = newPath;
                 }
-            }
 
-            if(!m_assetPathMapping.ContainsKey("/"))
-                m_assetPathMapping.Add("/", new AssetPath("![root]", "", null, true));           
-            root.Children.Insert(0, m_assetPathMapping["/"]);
+                next.Entries.Add(entry);
+            }
 
-            m_assetTreeView.ItemsSource = root.Children;
+            m_assetTreeView.ItemsSource = parent.Children;
             m_assetTreeView.Items.SortDescriptions.Add(new SortDescription("PathName", ListSortDirection.Ascending));
+        }
 
-            UpdateListView(m_selectedPath);
+        private bool ShouldDisplayAsset(AssetEntry entry)
+        {
+            return entry != null &&
+                (!ShowOnlyModified || entry.IsModified) && FilterText(entry.Name, entry);
+        }
+
+        private void UpdateTreeView(bool keepVisualState = true)
+        {
+            if (m_assetTreeView == null)
+                return;
+
+            if (!keepVisualState && m_selectedPath != null)
+                m_selectedPath.IsSelected = false;
+
+            if (ItemsSource == null)
+                return;
+
+            AssetPath root = m_assetPathMapping["__root__"];
+            AssetPath newRoot = root.Search(ShouldDisplayAsset, keepVisualState);
+
+            m_assetTreeView.SelectedValuePath = String.Empty;
+            m_assetTreeView.ItemsSource = newRoot?.Children;
+            m_assetTreeView.Items.Refresh();
         }
 
         private void UpdateListView(AssetPath path = null)
@@ -661,27 +766,19 @@ private void UpdateListView(AssetPath path = null)
                 return;
             }
 
-            List<AssetEntry> items = new List<AssetEntry>();
-            string fullPath = path.FullPath.Trim('/');
-
-            foreach (AssetEntry entry in ItemsSource)
-            {
-                if (ShowOnlyModified && !entry.IsModified)
-                    continue;
-                if (entry.Path.Equals(fullPath, StringComparison.OrdinalIgnoreCase))
-                {
-                    if (!FilterText(entry.Name, entry))
-                        continue;
-                    items.Add(entry);
-                }
-            }
-
-            m_assetListView.ItemsSource = items;
+            m_assetListView.ItemsSource = path.Entries;
 
             if (SelectedAsset != null)
             {
                 m_assetListView.SelectedItem = SelectedAsset;
             }
+            else if (SelectedAssets != null)
+            {
+                foreach (var item in SelectedAssets)
+                {
+                    m_assetListView.SelectedItems.Add(item);
+                }
+            }
         }
 
         private void assetListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/FrostyPlugin/Themes/Generic.xaml b/FrostyPlugin/Themes/Generic.xaml
index d7eb6bb7a..01c818521 100644
--- a/FrostyPlugin/Themes/Generic.xaml
+++ b/FrostyPlugin/Themes/Generic.xaml
@@ -238,7 +238,7 @@
 
                         <GridSplitter x:Name="gs" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Height="3" Background="{StaticResource ControlBackground}" ResizeDirection="Rows"/>
 
-                        <ListView x:Name="PART_AssetListView" Grid.Row="3" HorizontalContentAlignment="Stretch" SelectionMode="Single" />
+                        <ListView x:Name="PART_AssetListView" Grid.Row="4" HorizontalContentAlignment="Stretch" SelectionMode="Extended" ScrollViewer.CanContentScroll="True" VirtualizingPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" />
                         <Grid Grid.Row="2" Visibility="Hidden">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="3*"/>
@@ -1224,7 +1224,7 @@
                         <conv:AssetEntryToBitmapSourceConverter x:Key="AssetEntryToBitmapSourceConverter"/>
                     </ControlTemplate.Resources>
                     <Grid>
-                        <ListView x:Name="PART_AssetListView" Grid.Row="3" HorizontalContentAlignment="Stretch" SelectionMode="Single" ItemsSource="{TemplateBinding ItemsSource}">
+                        <ListView x:Name="PART_AssetListView" Grid.Row="3" HorizontalContentAlignment="Stretch" SelectionMode="Extended" ItemsSource="{TemplateBinding ItemsSource}" VirtualizingPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling">
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="ListViewItem" BasedOn="{StaticResource baseListViewItemStyle}">
                                     <Setter Property="ContextMenu" Value="{Binding Path=AssetContextMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:FrostyAssetListView}}}"/>
@@ -1251,6 +1251,11 @@
                                     </Setter>
                                 </Style>
                             </ListView.ItemContainerStyle>
+                            <ListView.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                </ItemsPanelTemplate>
+                            </ListView.ItemsPanel>
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn Width="{Binding Path=ActualWidth, ElementName=gridHelper1}" HeaderTemplate="{StaticResource assetListViewAscendingSorting}">

From 1cd215827539209dffee256a187dada01d5ec599 Mon Sep 17 00:00:00 2001
From: Aashu Krishnan <gpstore31@gmail.com>
Date: Wed, 20 Nov 2024 18:37:29 -0600
Subject: [PATCH 5/5] Data Explorer fixes for duplicated assets

---
 FrostyEditor/Windows/MainWindow.xaml.cs               |  5 ++---
 Plugins/DuplicationPlugin/DuplicateContextMenuItem.cs | 10 ++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/FrostyEditor/Windows/MainWindow.xaml.cs b/FrostyEditor/Windows/MainWindow.xaml.cs
index 171b8ef68..20ac482de 100644
--- a/FrostyEditor/Windows/MainWindow.xaml.cs
+++ b/FrostyEditor/Windows/MainWindow.xaml.cs
@@ -522,8 +522,7 @@ private void NewProject()
 
             // clear all modifications
             App.AssetManager.Reset();
-            dataExplorer.RefreshAll();
-            legacyExplorer.RefreshAll();
+            UpdateUI(true);
 
             // create a new blank project
             m_project = new FrostyProject();
@@ -644,7 +643,7 @@ private void LoadProject(string filename, bool saveProject)
                 
                 m_project = newProject;
 
-                UpdateUI();
+                UpdateUI(true);
 
                 legacyExplorer.ShowOnlyModified = false;
                 legacyExplorer.ShowOnlyModified = true;
diff --git a/Plugins/DuplicationPlugin/DuplicateContextMenuItem.cs b/Plugins/DuplicationPlugin/DuplicateContextMenuItem.cs
index 78cb3cb69..bbc9e2c28 100644
--- a/Plugins/DuplicationPlugin/DuplicateContextMenuItem.cs
+++ b/Plugins/DuplicationPlugin/DuplicateContextMenuItem.cs
@@ -591,6 +591,7 @@ public DuplicateContextMenuItem()
         {
             EbxAssetEntry entry = App.SelectedAsset as EbxAssetEntry;
             EbxAsset asset = App.AssetManager.GetEbx(entry);
+            EbxAsset newAsset = null;
 
             DuplicateAssetWindow win = new DuplicateAssetWindow(entry);
             if (win.ShowDialog() == false)
@@ -617,7 +618,8 @@ public DuplicateContextMenuItem()
                         }
                     }
 
-                    extensions[key].DuplicateAsset(entry, newName, newType != null, newType);
+                    EbxAssetEntry newEntry = extensions[key].DuplicateAsset(entry, newName, newType != null, newType);
+                    newAsset = App.AssetManager.GetEbx(newEntry);
                 }
                 catch (Exception e)
                 {
@@ -625,7 +627,11 @@ public DuplicateContextMenuItem()
                 }
             });
 
-            App.EditorWindow.DataExplorer.RefreshAll();
+            if (newAsset != null)
+            {
+                App.EditorWindow.DataExplorer.ItemsSource = App.AssetManager.EnumerateEbx();
+                App.EditorWindow.DataExplorer.SelectAsset(App.AssetManager.GetEbxEntry(newAsset.FileGuid));
+            }
         });
     }
 }