diff --git a/CUE4Parse b/CUE4Parse index a6f5517b..215f3dbe 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit a6f5517b7c44f0cac3817b1b1ea7f6ce6bc48666 +Subproject commit 215f3dbe910992d65011676e47e395dd9bd189df diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs index 01617c91..f5de48d8 100644 --- a/FModel/App.xaml.cs +++ b/FModel/App.xaml.cs @@ -41,7 +41,6 @@ public partial class App { UserSettings.Default = JsonConvert.DeserializeObject( File.ReadAllText(UserSettings.FilePath), JsonNetSerializer.SerializerSettings); - ApplicationService.ApplicationView.CUE4Parse.Provider.ReadScriptData = UserSettings.Default.ReadScriptData; } catch { diff --git a/FModel/ViewModels/AesManagerViewModel.cs b/FModel/ViewModels/AesManagerViewModel.cs index 19dc8258..c1134cb2 100644 --- a/FModel/ViewModels/AesManagerViewModel.cs +++ b/FModel/ViewModels/AesManagerViewModel.cs @@ -108,7 +108,7 @@ public class AesManagerViewModel : ViewModel if (_cue4Parse.Game == FGame.Unknown && UserSettings.Default.ManualGames.ContainsKey(UserSettings.Default.GameDirectory)) UserSettings.Default.ManualGames[UserSettings.Default.GameDirectory].AesKeys = _keysFromSettings; else UserSettings.Default.AesKeys[_cue4Parse.Game] = _keysFromSettings; - Log.Information("{@Json}", UserSettings.Default); + // Log.Information("{@Json}", UserSettings.Default); } private IEnumerable EnumerateAesKeys() diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 2c4b1884..6341b786 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -200,6 +200,7 @@ public class CUE4ParseViewModel : ViewModel break; } } + Provider.ReadScriptData = UserSettings.Default.ReadScriptData; GameDirectory = new GameDirectoryViewModel(); AssetsFolder = new AssetsFolderViewModel(); @@ -399,7 +400,6 @@ public class CUE4ParseViewModel : ViewModel } else if (endpoint.IsValid) { - if(string.IsNullOrEmpty(endpoint.Path)) return; var mappingsFolder = Path.Combine(UserSettings.Default.OutputDirectory, ".data"); var mappings = _apiEndpointView.DynamicApi.GetMappings(default, endpoint.Url, endpoint.Path); if (mappings is { Length: > 0 }) diff --git a/FModel/ViewModels/SettingsViewModel.cs b/FModel/ViewModels/SettingsViewModel.cs index 306d4835..e74a96fb 100644 --- a/FModel/ViewModels/SettingsViewModel.cs +++ b/FModel/ViewModels/SettingsViewModel.cs @@ -167,17 +167,6 @@ public class SettingsViewModel : ViewModel set => SetProperty(ref _selectedTextureExportFormat, value); } - private bool _selectedReadScriptData; - public bool SelectedReadScriptData - { - get => _selectedReadScriptData; - set - { - SetProperty(ref _selectedReadScriptData, value); - ApplicationService.ApplicationView.CUE4Parse.Provider.ReadScriptData = value; - } - } - public ReadOnlyObservableCollection UpdateModes { get; private set; } public ObservableCollection Presets { get; private set; } public ReadOnlyObservableCollection UeGames { get; private set; } @@ -219,7 +208,6 @@ public class SettingsViewModel : ViewModel private ELodFormat _lodExportFormatSnapshot; private EMaterialFormat _materialExportFormatSnapshot; private ETextureFormat _textureExportFormatSnapshot; - private bool _readScriptDataSnapshot; private bool _mappingsUpdate = false; @@ -274,7 +262,6 @@ public class SettingsViewModel : ViewModel _lodExportFormatSnapshot = UserSettings.Default.LodExportFormat; _materialExportFormatSnapshot = UserSettings.Default.MaterialExportFormat; _textureExportFormatSnapshot = UserSettings.Default.TextureExportFormat; - _readScriptDataSnapshot = UserSettings.Default.ReadScriptData; SelectedUpdateMode = _updateModeSnapshot; SelectedPreset = _presetSnapshot; @@ -291,7 +278,6 @@ public class SettingsViewModel : ViewModel SelectedLodExportFormat = _lodExportFormatSnapshot; SelectedMaterialExportFormat = _materialExportFormatSnapshot; SelectedTextureExportFormat = _textureExportFormatSnapshot; - SelectedReadScriptData = _readScriptDataSnapshot; SelectedAesReload = UserSettings.Default.AesReload; SelectedDiscordRpc = UserSettings.Default.DiscordRpc; @@ -408,7 +394,6 @@ public class SettingsViewModel : ViewModel UserSettings.Default.LodExportFormat = SelectedLodExportFormat; UserSettings.Default.MaterialExportFormat = SelectedMaterialExportFormat; UserSettings.Default.TextureExportFormat = SelectedTextureExportFormat; - UserSettings.Default.ReadScriptData = SelectedReadScriptData; UserSettings.Default.AesReload = SelectedAesReload; UserSettings.Default.DiscordRpc = SelectedDiscordRpc; diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml index 589ff037..f3794200 100644 --- a/FModel/Views/SettingsView.xaml +++ b/FModel/Views/SettingsView.xaml @@ -210,19 +210,15 @@ - - + + - +