diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index eb16bcb4..da4599bc 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -283,7 +283,6 @@ - diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs index d5382ad0..c9884d71 100644 --- a/FModel/MainWindow.Designer.cs +++ b/FModel/MainWindow.Designer.cs @@ -321,7 +321,7 @@ namespace FModel this.AESManagerButton.Name = "AESManagerButton"; this.AESManagerButton.Size = new System.Drawing.Size(191, 21); this.AESManagerButton.TabIndex = 8; - this.AESManagerButton.Text = "AES Manager"; + this.AESManagerButton.Text = "AES &Manager"; this.AESManagerButton.UseVisualStyleBackColor = true; this.AESManagerButton.Click += new System.EventHandler(this.AESManagerButton_Click); // @@ -334,7 +334,7 @@ namespace FModel this.StopButton.Name = "StopButton"; this.StopButton.Size = new System.Drawing.Size(75, 21); this.StopButton.TabIndex = 6; - this.StopButton.Text = "Stop"; + this.StopButton.Text = "&Stop"; this.StopButton.UseVisualStyleBackColor = true; this.StopButton.Click += new System.EventHandler(this.StopButton_Click); // @@ -347,7 +347,7 @@ namespace FModel this.OpenImageButton.Name = "OpenImageButton"; this.OpenImageButton.Size = new System.Drawing.Size(75, 21); this.OpenImageButton.TabIndex = 5; - this.OpenImageButton.Text = "Open Image"; + this.OpenImageButton.Text = "&Open Image"; this.OpenImageButton.UseVisualStyleBackColor = true; this.OpenImageButton.Click += new System.EventHandler(this.OpenImageButton_Click); // @@ -378,7 +378,7 @@ namespace FModel this.ExtractButton.Name = "ExtractButton"; this.ExtractButton.Size = new System.Drawing.Size(75, 21); this.ExtractButton.TabIndex = 0; - this.ExtractButton.Text = "Extract"; + this.ExtractButton.Text = "&Extract"; this.ExtractButton.UseVisualStyleBackColor = true; this.ExtractButton.Click += new System.EventHandler(this.ExtractButton_Click); // @@ -499,12 +499,12 @@ namespace FModel this.copyFilesToolStripMenuItem, this.saveAsJSONToolStripMenuItem1}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(181, 92); + this.contextMenuStrip1.Size = new System.Drawing.Size(144, 70); // // extractToolStripMenuItem // this.extractToolStripMenuItem.Name = "extractToolStripMenuItem"; - this.extractToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.extractToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.extractToolStripMenuItem.Text = "Extract"; this.extractToolStripMenuItem.Click += new System.EventHandler(this.extractToolStripMenuItem_Click); // @@ -516,7 +516,7 @@ namespace FModel this.copyFilePathWithoutExtensionToolStripMenuItem, this.copyFileNameWithoutExtensionToolStripMenuItem}); this.copyFilesToolStripMenuItem.Name = "copyFilesToolStripMenuItem"; - this.copyFilesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.copyFilesToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.copyFilesToolStripMenuItem.Text = "Copy File"; // // copyFileToolStripMenuItem @@ -550,7 +550,7 @@ namespace FModel // saveAsJSONToolStripMenuItem1 // this.saveAsJSONToolStripMenuItem1.Name = "saveAsJSONToolStripMenuItem1"; - this.saveAsJSONToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.saveAsJSONToolStripMenuItem1.Size = new System.Drawing.Size(143, 22); this.saveAsJSONToolStripMenuItem1.Text = "Save as JSON"; this.saveAsJSONToolStripMenuItem1.Click += new System.EventHandler(this.saveAsJSONToolStripMenuItem1_Click); // diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 31b3df2a..be72cf3b 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -143,13 +143,19 @@ namespace FModel /// private void checkAndAddDynamicKeys() { + List toCheck = null; if (!File.Exists(DynamicKeysManager.path)) { DynamicKeysManager.AESEntries = new List(); DynamicKeysManager.serialize("", ""); } + else + { + DynamicKeysManager.deserialize(); + toCheck = DynamicKeysManager.AESEntries; + } - string[] _backupDynamicKeys = null; + string[] BackupDynamicKeys = null; if (DLLImport.IsInternetAvailable() && (!string.IsNullOrWhiteSpace(Settings.Default.eEmail) && !string.IsNullOrWhiteSpace(Settings.Default.ePassword))) { string myContent = DynamicPAKs.GetEndpoint("https://fortnite-public-service-prod11.ol.epicgames.com/fortnite/api/storefront/v2/keychain", true); @@ -162,14 +168,14 @@ namespace FModel { AppendText("EPIC Authentication Success.", Color.DarkGreen, true); AppendText("", Color.Green, true); - _backupDynamicKeys = AesKeyParser.FromJson(myContent); + BackupDynamicKeys = AesKeyParser.FromJson(myContent); } } - if (_backupDynamicKeys != null) + if (BackupDynamicKeys != null) { DynamicKeysManager.AESEntries = new List(); - foreach (string myString in _backupDynamicKeys) + foreach (string myString in BackupDynamicKeys) { string[] parts = myString.Split(':'); string apiGuid = DynamicPAKs.getPakGuidFromKeychain(parts); @@ -186,8 +192,24 @@ namespace FModel DynamicKeysManager.serialize(aeskey.ToUpper(), actualPakName); - AppendText(actualPakName, Color.SeaGreen); - AppendText(" can be opened.", Color.Black, true); + #region DISPLAY PAKS + if (toCheck != null) + { + //display new paks that can be opened + bool wasThereBeforeStartup = toCheck.Where(i => i.thePak == actualPakName).Any(); + if (!wasThereBeforeStartup) + { + AppendText(actualPakName, Color.SeaGreen); + AppendText(" can now be opened.", Color.Black, true); + } + } + else + { + //display all paks that can be opened + AppendText(actualPakName, Color.SeaGreen); + AppendText(" can be opened.", Color.Black, true); + } + #endregion } } AppendText("", Color.Green, true); @@ -1215,8 +1237,7 @@ namespace FModel ItemIcon.DrawWatermark(g); - Image bg512 = Resources.BG512; - g.DrawImage(bg512, new Point(5, 383)); + g.FillRectangle(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), new Rectangle(5, 383, 512, 134)); DrawText.DrawTexts(theItem, g, specialMode); diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx index 528d10e7..6949cabc 100644 --- a/FModel/MainWindow.resx +++ b/FModel/MainWindow.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa - CAAAAk1TRnQBSQFMAgEBAgEAAZgBAQGYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAagBAQGoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/FModel/Methods/IconGenerator/DrawText.cs b/FModel/Methods/IconGenerator/DrawText.cs index e3a12607..ef5f49e7 100644 --- a/FModel/Methods/IconGenerator/DrawText.cs +++ b/FModel/Methods/IconGenerator/DrawText.cs @@ -310,7 +310,7 @@ namespace FModel { itemIcon = new Bitmap(bmpTemp); } - myGraphic.DrawImage(ImageUtilities.ResizeImage(itemIcon, 122, 122), new Point(395, 282)); + myGraphic.DrawImage(ImageUtilities.ResizeImage(itemIcon, 122, 122), new Point(275, 272)); } } diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 1fee12f8..7995e736 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -60,16 +60,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap BG512 { - get { - object obj = ResourceManager.GetObject("BG512", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Byte[]. /// diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index a723ebbd..b521ace4 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -130,9 +130,6 @@ ..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\BG512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\C512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/FModel/Resources/BG512.png b/FModel/Resources/BG512.png deleted file mode 100644 index eb259cef..00000000 Binary files a/FModel/Resources/BG512.png and /dev/null differ diff --git a/README.md b/README.md index 9c922556..eea4af2a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -# FModel +# FModel [![](https://img.shields.io/github/downloads/iAmAsval/FModel/total.svg?color=green&label=Total%20Downloads&logo=buzzfeed&logoColor=white)](https://github.com/iAmAsval/FModel/releases) +[![](https://img.shields.io/github/downloads/iAmAsval/FModel/latest/total.svg?label=Latest%20Release%20Download%20Count&logo=buzzfeed&logoColor=white)](https://github.com/iAmAsval/FModel//releases/latest) [![](https://img.shields.io/badge/License-GPL-blue.svg?logo=gnu)](https://github.com/iAmAsval/FModel/blob/master/LICENSE) [![](https://img.shields.io/badge/Twitter-@AsvalFN-1da1f2.svg?logo=twitter)](https://twitter.com/AsvalFN) [![](https://img.shields.io/badge/Discord-Need%20Help%3F-7289da.svg?logo=discord)](https://discord.gg/JmWvXKb)