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

added toolstrip to download my backups + fixed QuestBundle_S9_Fortbyte_LoadingScreen

Browse Source
This commit is contained in:
Asval
2019-08-06 12:38:07 +02:00
parent ac40a8c41c
commit 621a3067fe
13 changed files with 160 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FModel/FModel.csproj
View File

@@ -159,6 +159,7 @@
<Compile Include="Methods\IconGenerator\Translations\LoadLocRes.cs" />
<Compile Include="Methods\IconGenerator\Translations\SearchResource.cs" />
<Compile Include="Methods\ImagesMerger\ImagesMerger.cs" />
<Compile Include="Methods\PakHelper\BackupFilesEntry.cs" />
<Compile Include="Methods\PakHelper\CreateBackup.cs" />
<Compile Include="Methods\PakHelper\PakHelper.cs" />
<Compile Include="Methods\Serializer\AssetReader.cs" />

6
FModel/Forms/Settings.Designer.cs generated
View File

@@ -428,11 +428,11 @@ namespace FModel.Forms
//
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.Color.Red;
this.label7.Location = new System.Drawing.Point(89, 113);
this.label7.Location = new System.Drawing.Point(106, 113);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(117, 13);
this.label7.Size = new System.Drawing.Size(86, 13);
this.label7.TabIndex = 33;
this.label7.Text = "Banner Size: 1024x256";
this.label7.Text = "4:1 Aspect Ratio";
//
// button4
//

4
FModel/Forms/Settings.cs
View File

@@ -34,7 +34,7 @@ namespace FModel.Forms
textBox6.Text = Properties.Settings.Default.challengesWatermark;
if (string.IsNullOrWhiteSpace(textBox6.Text))
{
textBox6.Text = "{Bundle_Name} Generated using FModel & JohnWickParse - {Date}";
textBox6.Text = "@UseTheWatermarkBecauseWhyNot - {Date}";
}
else { textBox6.Text = Properties.Settings.Default.challengesWatermark; }
@@ -291,7 +291,7 @@ namespace FModel.Forms
newForm.Size = pictureBox1.Image.Size;
newForm.Icon = Resources.FModel;
newForm.Text = ThePak.CurrentUsedItem;
newForm.Text = "Challenges Design Template";
newForm.StartPosition = FormStartPosition.CenterScreen;
newForm.Controls.Add(pb);
newForm.Show();

46
FModel/MainWindow.Designer.cs generated
View File

@@ -48,6 +48,7 @@ namespace FModel
this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.saveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoSaveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.copySelectedFilePathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
@@ -88,7 +89,8 @@ namespace FModel
this.saveAsJSONToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.extractFolderContentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoSaveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.downloadBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -155,7 +157,9 @@ namespace FModel
this.loadOneToolStripMenuItem,
this.loadAllToolStripMenuItem,
this.toolStripSeparator1,
this.downloadBackupsToolStripMenuItem,
this.backupPAKsToolStripMenuItem,
this.toolStripSeparator8,
this.differenceModeToolStripMenuItem,
this.updateModeToolStripMenuItem,
this.toolStripSeparator2,
@@ -167,26 +171,26 @@ namespace FModel
// loadOneToolStripMenuItem
//
this.loadOneToolStripMenuItem.Name = "loadOneToolStripMenuItem";
this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.loadOneToolStripMenuItem.Text = "Load One PAK";
this.loadOneToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.loadOneToolStripMenuItem_DropDownItemClicked);
//
// loadAllToolStripMenuItem
//
this.loadAllToolStripMenuItem.Name = "loadAllToolStripMenuItem";
this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.loadAllToolStripMenuItem.Text = "Load All PAKs";
this.loadAllToolStripMenuItem.Click += new System.EventHandler(this.loadAllToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(217, 6);
//
// backupPAKsToolStripMenuItem
//
this.backupPAKsToolStripMenuItem.Name = "backupPAKsToolStripMenuItem";
this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.backupPAKsToolStripMenuItem.Text = "Backup PAKs";
this.backupPAKsToolStripMenuItem.Click += new System.EventHandler(this.backupPAKsToolStripMenuItem_Click);
//
@@ -194,7 +198,7 @@ namespace FModel
//
this.differenceModeToolStripMenuItem.CheckOnClick = true;
this.differenceModeToolStripMenuItem.Name = "differenceModeToolStripMenuItem";
this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.differenceModeToolStripMenuItem.Text = "Difference Mode";
this.differenceModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.differenceModeToolStripMenuItem_CheckedChanged);
//
@@ -203,21 +207,21 @@ namespace FModel
this.updateModeToolStripMenuItem.CheckOnClick = true;
this.updateModeToolStripMenuItem.Enabled = false;
this.updateModeToolStripMenuItem.Name = "updateModeToolStripMenuItem";
this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.updateModeToolStripMenuItem.Text = "Update Mode";
this.updateModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.updateModeToolStripMenuItem_CheckedChanged);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(159, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(217, 6);
//
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.Image = global::FModel.Properties.Resources.properties_16xLG;
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1;
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.settingsToolStripMenuItem.Text = "Settings";
this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
//
@@ -257,6 +261,13 @@ namespace FModel
this.saveAsJSONToolStripMenuItem.Text = "Save as JSON";
this.saveAsJSONToolStripMenuItem.Click += new System.EventHandler(this.SaveAsJSONToolStripMenuItem_Click);
//
// autoSaveAsJSONToolStripMenuItem
//
this.autoSaveAsJSONToolStripMenuItem.CheckOnClick = true;
this.autoSaveAsJSONToolStripMenuItem.Name = "autoSaveAsJSONToolStripMenuItem";
this.autoSaveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.autoSaveAsJSONToolStripMenuItem.Text = "Auto Save as JSON";
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
@@ -621,12 +632,17 @@ namespace FModel
this.extractFolderContentsToolStripMenuItem.Text = "Extract Folder Contents";
this.extractFolderContentsToolStripMenuItem.Click += new System.EventHandler(this.ExtractFolderContentsToolStripMenuItem_Click);
//
// autoSaveAsJSONToolStripMenuItem
// toolStripSeparator8
//
this.autoSaveAsJSONToolStripMenuItem.CheckOnClick = true;
this.autoSaveAsJSONToolStripMenuItem.Name = "autoSaveAsJSONToolStripMenuItem";
this.autoSaveAsJSONToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.autoSaveAsJSONToolStripMenuItem.Text = "Auto Save as JSON";
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(217, 6);
//
// downloadBackupsToolStripMenuItem
//
this.downloadBackupsToolStripMenuItem.Name = "downloadBackupsToolStripMenuItem";
this.downloadBackupsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.downloadBackupsToolStripMenuItem.Text = "Download Backups";
this.downloadBackupsToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.DownloadBackupsToolStripMenuItem_DropDownItemClicked);
//
// MainWindow
//
@@ -722,6 +738,8 @@ namespace FModel
private System.Windows.Forms.ToolStripMenuItem openExtractionFolderToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripMenuItem autoSaveAsJSONToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem downloadBackupsToolStripMenuItem;
}
}

45
FModel/MainWindow.cs
View File

@@ -17,6 +17,7 @@ using FModel.Forms;
using FModel.Properties;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using RestSharp;
using Image = System.Drawing.Image;
using Settings = FModel.Properties.Settings;
@@ -102,6 +103,19 @@ namespace FModel
loadOneToolStripMenuItem.DropDownItems.Add(thePak);
}));
}
private void AddBackupFiles()
{
if (CreateBackup.backupFilesList != null && CreateBackup.backupFilesList.Count > 0)
{
foreach (var item in CreateBackup.backupFilesList)
{
Invoke(new Action(() =>
{
downloadBackupsToolStripMenuItem.DropDownItems.Add(item.bFileName);
}));
}
}
}
/// <summary>
/// check if path exists
@@ -169,6 +183,8 @@ namespace FModel
FillWithPaKs();
AddToUI.checkAndAddDynamicKeys();
Utilities.colorMyPaks(loadOneToolStripMenuItem);
CreateBackup.GetFilesFromDropbox();
AddBackupFiles();
Utilities.SetFolderPermission(App.DefaultOutputPath);
Utilities.CreateDefaultFolders();
});
@@ -538,6 +554,35 @@ namespace FModel
CreateBackup.CreateBackupList();
});
}
private async void DownloadBackupsToolStripMenuItem_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
await Task.Run(() => {
if (CreateBackup.backupFilesList != null && CreateBackup.backupFilesList.Count > 0)
{
string filename = CreateBackup.backupFilesList.Where(x => string.Equals(x.bFileName, e.ClickedItem.Text)).Select(x => x.bFileName).FirstOrDefault();
string downloadLink = CreateBackup.backupFilesList.Where(x => string.Equals(x.bFileName, e.ClickedItem.Text)).Select(x => x.bFileDownload).FirstOrDefault();
if (!string.IsNullOrEmpty(downloadLink))
{
new UpdateMyState("Downloading " + filename, "Waiting").ChangeProcessState();
RestClient EndpointClient = new RestClient(downloadLink);
RestRequest EndpointRequest = new RestRequest(Method.GET);
string content = EndpointClient.Execute(EndpointRequest).Content;
File.WriteAllText(App.DefaultOutputPath + "\\Backup\\" + filename, content);
if (new System.IO.FileInfo(App.DefaultOutputPath + "\\Backup\\" + filename).Length > 0)
{
new UpdateMyState("\\Backup\\" + filename + " successfully downloaded", "Success").ChangeProcessState();
}
else
{
File.Delete(App.DefaultOutputPath + "\\Backup\\" + filename);
new UpdateMyState("Can't download " + filename, "Error").ChangeProcessState();
}
}
}
});
}
//UPDATE MODE
private void backgroundWorker2_DoWork(object sender, DoWorkEventArgs e)

2
FModel/MainWindow.resx
View File

@@ -131,7 +131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa
CAAAAk1TRnQBSQFMAgEBAgEAAfABAQHwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAfgBAQH4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

4
FModel/Methods/IconGenerator/ChallengeGenerator/BundleDesign.cs
View File

@@ -227,7 +227,9 @@ namespace FModel
JToken bundleCompletionRewards = myBundle["BundleCompletionRewards"];
if (bundleCompletionRewards != null)
{
new UpdateMyState("Drawing Completion Rewards...", "Waiting").ChangeProcessState();
theY += 35;
JArray bundleCompletionRewardsArray = bundleCompletionRewards.Value<JArray>();
foreach (JToken token in bundleCompletionRewardsArray)
{
@@ -267,7 +269,7 @@ namespace FModel
{
string rewardId = Path.GetFileName(assetPathName.Value<string>().Substring(0, assetPathName.Value<string>().LastIndexOf(".", StringComparison.Ordinal)));
if (!assetPathName.Value<string>().Contains("/Game/Items/Tokens/") && !rewardId.Contains("Quest_BR_")) //no fortbyte for weekly challenges
if (!assetPathName.Value<string>().Contains("/Game/Items/Tokens/") && !rewardId.Contains("Quest_BR_")) //no more fortbyte for weekly challenges
{
theY += 90;
drawCompletionText(myBitmap, compCount);

18
FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs
View File

@@ -181,14 +181,24 @@ namespace FModel
JToken description = token["Description"];
if (description != null)
{
descriptionKey = description["key"].Value<string>();
descriptionSource = description["source_string"].Value<string>();
JToken key = description["key"];
JToken sourceString = description["source_string"];
if (key != null && sourceString != null)
{
descriptionKey = key.Value<string>();
descriptionSource = sourceString.Value<string>();
}
}
JToken descriptionMain = AssetArray[0]["Description"];
if (descriptionMain != null)
{
descriptionKey = descriptionMain["key"].Value<string>();
descriptionSource = descriptionMain["source_string"].Value<string>();
JToken key = descriptionMain["key"];
JToken sourceString = descriptionMain["source_string"];
if (key != null && sourceString != null)
{
descriptionKey = key.Value<string>();
descriptionSource = sourceString.Value<string>();
}
}
}

4
FModel/Methods/IconGenerator/ChallengeGenerator/ChallengeInfoEntry.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FModel
{

20
FModel/Methods/PakHelper/BackupFilesEntry.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
namespace FModel
{
public struct BackupFilesEntry : IEquatable<BackupFilesEntry>
{
internal BackupFilesEntry(string fileName, string fileDownload)
{
bFileName = fileName;
bFileDownload = fileDownload;
}
public string bFileName { get; set; }
public string bFileDownload { get; set; }
bool IEquatable<BackupFilesEntry>.Equals(BackupFilesEntry other)
{
throw new NotImplementedException();
}
}
}

35
FModel/Methods/PakHelper/CreateBackup.cs
View File

@@ -1,6 +1,8 @@
using csharp_wick;
using FModel.Properties;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -10,6 +12,8 @@ namespace FModel
{
static class CreateBackup
{
public static List<BackupFilesEntry> backupFilesList { get; set; }
public static void CreateBackupList()
{
PakExtractor extractor = null;
@@ -79,7 +83,7 @@ namespace FModel
}
File.WriteAllText(App.DefaultOutputPath + "\\Backup" + Checking.BackupFileName, sb.ToString()); //File will always exist so we check the file size instead
if (new System.IO.FileInfo(App.DefaultOutputPath + "\\Backup" + Checking.BackupFileName).Length > 0)
if (new FileInfo(App.DefaultOutputPath + "\\Backup" + Checking.BackupFileName).Length > 0)
{
new UpdateMyState("\\Backup" + Checking.BackupFileName + " successfully created", "Success").ChangeProcessState();
}
@@ -89,5 +93,34 @@ namespace FModel
new UpdateMyState("Can't create " + Checking.BackupFileName.Substring(1), "Error").ChangeProcessState();
}
}
public static void GetFilesFromDropbox()
{
try
{
if (DLLImport.IsInternetAvailable())
{
string backupFiles = Keychain.GetEndpoint("https://dl.dropbox.com/s/lngkoq2ucd9di2n/FModel_Backups.json?dl=0");
backupFilesList = new List<BackupFilesEntry>();
if (!string.IsNullOrEmpty(backupFiles))
{
JArray array = JArray.Parse(backupFiles);
foreach (JProperty prop in array.Children<JObject>().Properties())
{
backupFilesList.Add(new BackupFilesEntry(prop.Name, prop.Value.Value<string>()));
}
}
}
else
{
new UpdateMyConsole("Your internet connection is currently unavailable, can't check for backup files at the moment.", Color.Red, true).AppendToConsole();
}
}
catch (Exception)
{
new UpdateMyConsole("[FModel] Error while checking for backup files", Color.Red, true).AppendToConsole();
}
}
}
}

6
FModel/Methods/PakHelper/PakHelper.cs
View File

@@ -70,9 +70,11 @@ namespace FModel
{
theExtractor = new PakExtractor(Settings.Default.PAKsPath + "\\" + pakName, pakKey);
}
catch (Exception)
catch (Exception ex)
{
new UpdateMyConsole("0x" + pakKey + " doesn't work with " + ThePak.dynamicPaksList[i].thePak, Color.Red, true).AppendToConsole();
if (string.Equals(ex.Message, "Extraction failed")) { new UpdateMyConsole("0x" + pakKey + " doesn't work with " + ThePak.dynamicPaksList[i].thePak, Color.Red, true).AppendToConsole(); }
else { new UpdateMyConsole("Message: " + ex.Message + "\nSource: " + ex.Source + "\nTarget: " + ex.TargetSite, Color.Red, true).AppendToConsole(); }
if (theExtractor != null) { theExtractor.Dispose(); }
continue;
}

1
README.md
View File

@@ -75,6 +75,7 @@ Also if you find this project useful, feel free to give it a :star: thank you :k
- [ScintillaNET](https://www.nuget.org/packages/jacobslusser.ScintillaNET)
- [Find & Replace for ScintillaNET](https://www.nuget.org/packages/snt.ScintillaNet.FindReplaceDialog/)
- [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
- [Cyotek ColorPicker](https://github.com/cyotek/Cyotek.Windows.Forms.ColorPicker)
### Contributors
<table><tr><td align="center"><a href="https://github.com/SirWaddles"><img src="https://avatars1.githubusercontent.com/u/769399?s=200&v=4" width="100px;" alt="Waddlesworth"/><br /><sub><b>Waddlesworth</b></sub></a><br><a href="https://github.com/SirWaddles" title="Github">🔧</a></td><td align="center"><a href="https://github.com/MaikyM"><img src="https://avatars3.githubusercontent.com/u/51415805?s=200&v=4" width="100px;" alt="Maiky M"/><br /><sub><b>Maiky M</b></sub></a><br /><a href="https://github.com/MaikyM" title="Github">🔧</a><a href="https://twitter.com/MaikyMOficial" title="Twitter">🐦</a></td><td align="center"><a href="https://github.com/AyeTSG"><img src="https://avatars1.githubusercontent.com/u/49595354?s=200&v=4" width="100px;" alt="AyeTSG"/><br><sub><b>AyeTSG</b></sub></a><br><a href="https://github.com/AyeTSG" title="Github">🔧</a><a href="https://twitter.com/AyeTSG" title="Twitter">🐦</a></td><td align="center"><a href="https://github.com/ItsFireMonkey"><img src="https://avatars2.githubusercontent.com/u/38590471?s=200&v=4" width="100px;" alt="FireMonkey"/><br /><sub><b>FireMonkey</b></sub></a><br><a href="https://github.com/ItsFireMonkey" title="Github">🔧</a><a href="https://twitter.com/iFireMonkey" title="Twitter">🐦</a></td></tr></table>