Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-24 02:34:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

small bug fixes

Browse Source
This commit is contained in:
iAmAsval 2020-05-26 10:36:42 +02:00
parent e9de63b69e
commit cc1520b4a7
9 changed files with 42 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FModel/Grabber/Aes/AesGrabber.cs
View File

@ -10,7 +10,7 @@ namespace FModel.Grabber.Aes
{
static class AesGrabber
{
public static async Task<bool> Load(bool forceReload = false, bool forceReloadMain = false)
public static async Task<bool> 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}");

13
FModel/Grabber/Cdn/CdnDataGrabber.cs
View File

@ -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<BackupMenuItemViewModel> backupsInfos = await GetBackups().ConfigureAwait(false);
if (backupsInfos.Any())

21
FModel/Grabber/Paks/PaksGrabber.cs
View File

@ -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 { });
});
}
}
}

13
FModel/MainWindow.xaml.cs
View File

@ -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

11
FModel/Properties/Resources.Designer.cs generated
View File

@ -2656,12 +2656,11 @@ namespace FModel.Properties {
/// <summary>
/// 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:.
/// </summary>
public static string TranslatorsFDetails {
get {

23
FModel/Properties/Resources.es.resx
View File

@ -292,13 +292,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite.</value>
<data name="ContributorsF" xml:space="preserve">
<value>Contributors</value>
</data>
<data name="ContributorsFDetails" xml:space="preserve">
<value>• Waddlesworth • Maiky
• FunGames • Not Officer
• PsychoPast • TSG
• XTigerHyperX • FireMonkey</value>
<comment>Do not translate</comment>
</data>
<data name="CopySuccess" xml:space="preserve">
<value>¡Copiado!</value>
</data>
@ -360,11 +353,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite.</value>
<data name="DonatorsF" xml:space="preserve">
<value>Donadores</value>
</data>
<data name="DonatorsFDetails" xml:space="preserve">
<value>• Yanteh • FunGames
• HYPEX • Alexander</value>
<comment>Do not translate</comment>
</data>
<data name="DownloadError" xml:space="preserve">
<value>Error al descargar {0}</value>
</data>
@ -973,17 +961,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite.</value>
<data name="TranslatorsF" xml:space="preserve">
<value>Traductores</value>
</data>
<data name="TranslatorsFDetails" xml:space="preserve">
<value>• 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:</value>
<comment>Do not translate</comment>
</data>
<data name="Turkish" xml:space="preserve">
<value>Turco</value>
</data>

11
FModel/Properties/Resources.resx
View File

@ -977,12 +977,11 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="TranslatorsFDetails" xml:space="preserve">
<value>• 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:</value>
• ES: Maiky.M#9879 • AR: PsychoPast#0001
• JA: FNJPNews#7820 • KO:
• PL: • PT-BR:
• RU: Seawod#4311 • TR:
• ZH-CN: • ZH-Hant:</value>
<comment>Do not translate</comment>
</data>
<data name="Turkish" xml:space="preserve">

3
FModel/Utils/Keys.cs
View File

@ -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}");
}
}

2
FModel/Windows/AESManager/AESManager.xaml.cs
View File

@ -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