From 5f1ddce5ed94a902401ff3a6aec601faee5ef067 Mon Sep 17 00:00:00 2001
From: iAmAsval <valentinbaudry64@gmail.com>
Date: Thu, 9 Dec 2021 10:39:23 +0100
Subject: [PATCH] you don't need that anyway

---
 CUE4Parse                               |  2 +-
 FModel/MainWindow.xaml                  | 22 +++--------------
 FModel/MainWindow.xaml.cs               |  6 -----
 FModel/Settings/UserSettings.cs         | 20 +++-------------
 FModel/ViewModels/CUE4ParseViewModel.cs |  6 -----
 FModel/ViewModels/MapViewerViewModel.cs | 16 +++++--------
 FModel/Views/SettingsView.xaml          | 32 +++++++++++--------------
 7 files changed, 27 insertions(+), 77 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index eb17756c..cf93fb7a 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit eb17756cf0a6505e2ba5cec467db58cfab231fe4
+Subproject commit cf93fb7ad93af74994f736db6cc134250e165a53
diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 757411ec..12a9ad50 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -94,7 +94,7 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator />
-                <MenuItem Header="Export Data" Command="{Binding RightClickMenuCommand}">
+                <MenuItem Header="Export Raw Data" Command="{Binding RightClickMenuCommand}">
                     <MenuItem.CommandParameter>
                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                             <Binding Source="Assets_Export_Data" />
@@ -147,9 +147,6 @@
                             </Canvas>
                         </Viewbox>
                     </MenuItem.Icon>
-                    <MenuItem Header="Export Data" IsCheckable="True" StaysOpenOnClick="True"
-                              InputGestureText="{Binding AutoExportData, Source={x:Static local:Settings.UserSettings.Default}}"
-                              IsChecked="{Binding IsAutoExportData, Source={x:Static local:Settings.UserSettings.Default}}" />
                     <MenuItem Header="Save Properties" IsCheckable="True" StaysOpenOnClick="True"
                               InputGestureText="{Binding AutoSaveProps, Source={x:Static local:Settings.UserSettings.Default}}"
                               IsChecked="{Binding IsAutoSaveProps, Source={x:Static local:Settings.UserSettings.Default}}" />
@@ -394,7 +391,7 @@
                                                 </Viewbox>
                                             </MenuItem.Icon>
                                         </MenuItem>
-                                        <MenuItem Header="Export Folder's Assets Data" Click="OnFolderExportClick">
+                                        <MenuItem Header="Export Folder's Assets Raw Data" Click="OnFolderExportClick">
                                             <MenuItem.Icon>
                                                 <Viewbox Width="16" Height="16">
                                                     <Canvas Width="24" Height="24">
@@ -522,7 +519,7 @@
                                                     </Viewbox>
                                                 </MenuItem.Icon>
                                             </MenuItem>
-                                            <MenuItem Header="Export Data" Command="{Binding DataContext.RightClickMenuCommand}">
+                                            <MenuItem Header="Export Raw Data" Command="{Binding DataContext.RightClickMenuCommand}">
                                                 <MenuItem.CommandParameter>
                                                     <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                                         <Binding Source="Assets_Export_Data" />
@@ -796,19 +793,6 @@
                         </Viewbox>
                     </StatusBarItem>
 
-                    <StatusBarItem Width="30" HorizontalContentAlignment="Stretch" ToolTip="Auto Export Data Enabled">
-                        <StatusBarItem.Style>
-                            <Style TargetType="StatusBarItem">
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsAutoExportData, Source={x:Static local:Settings.UserSettings.Default}}" Value="False">
-                                        <Setter Property="Visibility" Value="Hidden" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </StatusBarItem.Style>
-                        <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" Text="DTA" />
-                    </StatusBarItem>
-
                     <StatusBarItem Width="30" HorizontalContentAlignment="Stretch" ToolTip="Auto Save Properties Enabled">
                         <StatusBarItem.Style>
                             <Style TargetType="StatusBarItem">
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
index 9df6d8db..77b0540f 100644
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -11,7 +11,6 @@ using FModel.Settings;
 using FModel.ViewModels;
 using FModel.Views;
 using FModel.Views.Resources.Controls;
-using ICSharpCode.AvalonEdit.Editing;
 
 namespace FModel
 {
@@ -27,8 +26,6 @@ namespace FModel
 
         public MainWindow()
         {
-            CommandBindings.Add(new CommandBinding(new RoutedCommand("AutoExportData", typeof(MainWindow), new InputGestureCollection
-                {new KeyGesture(UserSettings.Default.AutoExportData.Key, UserSettings.Default.AutoExportData.Modifiers)}), OnAutoTriggerExecuted));
             CommandBindings.Add(new CommandBinding(new RoutedCommand("AutoSaveProps", typeof(MainWindow), new InputGestureCollection
                 {new KeyGesture(UserSettings.Default.AutoSaveProps.Key, UserSettings.Default.AutoSaveProps.Modifiers)}), OnAutoTriggerExecuted));
             CommandBindings.Add(new CommandBinding(new RoutedCommand("AutoSaveTextures", typeof(MainWindow), new InputGestureCollection
@@ -133,9 +130,6 @@ namespace FModel
         {
             switch ((e.Command as RoutedCommand)?.Name)
             {
-                case "AutoExportData":
-                    UserSettings.Default.IsAutoExportData = !UserSettings.Default.IsAutoExportData;
-                    break;
                 case "AutoSaveProps":
                     UserSettings.Default.IsAutoSaveProps = !UserSettings.Default.IsAutoSaveProps;
                     break;
diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs
index 0887e725..1e6f80be 100644
--- a/FModel/Settings/UserSettings.cs
+++ b/FModel/Settings/UserSettings.cs
@@ -86,13 +86,6 @@ namespace FModel.Settings
             set => SetProperty(ref _lastOpenedSettingTab, value);
         }
 
-        private bool _isAutoExportData;
-        public bool IsAutoExportData
-        {
-            get => _isAutoExportData;
-            set => SetProperty(ref _isAutoExportData, value);
-        }
-
         private bool _isAutoSaveProps;
         public bool IsAutoSaveProps
         {
@@ -450,28 +443,21 @@ namespace FModel.Settings
             set => SetProperty(ref _assetRemoveTab, value);
         }
 
-        private Hotkey _autoExportData = new(Key.F1);
-        public Hotkey AutoExportData
-        {
-            get => _autoExportData;
-            set => SetProperty(ref _autoExportData, value);
-        }
-
-        private Hotkey _autoSaveProps = new(Key.F2);
+        private Hotkey _autoSaveProps = new(Key.F1);
         public Hotkey AutoSaveProps
         {
             get => _autoSaveProps;
             set => SetProperty(ref _autoSaveProps, value);
         }
 
-        private Hotkey _autoSaveTextures = new(Key.F3);
+        private Hotkey _autoSaveTextures = new(Key.F2);
         public Hotkey AutoSaveTextures
         {
             get => _autoSaveTextures;
             set => SetProperty(ref _autoSaveTextures, value);
         }
 
-        private Hotkey _autoOpenSounds = new(Key.F4);
+        private Hotkey _autoOpenSounds = new(Key.F3);
         public Hotkey AutoOpenSounds
         {
             get => _autoOpenSounds;
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index 8a93db9f..fb8c18d2 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -636,9 +636,6 @@ namespace FModel.ViewModels
                     break;
                 }
             }
-
-            if (UserSettings.Default.IsAutoExportData)
-                ExportData(fullPath);
         }
 
         public void ExtractAndScroll(string fullPath, string objectName)
@@ -653,9 +650,6 @@ namespace FModel.ViewModels
 
             if (!exports.Any(CheckExport))
                 TabControl.SelectedTab.Image = null;
-
-            if (UserSettings.Default.IsAutoExportData)
-                ExportData(fullPath);
         }
 
         private bool CheckExport(UObject export) // return true once you wanna stop searching for exports
diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs
index 0758b687..9153cd7b 100644
--- a/FModel/ViewModels/MapViewerViewModel.cs
+++ b/FModel/ViewModels/MapViewerViewModel.cs
@@ -374,13 +374,10 @@ namespace FModel.ViewModels
 
             await _threadWorkerView.Begin(_ =>
             {
-                // if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerBR.Default__UIMapManagerBR_C", out UObject mapManager) ||
-                //     !mapManager.TryGetValue(out UObject mapMaterial, "MapMaterial") ||
-                //     !mapMaterial.TryGetValue(out FStructFallback cachedExpressionData, "CachedExpressionData") ||
-                //     !cachedExpressionData.TryGetValue(out FStructFallback parameters, "Parameters") ||
-                //     !parameters.TryGetValue(out UTexture2D[] textureValues, "TextureValues")) return;
+                if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerBR.Default__UIMapManagerBR_C", out UObject mapManager) ||
+                    !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
 
-                _bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap("FortniteGame/Content/Athena/Apollo/Maps/UI/Apollo_Terrain_Minimap.Apollo_Terrain_Minimap"), IsEnabled = true};
+                _bitmaps[0][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
                 _brMiniMapImage = GetImageSource(_bitmaps[0][_FIRST_BITMAP].Layer);
             });
         }
@@ -392,11 +389,10 @@ namespace FModel.ViewModels
 
             await _threadWorkerView.Begin(_ =>
             {
-                // if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerPapaya.Default__UIMapManagerPapaya_C", out UObject mapManager) ||
-                //     !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") ||
-                //     mapMaterial.ReferencedTextures.Count < 1) return;
+                if (!Utils.TryLoadObject("FortniteGame/Content/UI/IngameMap/UIMapManagerPapaya.Default__UIMapManagerPapaya_C", out UObject mapManager) ||
+                    !mapManager.TryGetValue(out UMaterial mapMaterial, "MapMaterial") || mapMaterial.ReferencedTextures.Count < 1) return;
 
-                _bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap("FortniteGame/Content/Athena/Apollo/Maps/Special/Papaya/UI/MiniMapPapaya.MiniMapPapaya"), IsEnabled = true};
+                _bitmaps[1][_FIRST_BITMAP] = new MapLayer{Layer = Utils.GetBitmap(mapMaterial.ReferencedTextures[0] as UTexture2D), IsEnabled = true};
                 _prMiniMapImage = GetImageSource(_bitmaps[1][_FIRST_BITMAP].Layer);
             });
         }
diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml
index 20f2f7f6..5d14eb0e 100644
--- a/FModel/Views/SettingsView.xaml
+++ b/FModel/Views/SettingsView.xaml
@@ -371,7 +371,6 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -403,32 +402,29 @@
 
                     <Separator Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource CustomSeparator}" />
 
-                    <TextBlock Grid.Row="8" Grid.Column="0" Text="Auto Export Data *" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <TextBlock Grid.Row="8" Grid.Column="0" Text="Auto Save Properties *" VerticalAlignment="Center" Margin="0 0 0 5" />
                     <controls:HotkeyTextBox Grid.Row="8" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
-                                            HotKey="{Binding AutoExportData, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="9" Grid.Column="0" Text="Auto Save Properties *" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="9" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding AutoSaveProps, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="10" Grid.Column="0" Text="Auto Save Textures *" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="10" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="9" Grid.Column="0" Text="Auto Save Textures *" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <controls:HotkeyTextBox Grid.Row="9" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding AutoSaveTextures, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="11" Grid.Column="0" Text="Auto Open Sounds *" VerticalAlignment="Center" />
-                    <controls:HotkeyTextBox Grid.Row="11" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}"
+                    <TextBlock Grid.Row="10" Grid.Column="0" Text="Auto Open Sounds *" VerticalAlignment="Center" />
+                    <controls:HotkeyTextBox Grid.Row="10" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}"
                                             HotKey="{Binding AutoOpenSounds, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
 
-                    <Separator Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource CustomSeparator}" />
+                    <Separator Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource CustomSeparator}" />
 
-                    <TextBlock Grid.Row="13" Grid.Column="0" Text="Add Audio File" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="13" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="12" Grid.Column="0" Text="Add Audio File" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <controls:HotkeyTextBox Grid.Row="12" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding AddAudio, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="14" Grid.Column="0" Text="Play / Pause Current Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="14" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="13" Grid.Column="0" Text="Play / Pause Current Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <controls:HotkeyTextBox Grid.Row="13" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding PlayPauseAudio, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="15" Grid.Column="0" Text="Previous Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="15" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="14" Grid.Column="0" Text="Previous Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <controls:HotkeyTextBox Grid.Row="14" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding PreviousAudio, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
-                    <TextBlock Grid.Row="16" Grid.Column="0" Text="Next Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <controls:HotkeyTextBox Grid.Row="16" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="15" Grid.Column="0" Text="Next Audio" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <controls:HotkeyTextBox Grid.Row="15" Grid.Column="2" Style="{StaticResource TextBoxDefaultStyle}" Margin="0 0 0 5"
                                             HotKey="{Binding NextAudio, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
                 </Grid>
             </DataTemplate>