Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-25 02:44:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

uncommon rarity but with less saturation + uplugin to json + added folder extract by right clicking on a folder

Browse Source
This commit is contained in:
Asval
2019-07-08 15:40:15 +02:00
parent f7d2b71294
commit 4959f98bcd
5 changed files with 100 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
FModel/MainWindow.Designer.cs generated
View File

@@ -53,6 +53,8 @@ namespace FModel
this.autoSaveImagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.mergeImagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tweetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutFModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.panel1 = new System.Windows.Forms.Panel();
@@ -80,8 +82,8 @@ namespace FModel
this.copyFilePathWithoutExtensionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copyFileNameWithoutExtensionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsJSONToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tweetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.extractFolderContentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -89,6 +91,7 @@ namespace FModel
this.tableLayoutPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
this.SuspendLayout();
//
// statusStrip1
@@ -263,7 +266,7 @@ namespace FModel
// saveImageToolStripMenuItem
//
this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem";
this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.saveImageToolStripMenuItem.Text = "Save Image";
this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click);
//
@@ -271,21 +274,33 @@ namespace FModel
//
this.autoSaveImagesToolStripMenuItem.CheckOnClick = true;
this.autoSaveImagesToolStripMenuItem.Name = "autoSaveImagesToolStripMenuItem";
this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.autoSaveImagesToolStripMenuItem.Text = "Auto Save Images";
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(165, 6);
//
// mergeImagesToolStripMenuItem
//
this.mergeImagesToolStripMenuItem.Name = "mergeImagesToolStripMenuItem";
this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.mergeImagesToolStripMenuItem.Text = "Merge Images";
this.mergeImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeImagesToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(165, 6);
//
// tweetToolStripMenuItem
//
this.tweetToolStripMenuItem.Name = "tweetToolStripMenuItem";
this.tweetToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.tweetToolStripMenuItem.Text = "Tweet";
this.tweetToolStripMenuItem.Click += new System.EventHandler(this.TweetToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -558,17 +573,19 @@ namespace FModel
this.saveAsJSONToolStripMenuItem1.Text = "Save as JSON";
this.saveAsJSONToolStripMenuItem1.Click += new System.EventHandler(this.saveAsJSONToolStripMenuItem1_Click);
//
// toolStripSeparator4
// contextMenuStrip2
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.extractFolderContentsToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip2";
this.contextMenuStrip2.Size = new System.Drawing.Size(197, 48);
//
// tweetToolStripMenuItem
// extractFolderContentsToolStripMenuItem
//
this.tweetToolStripMenuItem.Name = "tweetToolStripMenuItem";
this.tweetToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.tweetToolStripMenuItem.Text = "Tweet";
this.tweetToolStripMenuItem.Click += new System.EventHandler(this.TweetToolStripMenuItem_Click);
this.extractFolderContentsToolStripMenuItem.Name = "extractFolderContentsToolStripMenuItem";
this.extractFolderContentsToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.extractFolderContentsToolStripMenuItem.Text = "Extract Folder Contents";
this.extractFolderContentsToolStripMenuItem.Click += new System.EventHandler(this.ExtractFolderContentsToolStripMenuItem_Click);
//
// MainWindow
//
@@ -597,6 +614,7 @@ namespace FModel
this.tableLayoutPanel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
this.contextMenuStrip2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -656,6 +674,8 @@ namespace FModel
private System.Windows.Forms.ToolStripMenuItem saveAsJSONToolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripMenuItem tweetToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
private System.Windows.Forms.ToolStripMenuItem extractFolderContentsToolStripMenuItem;
}
}

73
FModel/MainWindow.cs
View File

@@ -1018,9 +1018,18 @@ namespace FModel
//EVENTS
private async void treeView1_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
{
await Task.Run(() => {
GetFilesAndFill(e);
});
if (e.Node != null && e.Button == MouseButtons.Right)
{
Checking.currentSelectedNodePartialPath = e.Node.FullPath + "\\";
extractFolderContentsToolStripMenuItem.Text = "Extract " + e.Node.Text + " Folder Contents";
contextMenuStrip2.Show(Cursor.Position);
}
else
{
await Task.Run(() => {
GetFilesAndFill(e);
});
}
}
private async void FilterTextBox_TextChanged(object sender, EventArgs e)
{
@@ -1118,9 +1127,9 @@ namespace FModel
}));
}
if (Checking.ExtractedFilePath.Contains(".locres") && !Checking.ExtractedFilePath.Contains("EngineOverrides"))
{
SerializeLocRes();
}
if (Checking.ExtractedFilePath.Contains(".uplugin"))
uPluginConvertToJson(Checking.ExtractedFilePath);
}
else { throw new ArgumentException("Error while extracting " + ThePak.CurrentUsedItem); }
}
@@ -1249,7 +1258,7 @@ namespace FModel
DrawText.DrawTexts(theItem, g, specialMode);
if (autoSaveImagesToolStripMenuItem.Checked || updateModeToolStripMenuItem.Checked)
if (autoSaveImagesToolStripMenuItem.Checked || Checking.UmWorking)
{
bmp.Save(App.DefaultOutputPath + "\\Icons\\" + ThePak.CurrentUsedItem + ".png", ImageFormat.Png);
@@ -1356,7 +1365,7 @@ namespace FModel
}
UpdateConsole(theItem.DisplayName.SourceString, Color.FromArgb(255, 66, 244, 66), "Success");
if (autoSaveImagesToolStripMenuItem.Checked || updateModeToolStripMenuItem.Checked)
if (autoSaveImagesToolStripMenuItem.Checked || Checking.UmWorking)
{
Invoke(new Action(() =>
{
@@ -1450,8 +1459,21 @@ namespace FModel
/// <param name="file"></param>
private void ConvertToTtf(string file)
{
File.Move(file, Path.ChangeExtension(file, ".ttf") ?? throw new InvalidOperationException());
UpdateConsole(ThePak.CurrentUsedItem + " successfully converter to a font", Color.FromArgb(255, 66, 244, 66), "Success");
if (File.Exists(Path.ChangeExtension(file, ".ttf"))) File.Delete(Path.ChangeExtension(file, ".ttf"));
File.Move(file, Path.ChangeExtension(file, ".ttf"));
UpdateConsole(ThePak.CurrentUsedItem + " successfully converted to a font", Color.FromArgb(255, 66, 244, 66), "Success");
}
private void uPluginConvertToJson(string file)
{
if (File.Exists(Path.ChangeExtension(file, ".json"))) File.Delete(Path.ChangeExtension(file, ".json"));
File.Move(file, Path.ChangeExtension(file, ".json"));
Invoke(new Action(() =>
{
scintilla1.Text = File.ReadAllText(Path.ChangeExtension(file, ".json"));
}));
UpdateConsole(ThePak.CurrentUsedItem + " successfully converter to JSON", Color.FromArgb(255, 66, 244, 66), "Success");
}
//EVENTS
@@ -1779,17 +1801,14 @@ namespace FModel
{
CopySelectedFile();
}
private void copyFileNameToolStripMenuItem_Click(object sender, EventArgs e)
{
CopySelectedFile(true);
}
private void copyFilePathWithoutExtensionToolStripMenuItem_Click(object sender, EventArgs e)
{
CopySelectedFile(false, false);
}
private void copyFileNameWithoutExtensionToolStripMenuItem_Click(object sender, EventArgs e)
{
CopySelectedFile(true, false);
@@ -1804,6 +1823,36 @@ namespace FModel
{
SaveAsJSON();
}
private void ExtractFolderContentsToolStripMenuItem_Click(object sender, EventArgs e)
{
_diffToExtract = new Dictionary<string, string>();
for (int i = 0; i < PakAsTxt.Length; i++)
{
if (PakAsTxt[i].Contains(Checking.currentSelectedNodePartialPath.Replace("\\", "/")))
{
string filename = Path.GetFileName(PakAsTxt[i]);
if (filename.Contains(".uasset") || filename.Contains(".uexp") || filename.Contains(".ubulk"))
{
if (!_diffToExtract.ContainsKey(filename.Substring(0, filename.LastIndexOf(".", StringComparison.Ordinal))))
_diffToExtract.Add(filename.Substring(0, filename.LastIndexOf(".", StringComparison.Ordinal)), PakAsTxt[i]);
}
}
}
Checking.UmWorking = true;
Invoke(new Action(() =>
{
ExtractButton.Enabled = false;
OpenImageButton.Enabled = false;
StopButton.Enabled = true;
}));
if (backgroundWorker2.IsBusy != true)
{
backgroundWorker2.RunWorkerAsync();
}
}
#endregion
}
}

5
FModel/MainWindow.resx
View File

@@ -131,7 +131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa
CAAAAk1TRnQBSQFMAgEBAgEAAbABAQGwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAbgBAQG4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -178,6 +178,9 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>686, 17</value>
</metadata>
<metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>841, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>63</value>
</metadata>

1
FModel/Methods/VarApp.cs
View File

@@ -69,6 +69,7 @@ namespace FModel
public static string BackupFileName { get; set; }
public static string ExtractedFilePath { get; set; }
public static bool DifferenceFileExists = false;
public static string currentSelectedNodePartialPath { get; set; }
}
public struct BundleInfoEntry: IEquatable<BundleInfoEntry>
{

BIN
FModel/Resources/U512.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB