diff --git a/FModel/Grabber/Aes/AesGrabber.cs b/FModel/Grabber/Aes/AesGrabber.cs index 068ab210..02fe3ee8 100644 --- a/FModel/Grabber/Aes/AesGrabber.cs +++ b/FModel/Grabber/Aes/AesGrabber.cs @@ -10,7 +10,7 @@ namespace FModel.Grabber.Aes { static class AesGrabber { - public static async Task Load(bool forceReload = false, bool forceReloadMain = false) + public static async Task Load(bool forceReload = false) { if (Globals.Game == EGame.Fortnite && MenuItems.pakFiles.AtLeastOnePak()) { @@ -27,7 +27,7 @@ namespace FModel.Grabber.Aes BenResponse benResponse = await AesData.GetData().ConfigureAwait(false); if (benResponse != null) { - if (forceReloadMain || !staticKeys.TryGetValue(Globals.Game.ToString(), out var _) && !string.IsNullOrEmpty(benResponse.MainKey)) + if (!string.IsNullOrEmpty(benResponse.MainKey)) { string mainKey = $"0x{benResponse.MainKey.Substring(2).ToUpper()}"; DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[AES]", $"BenBot Main key is {mainKey}"); diff --git a/FModel/Grabber/Cdn/CdnDataGrabber.cs b/FModel/Grabber/Cdn/CdnDataGrabber.cs index 9008098c..c21ba4e3 100644 --- a/FModel/Grabber/Cdn/CdnDataGrabber.cs +++ b/FModel/Grabber/Cdn/CdnDataGrabber.cs @@ -25,13 +25,16 @@ namespace FModel.Grabber.Cdn public static async Task PopulateBackups() { - // Backup PAKs Menu Item - MenuItems.backupFiles.Add(new BackupMenuItemViewModel + Application.Current.Dispatcher.Invoke(delegate { - Header = Properties.Resources.BackupPaks, - Icon = new Image { Source = new BitmapImage(new Uri("Resources/backup-restore.png", UriKind.Relative)) } + // Backup PAKs Menu Item + MenuItems.backupFiles.Add(new BackupMenuItemViewModel + { + Header = Properties.Resources.BackupPaks, + Icon = new Image { Source = new BitmapImage(new Uri("Resources/backup-restore.png", UriKind.Relative)) } + }); + MenuItems.backupFiles.Add(new Separator { }); }); - MenuItems.backupFiles.Add(new Separator { }); List backupsInfos = await GetBackups().ConfigureAwait(false); if (backupsInfos.Any()) diff --git a/FModel/Grabber/Paks/PaksGrabber.cs b/FModel/Grabber/Paks/PaksGrabber.cs index 0fb590cd..b78df30b 100644 --- a/FModel/Grabber/Paks/PaksGrabber.cs +++ b/FModel/Grabber/Paks/PaksGrabber.cs @@ -1,7 +1,6 @@ using FModel.Logger; using FModel.Utils; using FModel.ViewModels.MenuItem; -using FModel.Windows.CustomNotifier; using FModel.Windows.Launcher; using PakReader.Pak; using System; @@ -104,17 +103,21 @@ namespace FModel.Grabber.Paks StaysOpenOnClick = true } }; - MenuItems.pakFiles.Add(parent); - // Load All - MenuItems.pakFiles.Add(new PakMenuItemViewModel + Application.Current.Dispatcher.Invoke(delegate { - Header = Properties.Resources.LoadAll, - Icon = new Image { Source = new BitmapImage(new Uri("Resources/folder-download.png", UriKind.Relative)) } - }); + MenuItems.pakFiles.Add(parent); - // Separator - MenuItems.pakFiles.Add(new Separator { }); + // Load All + MenuItems.pakFiles.Add(new PakMenuItemViewModel + { + Header = Properties.Resources.LoadAll, + Icon = new Image { Source = new BitmapImage(new Uri("Resources/folder-download.png", UriKind.Relative)) } + }); + + // Separator + MenuItems.pakFiles.Add(new Separator { }); + }); } } } diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index 1533c069..0b4fc284 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -72,11 +72,7 @@ namespace FModel DebugHelper.WriteUserSettings(); Folders.CheckWatermarks(); - await Task.WhenAll( - PaksGrabber.PopulateMenu(), - AesGrabber.Load(Properties.Settings.Default.ReloadAesKeys), - CdnDataGrabber.DoCDNStuff() - ).ContinueWith(t => + await Task.WhenAll(Init()).ContinueWith(t => { Keys.NoKeyGoodBye(); MenuItems.FeedCustomGoTos(); @@ -91,6 +87,13 @@ namespace FModel TaskScheduler.FromCurrentSynchronizationContext()); } + private async Task Init() + { + await PaksGrabber.PopulateMenu().ConfigureAwait(false); + await AesGrabber.Load(Properties.Settings.Default.ReloadAesKeys).ConfigureAwait(false); + await CdnDataGrabber.DoCDNStuff().ConfigureAwait(false); + } + private void AeConfiguration() { AvalonEditFindReplaceHelper Frm = new AvalonEditFindReplaceHelper diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 1cc57d07..4f92b5d7 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -2656,12 +2656,11 @@ namespace FModel.Properties { /// /// Recherche une chaîne localisée semblable à • EN: Asval#2291 • FR: Asval#2291 ///• DE: FunGames#6822 • IT: Angry Cat#5581 - ///• ES: Maiky.M#9879 • ES-419: Maiky.M#9879 - ///• AR: PsychoPast#0001 • JA: FNJPNews#7820 - ///• KO: • PL: - ///• PT-BR: • RU: Seawod#4311 - ///• TR: • ZH-CN: - ///• ZH-Hant:. + ///• ES: Maiky.M#9879 • AR: PsychoPast#0001 + ///• JA: FNJPNews#7820 • KO: + ///• PL: • PT-BR: + ///• RU: Seawod#4311 • TR: + ///• ZH-CN: • ZH-Hant:. /// public static string TranslatorsFDetails { get { diff --git a/FModel/Properties/Resources.es.resx b/FModel/Properties/Resources.es.resx index 4a6ee6dd..cb3ce6bf 100644 --- a/FModel/Properties/Resources.es.resx +++ b/FModel/Properties/Resources.es.resx @@ -292,13 +292,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite. Contributors - - • Waddlesworth • Maiky -• FunGames • Not Officer -• PsychoPast • TSG -• XTigerHyperX • FireMonkey - Do not translate - ¡Copiado! @@ -360,11 +353,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite. Donadores - - • Yanteh • FunGames -• HYPEX • Alexander - Do not translate - Error al descargar {0} @@ -973,17 +961,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite. Traductores - - • EN: Asval#2291 • FR: Asval#2291 -• DE: FunGames#6822 • IT: Angry Cat#5581 -• ES: Maiky.M#9879 • ES-419: Maiky.M#9879 -• AR: PsychoPast#0001 • JA: FNJPNews#7820 -• KO: • PL: -• PT-BR: • RU: Seawod#4311 -• TR: • ZH-CN: -• ZH-Hant: - Do not translate - Turco diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index b43ec0bb..8dabb630 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -977,12 +977,11 @@ It's now the most used free software to leak on Fortnite. • EN: Asval#2291 • FR: Asval#2291 • DE: FunGames#6822 • IT: Angry Cat#5581 -• ES: Maiky.M#9879 • ES-419: Maiky.M#9879 -• AR: PsychoPast#0001 • JA: FNJPNews#7820 -• KO: • PL: -• PT-BR: • RU: Seawod#4311 -• TR: • ZH-CN: -• ZH-Hant: +• ES: Maiky.M#9879 • AR: PsychoPast#0001 +• JA: FNJPNews#7820 • KO: +• PL: • PT-BR: +• RU: Seawod#4311 • TR: +• ZH-CN: • ZH-Hant: Do not translate diff --git a/FModel/Utils/Keys.cs b/FModel/Utils/Keys.cs index 19277e9e..6be2df39 100644 --- a/FModel/Utils/Keys.cs +++ b/FModel/Utils/Keys.cs @@ -1,7 +1,6 @@ using FModel.Logger; using FModel.ViewModels.MenuItem; using FModel.ViewModels.StatusBar; -using FModel.Windows.CustomNotifier; using Newtonsoft.Json; using PakReader; using PakReader.Parsers.Objects; @@ -77,7 +76,7 @@ namespace FModel.Utils catch (System.Exception e) { StatusBarVm.statusBarViewModel.Set(e.Message, Properties.Resources.Error); - FConsole.AppendText(string.Format(Properties.Resources.DynamicKeyNotWorking, $"0x{dKey}", menuItem.PakFile.FileName), FColors.Red); + FConsole.AppendText(string.Format(Properties.Resources.DynamicKeyNotWorking, $"0x{dKey}", menuItem.PakFile.FileName), FColors.Red, true); DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[AES]", $"0x{dKey} is NOT!!!! working with {menuItem.PakFile.FileName}"); } } diff --git a/FModel/Windows/AESManager/AESManager.xaml.cs b/FModel/Windows/AESManager/AESManager.xaml.cs index 9143a4bd..2826b8a3 100644 --- a/FModel/Windows/AESManager/AESManager.xaml.cs +++ b/FModel/Windows/AESManager/AESManager.xaml.cs @@ -121,7 +121,7 @@ namespace FModel.Windows.AESManager { if (Globals.Game == EGame.Fortnite) { - bool success = await AesGrabber.Load(true, true).ConfigureAwait(false); + bool success = await AesGrabber.Load(true).ConfigureAwait(false); if (success) { Application.Current.Dispatcher.Invoke(delegate