From 699d71f4050814df0fb82ce9b94dfc5eed20fa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kubilay=20=22bazq=22=20T=C3=9CRK?=
 <69438838+bazq3D@users.noreply.github.com>
Date: Tue, 16 Jun 2026 19:19:37 +0300
Subject: [PATCH 1/3] feat: add dual progress bars, file list UI, sound alerts,
 taskbar flashing, and path auto-detection

- Moved asset extraction to a background thread using Task.Run to prevent UI freezing.
- Added a 2-column layout to MainWindow: left side contains settings/actions, and right side displays a dynamic Selected Files ListBox.
- Added "Remove" and "Clear All" buttons to manage the file queue dynamically.
- Implemented a dual progress bar system in the footer:
  - PbOverall: tracks progress of multiple YMAPs/files currently processing.
  - PbItems: tracks asset/entity extraction progress within the active file.
- Added sound notification (SystemSoundType.Question) upon successful extraction completion.
- Implemented user32.dll FlashWindow integration to flash the application's taskbar icon when the background task finishes.
- Automatically clears queues and resets progress bars upon completion.
- Improved GTA V path auto-detection on startup by parsing Steam's 'libraryfolders.vdf' to support custom drive libraries, Rockstar registry, and Epic manifests.
- Added input trimming to clean path names and fixed case-sensitivity issues during file picking (e.g., .YMAP / .YTYP capitalization).
---
 TexturesTesting/MainWindow.axaml    |  75 +++-
 TexturesTesting/MainWindow.axaml.cs | 546 +++++++++++++++++++++-------
 2 files changed, 475 insertions(+), 146 deletions(-)

diff --git a/TexturesTesting/MainWindow.axaml b/TexturesTesting/MainWindow.axaml
index 0f1fa1f..e4e4c37 100644
--- a/TexturesTesting/MainWindow.axaml
+++ b/TexturesTesting/MainWindow.axaml
@@ -8,33 +8,72 @@
         WindowStartupLocation="CenterScreen"
         Title="TexturesTesting">
     
-    <Grid RowDefinitions="*,*,*,*">
-        <Menu  VerticalAlignment="Top" Background="SlateGray">
+    <Grid ColumnDefinitions="*, 1.2*" RowDefinitions="Auto, *, Auto">
+        <!-- Menu spanning across both columns at the top -->
+        <Menu Grid.Row="0" Grid.ColumnSpan="2" VerticalAlignment="Top" Background="SlateGray">
             <MenuItem Header="_File" >
                 <MenuItem Click="BtnGTAPath_OnClick" x:Name="BtnGTAPath" Header="_Select GTAV Path..."/>
                 <Separator/>
                 <MenuItem x:Name="MiExit" Click="MiExit_OnClick" Header="_Exit"/>
             </MenuItem>
         </Menu>
-        <StackPanel Grid.Row="1">
-            <Label Margin="10" FontWeight="Bold" HorizontalAlignment="Center" Content="Extraction Settings"></Label>
-            <StackPanel Spacing="30" HorizontalAlignment="Center" Orientation="Horizontal">
+
+        <!-- Left Side: Extraction settings & action buttons -->
+        <StackPanel Grid.Row="1" Grid.Column="0" Margin="15" Spacing="12">
+            <Label FontWeight="Bold" HorizontalAlignment="Center" Content="Extraction Settings"/>
+            <StackPanel Spacing="10" HorizontalAlignment="Center">
                 <CheckBox Theme="{DynamicResource CardCheckBox}" x:Name="cbExtractXml" Content="Extract as XML(s)"/>
                 <CheckBox Theme="{DynamicResource CardCheckBox}" x:Name="cbExtractTextures" Content="Extract all Textures"/>
             </StackPanel>
+            
+            <Separator Height="10" Background="Transparent"/>
+            
+            <Label FontWeight="Bold" HorizontalAlignment="Center" Content="Extraction Input"/>
+            <StackPanel Spacing="10" HorizontalAlignment="Center">
+                <ComboBox x:Name="CBoxExtractType" Height="35" Width="170" SelectedIndex="0">
+                    <ComboBoxItem Content="By YMAP(s)"/>
+                    <ComboBoxItem Content="By YTYP(s)"/>
+                    <ComboBoxItem Content="By Text file"/>
+                    <ComboBoxItem Content="By YTYP(s) + MLO Entities"/>
+                </ComboBox>
+                <Button Classes="Warning" Theme="{DynamicResource OutlineButton}" x:Name="BtnLookfor" Click="BtnLookfor_OnClick" Width="170" Height="35" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Content="Pick file"/>
+                <Button Classes="Success" Theme="{DynamicResource OutlineButton}" Width="170" Height="35" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontWeight="Bold" x:Name="BtnLookEnts" Click="BtnLookEnts_OnClick">Extract Assets</Button>
+            </StackPanel>
         </StackPanel>
-        <StackPanel Spacing="10" HorizontalAlignment="Center" Grid.Row="2">
-            <ComboBox x:Name="CBoxExtractType" Height="40" Width="150" SelectedIndex="0">
-                <ComboBoxItem Content="By YMAP(s)"/>
-                <ComboBoxItem Content="By YTYP(s)"/>
-                <ComboBoxItem Content="By Text file"/>
-                <ComboBoxItem Content="By YTYP(s) + MLO Entities"/>
-            </ComboBox>
-            <Button Classes="Warning" Theme="{DynamicResource OutlineButton}" x:Name="BtnLookfor" Click="BtnLookfor_OnClick" Width="150" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Content="Pick file"/>
-            <Button Classes="Success" Theme="{DynamicResource OutlineButton}" Width="150" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontWeight="Bold" x:Name="BtnLookEnts" Click="BtnLookEnts_OnClick">Extract Assets</Button>
-        </StackPanel>
-        <StackPanel VerticalAlignment="Bottom" Grid.Row="3">
-            <Label Margin="5" Classes="Blue Ghost" Theme="{DynamicResource TagLabel}" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="labelCache" Content="Waiting"/>
-        </StackPanel>
+
+        <!-- Right Side: Selected Files List & Management -->
+        <Grid Grid.Row="1" Grid.Column="1" RowDefinitions="Auto, *, Auto" Margin="15">
+            <Label FontWeight="Bold" Content="Selected Files:" Margin="0,0,0,5"/>
+            <ListBox Grid.Row="1" x:Name="LbSelectedFiles" BorderThickness="1" BorderBrush="#FF444444" CornerRadius="4">
+                <!-- DataBound items will appear here -->
+            </ListBox>
+            <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10" Margin="0,10,0,0">
+                <Button Classes="Danger" Theme="{DynamicResource OutlineButton}" Click="BtnRemoveFile_OnClick" Content="Remove"/>
+                <Button Theme="{DynamicResource OutlineButton}" Click="BtnClearFiles_OnClick" Content="Clear All"/>
+            </StackPanel>
+        </Grid>
+
+        <!-- Footer: Status and Progress Bars -->
+        <Border Grid.Row="2" Grid.ColumnSpan="2" BorderThickness="0,1,0,0" BorderBrush="#FF444444" Padding="15,8">
+            <Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto">
+                <StackPanel Grid.Column="0" Spacing="2">
+                    <Grid ColumnDefinitions="Auto, *">
+                        <Label Content="Overall Progress:" FontWeight="Bold" FontSize="11" Padding="0,0,10,0"/>
+                        <Label Grid.Column="1" x:Name="LblOverallStatus" Content="No active task" FontSize="11" Padding="0"/>
+                    </Grid>
+                    <ProgressBar x:Name="PbOverall" Height="6" Minimum="0" Maximum="100" Value="0" HorizontalAlignment="Stretch" Margin="0,2,0,5"/>
+                    
+                    <Grid ColumnDefinitions="Auto, *">
+                        <Label Content="Current File Assets:" FontWeight="Bold" FontSize="11" Padding="0,0,10,0"/>
+                        <Label Grid.Column="1" x:Name="LblItemsStatus" Content="Waiting" FontSize="11" Padding="0"/>
+                    </Grid>
+                    <ProgressBar x:Name="PbItems" Height="6" Minimum="0" Maximum="100" Value="0" HorizontalAlignment="Stretch" Margin="0,2,0,0"/>
+                </StackPanel>
+                
+                <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="15,0,0,0">
+                    <Label Classes="Blue Ghost" Theme="{DynamicResource TagLabel}" x:Name="labelCache" Content="Waiting" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                </StackPanel>
+            </Grid>
+        </Border>
     </Grid>
 </Window>
diff --git a/TexturesTesting/MainWindow.axaml.cs b/TexturesTesting/MainWindow.axaml.cs
index 7449801..a951c5e 100644
--- a/TexturesTesting/MainWindow.axaml.cs
+++ b/TexturesTesting/MainWindow.axaml.cs
@@ -25,6 +25,10 @@ public partial class MainWindow : Window
     private static string? _vPath;
     private GameFileCache _gameFileCache;
     private static readonly ExtractTask _globalExtractTask = new();
+    private readonly System.Collections.ObjectModel.ObservableCollection<string> _selectedFileNames = new();
+
+    [System.Runtime.InteropServices.DllImport("user32.dll")]
+    private static extern bool FlashWindow(IntPtr hwnd, bool bInvert);
 
     private string config = AppDomain.CurrentDomain.BaseDirectory + @"config.ini";
 
@@ -33,6 +37,62 @@ public MainWindow()
         InitializeComponent();
         ToggleControls(false);
         BtnLookEnts.IsEnabled = false;
+        LbSelectedFiles.ItemsSource = _selectedFileNames;
+    }
+
+    protected override async void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        await InitializeGtaPathOnStartup();
+    }
+
+    private async Task InitializeGtaPathOnStartup()
+    {
+        var cfg = new ConfigParser(config);
+        string? configGtaPath = cfg.GetValue("CONFIG", "GTA5Path");
+        string? targetPath = null;
+
+        if (!string.IsNullOrEmpty(configGtaPath) && IsGtaPathValid(configGtaPath))
+        {
+            targetPath = configGtaPath.Trim(' ', '"', '\'', '\r', '\n');
+        }
+        else
+        {
+            var detectedPath = DetectGta5Path();
+            if (!string.IsNullOrEmpty(detectedPath))
+            {
+                targetPath = detectedPath.Trim(' ', '"', '\'', '\r', '\n');
+                cfg.SetValue("CONFIG", "GTA5Path", targetPath);
+                cfg.Save();
+            }
+        }
+
+        if (!string.IsNullOrEmpty(targetPath) && IsGtaPathValid(targetPath))
+        {
+            _vPath = targetPath.Trim(' ', '"', '\'', '\r', '\n');
+            var loadMods = false;
+            var questionBox = MessageBoxManager.GetMessageBoxStandard("Information", "Do you want to enable mods?",
+                ButtonEnum.YesNo,
+                MsBox.Avalonia.Enums.Icon.Info);
+            var result = await questionBox.ShowAsync();
+            GTA5Keys.LoadFromPath(_vPath);
+            labelCache.Content = "Loading...";
+            if (result == ButtonResult.Yes)
+            {
+                loadMods = true;
+            }
+            _gameFileCache = new GameFileCache(int.MaxValue, 10, _vPath, "mp2024_01_g9ec", loadMods, "Installers;_CommonRedist")
+            {
+                LoadAudio = false,
+                LoadVehicles = false,
+                LoadPeds = false
+            };
+            await Task.Run(() => _gameFileCache.Init(UpdateStatusCache, UpdateErrorLog));
+            if (!_gameFileCache.IsInited) return;
+            ToggleControls(true);
+            labelCache.Content = "Game Cache Loaded";
+            BtnGTAPath.IsEnabled = false;
+        }
     }
 
     private void ToggleControls(bool state)
@@ -53,20 +113,30 @@ private async void BtnGTAPath_OnClick(object? sender, RoutedEventArgs e)
 
         if (!string.IsNullOrEmpty(configGtaPath) && IsGtaPathValid(configGtaPath))
         {
-            _vPath = configGtaPath;
+            _vPath = configGtaPath.Trim(' ', '"', '\'', '\r', '\n');
         }
         else
         {
-            var selectGtaPath = await GetTopLevel(this)!.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
+            var detectedPath = DetectGta5Path();
+            if (!string.IsNullOrEmpty(detectedPath))
+            {
+                _vPath = detectedPath.Trim(' ', '"', '\'', '\r', '\n');
+                cfg.SetValue("CONFIG", "GTA5Path", _vPath);
+                cfg.Save();
+            }
+            else
             {
-                Title = "Select your GTA V Path",
-                AllowMultiple = false,
-            });
-
-            if (selectGtaPath.Count == 0) return;
-            _vPath = selectGtaPath[0].Path.LocalPath;
-            cfg.SetValue("CONFIG", "GTA5Path", _vPath);
-            cfg.Save();
+                var selectGtaPath = await GetTopLevel(this)!.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
+                {
+                    Title = "Select your GTA V Path",
+                    AllowMultiple = false,
+                });
+
+                if (selectGtaPath.Count == 0) return;
+                _vPath = selectGtaPath[0].Path.LocalPath.Trim(' ', '"', '\'', '\r', '\n');
+                cfg.SetValue("CONFIG", "GTA5Path", _vPath);
+                cfg.Save();
+            }
         }
 
         if (IsGtaPathValid(_vPath))
@@ -105,13 +175,109 @@ private async void BtnGTAPath_OnClick(object? sender, RoutedEventArgs e)
 
     private static bool IsGtaPathValid(string? path)
     {
-        return File.Exists(path + "\\GTA5.exe");
+        if (string.IsNullOrEmpty(path)) return false;
+        path = path.Trim(' ', '"', '\'', '\r', '\n');
+        return File.Exists(Path.Combine(path, "GTA5.exe"));
+    }
+
+    private static string? DetectGta5Path()
+    {
+#pragma warning disable CA1416
+        try
+        {
+            // 1. Check Rockstar Games Registry
+            using (var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Wow6432Node\Rockstar Games\Grand Theft Auto V"))
+            {
+                var path = key?.GetValue("InstallFolder") as string;
+                if (!string.IsNullOrEmpty(path) && IsGtaPathValid(path)) return path.Trim(' ', '"', '\'', '\r', '\n');
+            }
+
+            // 2. Check Steam Registry for Steam install path, then check steamapps/common/Grand Theft Auto V and libraryfolders.vdf
+            using (var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Wow6432Node\Valve\Steam"))
+            {
+                var steamPath = key?.GetValue("InstallPath") as string;
+                if (!string.IsNullOrEmpty(steamPath))
+                {
+                    steamPath = steamPath.Trim(' ', '"', '\'', '\r', '\n');
+                    var path = Path.Combine(steamPath, "steamapps", "common", "Grand Theft Auto V");
+                    if (IsGtaPathValid(path)) return path;
+
+                    var libraryFoldersVdf = Path.Combine(steamPath, "steamapps", "libraryfolders.vdf");
+                    if (File.Exists(libraryFoldersVdf))
+                    {
+                        try
+                        {
+                            var vdfContent = File.ReadAllText(libraryFoldersVdf);
+                            var matches = System.Text.RegularExpressions.Regex.Matches(vdfContent, @"\""path\""\s*\""([^\""]+)\""");
+                            foreach (System.Text.RegularExpressions.Match match in matches)
+                            {
+                                if (match.Success)
+                                {
+                                    var libPath = match.Groups[1].Value.Replace(@"\\", @"\").Trim(' ', '"', '\'', '\r', '\n');
+                                    var customPath = Path.Combine(libPath, "steamapps", "common", "Grand Theft Auto V");
+                                    if (IsGtaPathValid(customPath)) return customPath;
+                                }
+                            }
+                        }
+                        catch { }
+                    }
+                }
+            }
+
+            // 3. Epic Games Store install detection
+            var programData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+            var epicManifestsFolder = Path.Combine(programData, "Epic", "EpicGamesLauncher", "Data", "Manifests");
+            if (Directory.Exists(epicManifestsFolder))
+            {
+                foreach (var file in Directory.GetFiles(epicManifestsFolder, "*.item"))
+                {
+                    try
+                    {
+                        var content = File.ReadAllText(file);
+                        if (content.Contains("\"MandatoryAppFolderName\": \"GTAV\"") || content.Contains("\"AppName\": \"GrandTheftAutoV\""))
+                        {
+                            var match = System.Text.RegularExpressions.Regex.Match(content, @"\""InstallLocation\""\s*:\s*\""([^\""]+)\""");
+                            if (match.Success)
+                            {
+                                var path = match.Groups[1].Value.Replace(@"\\", @"\").Trim(' ', '"', '\'', '\r', '\n');
+                                if (IsGtaPathValid(path)) return path;
+                            }
+                        }
+                    }
+                    catch { }
+                }
+            }
+        }
+        catch { }
+
+        return null;
+#pragma warning restore CA1416
     }
 
     private void UpdateStatusCache(string text)
     {
         Dispatcher.UIThread.InvokeAsync(() => { labelCache.Content = text; });
     }
+
+    private void UpdateOverallProgress(double value, double max, string statusText)
+    {
+        Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            PbOverall.Maximum = max;
+            PbOverall.Value = value;
+            LblOverallStatus.Content = statusText;
+        });
+    }
+
+    private void UpdateItemsProgress(double value, double max, string statusText)
+    {
+        Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            PbItems.Maximum = max;
+            PbItems.Value = value;
+            LblItemsStatus.Content = statusText;
+        });
+    }
     
     private void UpdateErrorLog(string text)
     {
@@ -137,151 +303,228 @@ await Parallel.ForEachAsync(textures, ct, async (tex, token) =>
     private async void BtnLookEnts_OnClick(object? sender, RoutedEventArgs e)
     {
         ToggleControls(false);
-        if (_globalExtractTask.MapFiles.Count > 0)
+        BtnLookEnts.IsEnabled = false;
+
+        try
         {
-            var msBoxExtractPath = MessageBoxManager.GetMessageBoxStandard($"Information",
-                $"Select the folder where you want to save the files", ButtonEnum.Ok,
-                MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-            var result = await msBoxExtractPath.ShowAsync();
+            if (_globalExtractTask.MapFiles.Count > 0)
+            {
+                var selectFolder = await GetTopLevel(this)!.StorageProvider.OpenFolderPickerAsync(
+                    new FolderPickerOpenOptions { Title = "Select the folder where you want to save the files", AllowMultiple = false });
+
+                if (selectFolder is null || selectFolder.Count == 0)
+                {
+                    ToggleControls(true);
+                    BtnLookEnts.IsEnabled = true;
+                    return;
+                }
 
-            var selectFolder = await GetTopLevel(this)!.StorageProvider.OpenFolderPickerAsync(
-                new FolderPickerOpenOptions { Title = "Select the folder where you want to save the files", AllowMultiple = false });
+                string? outputPath = selectFolder[0].Path.LocalPath;
+                if (string.IsNullOrWhiteSpace(outputPath))
+                {
+                    ToggleControls(true);
+                    BtnLookEnts.IsEnabled = true;
+                    return;
+                }
 
-            if (selectFolder is null || selectFolder.Count == 0) { ToggleControls(true); return; }
+                bool extractXml = cbExtractXml.IsChecked ?? false;
+                bool extractTextures = cbExtractTextures.IsChecked ?? false;
 
-            string? outputPath = selectFolder[0].Path.LocalPath;
-            if (string.IsNullOrWhiteSpace(outputPath)) { ToggleControls(true); return; }
-            if (string.IsNullOrEmpty(outputPath)) return;
-            foreach (var mapFile in _globalExtractTask.MapFiles)
-            {
-                var ymapFolderPath = $"{outputPath}\\{Path.GetFileNameWithoutExtension(mapFile.FileName)}";
-                Directory.CreateDirectory(ymapFolderPath);
+                // Reset progress bars
+                UpdateOverallProgress(0, _globalExtractTask.MapFiles.Count, "Starting extraction...");
+                UpdateItemsProgress(0, 100, "Waiting...");
 
-                foreach (var entity in mapFile.EntsHashes)
+                // Copy to process on background thread
+                var mapFilesToProcess = new List<MapTask>(_globalExtractTask.MapFiles);
+
+                await Task.Run(async () =>
                 {
-                    ModelType mt = new();
-                    if (_gameFileCache.GetYdr(entity) != null)
-                    {
-                        var ydr = _gameFileCache.GetYdr(entity);
-                        ydr.Load(ydr.RpfFileEntry.File.ExtractFile(ydr.RpfFileEntry), ydr.RpfFileEntry);
-                        mt.YdrFiles.Add(ydr);
-                    }
+                    int totalMaps = mapFilesToProcess.Count;
+                    int currentMapIdx = 0;
 
-                    if (_gameFileCache.GetYdd(GetYddFromHash(entity)) != null)
+                    foreach (var mapFile in mapFilesToProcess)
                     {
-                        var ydd = _gameFileCache.GetYdd(GetYddFromHash(entity));
-                        ydd.Load(ydd.RpfFileEntry.File.ExtractFile(ydd.RpfFileEntry), ydd.RpfFileEntry);
-                        mt.YddFiles.Add(ydd);
-                    }
+                        currentMapIdx++;
+                        UpdateOverallProgress(currentMapIdx - 1, totalMaps, $"Processing: {mapFile.FileName} ({currentMapIdx}/{totalMaps})");
 
-                    if (_gameFileCache.GetYft(entity) != null)
-                    {
-                        var yft = _gameFileCache.GetYft(entity);
-                        yft.Load(yft.RpfFileEntry.File.ExtractFile(yft.RpfFileEntry), yft.RpfFileEntry);
-                        mt.YftFiles.Add(yft);
-                    }
+                        var ymapFolderPath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(mapFile.FileName) ?? "");
+                        Directory.CreateDirectory(ymapFolderPath);
 
-                    if (mt.YdrFiles.Count > 0)
-                    {
-                        foreach (var mYdr in mt.YdrFiles)
+                        int totalEntities = mapFile.EntsHashes.Count;
+                        int currentEntityIdx = 0;
+
+                        if (totalEntities == 0)
+                        {
+                            UpdateItemsProgress(0, 100, "No entities in this file");
+                        }
+
+                        foreach (var entity in mapFile.EntsHashes)
                         {
-                            if (!(bool)cbExtractXml.IsChecked!)
+                            currentEntityIdx++;
+
+                            // Resolve entity name for the status label
+                            string entityName = $"0x{entity:X8}";
+                            var arch = _gameFileCache.GetArchetype(entity);
+                            if (arch != null && arch.Name != null)
                             {
-                                await File.WriteAllBytesAsync($"{ymapFolderPath}\\{mYdr.Name}", mYdr.Save());
+                                entityName = arch.Name;
                             }
-                            else
+
+                            UpdateItemsProgress(currentEntityIdx, totalEntities, $"Extracting: {entityName} ({currentEntityIdx}/{totalEntities})");
+                            UpdateStatusCache($"Map {currentMapIdx}/{totalMaps} - {entityName}");
+
+                            ModelType mt = new();
+                            if (_gameFileCache.GetYdr(entity) != null)
                             {
-                                var ydrXml = MetaXml.GetXml(mYdr, filename: out var ydrName,
-                                    $"{ymapFolderPath}\\{mYdr.Name.Split(".")[0]}");
-                                await File.WriteAllTextAsync($"{ymapFolderPath}\\{mYdr.Name}.xml", ydrXml);
+                                var ydr = _gameFileCache.GetYdr(entity);
+                                ydr.Load(ydr.RpfFileEntry.File.ExtractFile(ydr.RpfFileEntry), ydr.RpfFileEntry);
+                                mt.YdrFiles.Add(ydr);
                             }
 
-                            if (!(bool)cbExtractTextures.IsChecked!) continue;
-                            var textures = new HashSet<Texture>();
-                            var textureMissing = new HashSet<string>();
-                            var extract = Directory.CreateDirectory($"{ymapFolderPath}\\alltextures\\");
-                            if (mYdr.Drawable != null)
+                            if (_gameFileCache.GetYdd(GetYddFromHash(entity)) != null)
                             {
-                                await Task.Run(() => CollectTextures(mYdr.Drawable, textures, textureMissing));
+                                var ydd = _gameFileCache.GetYdd(GetYddFromHash(entity));
+                                ydd.Load(ydd.RpfFileEntry.File.ExtractFile(ydd.RpfFileEntry), ydd.RpfFileEntry);
+                                mt.YddFiles.Add(ydd);
                             }
 
-                            await WriteTexturesAsync(textures, extract.FullName);
-                        }
-                    }
-
-                    if (mt.YddFiles.Count > 0)
-                    {
-                        foreach (var mYdd in mt.YddFiles)
-                        {
-                            if (!(bool)cbExtractXml.IsChecked!)
+                            if (_gameFileCache.GetYft(entity) != null)
                             {
-                                await File.WriteAllBytesAsync($"{ymapFolderPath}\\{mYdd.Name}", mYdd.Save());
+                                var yft = _gameFileCache.GetYft(entity);
+                                yft.Load(yft.RpfFileEntry.File.ExtractFile(yft.RpfFileEntry), yft.RpfFileEntry);
+                                mt.YftFiles.Add(yft);
                             }
-                            else
+
+                            if (mt.YdrFiles.Count > 0)
                             {
-                                var yddXml = MetaXml.GetXml(mYdd, filename: out var yddName,
-                                    $"{ymapFolderPath}\\{mYdd.Name.Split(".")[0]}");
-                                await File.WriteAllTextAsync($"{ymapFolderPath}\\{mYdd.Name}.xml", yddXml);
+                                foreach (var mYdr in mt.YdrFiles)
+                                {
+                                    if (!extractXml)
+                                    {
+                                        await File.WriteAllBytesAsync(Path.Combine(ymapFolderPath, mYdr.Name), mYdr.Save());
+                                    }
+                                    else
+                                    {
+                                        var ydrXml = MetaXml.GetXml(mYdr, filename: out var ydrName,
+                                            Path.Combine(ymapFolderPath, mYdr.Name.Split(".")[0]));
+                                        await File.WriteAllTextAsync(Path.Combine(ymapFolderPath, $"{mYdr.Name}.xml"), ydrXml);
+                                    }
+
+                                    if (!extractTextures) continue;
+                                    var textures = new HashSet<Texture>();
+                                    var textureMissing = new HashSet<string>();
+                                    var extract = Directory.CreateDirectory(Path.Combine(ymapFolderPath, "alltextures"));
+                                    if (mYdr.Drawable != null)
+                                    {
+                                        CollectTextures(mYdr.Drawable, textures, textureMissing);
+                                    }
+
+                                    await WriteTexturesAsync(textures, extract.FullName);
+                                }
                             }
 
-                            if (!(bool)cbExtractTextures.IsChecked!) continue;
-                            var textures = new HashSet<Texture>();
-                            var textureMissing = new HashSet<string>();
-                            var extract = Directory.CreateDirectory($"{ymapFolderPath}\\alltextures\\");
-                            if (mYdd.DrawableDict != null)
+                            if (mt.YddFiles.Count > 0)
                             {
-                                foreach (var dd in mYdd.Drawables)
+                                foreach (var mYdd in mt.YddFiles)
                                 {
-                                    await Task.Run(() => CollectTextures(dd, textures, textureMissing));
+                                    if (!extractXml)
+                                    {
+                                        await File.WriteAllBytesAsync(Path.Combine(ymapFolderPath, mYdd.Name), mYdd.Save());
+                                    }
+                                    else
+                                    {
+                                        var yddXml = MetaXml.GetXml(mYdd, filename: out var yddName,
+                                            Path.Combine(ymapFolderPath, mYdd.Name.Split(".")[0]));
+                                        await File.WriteAllTextAsync(Path.Combine(ymapFolderPath, $"{mYdd.Name}.xml"), yddXml);
+                                    }
+
+                                    if (!extractTextures) continue;
+                                    var textures = new HashSet<Texture>();
+                                    var textureMissing = new HashSet<string>();
+                                    var extract = Directory.CreateDirectory(Path.Combine(ymapFolderPath, "alltextures"));
+                                    if (mYdd.DrawableDict != null)
+                                    {
+                                        foreach (var dd in mYdd.Drawables)
+                                        {
+                                            CollectTextures(dd, textures, textureMissing);
+                                        }
+                                    }
+
+                                    await WriteTexturesAsync(textures, extract.FullName);
                                 }
                             }
 
-                            await WriteTexturesAsync(textures, extract.FullName);
+                            if (mt.YftFiles.Count > 0)
+                            {
+                                foreach (var mYft in mt.YftFiles)
+                                {
+                                    if (!extractXml)
+                                    {
+                                        await File.WriteAllBytesAsync(Path.Combine(ymapFolderPath, mYft.Name), mYft.Save());
+                                    }
+                                    else
+                                    {
+                                        var yftXml = MetaXml.GetXml(mYft, filename: out var yftName,
+                                            Path.Combine(ymapFolderPath, mYft.Name.Split(".")[0]));
+                                        await File.WriteAllTextAsync(Path.Combine(ymapFolderPath, $"{mYft.Name}.xml"), yftXml);
+                                    }
+
+                                    if (!extractTextures) continue;
+                                    var textures = new HashSet<Texture>();
+                                    var textureMissing = new HashSet<string>();
+                                    var extract = Directory.CreateDirectory(Path.Combine(ymapFolderPath, "alltextures"));
+                                    CollectTextures(mYft.Fragment.Drawable, textures, textureMissing);
+
+                                    await WriteTexturesAsync(textures, extract.FullName);
+                                }
+                            }
                         }
+
+                        // Set current map progress to 100% after finished
+                        UpdateItemsProgress(totalEntities, totalEntities, $"Finished: {mapFile.FileName}");
                     }
 
-                    if (mt.YftFiles.Count > 0)
-                    {
-                        foreach (var mYft in mt.YftFiles)
-                        {
-                            if (!(bool)cbExtractXml.IsChecked!)
-                            {
-                                await File.WriteAllBytesAsync($"{ymapFolderPath}\\{mYft.Name}", mYft.Save());
-                            }
-                            else
-                            {
-                                var yftXml = MetaXml.GetXml(mYft, filename: out var yftName,
-                                    $"{ymapFolderPath}\\{mYft.Name.Split(".")[0]}");
-                                await File.WriteAllTextAsync($"{ymapFolderPath}\\{mYft.Name}.xml", yftXml);
-                            }
+                    UpdateOverallProgress(totalMaps, totalMaps, "All files processed successfully.");
+                });
 
-                            if (!(bool)cbExtractTextures.IsChecked!) continue;
-                            var textures = new HashSet<Texture>();
-                            var textureMissing = new HashSet<string>();
-                            var extract = Directory.CreateDirectory($"{ymapFolderPath}\\alltextures\\");
-                            await Task.Run(() => CollectTextures(mYft.Fragment.Drawable, textures, textureMissing));
+                // Clear the map files queue
+                _selectedFileNames.Clear();
+                _globalExtractTask.MapFiles.Clear();
 
-                            await WriteTexturesAsync(textures, extract.FullName);
-                        }
-                    }
+                // Play system sound and flash window to notify completion
+                SystemSoundPlayer.PlaySystemSound(SystemSoundType.Question);
+                var hwnd = this.TryGetPlatformHandle()?.Handle;
+                if (hwnd.HasValue)
+                {
+                    FlashWindow(hwnd.Value, true);
                 }
-            }
 
-            var msBoxExtract = MessageBoxManager.GetMessageBoxStandard($"Information", $"Extraction Completed",
-                ButtonEnum.Ok,
-                MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-            await msBoxExtract.ShowAsync();
+                var msBoxExtract = MessageBoxManager.GetMessageBoxStandard($"Information", $"Extraction Completed",
+                    ButtonEnum.Ok,
+                    MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                await msBoxExtract.ShowAsync();
+            }
+            else
+            {
+                var noEntsMsg = MessageBoxManager.GetMessageBoxStandard($"Information", $"No Entities Detected",
+                    ButtonEnum.Ok,
+                    MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                await noEntsMsg.ShowAsync();
+            }
         }
-        else
+        catch (Exception ex)
         {
-            var noEntsMsg = MessageBoxManager.GetMessageBoxStandard($"Information", $"No Entities Detected",
+            var errMsg = MessageBoxManager.GetMessageBoxStandard($"Error", $"Extraction failed: {ex.Message}",
                 ButtonEnum.Ok,
-                MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-            await noEntsMsg.ShowAsync();
+                MsBox.Avalonia.Enums.Icon.Error, WindowStartupLocation.CenterScreen);
+            await errMsg.ShowAsync();
+        }
+        finally
+        {
+            ToggleControls(true);
+            BtnLookEnts.IsEnabled = false;
+            UpdateStatusCache("Ready");
         }
-
-        ToggleControls(true);
-        labelCache.Content = "Ready";
     }
 
     private void MiExit_OnClick(object? sender, RoutedEventArgs e)
@@ -452,14 +695,22 @@ private async void BtnLookfor_OnClick(object? sender, RoutedEventArgs e)
                 var ymapMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information",
                     $"Detected {ymapResult.ToList().Count} YMAP(s)", ButtonEnum.Ok,
                     MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-                if (ymapResult.Any(x => x.Name.Contains(".ymap")))
+                if (ymapResult.Any(x => x.Name.EndsWith(".ymap", StringComparison.OrdinalIgnoreCase)))
                 {
                     await ymapMsgInfo.ShowAsync();
-                    BtnLookEnts.IsEnabled = true;
                     foreach (var ymap in ymapResult)
                     {
-                        _globalExtractTask.MapFiles.Add(new MapTask(ymap.Path.LocalPath,
-                            GetEntityHashesFromFile(ymap.Path.LocalPath, 0)));
+                        var path = ymap.Path.LocalPath;
+                        var fileName = Path.GetFileName(path);
+                        if (!_selectedFileNames.Contains(fileName))
+                        {
+                            _selectedFileNames.Add(fileName);
+                            _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(path, 0)));
+                        }
+                    }
+                    if (_globalExtractTask.MapFiles.Count > 0)
+                    {
+                        BtnLookEnts.IsEnabled = true;
                     }
                 }
 
@@ -478,22 +729,31 @@ private async void BtnLookfor_OnClick(object? sender, RoutedEventArgs e)
                     $"Detected {ytypResult.ToList().Count} YTYP(s)", ButtonEnum.Ok,
                     MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
                 if (ytypResult.Count <= 0) return;
-                if (ytypResult.Any(x => x.Name.Contains(".ytyp")))
+                if (ytypResult.Any(x => x.Name.EndsWith(".ytyp", StringComparison.OrdinalIgnoreCase)))
                 {
                     await ytypMsgInfo.ShowAsync();
-                    BtnLookEnts.IsEnabled = true;
                     foreach (var ytyp in ytypResult)
                     {
                         try
                         {
-                            var hashes = GetEntityHashesFromFile(ytyp.Path.LocalPath, 1, CBoxExtractType.SelectedIndex == 3);
-                            _globalExtractTask.MapFiles.Add(new MapTask(ytyp.Path.LocalPath, hashes));
+                            var path = ytyp.Path.LocalPath;
+                            var fileName = Path.GetFileName(path);
+                            if (!_selectedFileNames.Contains(fileName))
+                            {
+                                var hashes = GetEntityHashesFromFile(path, 1, CBoxExtractType.SelectedIndex == 3);
+                                _selectedFileNames.Add(fileName);
+                                _globalExtractTask.MapFiles.Add(new MapTask(path, hashes));
+                            }
                         }
                         catch (InvalidDataException ex)
                         {
                             Debug.WriteLine($"InvalidDataException for file {ytyp.Path.LocalPath}: {ex.Message}");
                         }
                     }
+                    if (_globalExtractTask.MapFiles.Count > 0)
+                    {
+                        BtnLookEnts.IsEnabled = true;
+                    }
                 }
 
                 break;
@@ -510,18 +770,48 @@ private async void BtnLookfor_OnClick(object? sender, RoutedEventArgs e)
                     ButtonEnum.Ok,
                     MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
                 if (textFileResult.Count <= 0) return;
-                if (textFileResult.Any(x => x.Name.Contains(".txt")))
+                if (textFileResult.Any(x => x.Name.EndsWith(".txt", StringComparison.OrdinalIgnoreCase)))
                 {
                     await textFileMsgInfo.ShowAsync();
-                    BtnLookEnts.IsEnabled = true;
-                    _globalExtractTask.MapFiles.Add(new MapTask(textFileResult[0].Path.LocalPath,
-                        GetEntityHashesFromFile(File.ReadAllLines(textFileResult[0].Path.LocalPath))));
+                    var path = textFileResult[0].Path.LocalPath;
+                    var fileName = Path.GetFileName(path);
+                    if (!_selectedFileNames.Contains(fileName))
+                    {
+                        _selectedFileNames.Add(fileName);
+                        _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(File.ReadAllLines(path))));
+                    }
+                    if (_globalExtractTask.MapFiles.Count > 0)
+                    {
+                        BtnLookEnts.IsEnabled = true;
+                    }
                 }
 
                 break;
         }
     }
 
+    private void BtnRemoveFile_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var selectedIdx = LbSelectedFiles.SelectedIndex;
+        if (selectedIdx >= 0 && selectedIdx < _selectedFileNames.Count)
+        {
+            _selectedFileNames.RemoveAt(selectedIdx);
+            _globalExtractTask.MapFiles.RemoveAt(selectedIdx);
+        }
+
+        if (_globalExtractTask.MapFiles.Count == 0)
+        {
+            BtnLookEnts.IsEnabled = false;
+        }
+    }
+
+    private void BtnClearFiles_OnClick(object? sender, RoutedEventArgs e)
+    {
+        _selectedFileNames.Clear();
+        _globalExtractTask.MapFiles.Clear();
+        BtnLookEnts.IsEnabled = false;
+    }
+
     private static List<uint> GetEntityHashesFromFile(string file, int type, bool includeMloEntities = false)
     {
         List<uint> hashes = [];

From a626b99193fe13a08d66cbc8a35f7f75fa8d4c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kubilay=20=22bazq=22=20T=C3=9CRK?=
 <69438838+bazq3D@users.noreply.github.com>
Date: Wed, 17 Jun 2026 22:24:15 +0300
Subject: [PATCH 2/3] fix: resolve compiler warnings and prevent crashes on
 invalid ymap loads

This commit fixes various compiler, MSBuild, and code analyzer warnings. It also adds robust error handling and null-safety to prevent the application from crashing when loading empty or invalid YMAP/YTYP files.

- Initialized _gameFileCache to null! to prevent CS8618 warning
- Marked TryResolve as returning Texture? to fix nullability warnings
- Replaced value type null check with Hash != 0 to fix CS0472
- Added null safety guards in GetEntityHashesFromFile for AllEntities, entitySets, and entities
- Wrapped file pickers/loading block in try-catch to prevent unhandled exception crashes
- Observed exceptions in empty catch blocks with Debug.WriteLine
- Removed IncludeAssets from Costura.Fody PackageReference
- Moved project files to repository root
---
 TexturesTesting/App.axaml => App.axaml        |   0
 TexturesTesting/App.axaml.cs => App.axaml.cs  |   0
 .../ExtractTask.cs => ExtractTask.cs          |   0
 .../FodyWeavers.xml => FodyWeavers.xml        |   0
 .../MainWindow.axaml => MainWindow.axaml      |   0
 ...MainWindow.axaml.cs => MainWindow.axaml.cs | 255 ++++++++++--------
 TexturesTesting/MapTask.cs => MapTask.cs      |   0
 TexturesTesting/ModelType.cs => ModelType.cs  |   0
 TexturesTesting/Program.cs => Program.cs      |   0
 ...stemSoundPlayer.cs => SystemSoundPlayer.cs |   0
 ...esTesting.csproj => TexturesTesting.csproj |   3 +-
 TexturesTesting/app.manifest => app.manifest  |   0
 TexturesTesting/ttlogo.ico => ttlogo.ico      | Bin
 13 files changed, 149 insertions(+), 109 deletions(-)
 rename TexturesTesting/App.axaml => App.axaml (100%)
 rename TexturesTesting/App.axaml.cs => App.axaml.cs (100%)
 rename TexturesTesting/ExtractTask.cs => ExtractTask.cs (100%)
 rename TexturesTesting/FodyWeavers.xml => FodyWeavers.xml (100%)
 rename TexturesTesting/MainWindow.axaml => MainWindow.axaml (100%)
 rename TexturesTesting/MainWindow.axaml.cs => MainWindow.axaml.cs (79%)
 rename TexturesTesting/MapTask.cs => MapTask.cs (100%)
 rename TexturesTesting/ModelType.cs => ModelType.cs (100%)
 rename TexturesTesting/Program.cs => Program.cs (100%)
 rename TexturesTesting/SystemSoundPlayer.cs => SystemSoundPlayer.cs (100%)
 rename TexturesTesting/TexturesTesting.csproj => TexturesTesting.csproj (93%)
 rename TexturesTesting/app.manifest => app.manifest (100%)
 rename TexturesTesting/ttlogo.ico => ttlogo.ico (100%)

diff --git a/TexturesTesting/App.axaml b/App.axaml
similarity index 100%
rename from TexturesTesting/App.axaml
rename to App.axaml
diff --git a/TexturesTesting/App.axaml.cs b/App.axaml.cs
similarity index 100%
rename from TexturesTesting/App.axaml.cs
rename to App.axaml.cs
diff --git a/TexturesTesting/ExtractTask.cs b/ExtractTask.cs
similarity index 100%
rename from TexturesTesting/ExtractTask.cs
rename to ExtractTask.cs
diff --git a/TexturesTesting/FodyWeavers.xml b/FodyWeavers.xml
similarity index 100%
rename from TexturesTesting/FodyWeavers.xml
rename to FodyWeavers.xml
diff --git a/TexturesTesting/MainWindow.axaml b/MainWindow.axaml
similarity index 100%
rename from TexturesTesting/MainWindow.axaml
rename to MainWindow.axaml
diff --git a/TexturesTesting/MainWindow.axaml.cs b/MainWindow.axaml.cs
similarity index 79%
rename from TexturesTesting/MainWindow.axaml.cs
rename to MainWindow.axaml.cs
index a951c5e..6079519 100644
--- a/TexturesTesting/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -23,7 +23,7 @@ namespace TexturesTesting;
 public partial class MainWindow : Window
 {
     private static string? _vPath;
-    private GameFileCache _gameFileCache;
+    private GameFileCache _gameFileCache = null!;
     private static readonly ExtractTask _globalExtractTask = new();
     private readonly System.Collections.ObjectModel.ObservableCollection<string> _selectedFileNames = new();
 
@@ -219,7 +219,10 @@ private static bool IsGtaPathValid(string? path)
                                 }
                             }
                         }
-                        catch { }
+                        catch (Exception ex)
+                        {
+                            Debug.WriteLine(ex);
+                        }
                     }
                 }
             }
@@ -244,11 +247,17 @@ private static bool IsGtaPathValid(string? path)
                             }
                         }
                     }
-                    catch { }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine(ex);
+                    }
                 }
             }
         }
-        catch { }
+        catch (Exception ex)
+        {
+            Debug.WriteLine(ex);
+        }
 
         return null;
 #pragma warning restore CA1416
@@ -296,8 +305,10 @@ await Parallel.ForEachAsync(textures, ct, async (tex, token) =>
                 var dds = DDSIO.GetDDSFile(tex);
                 await File.WriteAllBytesAsync(fpath, dds, token);
             }
-            catch
-            { }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+            }
         });
     }
     private async void BtnLookEnts_OnClick(object? sender, RoutedEventArgs e)
@@ -514,6 +525,7 @@ await Task.Run(async () =>
         }
         catch (Exception ex)
         {
+            Debug.WriteLine(ex);
             var errMsg = MessageBoxManager.GetMessageBoxStandard($"Error", $"Extraction failed: {ex.Message}",
                 ButtonEnum.Ok,
                 MsBox.Avalonia.Enums.Icon.Error, WindowStartupLocation.CenterScreen);
@@ -574,9 +586,9 @@ private void CollectTextures(DrawableBase d, ISet<Texture> textureSet, ISet<stri
         Archetype arch = _gameFileCache.GetArchetype(archhash);
         if (arch == null) return;
 
-        uint txdHash = arch.TextureDict != null ? ToUInt(arch.TextureDict.Hash) : archhash;
+        uint txdHash = arch.TextureDict.Hash != 0 ? arch.TextureDict.Hash : archhash;
 
-        var foundCache = new Dictionary<ulong, Texture>(64);
+        var foundCache = new Dictionary<ulong, Texture?>(64);
         var parentCache = new Dictionary<uint, uint>(8);
 
         uint GetParentTxd(uint h)
@@ -588,7 +600,7 @@ uint GetParentTxd(uint h)
             return p;
         }
 
-        Texture TryResolve(uint texHash, uint startTxd)
+        Texture? TryResolve(uint texHash, uint startTxd)
         {
             if (texHash == 0) return null;
 
@@ -680,113 +692,123 @@ Texture TryResolve(uint texHash, uint startTxd)
 
     private async void BtnLookfor_OnClick(object? sender, RoutedEventArgs e)
     {
-        switch (CBoxExtractType.SelectedIndex)
+        try
         {
-            case 0: // YMAPs
+            switch (CBoxExtractType.SelectedIndex)
+            {
+                case 0: // YMAPs
 
-                var ymapResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
-                    new FilePickerOpenOptions()
-                    {
-                        Title = "Select YMAP(s) folder",
-                        AllowMultiple = true,
-                        FileTypeFilter = new[] { new FilePickerFileType("YMAP(s)") { Patterns = new[] { "*.ymap" }}}
-                    });
-                if (ymapResult.Count <= 0) return;
-                var ymapMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information",
-                    $"Detected {ymapResult.ToList().Count} YMAP(s)", ButtonEnum.Ok,
-                    MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-                if (ymapResult.Any(x => x.Name.EndsWith(".ymap", StringComparison.OrdinalIgnoreCase)))
-                {
-                    await ymapMsgInfo.ShowAsync();
-                    foreach (var ymap in ymapResult)
-                    {
-                        var path = ymap.Path.LocalPath;
-                        var fileName = Path.GetFileName(path);
-                        if (!_selectedFileNames.Contains(fileName))
+                    var ymapResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
+                        new FilePickerOpenOptions()
                         {
-                            _selectedFileNames.Add(fileName);
-                            _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(path, 0)));
-                        }
-                    }
-                    if (_globalExtractTask.MapFiles.Count > 0)
-                    {
-                        BtnLookEnts.IsEnabled = true;
-                    }
-                }
-
-                break;
-            case 1:
-            case 3:
-                var ytypResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
-                    new FilePickerOpenOptions()
-                    {
-                        Title = "Select YTYP(s) folder",
-                        AllowMultiple = true,
-                        FileTypeFilter = new[] { new FilePickerFileType("YTYP(s)") { Patterns = new[] { "*.ytyp" }}}
-                    });
-
-                var ytypMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information",
-                    $"Detected {ytypResult.ToList().Count} YTYP(s)", ButtonEnum.Ok,
-                    MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-                if (ytypResult.Count <= 0) return;
-                if (ytypResult.Any(x => x.Name.EndsWith(".ytyp", StringComparison.OrdinalIgnoreCase)))
-                {
-                    await ytypMsgInfo.ShowAsync();
-                    foreach (var ytyp in ytypResult)
+                            Title = "Select YMAP(s) folder",
+                            AllowMultiple = true,
+                            FileTypeFilter = new[] { new FilePickerFileType("YMAP(s)") { Patterns = new[] { "*.ymap" }}}
+                        });
+                    if (ymapResult.Count <= 0) return;
+                    var ymapMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information",
+                        $"Detected {ymapResult.ToList().Count} YMAP(s)", ButtonEnum.Ok,
+                        MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                    if (ymapResult.Any(x => x.Name.EndsWith(".ymap", StringComparison.OrdinalIgnoreCase)))
                     {
-                        try
+                        await ymapMsgInfo.ShowAsync();
+                        foreach (var ymap in ymapResult)
                         {
-                            var path = ytyp.Path.LocalPath;
+                            var path = ymap.Path.LocalPath;
                             var fileName = Path.GetFileName(path);
                             if (!_selectedFileNames.Contains(fileName))
                             {
-                                var hashes = GetEntityHashesFromFile(path, 1, CBoxExtractType.SelectedIndex == 3);
                                 _selectedFileNames.Add(fileName);
-                                _globalExtractTask.MapFiles.Add(new MapTask(path, hashes));
+                                _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(path, 0)));
                             }
                         }
-                        catch (InvalidDataException ex)
+                        if (_globalExtractTask.MapFiles.Count > 0)
                         {
-                            Debug.WriteLine($"InvalidDataException for file {ytyp.Path.LocalPath}: {ex.Message}");
+                            BtnLookEnts.IsEnabled = true;
                         }
                     }
-                    if (_globalExtractTask.MapFiles.Count > 0)
-                    {
-                        BtnLookEnts.IsEnabled = true;
-                    }
-                }
 
-                break;
-            case 2:
-                var textFileResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
-                    new FilePickerOpenOptions()
-                    {
-                        Title = "Select Text File folder",
-                        AllowMultiple = false,
-                        FileTypeFilter = new[] { new FilePickerFileType("Text File") { Patterns = new[] { "*.txt" }}}
-                    });
-
-                var textFileMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information", $"Valid Text File",
-                    ButtonEnum.Ok,
-                    MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
-                if (textFileResult.Count <= 0) return;
-                if (textFileResult.Any(x => x.Name.EndsWith(".txt", StringComparison.OrdinalIgnoreCase)))
-                {
-                    await textFileMsgInfo.ShowAsync();
-                    var path = textFileResult[0].Path.LocalPath;
-                    var fileName = Path.GetFileName(path);
-                    if (!_selectedFileNames.Contains(fileName))
+                    break;
+                case 1:
+                case 3:
+                    var ytypResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
+                        new FilePickerOpenOptions()
+                        {
+                            Title = "Select YTYP(s) folder",
+                            AllowMultiple = true,
+                            FileTypeFilter = new[] { new FilePickerFileType("YTYP(s)") { Patterns = new[] { "*.ytyp" }}}
+                        });
+
+                    var ytypMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information",
+                        $"Detected {ytypResult.ToList().Count} YTYP(s)", ButtonEnum.Ok,
+                        MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                    if (ytypResult.Count <= 0) return;
+                    if (ytypResult.Any(x => x.Name.EndsWith(".ytyp", StringComparison.OrdinalIgnoreCase)))
                     {
-                        _selectedFileNames.Add(fileName);
-                        _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(File.ReadAllLines(path))));
+                        await ytypMsgInfo.ShowAsync();
+                        foreach (var ytyp in ytypResult)
+                        {
+                            try
+                            {
+                                var path = ytyp.Path.LocalPath;
+                                var fileName = Path.GetFileName(path);
+                                if (!_selectedFileNames.Contains(fileName))
+                                {
+                                    var hashes = GetEntityHashesFromFile(path, 1, CBoxExtractType.SelectedIndex == 3);
+                                    _selectedFileNames.Add(fileName);
+                                    _globalExtractTask.MapFiles.Add(new MapTask(path, hashes));
+                                }
+                            }
+                            catch (InvalidDataException ex)
+                            {
+                                Debug.WriteLine($"InvalidDataException for file {ytyp.Path.LocalPath}: {ex.Message}");
+                            }
+                        }
+                        if (_globalExtractTask.MapFiles.Count > 0)
+                        {
+                            BtnLookEnts.IsEnabled = true;
+                        }
                     }
-                    if (_globalExtractTask.MapFiles.Count > 0)
+
+                    break;
+                case 2:
+                    var textFileResult = await GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(
+                        new FilePickerOpenOptions()
+                        {
+                            Title = "Select Text File folder",
+                            AllowMultiple = false,
+                            FileTypeFilter = new[] { new FilePickerFileType("Text File") { Patterns = new[] { "*.txt" }}}
+                        });
+
+                    var textFileMsgInfo = MessageBoxManager.GetMessageBoxStandard($"Information", $"Valid Text File",
+                        ButtonEnum.Ok,
+                        MsBox.Avalonia.Enums.Icon.Info, WindowStartupLocation.CenterScreen);
+                    if (textFileResult.Count <= 0) return;
+                    if (textFileResult.Any(x => x.Name.EndsWith(".txt", StringComparison.OrdinalIgnoreCase)))
                     {
-                        BtnLookEnts.IsEnabled = true;
+                        await textFileMsgInfo.ShowAsync();
+                        var path = textFileResult[0].Path.LocalPath;
+                        var fileName = Path.GetFileName(path);
+                        if (!_selectedFileNames.Contains(fileName))
+                        {
+                            _selectedFileNames.Add(fileName);
+                            _globalExtractTask.MapFiles.Add(new MapTask(path, GetEntityHashesFromFile(File.ReadAllLines(path))));
+                        }
+                        if (_globalExtractTask.MapFiles.Count > 0)
+                        {
+                            BtnLookEnts.IsEnabled = true;
+                        }
                     }
-                }
 
-                break;
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine(ex);
+            var box = MessageBoxManager.GetMessageBoxStandard("Error", $"Failed to load file(s): {ex.Message}", ButtonEnum.Ok,
+                MsBox.Avalonia.Enums.Icon.Error, WindowStartupLocation.CenterScreen);
+            await box.ShowAsync();
         }
     }
 
@@ -820,25 +842,44 @@ private static List<uint> GetEntityHashesFromFile(string file, int type, bool in
             case 0:
                 var ymapFile = new YmapFile();
                 ymapFile.Load(File.ReadAllBytes(file));
-                hashes.AddRange(ymapFile.AllEntities.Select(entity => entity._CEntityDef.archetypeName.Hash));
+                if (ymapFile.AllEntities != null)
+                {
+                    hashes.AddRange(ymapFile.AllEntities
+                        .Where(entity => entity?._CEntityDef != null)
+                        .Select(entity => entity._CEntityDef.archetypeName.Hash));
+                }
                 return hashes.Distinct().ToList();
             case 1:
                 var ytypFile = new YtypFile();
                 ytypFile.Load(File.ReadAllBytes(file));
-                hashes.AddRange(ytypFile.AllArchetypes.Select(archetype => archetype._BaseArchetypeDef.assetName.Hash));
-                if (includeMloEntities)
+                if (ytypFile.AllArchetypes != null)
                 {
-                    foreach (var archetype in ytypFile.AllArchetypes.Where(x => x.Type == MetaName.CMloArchetypeDef))
+                    hashes.AddRange(ytypFile.AllArchetypes
+                        .Where(archetype => archetype?._BaseArchetypeDef != null)
+                        .Select(archetype => archetype._BaseArchetypeDef.assetName.Hash));
+                    
+                    if (includeMloEntities)
                     {
-                        var mlo = (MloArchetype)archetype;
-                        if (mlo?.entitySets != null && mlo.entitySets.Length != 0)
+                        foreach (var archetype in ytypFile.AllArchetypes.Where(x => x != null && x.Type == MetaName.CMloArchetypeDef))
                         {
-                            hashes.AddRange(
-                                mlo.entitySets
-                                    .SelectMany(entitySet => entitySet.Entities.Select(x => x.Data.archetypeName.Hash))
-                            );
+                            var mlo = (MloArchetype)archetype;
+                            if (mlo.entitySets != null && mlo.entitySets.Length != 0)
+                            {
+                                hashes.AddRange(
+                                    mlo.entitySets
+                                        .Where(entitySet => entitySet?.Entities != null)
+                                        .SelectMany(entitySet => entitySet.Entities
+                                            .Where(x => x?.Data != null)
+                                            .Select(x => x.Data.archetypeName.Hash))
+                                );
+                            }
+                            if (mlo.entities != null)
+                            {
+                                hashes.AddRange(mlo.entities
+                                    .Where(x => x?.Data != null)
+                                    .Select(x => x.Data.archetypeName.Hash));
+                            }
                         }
-                        hashes.AddRange(mlo.entities.Select(x => x.Data.archetypeName.Hash));
                     }
                 }
 
diff --git a/TexturesTesting/MapTask.cs b/MapTask.cs
similarity index 100%
rename from TexturesTesting/MapTask.cs
rename to MapTask.cs
diff --git a/TexturesTesting/ModelType.cs b/ModelType.cs
similarity index 100%
rename from TexturesTesting/ModelType.cs
rename to ModelType.cs
diff --git a/TexturesTesting/Program.cs b/Program.cs
similarity index 100%
rename from TexturesTesting/Program.cs
rename to Program.cs
diff --git a/TexturesTesting/SystemSoundPlayer.cs b/SystemSoundPlayer.cs
similarity index 100%
rename from TexturesTesting/SystemSoundPlayer.cs
rename to SystemSoundPlayer.cs
diff --git a/TexturesTesting/TexturesTesting.csproj b/TexturesTesting.csproj
similarity index 93%
rename from TexturesTesting/TexturesTesting.csproj
rename to TexturesTesting.csproj
index 1dea71e..f9b14bc 100644
--- a/TexturesTesting/TexturesTesting.csproj
+++ b/TexturesTesting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
@@ -25,7 +25,6 @@
         <PackageReference Include="Collections.Pooled" Version="1.0.82" />
         <PackageReference Include="Costura.Fody" Version="5.7.0">
           <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.4.0-beta.1">
           <PrivateAssets>all</PrivateAssets>
diff --git a/TexturesTesting/app.manifest b/app.manifest
similarity index 100%
rename from TexturesTesting/app.manifest
rename to app.manifest
diff --git a/TexturesTesting/ttlogo.ico b/ttlogo.ico
similarity index 100%
rename from TexturesTesting/ttlogo.ico
rename to ttlogo.ico

From 91f14b30a769b38e298a8f428c579aec7dd19aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kubilay=20=22bazq=22=20T=C3=9CRK?=
 <69438838+bazq3D@users.noreply.github.com>
Date: Wed, 17 Jun 2026 22:27:15 +0300
Subject: [PATCH 3/3] chore: add console logging to YMAP processing and fix sln
 reference

This commit adds detailed console trace logs during YMAP/YTYP file loading and entity processing, helping debug cases where some YMAPs are not fully exported. It also updates the project reference in TexturesTesting.sln to match the repository root and optimizes GetYdr/GetYdd/GetYft lookups.
---
 MainWindow.axaml.cs | 34 ++++++++++++++++++++++------------
 TexturesTesting.sln |  4 ++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index 6079519..93f4f81 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -356,6 +356,8 @@ await Task.Run(async () =>
                     foreach (var mapFile in mapFilesToProcess)
                     {
                         currentMapIdx++;
+                        Console.WriteLine($"[bazq] --------------------------------------------------");
+                        Console.WriteLine($"[bazq] Processing YMAP: {mapFile.FileName} ({currentMapIdx}/{totalMaps})");
                         UpdateOverallProgress(currentMapIdx - 1, totalMaps, $"Processing: {mapFile.FileName} ({currentMapIdx}/{totalMaps})");
 
                         var ymapFolderPath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(mapFile.FileName) ?? "");
@@ -364,6 +366,8 @@ await Task.Run(async () =>
                         int totalEntities = mapFile.EntsHashes.Count;
                         int currentEntityIdx = 0;
 
+                        Console.WriteLine($"[bazq] Total entities to process in this map: {totalEntities}");
+
                         if (totalEntities == 0)
                         {
                             UpdateItemsProgress(0, 100, "No entities in this file");
@@ -385,25 +389,28 @@ await Task.Run(async () =>
                             UpdateStatusCache($"Map {currentMapIdx}/{totalMaps} - {entityName}");
 
                             ModelType mt = new();
-                            if (_gameFileCache.GetYdr(entity) != null)
+                            var ydrEntry = _gameFileCache.GetYdr(entity);
+                            var yddEntry = _gameFileCache.GetYdd(GetYddFromHash(entity));
+                            var yftEntry = _gameFileCache.GetYft(entity);
+
+                            Console.WriteLine($"[bazq] - Entity: {entityName} (0x{entity:X8}) -> YDR: {(ydrEntry != null ? "FOUND" : "NOT FOUND")}, YDD: {(yddEntry != null ? "FOUND" : "NOT FOUND")}, YFT: {(yftEntry != null ? "FOUND" : "NOT FOUND")}");
+
+                            if (ydrEntry != null)
                             {
-                                var ydr = _gameFileCache.GetYdr(entity);
-                                ydr.Load(ydr.RpfFileEntry.File.ExtractFile(ydr.RpfFileEntry), ydr.RpfFileEntry);
-                                mt.YdrFiles.Add(ydr);
+                                ydrEntry.Load(ydrEntry.RpfFileEntry.File.ExtractFile(ydrEntry.RpfFileEntry), ydrEntry.RpfFileEntry);
+                                mt.YdrFiles.Add(ydrEntry);
                             }
 
-                            if (_gameFileCache.GetYdd(GetYddFromHash(entity)) != null)
+                            if (yddEntry != null)
                             {
-                                var ydd = _gameFileCache.GetYdd(GetYddFromHash(entity));
-                                ydd.Load(ydd.RpfFileEntry.File.ExtractFile(ydd.RpfFileEntry), ydd.RpfFileEntry);
-                                mt.YddFiles.Add(ydd);
+                                yddEntry.Load(yddEntry.RpfFileEntry.File.ExtractFile(yddEntry.RpfFileEntry), yddEntry.RpfFileEntry);
+                                mt.YddFiles.Add(yddEntry);
                             }
 
-                            if (_gameFileCache.GetYft(entity) != null)
+                            if (yftEntry != null)
                             {
-                                var yft = _gameFileCache.GetYft(entity);
-                                yft.Load(yft.RpfFileEntry.File.ExtractFile(yft.RpfFileEntry), yft.RpfFileEntry);
-                                mt.YftFiles.Add(yft);
+                                yftEntry.Load(yftEntry.RpfFileEntry.File.ExtractFile(yftEntry.RpfFileEntry), yftEntry.RpfFileEntry);
+                                mt.YftFiles.Add(yftEntry);
                             }
 
                             if (mt.YdrFiles.Count > 0)
@@ -842,12 +849,15 @@ private static List<uint> GetEntityHashesFromFile(string file, int type, bool in
             case 0:
                 var ymapFile = new YmapFile();
                 ymapFile.Load(File.ReadAllBytes(file));
+                int entityCount = 0;
                 if (ymapFile.AllEntities != null)
                 {
+                    entityCount = ymapFile.AllEntities.Count();
                     hashes.AddRange(ymapFile.AllEntities
                         .Where(entity => entity?._CEntityDef != null)
                         .Select(entity => entity._CEntityDef.archetypeName.Hash));
                 }
+                Console.WriteLine($"[bazq] YMAP Loaded: {Path.GetFileName(file)} | Total Entities: {entityCount} | Unique Archetype Hashes: {hashes.Distinct().Count()}");
                 return hashes.Distinct().ToList();
             case 1:
                 var ytypFile = new YtypFile();
diff --git a/TexturesTesting.sln b/TexturesTesting.sln
index 8af2db2..f0f59b4 100644
--- a/TexturesTesting.sln
+++ b/TexturesTesting.sln
@@ -1,6 +1,6 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturesTesting", "TexturesTesting\TexturesTesting.csproj", "{D140DA5C-7D23-4F34-944A-9B84E03BCE19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturesTesting", "TexturesTesting.csproj", "{D140DA5C-7D23-4F34-944A-9B84E03BCE19}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution