diff --git a/CUE4Parse b/CUE4Parse index c085c582..a2fe8e78 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit c085c5827b8ee3077f96a88bb9eb77e141c0220d +Subproject commit a2fe8e78ecce6be9f1cd87cc2f1a3fadf616a543 diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index ef19b719..16f2c2b8 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -32,6 +32,7 @@ using CUE4Parse.UE4.Wwise; using CUE4Parse_Conversion; using CUE4Parse_Conversion.Sounds; using CUE4Parse.FileProvider.Objects; +using CUE4Parse.UE4.Objects.Core.Serialization; using EpicManifestParser.Objects; using FModel.Creator; using FModel.Extensions; @@ -132,7 +133,7 @@ public class CUE4ParseViewModel : ViewModel Provider = new StreamedFileProvider("FortniteLive", true, new VersionContainer( UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform, - customVersions: UserSettings.Default.OverridedCustomVersions[Game], + customVersions: new FCustomVersionContainer(UserSettings.Default.OverridedCustomVersions[Game]), optionOverrides: UserSettings.Default.OverridedOptions[Game])); break; } @@ -142,7 +143,7 @@ public class CUE4ParseViewModel : ViewModel Provider = new StreamedFileProvider("ValorantLive", true, new VersionContainer( UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform, - customVersions: UserSettings.Default.OverridedCustomVersions[Game], + customVersions: new FCustomVersionContainer(UserSettings.Default.OverridedCustomVersions[Game]), optionOverrides: UserSettings.Default.OverridedOptions[Game])); break; } @@ -152,7 +153,7 @@ public class CUE4ParseViewModel : ViewModel if (gameDirectory.Contains("eFootball")) parent = gameDirectory.SubstringBeforeLast("\\pak").SubstringAfterLast("\\"); Game = parent.ToEnum(FGame.Unknown); var versions = new VersionContainer(UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform, - customVersions: UserSettings.Default.OverridedCustomVersions[Game], + customVersions: new FCustomVersionContainer(UserSettings.Default.OverridedCustomVersions[Game]), optionOverrides: UserSettings.Default.OverridedOptions[Game], mapStructTypesOverrides: UserSettings.Default.OverridedMapStructTypes[Game]); @@ -185,7 +186,7 @@ public class CUE4ParseViewModel : ViewModel case FGame.Unknown when UserSettings.Default.ManualGames.TryGetValue(gameDirectory, out var settings): { versions = new VersionContainer(settings.OverridedGame, UserSettings.Default.OverridedPlatform, - customVersions: settings.OverridedCustomVersions, + customVersions: new FCustomVersionContainer(settings.OverridedCustomVersions), optionOverrides: settings.OverridedOptions, mapStructTypesOverrides: settings.OverridedMapStructTypes); goto default;