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

deleted BG512.png + only display "pak can be opened" if it's new + useful hotkey

Browse Source
This commit is contained in:
Asval 2019-06-30 16:00:06 +02:00
parent 3e3faca354
commit 0964a43e41
9 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FModel/FModel.csproj
View File

@ -283,7 +283,6 @@
<None Include="Resources\L512.png" />
<None Include="Resources\E512.png" />
<None Include="Resources\C512.png" />
<None Include="Resources\BG512.png" />
<None Include="Resources\properties_16xLG.png" />
<None Include="Resources\StatusAnnotations_Information_16xLG_color.png" />
<None Include="Resources\folder_Closed_16xLG.png" />

16
FModel/MainWindow.Designer.cs generated
View File

@ -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);
//

37
FModel/MainWindow.cs
View File

@ -143,13 +143,19 @@ namespace FModel
/// </summary>
private void checkAndAddDynamicKeys()
{
List<AESEntry> toCheck = null;
if (!File.Exists(DynamicKeysManager.path))
{
DynamicKeysManager.AESEntries = new List<AESEntry>();
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<AESEntry>();
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);

2
FModel/MainWindow.resx
View File

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

2
FModel/Methods/IconGenerator/DrawText.cs
View File

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

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

@ -60,16 +60,6 @@ namespace FModel.Properties {
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap BG512 {
get {
object obj = ResourceManager.GetObject("BG512", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Byte[].
/// </summary>

3
FModel/Properties/Resources.resx
View File

@ -130,9 +130,6 @@
<data name="properties_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="BG512" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\BG512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="C512" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\C512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
FModel/Resources/BG512.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 642 B

3
README.md
View File

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