From e668c539471c16a9fb08d0bc65f54dc3a0691b8f Mon Sep 17 00:00:00 2001 From: LongerWarrior Date: Fri, 4 Oct 2024 01:32:57 +0300 Subject: [PATCH] bump --- CUE4Parse | 2 +- FModel/ViewModels/CUE4ParseViewModel.cs | 35 ++++++++++++++----------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index f30b4807..69c71336 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit f30b4807467a6d91bdb10210ff20db5812160bbf +Subproject commit 69c713361fb53c07a5c55a771555817d2bd28159 diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 7b6a4c5a..57ee9ec2 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -15,6 +15,7 @@ using CUE4Parse.Compression; using CUE4Parse.Encryption.Aes; using CUE4Parse.FileProvider; using CUE4Parse.FileProvider.Vfs; +using CUE4Parse.GameTypes.ApexMobile.Encryption.Aes; using CUE4Parse.GameTypes.DBD.Encryption.Aes; using CUE4Parse.GameTypes.DeltaForce.Encryption.Aes; using CUE4Parse.GameTypes.DreamStar.Encryption.Aes; @@ -23,8 +24,9 @@ using CUE4Parse.GameTypes.FunkoFusion.Encryption.Aes; using CUE4Parse.GameTypes.MJS.Encryption.Aes; using CUE4Parse.GameTypes.NetEase.MAR.Encryption.Aes; using CUE4Parse.GameTypes.PAXDEI.Encryption.Aes; -using CUE4Parse.GameTypes.Rennsport.Encryption.Aes; -using CUE4Parse.GameTypes.UDWN.Encryption.Aes; +using CUE4Parse.GameTypes.Rennsport.Encryption.Aes; +using CUE4Parse.GameTypes.Snowbreak.Encryption.Aes; +using CUE4Parse.GameTypes.UDWN.Encryption.Aes; using CUE4Parse.GameTypes.THPS.Encryption.Aes; using CUE4Parse.MappingsProvider; using CUE4Parse.UE4.AssetRegistry; @@ -50,7 +52,6 @@ using CUE4Parse.UE4.Wwise; using CUE4Parse_Conversion; using CUE4Parse_Conversion.Sounds; - using EpicManifestParser; using FModel.Creator; @@ -192,6 +193,8 @@ public class CUE4ParseViewModel : ViewModel Provider.ReadScriptData = UserSettings.Default.ReadScriptData; Provider.CustomEncryption = Provider.Versions.Game switch { + EGame.GAME_ApexLegendsMobile => ApexLegendsMobileAes.DecryptApexMobile, + EGame.GAME_Snowbreak => SnowbreakAes.SnowbreakDecrypt, EGame.GAME_MarvelRivals => MarvelAes.MarvelDecrypt, EGame.GAME_Undawn => ToaaAes.ToaaDecrypt, EGame.GAME_DeadByDaylight => DBDAes.DbDDecrypt, @@ -200,8 +203,8 @@ public class CUE4ParseViewModel : ViewModel EGame.GAME_DreamStar => DreamStarAes.DreamStarDecrypt, EGame.GAME_DeltaForceHawkOps => DeltaForceAes.DeltaForceDecrypt, EGame.GAME_MonsterJamShowdown => MonsterJamShowdownAes.MonsterJamShowdownDecrypt, - EGame.GAME_Rennsport => RennsportAes.RennsportDecrypt, - EGame.GAME_FunkoFusion => FunkoFusionAes.FunkoFusionDecrypt, + EGame.GAME_Rennsport => RennsportAes.RennsportDecrypt, + EGame.GAME_FunkoFusion => FunkoFusionAes.FunkoFusionDecrypt, EGame.GAME_TonyHawkProSkater12 => THPS12Aes.THPS12Decrypt, _ => Provider.CustomEncryption }; @@ -606,7 +609,7 @@ public class CUE4ParseViewModel : ViewModel case "umap": { var exports = Provider.LoadAllObjects(fullPath); - TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), saveProperties, updateUi); + TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), saveProperties, updateUi); if (HasFlag(bulk, EBulkType.Properties)) break; // do not search for viewable exports if we are dealing with jsons foreach (var e in exports) @@ -684,16 +687,16 @@ public class CUE4ParseViewModel : ViewModel } break; - } - case "bin" when fileName.Contains("GlobalShaderCache"): - { - if (Provider.TryCreateReader(fullPath, out var archive)) - { - var registry = new FGlobalShaderCache(archive); - TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(registry, Formatting.Indented), saveProperties, updateUi); - } - - break; + } + case "bin" when fileName.Contains("GlobalShaderCache", StringComparison.OrdinalIgnoreCase): + { + if (Provider.TryCreateReader(fullPath, out var archive)) + { + var registry = new FGlobalShaderCache(archive); + TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(registry, Formatting.Indented), saveProperties, updateUi); + } + + break; } case "bnk": case "pck":