LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-28 08:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/PhoenixARC/-PCK-Studio into main

Browse Source
This commit is contained in:
miku-666
2022-08-21 16:10:58 +02:00
parent 561d0c19ec 075b8b1d85
commit 7b17ae21fe
9 changed files with 1113 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/Classes/IO/LOC/LOCFileWriter.cs
View File

@@ -20,7 +20,7 @@ namespace PckStudio.Classes.IO.LOC
private void WriteToStream(Stream stream, int type)
{
if (_locfile == null) throw new ArgumentNullException(nameof(_locfile));
_ = _locfile ?? throw new ArgumentNullException(nameof(_locfile));
WriteInt(stream, type);
WriteInt(stream, _locfile.Languages.Count);
if (type == 2) WriteLocKeys(stream);

4
PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs generated
View File

@@ -87,9 +87,9 @@
}
#endregion
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Button cancelButton;
public System.Windows.Forms.Label label2;
public System.Windows.Forms.Button button1;
}
}

394
PCK-Studio/Forms/Editor/AudioEditor.Designer.cs generated
View File

@@ -29,55 +29,55 @@ namespace PckStudio.Forms.Editor
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioEditor));
this.treeView1 = new System.Windows.Forms.TreeView();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.addCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.catImages = new System.Windows.Forms.ImageList(this.components);
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.creditsEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deleteUnusedBINKAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToEditCreditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optimizeDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bINKACompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.treeView2 = new System.Windows.Forms.TreeView();
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.addEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.verifyFileLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.playOverworldInCreative = new MetroFramework.Controls.MetroCheckBox();
this.compressionUpDown = new System.Windows.Forms.NumericUpDown();
this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).BeginInit();
this.SuspendLayout();
//
// treeView1
//
resources.ApplyResources(this.treeView1, "treeView1");
this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.treeView1.ContextMenuStrip = this.contextMenuStrip1;
this.treeView1.ForeColor = System.Drawing.Color.White;
this.treeView1.ImageList = this.catImages;
this.treeView1.LabelEdit = true;
this.treeView1.Name = "treeView1";
this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown);
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioEditor));
this.treeView1 = new System.Windows.Forms.TreeView();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.addCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.catImages = new System.Windows.Forms.ImageList(this.components);
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.creditsEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deleteUnusedBINKAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToEditCreditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optimizeDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bINKACompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.treeView2 = new System.Windows.Forms.TreeView();
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.addEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.verifyFileLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.playOverworldInCreative = new MetroFramework.Controls.MetroCheckBox();
this.compressionUpDown = new System.Windows.Forms.NumericUpDown();
this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).BeginInit();
this.SuspendLayout();
//
// treeView1
//
resources.ApplyResources(this.treeView1, "treeView1");
this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.treeView1.ContextMenuStrip = this.contextMenuStrip1;
this.treeView1.ForeColor = System.Drawing.Color.White;
this.treeView1.ImageList = this.catImages;
this.treeView1.LabelEdit = true;
this.treeView1.Name = "treeView1";
this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown);
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addCategoryStripMenuItem,
this.removeCategoryStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
@@ -140,174 +140,166 @@ namespace PckStudio.Forms.Editor
this.creditsEditorToolStripMenuItem,
this.deleteUnusedBINKAsToolStripMenuItem,
this.openDataFolderToolStripMenuItem});
this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem");
//
// creditsEditorToolStripMenuItem
//
this.creditsEditorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ExportFile;
this.creditsEditorToolStripMenuItem.Name = "creditsEditorToolStripMenuItem";
resources.ApplyResources(this.creditsEditorToolStripMenuItem, "creditsEditorToolStripMenuItem");
this.creditsEditorToolStripMenuItem.Click += new System.EventHandler(this.creditsEditorToolStripMenuItem_Click);
//
// deleteUnusedBINKAsToolStripMenuItem
//
this.deleteUnusedBINKAsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.deleteUnusedBINKAsToolStripMenuItem.Name = "deleteUnusedBINKAsToolStripMenuItem";
resources.ApplyResources(this.deleteUnusedBINKAsToolStripMenuItem, "deleteUnusedBINKAsToolStripMenuItem");
this.deleteUnusedBINKAsToolStripMenuItem.Click += new System.EventHandler(this.deleteUnusedBINKAsToolStripMenuItem_Click);
//
// openDataFolderToolStripMenuItem
//
this.openDataFolderToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ZZFolder;
this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem";
resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem");
this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem");
//
// creditsEditorToolStripMenuItem
//
this.creditsEditorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ExportFile;
this.creditsEditorToolStripMenuItem.Name = "creditsEditorToolStripMenuItem";
resources.ApplyResources(this.creditsEditorToolStripMenuItem, "creditsEditorToolStripMenuItem");
this.creditsEditorToolStripMenuItem.Click += new System.EventHandler(this.creditsEditorToolStripMenuItem_Click);
//
// deleteUnusedBINKAsToolStripMenuItem
//
this.deleteUnusedBINKAsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.deleteUnusedBINKAsToolStripMenuItem.Name = "deleteUnusedBINKAsToolStripMenuItem";
resources.ApplyResources(this.deleteUnusedBINKAsToolStripMenuItem, "deleteUnusedBINKAsToolStripMenuItem");
this.deleteUnusedBINKAsToolStripMenuItem.Click += new System.EventHandler(this.deleteUnusedBINKAsToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.howToAddSongsToolStripMenuItem,
this.whatIsEachCategoryToolStripMenuItem,
this.howToEditCreditsToolStripMenuItem,
this.optimizeDataFolderToolStripMenuItem,
this.bINKACompressionToolStripMenuItem});
this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem");
//
// howToAddSongsToolStripMenuItem
//
this.howToAddSongsToolStripMenuItem.Name = "howToAddSongsToolStripMenuItem";
resources.ApplyResources(this.howToAddSongsToolStripMenuItem, "howToAddSongsToolStripMenuItem");
this.howToAddSongsToolStripMenuItem.Click += new System.EventHandler(this.howToAddSongsToolStripMenuItem_Click);
//
// whatIsEachCategoryToolStripMenuItem
//
this.whatIsEachCategoryToolStripMenuItem.Name = "whatIsEachCategoryToolStripMenuItem";
resources.ApplyResources(this.whatIsEachCategoryToolStripMenuItem, "whatIsEachCategoryToolStripMenuItem");
this.whatIsEachCategoryToolStripMenuItem.Click += new System.EventHandler(this.whatIsEachCategoryToolStripMenuItem_Click);
//
// howToEditCreditsToolStripMenuItem
//
this.howToEditCreditsToolStripMenuItem.Name = "howToEditCreditsToolStripMenuItem";
resources.ApplyResources(this.howToEditCreditsToolStripMenuItem, "howToEditCreditsToolStripMenuItem");
this.howToEditCreditsToolStripMenuItem.Click += new System.EventHandler(this.howToEditCreditsToolStripMenuItem_Click);
//
// optimizeDataFolderToolStripMenuItem
//
this.optimizeDataFolderToolStripMenuItem.Name = "optimizeDataFolderToolStripMenuItem";
resources.ApplyResources(this.optimizeDataFolderToolStripMenuItem, "optimizeDataFolderToolStripMenuItem");
this.optimizeDataFolderToolStripMenuItem.Click += new System.EventHandler(this.optimizeDataFolderToolStripMenuItem_Click);
//
// bINKACompressionToolStripMenuItem
//
this.bINKACompressionToolStripMenuItem.Name = "bINKACompressionToolStripMenuItem";
resources.ApplyResources(this.bINKACompressionToolStripMenuItem, "bINKACompressionToolStripMenuItem");
this.bINKACompressionToolStripMenuItem.Click += new System.EventHandler(this.BINKACompressionToolStripMenuItem_Click);
//
// treeView2
//
this.treeView2.AllowDrop = true;
resources.ApplyResources(this.treeView2, "treeView2");
this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.treeView2.ContextMenuStrip = this.contextMenuStrip2;
this.treeView2.ForeColor = System.Drawing.Color.White;
this.treeView2.Name = "treeView2";
this.treeView2.DragDrop += new System.Windows.Forms.DragEventHandler(this.Binka_DragDrop);
this.treeView2.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView2_DragEnter);
this.treeView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown);
//
// contextMenuStrip2
//
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem");
//
// howToAddSongsToolStripMenuItem
//
this.howToAddSongsToolStripMenuItem.Name = "howToAddSongsToolStripMenuItem";
resources.ApplyResources(this.howToAddSongsToolStripMenuItem, "howToAddSongsToolStripMenuItem");
this.howToAddSongsToolStripMenuItem.Click += new System.EventHandler(this.howToAddSongsToolStripMenuItem_Click);
//
// whatIsEachCategoryToolStripMenuItem
//
this.whatIsEachCategoryToolStripMenuItem.Name = "whatIsEachCategoryToolStripMenuItem";
resources.ApplyResources(this.whatIsEachCategoryToolStripMenuItem, "whatIsEachCategoryToolStripMenuItem");
this.whatIsEachCategoryToolStripMenuItem.Click += new System.EventHandler(this.whatIsEachCategoryToolStripMenuItem_Click);
//
// howToEditCreditsToolStripMenuItem
//
this.howToEditCreditsToolStripMenuItem.Name = "howToEditCreditsToolStripMenuItem";
resources.ApplyResources(this.howToEditCreditsToolStripMenuItem, "howToEditCreditsToolStripMenuItem");
this.howToEditCreditsToolStripMenuItem.Click += new System.EventHandler(this.howToEditCreditsToolStripMenuItem_Click);
//
// optimizeDataFolderToolStripMenuItem
//
this.optimizeDataFolderToolStripMenuItem.Name = "optimizeDataFolderToolStripMenuItem";
resources.ApplyResources(this.optimizeDataFolderToolStripMenuItem, "optimizeDataFolderToolStripMenuItem");
this.optimizeDataFolderToolStripMenuItem.Click += new System.EventHandler(this.optimizeDataFolderToolStripMenuItem_Click);
//
// bINKACompressionToolStripMenuItem
//
this.bINKACompressionToolStripMenuItem.Name = "bINKACompressionToolStripMenuItem";
resources.ApplyResources(this.bINKACompressionToolStripMenuItem, "bINKACompressionToolStripMenuItem");
this.bINKACompressionToolStripMenuItem.Click += new System.EventHandler(this.BINKACompressionToolStripMenuItem_Click);
//
// treeView2
//
this.treeView2.AllowDrop = true;
resources.ApplyResources(this.treeView2, "treeView2");
this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.treeView2.ContextMenuStrip = this.contextMenuStrip2;
this.treeView2.ForeColor = System.Drawing.Color.White;
this.treeView2.Name = "treeView2";
this.treeView2.DragDrop += new System.Windows.Forms.DragEventHandler(this.Binka_DragDrop);
this.treeView2.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView2_DragEnter);
this.treeView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown);
//
// contextMenuStrip2
//
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addEntryMenuItem,
this.removeEntryMenuItem,
this.verifyFileLocationToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2");
//
// addEntryMenuItem
//
resources.ApplyResources(this.addEntryMenuItem, "addEntryMenuItem");
this.addEntryMenuItem.Name = "addEntryMenuItem";
this.addEntryMenuItem.Click += new System.EventHandler(this.addEntryMenuItem_Click);
//
// removeEntryMenuItem
//
this.removeEntryMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.removeEntryMenuItem.Name = "removeEntryMenuItem";
resources.ApplyResources(this.removeEntryMenuItem, "removeEntryMenuItem");
this.removeEntryMenuItem.Click += new System.EventHandler(this.removeEntryMenuItem_Click);
//
// verifyFileLocationToolStripMenuItem
//
this.verifyFileLocationToolStripMenuItem.Name = "verifyFileLocationToolStripMenuItem";
resources.ApplyResources(this.verifyFileLocationToolStripMenuItem, "verifyFileLocationToolStripMenuItem");
this.verifyFileLocationToolStripMenuItem.Click += new System.EventHandler(this.verifyFileLocationToolStripMenuItem_Click);
//
// playOverworldInCreative
//
resources.ApplyResources(this.playOverworldInCreative, "playOverworldInCreative");
this.playOverworldInCreative.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.playOverworldInCreative.ForeColor = System.Drawing.SystemColors.Window;
this.playOverworldInCreative.Name = "playOverworldInCreative";
this.playOverworldInCreative.Theme = MetroFramework.MetroThemeStyle.Dark;
this.playOverworldInCreative.UseCustomBackColor = true;
this.playOverworldInCreative.UseCustomForeColor = true;
this.playOverworldInCreative.UseSelectable = true;
//
// compressionUpDown
//
this.compressionUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.compressionUpDown.ForeColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.compressionUpDown, "compressionUpDown");
this.compressionUpDown.Maximum = new decimal(new int[] {
this.contextMenuStrip2.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2");
//
// addEntryMenuItem
//
resources.ApplyResources(this.addEntryMenuItem, "addEntryMenuItem");
this.addEntryMenuItem.Name = "addEntryMenuItem";
this.addEntryMenuItem.Click += new System.EventHandler(this.addEntryMenuItem_Click);
//
// removeEntryMenuItem
//
this.removeEntryMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.removeEntryMenuItem.Name = "removeEntryMenuItem";
resources.ApplyResources(this.removeEntryMenuItem, "removeEntryMenuItem");
this.removeEntryMenuItem.Click += new System.EventHandler(this.removeEntryMenuItem_Click);
//
// verifyFileLocationToolStripMenuItem
//
this.verifyFileLocationToolStripMenuItem.Name = "verifyFileLocationToolStripMenuItem";
resources.ApplyResources(this.verifyFileLocationToolStripMenuItem, "verifyFileLocationToolStripMenuItem");
this.verifyFileLocationToolStripMenuItem.Click += new System.EventHandler(this.verifyFileLocationToolStripMenuItem_Click);
//
// playOverworldInCreative
//
resources.ApplyResources(this.playOverworldInCreative, "playOverworldInCreative");
this.playOverworldInCreative.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.playOverworldInCreative.ForeColor = System.Drawing.SystemColors.Window;
this.playOverworldInCreative.Name = "playOverworldInCreative";
this.playOverworldInCreative.Theme = MetroFramework.MetroThemeStyle.Dark;
this.playOverworldInCreative.UseCustomBackColor = true;
this.playOverworldInCreative.UseCustomForeColor = true;
this.playOverworldInCreative.UseSelectable = true;
//
// compressionUpDown
//
this.compressionUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.compressionUpDown.ForeColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.compressionUpDown, "compressionUpDown");
this.compressionUpDown.Maximum = new decimal(new int[] {
9,
0,
0,
0});
this.compressionUpDown.Minimum = new decimal(new int[] {
this.compressionUpDown.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.compressionUpDown.Name = "compressionUpDown";
this.compressionUpDown.Value = new decimal(new int[] {
this.compressionUpDown.Name = "compressionUpDown";
this.compressionUpDown.Value = new decimal(new int[] {
4,
0,
0,
0});
//
// metroLabel1
//
resources.ApplyResources(this.metroLabel1, "metroLabel1");
this.metroLabel1.Name = "metroLabel1";
this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
//
// AudioEditor
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.metroLabel1);
this.Controls.Add(this.compressionUpDown);
this.Controls.Add(this.playOverworldInCreative);
this.Controls.Add(this.treeView1);
this.Controls.Add(this.treeView2);
this.Controls.Add(this.menuStrip);
this.Name = "AudioEditor";
this.Style = MetroFramework.MetroColorStyle.Silver;
this.Theme = MetroFramework.MetroThemeStyle.Dark;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.AudioEditor_FormClosed);
this.Shown += new System.EventHandler(this.AudioEditor_Shown);
this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
this.contextMenuStrip2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
//
// metroLabel1
//
resources.ApplyResources(this.metroLabel1, "metroLabel1");
this.metroLabel1.Name = "metroLabel1";
this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
//
// openDataFolderToolStripMenuItem
//
this.openDataFolderToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ZZFolder;
this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem";
resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem");
this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click);
//
// AudioEditor
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.metroLabel1);
this.Controls.Add(this.compressionUpDown);
this.Controls.Add(this.playOverworldInCreative);
this.Controls.Add(this.treeView1);
this.Controls.Add(this.treeView2);
this.Controls.Add(this.menuStrip);
this.Name = "AudioEditor";
this.Style = MetroFramework.MetroColorStyle.Silver;
this.Theme = MetroFramework.MetroThemeStyle.Dark;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.AudioEditor_FormClosed);
this.Shown += new System.EventHandler(this.AudioEditor_Shown);
this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip.ResumeLayout(false);
@@ -339,5 +331,13 @@ namespace PckStudio.Forms.Editor
private System.Windows.Forms.ToolStripMenuItem verifyFileLocationToolStripMenuItem;
private MetroFramework.Controls.MetroCheckBox playOverworldInCreative;
private System.Windows.Forms.ToolStripMenuItem deleteUnusedBINKAsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem howToAddSongsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem whatIsEachCategoryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem howToEditCreditsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optimizeDataFolderToolStripMenuItem;
private System.Windows.Forms.NumericUpDown compressionUpDown;
private System.Windows.Forms.ToolStripMenuItem bINKACompressionToolStripMenuItem;
private MetroFramework.Controls.MetroLabel metroLabel1;
private System.Windows.Forms.ToolStripMenuItem openDataFolderToolStripMenuItem;
}
}

108
PCK-Studio/Forms/Editor/AudioEditor.cs
View File

@@ -20,7 +20,6 @@ namespace PckStudio.Forms.Editor
public partial class AudioEditor : MetroForm
{
public string defaultType = "yes";
private string DataDirectory = "";
string tempDir = "";
PCKAudioFile audioFile = null;
PCKFile.FileData audioPCK;
@@ -95,7 +94,6 @@ namespace PckStudio.Forms.Editor
treeNode.Tag = category;
treeView1.Nodes.Add(treeNode);
}
playOverworldInCreative.Enabled = audioFile.HasCategory(PCKAudioFile.AudioCategory.EAudioType.Creative);
}
@@ -115,13 +113,13 @@ namespace PckStudio.Forms.Editor
private void handleUtilFiles(bool extractFiles = true)
{
//string asiPath = Path.Combine(tempDir, "binkawin.asi");
//string mssPath = Path.Combine(tempDir, "mss32.dll");
string asiPath = Path.Combine(tempDir, "binkawin.asi");
string mssPath = Path.Combine(tempDir, "mss32.dll");
string encoderPath = Path.Combine(tempDir, "binka_encode.exe");
// Deletes files so that System.IO exceptions are avoided
//if (File.Exists(asiPath)) File.Delete(asiPath);
//if (File.Exists(mssPath)) File.Delete(mssPath);
if (File.Exists(asiPath)) File.Delete(asiPath);
if (File.Exists(mssPath)) File.Delete(mssPath);
if (File.Exists(encoderPath)) File.Delete(encoderPath);
if (Directory.Exists(tempDir)) Directory.Delete(tempDir);
@@ -129,8 +127,8 @@ namespace PckStudio.Forms.Editor
{
Directory.CreateDirectory(tempDir);
ExtractResource("binka_encode", encoderPath);
//ExtractResource("mss32", mssPath);
//ExtractResource("binkawin", asiPath);
ExtractResource("mss32", mssPath);
ExtractResource("binkawin", asiPath);
}
}
@@ -142,19 +140,14 @@ namespace PckStudio.Forms.Editor
private void verifyFileLocationToolStripMenuItem_Click(object sender, EventArgs e)
{
if (treeView1.SelectedNode.Tag == null || treeView2.SelectedNode.Tag == null) return;
if (treeView1.SelectedNode == null || treeView2.SelectedNode == null) return;
var entry = treeView2.SelectedNode;
if (string.IsNullOrEmpty(DataDirectory)) getDataDirectory();
string FileName = Path.Combine(DataDirectory, entry.Text + ".binka");
Console.WriteLine(FileName);
if (!Directory.Exists(DataDirectory))
{
MessageBox.Show("There is not a \"Data\" folder present in the pack folder", "Folder missing");
return;
}
if (!parent.CreateDataFolder()) return;
string FileName = Path.Combine(parent.GetDataPath(), entry.Text + ".binka");
if (File.Exists(FileName)) MessageBox.Show("\"" + entry.Text + ".binka\" exists in the \"Data\" folder", "File found");
else MessageBox.Show("\"" + entry.Text + ".binka\" does not exist in the \"Data\" folder", "File missing");
else MessageBox.Show("\"" + entry.Text + ".binka\" does not exist in the \"Data\" folder. The game will crash when attempting to load this track.", "File missing");
}
private void treeView1_AfterSelect(object sender, TreeViewEventArgs e)
@@ -191,20 +184,13 @@ namespace PckStudio.Forms.Editor
private void addEntryMenuItem_Click(object sender, EventArgs e)
{
if (treeView1.SelectedNode is TreeNode t && t.Tag is PCKAudioFile.AudioCategory &&
// Gets the MainForm so we can access the Save Location
Owner.Owner is MainForm parent)
if (treeView1.SelectedNode is TreeNode t && t.Tag is PCKAudioFile.AudioCategory)
{
if (string.IsNullOrEmpty(DataDirectory)) getDataDirectory();
if (!Directory.Exists(DataDirectory))
{
MessageBox.Show("There is not a \"Data\" folder present in the pack folder", "Folder missing");
return;
}
if (!parent.CreateDataFolder()) return;
OpenFileDialog ofn = new OpenFileDialog();
ofn.Multiselect = true;
ofn.Filter = "BINKA files (*.binka)|*.binka|WAV files (*.wav)|*.wav";
ofn.Filter = "Supported audio files (*.binka,*.wav)|*.binka;*.wav";
ofn.Title = "Please choose WAV or BINKA files to add to your pack";
ofn.ShowDialog();
ofn.Dispose();
@@ -251,7 +237,7 @@ namespace PckStudio.Forms.Editor
{
if (Path.GetExtension(file) == ".binka" || Path.GetExtension(file) == ".wav")
{
string new_loc = Path.Combine(DataDirectory, Path.GetFileNameWithoutExtension(file) + ".binka");
string new_loc = Path.Combine(parent.GetDataPath(), Path.GetFileNameWithoutExtension(file) + ".binka");
bool duplicate_song = false; // To handle if a file already in the pack is dropped back in
if (File.Exists(new_loc))
{
@@ -280,7 +266,7 @@ namespace PckStudio.Forms.Editor
var process = Process.Start(new ProcessStartInfo
{
FileName = Path.Combine(tempDir, "binka_encode.exe"),
Arguments = $"\"{file}\" \"{new_loc}\"",
Arguments = $"\"{file}\" \"{new_loc}\" -s -b" + compressionUpDown.Value.ToString(),
UseShellExecute = true,
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden
@@ -298,8 +284,8 @@ namespace PckStudio.Forms.Editor
else if (!duplicate_song)
{
Console.WriteLine(Path.GetFileName(file));
File.Delete(Path.Combine(DataDirectory, Path.GetFileName(file)));
File.Copy(file, Path.Combine(DataDirectory, Path.GetFileName(file)));
File.Delete(Path.Combine(parent.GetDataPath(), Path.GetFileName(file)));
File.Copy(file, Path.Combine(parent.GetDataPath(), Path.GetFileName(file)));
}
var songName = Path.GetFileNameWithoutExtension(file);
@@ -316,14 +302,9 @@ namespace PckStudio.Forms.Editor
{
//MessageBox.Show((Owner.Owner as MainForm).saveLocation);
// Gets the MainForm so we can access the Save Location
if (treeView1.SelectedNode != null && Owner.Owner is MainForm parent)
if (treeView1.SelectedNode != null)
{
if (string.IsNullOrEmpty(DataDirectory)) getDataDirectory();
if (!Directory.Exists(DataDirectory))
{
MessageBox.Show("There is not a \"Data\" folder present in the pack folder", "Folder missing");
return;
}
if (!parent.CreateDataFolder()) return;
ProcessEntries((string[])e.Data.GetData(DataFormats.FileDrop, false));
}
@@ -407,9 +388,9 @@ namespace PckStudio.Forms.Editor
totalSongList.Add(song);
}
if (string.IsNullOrEmpty(DataDirectory)) getDataDirectory();
if (!parent.CreateDataFolder()) return;
int totalDeleted = 0;
foreach (string song in Directory.GetFiles(DataDirectory, "*.binka"))
foreach (string song in Directory.GetFiles(parent.GetDataPath(), "*.binka"))
{
if (!totalSongList.Contains(Path.GetFileNameWithoutExtension(song)))
{
@@ -429,8 +410,49 @@ namespace PckStudio.Forms.Editor
MessageBox.Show("Successfully deleted " + totalDeleted + " files", "Done");
}
// For when the Data Directory variable is null, this sets the variable in the form
private void getDataDirectory()
private void howToAddSongsToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("Right click the right window and press \"Add Entry\" or drag and drop a valid WAV file into the editor's right window. You can also drop other BINKA files, either from the main game or using a tool like BinkMan. The editor will automatically put the song in the Data folder for you.", "How to add a song");
}
private void whatIsEachCategoryToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("Categories are pretty self explanatory. The game controls when each category should play.\n" +
"\nGAMEPLAY - Plays in the specified dimensions.\n" +
"-Overworld: Plays in survival mode and in Creative if no songs are set\n" +
"-Nether: Nothing special to note.\n" +
"-End: Prioritizes the final track when the dragon is alive.\n" +
"-Creative: Does not play survival tracks unless they're included.\n" +
"-Menu: Plays on the title screen and only once when the pack is loading. Perfect for intro songs.\n" +
"\nMINI GAMES - Will only play if you change the map grf files to load your pack and set the ThemeID to 0 for Vanilla maps.\n" +
"-Battle: Plays in the Battle Mini Game.\n" +
"-Tumble: Plays in the Tumble Mini Game.\n" +
"-Glide: Plays in the Glide Mini Game.\n",
"What is each category?");
}
private void howToEditCreditsToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("Click Tools -> Credits Editor. This will allow you to edit all the credits easily in the pack easily. Only supports English credits at the moment. ","How to edit credits?");
}
private void optimizeDataFolderToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("Click Tools -> Delete Unused BINKA files. This will clean your folder of any unused songs.", "How to optimize the Data folder");
}
private void BINKACompressionToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("The numerical up/down control is responsible for the level of compression used when converting WAV files. The default is 4, which was commonly used by 4J for the game's files.","BINKA Compression Level");
}
private void openDataFolderToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!parent.CreateDataFolder()) return;
Process.Start("explorer.exe", parent.GetDataPath());
}
private void AudioEditor_Shown(object sender, EventArgs e)
{
if (Owner.Owner is MainForm p) parent = p;
else Close();

198
PCK-Studio/Forms/Editor/AudioEditor.resx
View File

@@ -166,7 +166,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADk
MAAAAk1TRnQBSQFMAgEBCQEAAUgBAAFIAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
MAAAAk1TRnQBSQFMAgEBCQEAAVgBAAFYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABMAMAAQEBAAEgBgABMBIAAzgB/wM1Af8DNQH/AzMB/wMwAf8DLwH/Ay0B/wMtAf8DJAH/AzsB/wM4
Af8DNQH/Ay0B/wMnAf8DNgH/AzIB/8AAAzgB/wN/Af8DeQH/A3kB/wN5Af8DcQH/A3EB/wN5Af8DeQH/
A3EB/wNxAf8DcQH/A3kB/wN5Af8DfwH/AzIB/8AAAzIB/wN2Af8DsAH/A7AB/wOvAf8DrwH/A68B/wOo
@@ -387,7 +387,7 @@
<value>0</value>
</data>
<data name="treeView1.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 230</value>
<value>128, 208</value>
</data>
<data name="treeView1.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@@ -402,7 +402,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;treeView1.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>19, 8</value>
@@ -410,36 +410,6 @@
<data name="menuStrip.AutoSize" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>File</value>
</data>
<data name="creditsEditorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="creditsEditorToolStripMenuItem.Text" xml:space="preserve">
<value>Credits Editor</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Text" xml:space="preserve">
<value>Delete Unused BINKAs</value>
</data>
<data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="toolsToolStripMenuItem.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 60</value>
</data>
@@ -462,7 +432,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>File</value>
</data>
<data name="saveToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -480,6 +456,60 @@
<data name="saveToolStripMenuItem1.Text" xml:space="preserve">
<value>Save</value>
</data>
<data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="toolsToolStripMenuItem.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="creditsEditorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="creditsEditorToolStripMenuItem.Text" xml:space="preserve">
<value>Credits Editor</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Text" xml:space="preserve">
<value>Delete Unused BINKAs</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Text" xml:space="preserve">
<value>How to add songs</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Text" xml:space="preserve">
<value>What is each category?</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Text" xml:space="preserve">
<value>How to edit credits</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>How to Optimize the Data folder</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Text" xml:space="preserve">
<value>BINKA Compression</value>
</data>
<data name="treeView2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
@@ -499,7 +529,7 @@
<value>410, 24</value>
</data>
<data name="treeView2.Size" type="System.Drawing.Size, System.Drawing">
<value>279, 230</value>
<value>279, 208</value>
</data>
<data name="menuStrip.Text" xml:space="preserve">
<value>menuStrip1</value>
@@ -514,7 +544,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;treeView2.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>282, 8</value>
@@ -600,8 +630,62 @@
<value>$this</value>
</data>
<data name="&gt;&gt;playOverworldInCreative.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="compressionUpDown.Location" type="System.Drawing.Point, System.Drawing">
<value>310, 298</value>
</data>
<data name="compressionUpDown.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 20</value>
</data>
<data name="compressionUpDown.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="&gt;&gt;compressionUpDown.Name" xml:space="preserve">
<value>compressionUpDown</value>
</data>
<data name="&gt;&gt;compressionUpDown.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;compressionUpDown.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;compressionUpDown.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="metroLabel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="metroLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>93, 299</value>
</data>
<data name="metroLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>211, 19</value>
</data>
<data name="metroLabel1.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="metroLabel1.Text" xml:space="preserve">
<value>WAV to BINKA Compression Level:</value>
</data>
<data name="&gt;&gt;metroLabel1.Name" xml:space="preserve">
<value>metroLabel1</value>
</data>
<data name="&gt;&gt;metroLabel1.Type" xml:space="preserve">
<value>MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
</data>
<data name="&gt;&gt;metroLabel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;metroLabel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="openDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
</data>
<data name="openDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>Open Data Folder</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -662,12 +746,48 @@
<data name="&gt;&gt;creditsEditorToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;deleteUnusedBINKAsToolStripMenuItem.Name" xml:space="preserve">
<value>deleteUnusedBINKAsToolStripMenuItem</value>
</data>
<data name="&gt;&gt;deleteUnusedBINKAsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;helpToolStripMenuItem.Name" xml:space="preserve">
<value>helpToolStripMenuItem</value>
</data>
<data name="&gt;&gt;helpToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;howToAddSongsToolStripMenuItem.Name" xml:space="preserve">
<value>howToAddSongsToolStripMenuItem</value>
</data>
<data name="&gt;&gt;howToAddSongsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;whatIsEachCategoryToolStripMenuItem.Name" xml:space="preserve">
<value>whatIsEachCategoryToolStripMenuItem</value>
</data>
<data name="&gt;&gt;whatIsEachCategoryToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;howToEditCreditsToolStripMenuItem.Name" xml:space="preserve">
<value>howToEditCreditsToolStripMenuItem</value>
</data>
<data name="&gt;&gt;howToEditCreditsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;optimizeDataFolderToolStripMenuItem.Name" xml:space="preserve">
<value>optimizeDataFolderToolStripMenuItem</value>
</data>
<data name="&gt;&gt;optimizeDataFolderToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;bINKACompressionToolStripMenuItem.Name" xml:space="preserve">
<value>bINKACompressionToolStripMenuItem</value>
</data>
<data name="&gt;&gt;bINKACompressionToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;addEntryMenuItem.Name" xml:space="preserve">
<value>addEntryMenuItem</value>
</data>
@@ -686,10 +806,10 @@
<data name="&gt;&gt;verifyFileLocationToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;deleteUnusedBINKAsToolStripMenuItem.Name" xml:space="preserve">
<value>deleteUnusedBINKAsToolStripMenuItem</value>
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Name" xml:space="preserve">
<value>openDataFolderToolStripMenuItem</value>
</data>
<data name="&gt;&gt;deleteUnusedBINKAsToolStripMenuItem.Type" xml:space="preserve">
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">

2
PCK-Studio/Forms/Utilities/Animation/AnimationEditor.cs
View File

@@ -122,7 +122,7 @@ namespace PckStudio
private PCKFile.FileData CreateNewAnimationFile(Image imgageFile, string name = "")
{
PCKFile.FileData file = new PCKFile.FileData(name, 2);
PCKFile.FileData file = new PCKFile.FileData(name, PCKFile.FileData.FileType.TextureFile);
file.properties.Add(("ANIM", ""));
using (var stream = new MemoryStream())
{

1314
PCK-Studio/Forms/Utilities/Skins/ANIMEditor.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

14
PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs
View File

@@ -21,6 +21,14 @@ namespace PckStudio.Forms.Utilities.Skins
void processCheckBoxes(bool set_all = false, bool value = false)
{
#region processes every single checkbox with the correct ANIM flags
helmetCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.HEAD_DISABLED);
chestplateCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.BODY_DISABLED);
leftArmorCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.LEFT_ARM_DISABLED);
rightArmorCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.RIGHT_ARM_DISABLED);
leftLeggingCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.LEFT_LEG_DISABLED);
rightLeggingCheckBox.Enabled = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.RIGHT_LEG_DISABLED);
bobbingCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.HEAD_BOBBING_DISABLED);
bodyCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.BODY_DISABLED);
bodyOCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.BODY_OVERLAY_DISABLED);
@@ -60,6 +68,7 @@ namespace PckStudio.Forms.Utilities.Skins
syncLegsCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.SYNCED_LEGS);
unknownCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.unk_BIT4);
zombieCheckBox.Checked = set_all ? value : anim.GetANIMFlag(eANIM_EFFECTS.ZOMBIE_ARMS);
#endregion
}
public ANIMEditor(string ANIM)
@@ -112,6 +121,7 @@ namespace PckStudio.Forms.Utilities.Skins
syncLegsCheckBox.CheckedChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.SYNCED_LEGS); };
unknownCheckBox.CheckedChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.unk_BIT4); };
zombieCheckBox.CheckedChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.ZOMBIE_ARMS); };
#endregion
helmetCheckBox.EnabledChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.FORCE_HEAD_ARMOR); };
chestplateCheckBox.EnabledChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.FORCE_BODY_ARMOR); };
@@ -119,13 +129,13 @@ namespace PckStudio.Forms.Utilities.Skins
leftArmorCheckBox.EnabledChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.FORCE_LEFT_ARM_ARMOR); };
rightLeggingCheckBox.EnabledChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.FORCE_RIGHT_LEG_ARMOR); };
leftLeggingCheckBox.EnabledChanged += (sender, EventArgs) => { flagChanged(sender, EventArgs, eANIM_EFFECTS.FORCE_LEFT_LEG_ARMOR); };
#endregion
processCheckBoxes();
}
private void closeButton_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
saved = true;
Close();
}
@@ -196,6 +206,7 @@ namespace PckStudio.Forms.Utilities.Skins
Image skin = isSlim ? Properties.Resources.slim_template : Properties.Resources.classic_template;
#region Image processing code for generating the skin templates based on the input ANIM value
Bitmap nb = new Bitmap(64, (!isSlim && !isClassic64) ? 32 : 64);
using (Graphics g = Graphics.FromImage(nb))
{
@@ -227,6 +238,7 @@ namespace PckStudio.Forms.Utilities.Skins
nb.MakeTransparent(Color.Magenta);
skin = nb;
}
#endregion
skin.Save(saveFileDialog.FileName);
}

16
PCK-Studio/MainForm.cs
View File

@@ -23,7 +23,7 @@ namespace PckStudio
{
public partial class MainForm : MetroFramework.Forms.MetroForm
{
public string saveLocation = string.Empty;
string saveLocation = string.Empty;
PCKFile currentPCK = null;
bool needsUpdate = false;
bool saved = true;
@@ -218,7 +218,7 @@ namespace PckStudio
node.ImageIndex = 3;
node.SelectedImageIndex = 3;
break;
case 8:
case PCKFile.FileData.FileType.AudioFile:
node.ImageIndex = 1;
node.SelectedImageIndex = 1;
break;
@@ -2699,22 +2699,12 @@ namespace PckStudio
if (Path.GetFileName(file.filepath) == "audio.pck")
{
try
{
if (!TryGetLocFile(out LOCFile locFile))
throw new Exception("No .loc File found.");
AudioEditor diag = new AudioEditor(file, locFile, LittleEndianCheckBox.Checked);
diag.ShowDialog(this);
if (diag.saved) TrySetLocFile(locFile);
if (diag.ShowDialog(this) == DialogResult.OK) TrySetLocFile(locFile);
diag.Dispose();
}
catch (Exception ex)
{
MessageBox.Show("Error", ex.Message, MessageBoxButtons.OK,
MessageBoxIcon.Error);
return;
}
}
if (file.filetype == PCKFile.FileData.FileType.LocalisationFile &&
(file.filepath == "languages.loc" || file.filepath == "localisation.loc"))