From 22d1983ee3d105b7a9b52cc7e47f4dffb6a91b90 Mon Sep 17 00:00:00 2001 From: MayNL Date: Wed, 1 Apr 2026 19:08:55 -0400 Subject: [PATCH] Renamed PCK "Properties" to "Parameters" there's a lot of things with this name scheme in this program so definitely possible i missed something. --- PCK-Studio/Controls/PckEditor.Designer.cs | 216 +++++------ PCK-Studio/Controls/PckEditor.cs | 148 ++++---- PCK-Studio/Controls/PckEditor.resx | 355 +++++++++--------- ...gner.cs => AddParameterPrompt.Designer.cs} | 10 +- ...ropertyPrompt.cs => AddParameterPrompt.cs} | 12 +- ...mpt.ja.resx => AddParameterPrompt.ja.resx} | 0 ...rtyPrompt.resx => AddParameterPrompt.resx} | 4 +- .../Skins-And-Textures/AdvancedOptions.cs | 4 +- PCK-Studio/MainForm.cs | 8 +- PCK-Studio/PckStudio.csproj | 14 +- .../Deserializer/AnimationDeserializer.cs | 2 +- .../Extensions/PckAssetExtensions.cs | 42 +-- PckStudio.Core/Extensions/SkinExtensions.cs | 20 +- .../Serializer/AnimationSerializer.cs | 2 +- PckStudio.Core/Skin/SkinBOX.cs | 2 +- PckStudio.Core/Skin/SkinPartOffset.cs | 2 +- Vendor/OMI-Lib | 2 +- 17 files changed, 421 insertions(+), 422 deletions(-) rename PCK-Studio/Forms/Additional-Popups/{AddPropertyPrompt.Designer.cs => AddParameterPrompt.Designer.cs} (93%) rename PCK-Studio/Forms/Additional-Popups/{AddPropertyPrompt.cs => AddParameterPrompt.cs} (52%) rename PCK-Studio/Forms/Additional-Popups/{AddPropertyPrompt.ja.resx => AddParameterPrompt.ja.resx} (100%) rename PCK-Studio/Forms/Additional-Popups/{AddPropertyPrompt.resx => AddParameterPrompt.resx} (99%) diff --git a/PCK-Studio/Controls/PckEditor.Designer.cs b/PCK-Studio/Controls/PckEditor.Designer.cs index 2b27b7fb..b9d6a461 100644 --- a/PCK-Studio/Controls/PckEditor.Designer.cs +++ b/PCK-Studio/Controls/PckEditor.Designer.cs @@ -36,17 +36,17 @@ namespace PckStudio.Controls this.pckFileLabel = new MetroFramework.Controls.MetroLabel(); this.labelImageSize = new MetroFramework.Controls.MetroLabel(); this.fileEntryCountLabel = new MetroFramework.Controls.MetroLabel(); - this.PropertiesTabControl = new MetroFramework.Controls.MetroTabControl(); + this.ParametersTabControl = new MetroFramework.Controls.MetroTabControl(); this.MetaTab = new MetroFramework.Controls.MetroTabPage(); this.metroLabel2 = new MetroFramework.Controls.MetroLabel(); - this.entryTypeTextBox = new MetroFramework.Controls.MetroTextBox(); - this.entryDataTextBox = new MetroFramework.Controls.MetroTextBox(); + this.ParameterTypeTextBox = new MetroFramework.Controls.MetroTextBox(); + this.parameterValueTextBox = new MetroFramework.Controls.MetroTextBox(); this.buttonEdit = new MetroFramework.Controls.MetroButton(); this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.treeMeta = new System.Windows.Forms.TreeView(); - this.contextMenuMetaTree = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.treeParameters = new System.Windows.Forms.TreeView(); + this.contextMenuParameterTree = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addParameterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addParameterToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addBOXEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addANIMEntryToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addMultipleEntriesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -108,9 +108,9 @@ namespace PckStudio.Controls this.previewPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); logoPictureBox = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(logoPictureBox)).BeginInit(); - this.PropertiesTabControl.SuspendLayout(); + this.ParametersTabControl.SuspendLayout(); this.MetaTab.SuspendLayout(); - this.contextMenuMetaTree.SuspendLayout(); + this.contextMenuParameterTree.SuspendLayout(); this.contextMenuPCKEntries.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).BeginInit(); this.SuspendLayout(); @@ -140,25 +140,25 @@ namespace PckStudio.Controls this.fileEntryCountLabel.Name = "fileEntryCountLabel"; this.fileEntryCountLabel.Theme = MetroFramework.MetroThemeStyle.Dark; // - // PropertiesTabControl + // ParametersTabControl // - this.PropertiesTabControl.Controls.Add(this.MetaTab); - resources.ApplyResources(this.PropertiesTabControl, "PropertiesTabControl"); - this.PropertiesTabControl.Name = "PropertiesTabControl"; - this.PropertiesTabControl.SelectedIndex = 0; - this.PropertiesTabControl.Style = MetroFramework.MetroColorStyle.Silver; - this.PropertiesTabControl.Theme = MetroFramework.MetroThemeStyle.Dark; - this.PropertiesTabControl.UseSelectable = true; + this.ParametersTabControl.Controls.Add(this.MetaTab); + resources.ApplyResources(this.ParametersTabControl, "ParametersTabControl"); + this.ParametersTabControl.Name = "ParametersTabControl"; + this.ParametersTabControl.SelectedIndex = 0; + this.ParametersTabControl.Style = MetroFramework.MetroColorStyle.Silver; + this.ParametersTabControl.Theme = MetroFramework.MetroThemeStyle.Dark; + this.ParametersTabControl.UseSelectable = true; // // MetaTab // this.MetaTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.MetaTab.Controls.Add(this.metroLabel2); - this.MetaTab.Controls.Add(this.entryTypeTextBox); - this.MetaTab.Controls.Add(this.entryDataTextBox); + this.MetaTab.Controls.Add(this.ParameterTypeTextBox); + this.MetaTab.Controls.Add(this.parameterValueTextBox); this.MetaTab.Controls.Add(this.buttonEdit); this.MetaTab.Controls.Add(this.metroLabel1); - this.MetaTab.Controls.Add(this.treeMeta); + this.MetaTab.Controls.Add(this.treeParameters); this.MetaTab.HorizontalScrollbarBarColor = true; this.MetaTab.HorizontalScrollbarHighlightOnWheel = false; this.MetaTab.HorizontalScrollbarSize = 10; @@ -177,63 +177,63 @@ namespace PckStudio.Controls // // entryTypeTextBox // - resources.ApplyResources(this.entryTypeTextBox, "entryTypeTextBox"); + resources.ApplyResources(this.ParameterTypeTextBox, "entryTypeTextBox"); // // // - this.entryTypeTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); - this.entryTypeTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); - this.entryTypeTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); - this.entryTypeTextBox.CustomButton.Name = ""; - this.entryTypeTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); - this.entryTypeTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.entryTypeTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex"))); - this.entryTypeTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.entryTypeTextBox.CustomButton.UseSelectable = true; - this.entryTypeTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); - this.entryTypeTextBox.Lines = new string[0]; - this.entryTypeTextBox.MaxLength = 32767; - this.entryTypeTextBox.Name = "entryTypeTextBox"; - this.entryTypeTextBox.PasswordChar = '\0'; - this.entryTypeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.entryTypeTextBox.SelectedText = ""; - this.entryTypeTextBox.SelectionLength = 0; - this.entryTypeTextBox.SelectionStart = 0; - this.entryTypeTextBox.ShortcutsEnabled = true; - this.entryTypeTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.entryTypeTextBox.UseSelectable = true; - this.entryTypeTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.entryTypeTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.ParameterTypeTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); + this.ParameterTypeTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); + this.ParameterTypeTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); + this.ParameterTypeTextBox.CustomButton.Name = ""; + this.ParameterTypeTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); + this.ParameterTypeTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.ParameterTypeTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex"))); + this.ParameterTypeTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.ParameterTypeTextBox.CustomButton.UseSelectable = true; + this.ParameterTypeTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); + this.ParameterTypeTextBox.Lines = new string[0]; + this.ParameterTypeTextBox.MaxLength = 32767; + this.ParameterTypeTextBox.Name = "entryTypeTextBox"; + this.ParameterTypeTextBox.PasswordChar = '\0'; + this.ParameterTypeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.ParameterTypeTextBox.SelectedText = ""; + this.ParameterTypeTextBox.SelectionLength = 0; + this.ParameterTypeTextBox.SelectionStart = 0; + this.ParameterTypeTextBox.ShortcutsEnabled = true; + this.ParameterTypeTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; + this.ParameterTypeTextBox.UseSelectable = true; + this.ParameterTypeTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.ParameterTypeTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // // entryDataTextBox // - resources.ApplyResources(this.entryDataTextBox, "entryDataTextBox"); + resources.ApplyResources(this.parameterValueTextBox, "entryDataTextBox"); // // // - this.entryDataTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image1"))); - this.entryDataTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode1"))); - this.entryDataTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location1"))); - this.entryDataTextBox.CustomButton.Name = ""; - this.entryDataTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size1"))); - this.entryDataTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.entryDataTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex1"))); - this.entryDataTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.entryDataTextBox.CustomButton.UseSelectable = true; - this.entryDataTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible1"))); - this.entryDataTextBox.Lines = new string[0]; - this.entryDataTextBox.MaxLength = 32767; - this.entryDataTextBox.Name = "entryDataTextBox"; - this.entryDataTextBox.PasswordChar = '\0'; - this.entryDataTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.entryDataTextBox.SelectedText = ""; - this.entryDataTextBox.SelectionLength = 0; - this.entryDataTextBox.SelectionStart = 0; - this.entryDataTextBox.ShortcutsEnabled = true; - this.entryDataTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.entryDataTextBox.UseSelectable = true; - this.entryDataTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.entryDataTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.parameterValueTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image1"))); + this.parameterValueTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode1"))); + this.parameterValueTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location1"))); + this.parameterValueTextBox.CustomButton.Name = ""; + this.parameterValueTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size1"))); + this.parameterValueTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.parameterValueTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex1"))); + this.parameterValueTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.parameterValueTextBox.CustomButton.UseSelectable = true; + this.parameterValueTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible1"))); + this.parameterValueTextBox.Lines = new string[0]; + this.parameterValueTextBox.MaxLength = 32767; + this.parameterValueTextBox.Name = "entryDataTextBox"; + this.parameterValueTextBox.PasswordChar = '\0'; + this.parameterValueTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.parameterValueTextBox.SelectedText = ""; + this.parameterValueTextBox.SelectionLength = 0; + this.parameterValueTextBox.SelectionStart = 0; + this.parameterValueTextBox.ShortcutsEnabled = true; + this.parameterValueTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; + this.parameterValueTextBox.UseSelectable = true; + this.parameterValueTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.parameterValueTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // // buttonEdit // @@ -249,74 +249,74 @@ namespace PckStudio.Controls this.metroLabel1.Name = "metroLabel1"; this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; // - // treeMeta + // treeParameters // - this.treeMeta.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); - this.treeMeta.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.treeMeta.ContextMenuStrip = this.contextMenuMetaTree; - resources.ApplyResources(this.treeMeta, "treeMeta"); - this.treeMeta.ForeColor = System.Drawing.SystemColors.Window; - this.treeMeta.Name = "treeMeta"; - this.treeMeta.PathSeparator = "/"; - this.treeMeta.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeMeta_AfterSelect); - this.treeMeta.DoubleClick += new System.EventHandler(this.treeMeta_DoubleClick); - this.treeMeta.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeMeta_KeyDown); + this.treeParameters.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); + this.treeParameters.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.treeParameters.ContextMenuStrip = this.contextMenuParameterTree; + resources.ApplyResources(this.treeParameters, "treeParameters"); + this.treeParameters.ForeColor = System.Drawing.SystemColors.Window; + this.treeParameters.Name = "treeParameters"; + this.treeParameters.PathSeparator = "/"; + this.treeParameters.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeParameter_AfterSelect); + this.treeParameters.DoubleClick += new System.EventHandler(this.treeParameter_DoubleClick); + this.treeParameters.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeParameter_KeyDown); // - // contextMenuMetaTree + // contextMenuParameterTree // - this.contextMenuMetaTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addEntryToolStripMenuItem, + this.contextMenuParameterTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addParameterToolStripMenuItem, this.addMultipleEntriesToolStripMenuItem1, this.deleteEntryToolStripMenuItem, this.editAllEntriesToolStripMenuItem}); - this.contextMenuMetaTree.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuMetaTree, "contextMenuMetaTree"); + this.contextMenuParameterTree.Name = "contextMenuStrip1"; + resources.ApplyResources(this.contextMenuParameterTree, "contextMenuParameterTree"); // - // addEntryToolStripMenuItem + // addParameterToolStripMenuItem // - this.addEntryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addEntryToolStripMenuItem1, + this.addParameterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addParameterToolStripMenuItem1, this.addBOXEntryToolStripMenuItem1, this.addANIMEntryToolStripMenuItem1}); - resources.ApplyResources(this.addEntryToolStripMenuItem, "addEntryToolStripMenuItem"); - this.addEntryToolStripMenuItem.Name = "addEntryToolStripMenuItem"; + resources.ApplyResources(this.addParameterToolStripMenuItem, "addParameterToolStripMenuItem"); + this.addParameterToolStripMenuItem.Name = "addParameterToolStripMenuItem"; // - // addEntryToolStripMenuItem1 + // addParameterToolStripMenuItem1 // - this.addEntryToolStripMenuItem1.Name = "addEntryToolStripMenuItem1"; - resources.ApplyResources(this.addEntryToolStripMenuItem1, "addEntryToolStripMenuItem1"); - this.addEntryToolStripMenuItem1.Click += new System.EventHandler(this.addEntryToolStripMenuItem_Click); + this.addParameterToolStripMenuItem1.Name = "addParameterToolStripMenuItem1"; + resources.ApplyResources(this.addParameterToolStripMenuItem1, "addParameterToolStripMenuItem1"); + this.addParameterToolStripMenuItem1.Click += new System.EventHandler(this.addParameterToolStripMenuItem_Click); // // addBOXEntryToolStripMenuItem1 // this.addBOXEntryToolStripMenuItem1.Name = "addBOXEntryToolStripMenuItem1"; resources.ApplyResources(this.addBOXEntryToolStripMenuItem1, "addBOXEntryToolStripMenuItem1"); - this.addBOXEntryToolStripMenuItem1.Click += new System.EventHandler(this.addBOXEntryToolStripMenuItem1_Click); + this.addBOXEntryToolStripMenuItem1.Click += new System.EventHandler(this.addBOXParameterToolStripMenuItem1_Click); // // addANIMEntryToolStripMenuItem1 // this.addANIMEntryToolStripMenuItem1.Name = "addANIMEntryToolStripMenuItem1"; resources.ApplyResources(this.addANIMEntryToolStripMenuItem1, "addANIMEntryToolStripMenuItem1"); - this.addANIMEntryToolStripMenuItem1.Click += new System.EventHandler(this.addANIMEntryToolStripMenuItem1_Click); + this.addANIMEntryToolStripMenuItem1.Click += new System.EventHandler(this.addSkinANIMParameterToolStripMenuItem1_Click); // // addMultipleEntriesToolStripMenuItem1 // this.addMultipleEntriesToolStripMenuItem1.Name = "addMultipleEntriesToolStripMenuItem1"; resources.ApplyResources(this.addMultipleEntriesToolStripMenuItem1, "addMultipleEntriesToolStripMenuItem1"); - this.addMultipleEntriesToolStripMenuItem1.Click += new System.EventHandler(this.addMultipleEntriesToolStripMenuItem1_Click); + this.addMultipleEntriesToolStripMenuItem1.Click += new System.EventHandler(this.addMultipleParametersToolStripMenuItem1_Click); // // deleteEntryToolStripMenuItem // this.deleteEntryToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_delete; this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem"; resources.ApplyResources(this.deleteEntryToolStripMenuItem, "deleteEntryToolStripMenuItem"); - this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteEntryToolStripMenuItem_Click); + this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteParameterToolStripMenuItem_Click); // // editAllEntriesToolStripMenuItem // this.editAllEntriesToolStripMenuItem.Name = "editAllEntriesToolStripMenuItem"; resources.ApplyResources(this.editAllEntriesToolStripMenuItem, "editAllEntriesToolStripMenuItem"); - this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllEntriesToolStripMenuItem_Click); + this.editAllEntriesToolStripMenuItem.Click += new System.EventHandler(this.editAllParametersToolStripMenuItem_Click); // // label11 // @@ -726,7 +726,7 @@ namespace PckStudio.Controls this.Controls.Add(this.pckFileLabel); this.Controls.Add(this.labelImageSize); this.Controls.Add(this.fileEntryCountLabel); - this.Controls.Add(this.PropertiesTabControl); + this.Controls.Add(this.ParametersTabControl); this.Controls.Add(this.label11); this.Controls.Add(this.treeViewMain); this.Controls.Add(logoPictureBox); @@ -734,10 +734,10 @@ namespace PckStudio.Controls this.Name = "PckEditor"; this.Load += new System.EventHandler(this.PckEditor_Load); ((System.ComponentModel.ISupportInitialize)(logoPictureBox)).EndInit(); - this.PropertiesTabControl.ResumeLayout(false); + this.ParametersTabControl.ResumeLayout(false); this.MetaTab.ResumeLayout(false); this.MetaTab.PerformLayout(); - this.contextMenuMetaTree.ResumeLayout(false); + this.contextMenuParameterTree.ResumeLayout(false); this.contextMenuPCKEntries.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.previewPictureBox)).EndInit(); this.ResumeLayout(false); @@ -750,15 +750,15 @@ namespace PckStudio.Controls private MetroFramework.Controls.MetroLabel pckFileLabel; private MetroFramework.Controls.MetroLabel labelImageSize; private MetroFramework.Controls.MetroLabel fileEntryCountLabel; - private MetroFramework.Controls.MetroTabControl PropertiesTabControl; + private MetroFramework.Controls.MetroTabControl ParametersTabControl; private MetroFramework.Controls.MetroTabPage MetaTab; - private System.Windows.Forms.TreeView treeMeta; + private System.Windows.Forms.TreeView treeParameters; private MetroFramework.Controls.MetroLabel label11; private System.Windows.Forms.TreeView treeViewMain; private PckStudio.ToolboxItems.InterpolationPictureBox previewPictureBox; - private System.Windows.Forms.ContextMenuStrip contextMenuMetaTree; - private System.Windows.Forms.ToolStripMenuItem addEntryToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem addEntryToolStripMenuItem1; + private System.Windows.Forms.ContextMenuStrip contextMenuParameterTree; + private System.Windows.Forms.ToolStripMenuItem addParameterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem addParameterToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addBOXEntryToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addANIMEntryToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem; @@ -806,8 +806,8 @@ namespace PckStudio.Controls private System.Windows.Forms.ImageList imageList; private System.Windows.Forms.ToolStripMenuItem addMultipleEntriesToolStripMenuItem1; private MetroFramework.Controls.MetroLabel metroLabel2; - private MetroFramework.Controls.MetroTextBox entryTypeTextBox; - private MetroFramework.Controls.MetroTextBox entryDataTextBox; + private MetroFramework.Controls.MetroTextBox ParameterTypeTextBox; + private MetroFramework.Controls.MetroTextBox parameterValueTextBox; private MetroFramework.Controls.MetroButton buttonEdit; private MetroFramework.Controls.MetroLabel metroLabel1; private MetroFramework.Controls.MetroCheckBox LittleEndianCheckBox; diff --git a/PCK-Studio/Controls/PckEditor.cs b/PCK-Studio/Controls/PckEditor.cs index d6a0ee10..cda57f99 100644 --- a/PCK-Studio/Controls/PckEditor.cs +++ b/PCK-Studio/Controls/PckEditor.cs @@ -435,9 +435,9 @@ namespace PckStudio.Controls private void HandleSkinFile(PckAsset asset) { Skin skin = asset.GetSkin(); - if (asset.HasProperty("CAPEPATH")) + if (asset.HasParameter("CAPEPATH")) { - string capeAssetPath = asset.GetProperty("CAPEPATH"); + string capeAssetPath = asset.GetParameter("CAPEPATH"); if (EditorValue.File.TryGetAsset(capeAssetPath, PckAssetType.CapeFile, out PckAsset capeAsset)) { skin.CapeTexture = capeAsset.GetTexture(); @@ -454,9 +454,9 @@ namespace PckStudio.Controls using CustomSkinEditor skinEditor = new CustomSkinEditor(skin, saveContext, EditorValue.File.xmlVersion); if (skinEditor.ShowDialog() == DialogResult.OK) { - entryDataTextBox.Text = entryTypeTextBox.Text = string.Empty; + parameterValueTextBox.Text = ParameterTypeTextBox.Text = string.Empty; _wasModified = true; - ReloadMetaTreeView(); + ReloadParameterTreeView(); } } @@ -532,7 +532,7 @@ namespace PckStudio.Controls { if (EditorValue.File.TryGetAsset("0", PckAssetType.InfoFile, out PckAsset asset)) { - asset.RemoveProperties("LOCK"); + asset.RemoveParameters("LOCK"); } } @@ -591,7 +591,7 @@ namespace PckStudio.Controls // In case the Rename function was just used and the selected node name no longer matches the file name string selectedNodeText = treeViewMain.SelectedNode is TreeNode node ? node.FullPath : string.Empty; previewPictureBox.Image = Resources.NoImageFound; - treeMeta.Nodes.Clear(); + treeParameters.Nodes.Clear(); treeViewMain.Nodes.Clear(); BuildPckTreeView(treeViewMain.Nodes, EditorValue.File); treeViewMain.Sort(); @@ -682,15 +682,15 @@ namespace PckStudio.Controls return false; } - private void ReloadMetaTreeView() + private void ReloadParameterTreeView() { - treeMeta.Nodes.Clear(); + treeParameters.Nodes.Clear(); if (treeViewMain.SelectedNode is TreeNode node && node.Tag is PckAsset asset) { - foreach (KeyValuePair property in asset.GetProperties()) + foreach (KeyValuePair parameter in asset.GetParameters()) { - treeMeta.Nodes.Add(CreateNode(property.Key, property)); + treeParameters.Nodes.Add(CreateNode(parameter.Key, parameter)); } } } @@ -818,7 +818,7 @@ namespace PckStudio.Controls { } - mfNew.AddProperty(key, value); + mfNew.AddParameter(key, value); } _wasModified = true; } @@ -880,9 +880,9 @@ namespace PckStudio.Controls private void treeViewMain_AfterSelect(object sender, TreeViewEventArgs e) { - ReloadMetaTreeView(); + ReloadParameterTreeView(); - entryTypeTextBox.Text = entryDataTextBox.Text = labelImageSize.Text = string.Empty; + ParameterTypeTextBox.Text = parameterValueTextBox.Text = labelImageSize.Text = string.Empty; buttonEdit.Visible = false; previewPictureBox.Image = Resources.NoImageFound; @@ -1178,10 +1178,10 @@ namespace PckStudio.Controls continue; } PckAsset importedAsset = EditorValue.File.CreateNewAsset(assetPath, assetType, () => File.ReadAllBytes(filepath)); - string propertyFile = filepath + ".txt"; - if (File.Exists(propertyFile)) + string parameterFile = filepath + ".txt"; + if (File.Exists(parameterFile)) { - importedAsset.DeserializeProperties(File.ReadAllLines(propertyFile)); + importedAsset.DeserializeParameters(File.ReadAllLines(parameterFile)); } addedCount++; } @@ -1287,7 +1287,7 @@ namespace PckStudio.Controls PckAsset asset = EditorValue.File.CreateNewAsset(animationFilepath, PckAssetType.TextureFile); asset.SetSerializedData(newAnimation, AnimationSerializer.DefaultSerializer); BuildMainTreeView(); - ReloadMetaTreeView(); + ReloadParameterTreeView(); } } @@ -1405,7 +1405,7 @@ namespace PckStudio.Controls string[] param = property.Split(':'); if (param.Length < 2) continue; - newFile.AddProperty(param[0], param[1]); + newFile.AddParameter(param[0], param[1]); //switch (param[0]) //{ // case "DISPLAYNAMEID": @@ -1525,7 +1525,7 @@ namespace PckStudio.Controls $"Asset path: {asset.Filename}" + $"\nAsset type: {(int)asset.Type} ({asset.Type})" + $"\nAsset size: {asset.Size}" + - $"\nProperties count: {asset.PropertyCount}" + $"\nParameter count: {asset.ParameterCount}" , Path.GetFileName(asset.Filename) + " Asset info"); } } @@ -1535,12 +1535,12 @@ namespace PckStudio.Controls if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset) && asset.Type == PckAssetType.SkinFile) { - foreach (KeyValuePair p in asset.GetProperties().ToList()) + foreach (KeyValuePair p in asset.GetParameters().ToList()) { if (p.Key == "BOX" || p.Key == "OFFSET") - asset.SetProperty(asset.GetPropertyIndex(p), new KeyValuePair(p.Key, p.Value.Replace(',', '.'))); + asset.SetParameter(asset.GetParameterIndex(p), new KeyValuePair(p.Key, p.Value.Replace(',', '.'))); } - ReloadMetaTreeView(); + ReloadParameterTreeView(); _wasModified = true; } } @@ -1616,9 +1616,9 @@ namespace PckStudio.Controls private void extractFile(string outFilePath, PckAsset asset) { File.WriteAllBytes(outFilePath, asset.Data); - if (asset.PropertyCount > 0) + if (asset.ParameterCount > 0) { - File.WriteAllLines($"{outFilePath}.txt", asset.SerializeProperties()); + File.WriteAllLines($"{outFilePath}.txt", asset.SerializeParameters()); } } @@ -1640,9 +1640,9 @@ namespace PckStudio.Controls TreeNode newNode = new TreeNode(); newNode.Text = Path.GetFileName(diag.NewText); var newFile = new PckAsset(diag.NewText, asset.Type); - foreach (KeyValuePair property in asset.GetProperties()) + foreach (KeyValuePair parameter in asset.GetParameters()) { - newFile.AddProperty(property); + newFile.AddParameter(parameter); } newFile.SetData(asset.Data); newFile.Filename = diag.NewText; @@ -1768,9 +1768,9 @@ namespace PckStudio.Controls { if (TryGetLocFile(out LOCFile locFile)) { - if (asset.TryGetProperty("THEMENAMEID", out string value)) + if (asset.TryGetParameter("THEMENAMEID", out string value)) locFile.RemoveLocKey(value); - if (asset.TryGetProperty("DISPLAYNAMEID", out value)) + if (asset.TryGetParameter("DISPLAYNAMEID", out value)) locFile.RemoveLocKey(value); TrySetLocFile(locFile); } @@ -1804,12 +1804,12 @@ namespace PckStudio.Controls } } - private void treeMeta_AfterSelect(object sender, TreeViewEventArgs e) + private void treeParameter_AfterSelect(object sender, TreeViewEventArgs e) { - if (e.Node is TreeNode t && t.Tag is KeyValuePair property) + if (e.Node is TreeNode t && t.Tag is KeyValuePair parameter) { - entryTypeTextBox.Text = property.Key; - entryDataTextBox.Text = property.Value; + ParameterTypeTextBox.Text = parameter.Key; + parameterValueTextBox.Text = parameter.Value; } } @@ -1834,41 +1834,41 @@ namespace PckStudio.Controls e.CancelEdit = true; } - private void editAllEntriesToolStripMenuItem_Click(object sender, EventArgs e) + private void editAllParametersToolStripMenuItem_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) { - IEnumerable props = asset.SerializeProperties(seperater: " "); - using (var input = new MultiTextPrompt(props)) + IEnumerable parameters = asset.SerializeParameters(separator: " "); + using (var input = new MultiTextPrompt(parameters)) { if (input.ShowDialog(this) == DialogResult.OK) { - asset.ClearProperties(); - asset.DeserializeProperties(input.TextOutput); - ReloadMetaTreeView(); + asset.ClearParameters(); + asset.DeserializeParameters(input.TextOutput); + ReloadParameterTreeView(); _wasModified = true; } } } } - private void treeMeta_DoubleClick(object sender, EventArgs e) + private void treeParameter_DoubleClick(object sender, EventArgs e) { - if (treeMeta.SelectedNode is TreeNode subnode && subnode.Tag is KeyValuePair property && + if (treeParameters.SelectedNode is TreeNode subnode && subnode.Tag is KeyValuePair parameter && treeViewMain.SelectedNode is TreeNode node && node.Tag is PckAsset asset) { - if (asset.HasProperty(property.Key)) + if (asset.HasParameter(parameter.Key)) { - switch (property.Key) + switch (parameter.Key) { case "ANIM" when asset.Type == PckAssetType.SkinFile: try { - using ANIMEditor diag = new ANIMEditor(SkinANIM.FromString(property.Value)); + using ANIMEditor diag = new ANIMEditor(SkinANIM.FromString(parameter.Value)); if (diag.ShowDialog(this) == DialogResult.OK) { - asset.SetProperty(asset.GetPropertyIndex(property), new KeyValuePair("ANIM", diag.ResultAnim.ToString())); - ReloadMetaTreeView(); + asset.SetParameter(asset.GetParameterIndex(parameter), new KeyValuePair("ANIM", diag.ResultAnim.ToString())); + ReloadParameterTreeView(); _wasModified = true; } return; @@ -1876,7 +1876,7 @@ namespace PckStudio.Controls catch (Exception ex) { Debug.WriteLine(ex.Message); - Trace.WriteLine("Invalid ANIM value: " + property.Value); + Trace.WriteLine("Invalid ANIM value: " + parameter.Value); MessageBox.Show(this, "Failed to parse ANIM value, aborting to normal functionality. Please make sure the value only includes hexadecimal characters (0-9,A-F) and has no more than 8 characters."); } break; @@ -1884,11 +1884,11 @@ namespace PckStudio.Controls case "BOX" when asset.Type == PckAssetType.SkinFile: try { - using BoxEditor diag = new BoxEditor(property.Value, EditorValue.File.xmlVersion); + using BoxEditor diag = new BoxEditor(parameter.Value, EditorValue.File.xmlVersion); if (diag.ShowDialog(this) == DialogResult.OK) { - asset.SetProperty(asset.GetPropertyIndex(property), new KeyValuePair("BOX", diag.Result.ToString())); - ReloadMetaTreeView(); + asset.SetParameter(asset.GetParameterIndex(parameter), new KeyValuePair("BOX", diag.Result.ToString())); + ReloadParameterTreeView(); _wasModified = true; } return; @@ -1896,7 +1896,7 @@ namespace PckStudio.Controls catch (Exception ex) { Debug.WriteLine(ex.Message); - Trace.WriteLine("Invalid BOX value: " + property.Value); + Trace.WriteLine("Invalid BOX value: " + parameter.Value); MessageBox.Show(this, "Failed to parse BOX value, aborting to normal functionality."); } break; @@ -1906,12 +1906,12 @@ namespace PckStudio.Controls } - using (AddPropertyPrompt addProperty = new AddPropertyPrompt(property)) + using (AddParameterPrompt addParameter = new AddParameterPrompt(parameter)) { - if (addProperty.ShowDialog(this) == DialogResult.OK) + if (addParameter.ShowDialog(this) == DialogResult.OK) { - asset.SetProperty(asset.GetPropertyIndex(property), addProperty.Property); - ReloadMetaTreeView(); + asset.SetParameter(asset.GetParameterIndex(parameter), addParameter.Parameter); + ReloadParameterTreeView(); _wasModified = true; } } @@ -1919,77 +1919,77 @@ namespace PckStudio.Controls } } - private void treeMeta_KeyDown(object sender, KeyEventArgs e) + private void treeParameter_KeyDown(object sender, KeyEventArgs e) { if (e.KeyData == Keys.Delete) - deleteEntryToolStripMenuItem_Click(sender, e); + deleteParameterToolStripMenuItem_Click(sender, e); } - private void addMultipleEntriesToolStripMenuItem1_Click(object sender, EventArgs e) + private void addMultipleParametersToolStripMenuItem1_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) { using var input = new MultiTextPrompt(); if (input.ShowDialog(this) == DialogResult.OK) { - asset.DeserializeProperties(input.TextOutput); - ReloadMetaTreeView(); + asset.DeserializeParameters(input.TextOutput); + ReloadParameterTreeView(); _wasModified = true; } } } - private void addBOXEntryToolStripMenuItem1_Click(object sender, EventArgs e) + private void addBOXParameterToolStripMenuItem1_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode is TreeNode t && t.Tag is PckAsset asset) { using BoxEditor diag = new BoxEditor(SkinBOX.DefaultHead, EditorValue.File.xmlVersion); if (diag.ShowDialog(this) == DialogResult.OK) { - asset.AddProperty("BOX", diag.Result); - ReloadMetaTreeView(); + asset.AddParameter("BOX", diag.Result); + ReloadParameterTreeView(); _wasModified = true; } return; } } - private void addANIMEntryToolStripMenuItem1_Click(object sender, EventArgs e) + private void addSkinANIMParameterToolStripMenuItem1_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset)) { using ANIMEditor diag = new ANIMEditor(SkinANIM.Empty); if (diag.ShowDialog(this) == DialogResult.OK) { - asset.AddProperty("ANIM", diag.ResultAnim); - ReloadMetaTreeView(); + asset.AddParameter("ANIM", diag.ResultAnim); + ReloadParameterTreeView(); _wasModified = true; } return; } } - private void deleteEntryToolStripMenuItem_Click(object sender, EventArgs e) + private void deleteParameterToolStripMenuItem_Click(object sender, EventArgs e) { - if (treeMeta.SelectedNode is TreeNode t && t.Tag is KeyValuePair property && + if (treeParameters.SelectedNode is TreeNode t && t.Tag is KeyValuePair parameter && treeViewMain.SelectedNode is TreeNode main && main.Tag is PckAsset asset && - asset.RemoveProperty(property)) + asset.RemoveParameter(parameter)) { - treeMeta.SelectedNode.Remove(); + treeParameters.SelectedNode.Remove(); _wasModified = true; } } - private void addEntryToolStripMenuItem_Click(object sender, EventArgs e) + private void addParameterToolStripMenuItem_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode is TreeNode t && t.Tag is PckAsset asset) { - using AddPropertyPrompt addProperty = new AddPropertyPrompt(); - if (addProperty.ShowDialog(this) == DialogResult.OK) + using AddParameterPrompt addParameter = new AddParameterPrompt(); + if (addParameter.ShowDialog(this) == DialogResult.OK) { - asset.AddProperty(addProperty.Property); - ReloadMetaTreeView(); + asset.AddParameter(addParameter.Parameter); + ReloadParameterTreeView(); _wasModified = true; } } diff --git a/PCK-Studio/Controls/PckEditor.resx b/PCK-Studio/Controls/PckEditor.resx index 86422c5d..6eb9eb04 100644 --- a/PCK-Studio/Controls/PckEditor.resx +++ b/PCK-Studio/Controls/PckEditor.resx @@ -861,14 +861,11 @@ 831, 252 - 30, 19 + 0, 0 19 - - - labelImageSize @@ -915,7 +912,7 @@ True - 204, 135 + 204, 129 0, 0 @@ -960,7 +957,7 @@ False - 215, 105 + 215, 99 146, 20 @@ -1005,7 +1002,7 @@ False - 215, 137 + 215, 131 146, 20 @@ -1029,7 +1026,7 @@ Bottom, Right - 215, 163 + 215, 157 146, 33 @@ -1062,7 +1059,7 @@ True - 266, 28 + 266, 22 0, 0 @@ -1082,90 +1079,40 @@ 6 - + 301, 19 - - 160, 22 + + 206, 92 - - Add Entry + + contextMenuParameterTree - - 160, 22 - - - Add BOX Entry - - - 160, 22 - - - Add ANIM Entry - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx - DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x - 4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC - - - - 181, 22 - - - Add Entry - - - 181, 22 - - - Add Multiple Entries - - - 181, 22 - - - Delete Entry - - - 181, 22 - - - Edit All Entries - - - 182, 92 - - - contextMenuMetaTree - - + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Left - + 5, 5 - + 204, 229 - + 0 - - treeMeta + + treeParameters - + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + MetaTab - + 7 @@ -1181,7 +1128,7 @@ 0 - Properties + Parameters MetaTab @@ -1190,35 +1137,85 @@ MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - PropertiesTabControl + ParametersTabControl 0 - + Bottom - + 279, 270 - + 732, 281 - + 11 - - PropertiesTabControl + + ParametersTabControl - + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - + $this - + 7 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx + DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x + 4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC + + + + 205, 22 + + + Add Parameter + + + 212, 22 + + + Add Parameter + + + 212, 22 + + + Add BOX Parameter + + + 212, 22 + + + Add Skin ANIM Parameter + + + 205, 22 + + + Add Multiple Parameters + + + 205, 22 + + + Delete Parameter + + + 205, 22 + + + Edit All Parameters + True @@ -1249,6 +1246,64 @@ 22, 20 + + 158, 236 + + + contextMenuPCKEntries + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Left + + + 0 + + + 204, 20 + + + 32, 32 + + + 5, 50 + + + 0 + + + 274, 501 + + + 20 + + + treeViewMain + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAAwSURBVDhPY/j/ + /z8DJRhDAI5FGf6jYHT5UQPQDEBXTCweTgZgw1gUY8MYAqMGkI4B8bClX7FZFPQAAAAASUVORK5CYII= + + + + 157, 22 + + + Create + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1337,18 +1392,19 @@ EntityMaterials.bin - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAAwSURBVDhPY/j/ - /z8DJRhDAI5FGf6jYHT5UQPQDEBXTCweTgZgw1gUY8MYAqMGkI4B8bClX7FZFPQAAAAASUVORK5CYII= + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABoSURBVDhPvcxB + CsAgDAVRL9GLZ+81cj2L0kA61UQoGPjgwnmlPFdrbavZn/AY+alqjjAikCKMZkCIMFoBS4SRn4h8xj4E + Zgj7FCDCfgvwCPstoF1l7DfQ3+xDwELuHECov1/xMcDPuhsgou11NRjL2QAAAABJRU5ErkJggg== - + 157, 22 - - Create + + Import @@ -1401,19 +1457,11 @@ Add File - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAABoSURBVDhPvcxB - CsAgDAVRL9GLZ+81cj2L0kA61UQoGPjgwnmlPFdrbavZn/AY+alqjjAikCKMZkCIMFoBS4SRn4h8xj4E - Zgj7FCDCfgvwCPstoF1l7DfQ3+xDwELuHECov1/xMcDPuhsgou11NRjL2QAAAABJRU5ErkJggg== - - - + 157, 22 - - Import + + Export 185, 22 @@ -1421,11 +1469,11 @@ Export as 3DS Texture - + 157, 22 - - Export + + Set File Type 222, 22 @@ -1499,15 +1547,15 @@ Entity Materials File (.BIN) - - 157, 22 - - - Set File Type - 154, 6 + + 157, 22 + + + Misc. Functions + 223, 22 @@ -1526,6 +1574,12 @@ Correct Skin Decimals + + 223, 22 + + + Set Endianness + 100, 22 @@ -1538,11 +1592,11 @@ Little - + 223, 22 - - Set Endianness + + Set Model Container version 80, 22 @@ -1562,18 +1616,6 @@ 3 - - 223, 22 - - - Set Model Container version - - - 157, 22 - - - Misc. Functions - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1633,51 +1675,6 @@ Delete - - 158, 236 - - - contextMenuPCKEntries - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Left - - - 0 - - - 204, 20 - - - 32, 32 - - - 5, 50 - - - 0 - - - 274, 501 - - - 20 - - - treeViewMain - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1747,7 +1744,7 @@ previewPictureBox - PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null + PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null $this @@ -1770,16 +1767,16 @@ 1016, 558 - - addEntryToolStripMenuItem + + addParameterToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - addEntryToolStripMenuItem1 + + addParameterToolStripMenuItem1 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2110,6 +2107,6 @@ PckEditor - PckStudio.Controls.EditorControl`1[[PckStudio.Core.PackInfo, PckStudio.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null + PckStudio.Controls.EditorControl`1[[PckStudio.Core.PackInfo, PckStudio.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], PCK-Studio, Version=7.0.1.2, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.Designer.cs similarity index 93% rename from PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.Designer.cs index f3f1473a..49fd9ecd 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.Designer.cs @@ -1,6 +1,6 @@ namespace PckStudio.Forms.Additional_Popups { - partial class AddPropertyPrompt + partial class AddParameterPrompt { /// /// Required designer variable. @@ -29,7 +29,7 @@ private void InitializeComponent() { System.Windows.Forms.Label label1; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddPropertyPrompt)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddParameterPrompt)); System.Windows.Forms.Label label2; this.keyTextBox = new System.Windows.Forms.TextBox(); this.valueTextBox = new System.Windows.Forms.TextBox(); @@ -74,10 +74,12 @@ this.saveButton.UseVisualStyleBackColor = true; this.saveButton.Click += new System.EventHandler(this.saveButton_Click); // - // AddPropertyPrompt + // AddParameterPrompt // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackLocation = MetroFramework.Forms.BackLocation.TopLeft; + this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.None; this.Controls.Add(this.saveButton); this.Controls.Add(label2); this.Controls.Add(label1); @@ -85,7 +87,7 @@ this.Controls.Add(this.keyTextBox); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "AddPropertyPrompt"; + this.Name = "AddParameterPrompt"; this.Resizable = false; this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; this.Style = MetroFramework.MetroColorStyle.Black; diff --git a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.cs b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.cs similarity index 52% rename from PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.cs rename to PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.cs index 5b082b2e..364c38e9 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.cs @@ -4,24 +4,24 @@ using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups { - public partial class AddPropertyPrompt : MetroFramework.Forms.MetroForm + public partial class AddParameterPrompt : MetroFramework.Forms.MetroForm { - public KeyValuePair Property => new KeyValuePair(keyTextBox.Text, valueTextBox.Text); + public KeyValuePair Parameter => new KeyValuePair(keyTextBox.Text, valueTextBox.Text); - public AddPropertyPrompt(KeyValuePair property) - : this(property.Key, property.Value) + public AddParameterPrompt(KeyValuePair parameter) + : this(parameter.Key, parameter.Value) { } - public AddPropertyPrompt(string name, string value) + public AddParameterPrompt(string name, string value) { InitializeComponent(); keyTextBox.Text = name; valueTextBox.Text = value; } - public AddPropertyPrompt() + public AddParameterPrompt() { InitializeComponent(); } diff --git a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.ja.resx b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.ja.resx similarity index 100% rename from PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.ja.resx rename to PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.ja.resx diff --git a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.resx similarity index 99% rename from PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx rename to PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.resx index cc7191cc..3acc03fa 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/AddParameterPrompt.resx @@ -135,7 +135,7 @@ 2 - Entry + Type label1 @@ -2771,7 +2771,7 @@ CenterParent - AddPropertyPrompt + AddParameterPrompt MetroFramework.Forms.MetroForm, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a diff --git a/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs index 9d56174b..e4f8699f 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs @@ -29,7 +29,7 @@ namespace PckStudio.Popups InitializeComponent(); _pckFile = pckFile; propertyTreeview.Nodes.Clear(); - propertyTreeview.Nodes.AddRange(_pckFile.GetPropertyList().Select(s => new TreeNode(s)).ToArray()); + propertyTreeview.Nodes.AddRange(_pckFile.GetParameterList().Select(s => new TreeNode(s)).ToArray()); } private void applyButton_Click(object sender, EventArgs e) @@ -64,7 +64,7 @@ namespace PckStudio.Popups if (index == -1 || (Enum.IsDefined(typeof(PckAssetType), index) && (int)asset.Type == index)) { - asset.AddProperty(propertyKeyTextBox.Text, propertyValueTextBox.Text); + asset.AddParameter(propertyKeyTextBox.Text, propertyValueTextBox.Text); } } diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 6c7abecd..9cc9e3f5 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -342,8 +342,8 @@ namespace PckStudio var pack = new PckFile(3); PckAsset zeroAsset = pack.CreateNewAsset("0", PckAssetType.InfoFile); - zeroAsset.AddProperty("PACKID", packId); - zeroAsset.AddProperty("PACKVERSION", packVersion); + zeroAsset.AddParameter("PACKID", packId); + zeroAsset.AddParameter("PACKVERSION", packVersion); var locFile = new LOCFile(); locFile.InitializeDefault(packName); @@ -369,8 +369,8 @@ namespace PckStudio comparisonAsset.SetTexture(Core.Properties.Resources.Comparison); PckAsset texturepackInfoAsset = pack.CreateNewAsset($"{res}/{res}Info.pck", PckAssetType.TexturePackInfoFile); - texturepackInfoAsset.AddProperty("PACKID", "0"); - texturepackInfoAsset.AddProperty("DATAPATH", $"{res}Data.pck"); + texturepackInfoAsset.AddParameter("PACKID", "0"); + texturepackInfoAsset.AddParameter("DATAPATH", $"{res}Data.pck"); texturepackInfoAsset.SetData(new PckFileWriter(infoPCK, OMI.ByteOrder.BigEndian)); diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 42c09491..ec342ea4 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -316,11 +316,11 @@ ItemSelectionPopUp.cs - + Form - - AddPropertyPrompt.cs + + AddParameterPrompt.cs Form @@ -466,11 +466,11 @@ ItemSelectionPopUp.cs - - AddPropertyPrompt.cs + + AddParameterPrompt.cs - - AddPropertyPrompt.cs + + AddParameterPrompt.cs AddSkinPrompt.cs diff --git a/PckStudio.Core/Deserializer/AnimationDeserializer.cs b/PckStudio.Core/Deserializer/AnimationDeserializer.cs index e4c782b7..fedd6f1f 100644 --- a/PckStudio.Core/Deserializer/AnimationDeserializer.cs +++ b/PckStudio.Core/Deserializer/AnimationDeserializer.cs @@ -24,7 +24,7 @@ namespace PckStudio.Core.Deserializer { Image texture = asset.GetTexture(); IEnumerable frameTextures = texture.Split(ImageLayoutDirection.Vertical); - string animString = asset.GetProperty("ANIM"); + string animString = asset.GetParameter("ANIM"); bool animStringIsEmpty = string.IsNullOrEmpty(animString); Animation animation = new Animation(frameTextures, animStringIsEmpty); if (!animStringIsEmpty) diff --git a/PckStudio.Core/Extensions/PckAssetExtensions.cs b/PckStudio.Core/Extensions/PckAssetExtensions.cs index bbf72698..fcf0cb5c 100644 --- a/PckStudio.Core/Extensions/PckAssetExtensions.cs +++ b/PckStudio.Core/Extensions/PckAssetExtensions.cs @@ -83,11 +83,11 @@ namespace PckStudio.Core.Extensions int skinId = asset.GetSkinId(); - string name = asset.GetProperty("DISPLAYNAME"); + string name = asset.GetParameter("DISPLAYNAME"); Image texture = asset.GetTexture(); - SkinANIM anim = asset.GetProperty("ANIM", SkinANIM.FromString); - IEnumerable boxes = asset.GetMultipleProperties("BOX").Select(kv => SkinBOX.FromString(kv.Value)); - IEnumerable offsets = asset.GetMultipleProperties("OFFSET").Select(kv => SkinPartOffset.FromString(kv.Value)); + SkinANIM anim = asset.GetParameter("ANIM", SkinANIM.FromString); + IEnumerable boxes = asset.GetMultipleParameters("BOX").Select(kv => SkinBOX.FromString(kv.Value)); + IEnumerable offsets = asset.GetMultipleParameters("OFFSET").Select(kv => SkinPartOffset.FromString(kv.Value)); return new Skin.Skin(name, skinId, texture, anim, boxes, offsets); } @@ -103,46 +103,46 @@ namespace PckStudio.Core.Extensions // TODO: keep filepath asset.Filename = $"dlcskin{skinId}.png"; - asset.SetProperty("DISPLAYNAME", skin.MetaData.Name); + asset.SetParameter("DISPLAYNAME", skin.MetaData.Name); if (localizationFile is not null) { string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME"; - asset.SetProperty("DISPLAYNAMEID", skinLocKey); + asset.SetParameter("DISPLAYNAMEID", skinLocKey); localizationFile.SetLocEntry(skinLocKey, skin.MetaData.Name); } if (!string.IsNullOrEmpty(skin.MetaData.Theme)) { - asset.SetProperty("THEMENAME", skin.MetaData.Theme); + asset.SetParameter("THEMENAME", skin.MetaData.Theme); if (localizationFile is not null) { string skinThemeLocKey = $"IDS_dlcskin{skinId}_THEMENAME"; - asset.SetProperty("THEMENAMEID", skinThemeLocKey); + asset.SetParameter("THEMENAMEID", skinThemeLocKey); localizationFile.SetLocEntry(skinThemeLocKey, skin.MetaData.Theme); } } if (skin.HasCape) { - asset.SetProperty("CAPEPATH", $"dlccape{skinId}.png"); + asset.SetParameter("CAPEPATH", $"dlccape{skinId}.png"); } - asset.SetProperty("ANIM", skin.Anim.ToString()); - asset.SetProperty("GAME_FLAGS", "0x18"); - asset.SetProperty("FREE", "1"); + asset.SetParameter("ANIM", skin.Anim.ToString()); + asset.SetParameter("GAME_FLAGS", "0x18"); + asset.SetParameter("FREE", "1"); - asset.RemoveProperties("BOX"); - asset.RemoveProperties("OFFSET"); + asset.RemoveParameters("BOX"); + asset.RemoveParameters("OFFSET"); foreach (SkinBOX box in skin.Model.AdditionalBoxes) { - asset.AddProperty(box.ToProperty()); + asset.AddParameter(box.ToParameter()); } foreach (SkinPartOffset offset in skin.Model.PartOffsets) { - asset.AddProperty(offset.ToProperty()); + asset.AddParameter(offset.ToParameter()); } } @@ -205,7 +205,7 @@ namespace PckStudio.Core.Extensions return asset.Filename.Remove(asset.Filename.Length - (MipMap.Length + 1) - ext.Length) + ext; } - public static void DeserializeProperties(this PckAsset asset, IEnumerable serializedData) + public static void DeserializeParameters(this PckAsset asset, IEnumerable serializedData) { IEnumerable> lines = serializedData .Select(line => line.Split([' '], 2)) @@ -213,14 +213,14 @@ namespace PckStudio.Core.Extensions .Select(keyValue => new KeyValuePair(keyValue[0].Replace(":", ""), keyValue[1])); foreach (KeyValuePair kv in lines) { - asset.AddProperty(kv); + asset.AddParameter(kv); } } - public static IEnumerable SerializeProperties(this PckAsset asset, string seperater = ":") + public static IEnumerable SerializeParameters(this PckAsset asset, string separator = ":") { - IReadOnlyList> properties = asset.GetProperties(); - return properties.Select(property => property.Key + seperater + property.Value); + IReadOnlyList> parameters = asset.GetParameters(); + return parameters.Select(parameter => parameter.Key + separator + parameter.Value); } } } diff --git a/PckStudio.Core/Extensions/SkinExtensions.cs b/PckStudio.Core/Extensions/SkinExtensions.cs index d1518fd4..e0e8753b 100644 --- a/PckStudio.Core/Extensions/SkinExtensions.cs +++ b/PckStudio.Core/Extensions/SkinExtensions.cs @@ -17,40 +17,40 @@ namespace PckStudio.Core.Extensions string skinId = skin.Identifier.ToString("d08"); PckAsset skinFile = new PckAsset($"dlcskin{skinId}.png", PckAssetType.SkinFile); - skinFile.AddProperty("DISPLAYNAME", skin.MetaData.Name); + skinFile.AddParameter("DISPLAYNAME", skin.MetaData.Name); if (localizationFile is not null) { string skinLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME"; - skinFile.AddProperty("DISPLAYNAMEID", skinLocKey); + skinFile.AddParameter("DISPLAYNAMEID", skinLocKey); localizationFile.AddLocKey(skinLocKey, skin.MetaData.Name); } if (!string.IsNullOrEmpty(skin.MetaData.Theme)) { - skinFile.AddProperty("THEMENAME", skin.MetaData.Theme); + skinFile.AddParameter("THEMENAME", skin.MetaData.Theme); if (localizationFile is not null) { - skinFile.AddProperty("THEMENAMEID", $"IDS_dlcskin{skinId}_THEMENAME"); + skinFile.AddParameter("THEMENAMEID", $"IDS_dlcskin{skinId}_THEMENAME"); localizationFile.AddLocKey($"IDS_dlcskin{skinId}_THEMENAME", skin.MetaData.Theme); } } if (skin.HasCape) { - skinFile.AddProperty("CAPEPATH", $"dlccape{skinId}.png"); + skinFile.AddParameter("CAPEPATH", $"dlccape{skinId}.png"); } - skinFile.AddProperty("ANIM", skin.Anim); - skinFile.AddProperty("GAME_FLAGS", "0x18"); - skinFile.AddProperty("FREE", "1"); + skinFile.AddParameter("ANIM", skin.Anim); + skinFile.AddParameter("GAME_FLAGS", "0x18"); + skinFile.AddParameter("FREE", "1"); foreach (SkinBOX box in skin.Model.AdditionalBoxes) { - skinFile.AddProperty(box.ToProperty()); + skinFile.AddParameter(box.ToParameter()); } foreach (SkinPartOffset offset in skin.Model.PartOffsets) { - skinFile.AddProperty(offset.ToProperty()); + skinFile.AddParameter(offset.ToParameter()); } skinFile.SetTexture(skin.Texture); diff --git a/PckStudio.Core/Serializer/AnimationSerializer.cs b/PckStudio.Core/Serializer/AnimationSerializer.cs index a3e78b68..f23c2460 100644 --- a/PckStudio.Core/Serializer/AnimationSerializer.cs +++ b/PckStudio.Core/Serializer/AnimationSerializer.cs @@ -36,7 +36,7 @@ namespace PckStudio.Core.Serializer public void Serialize(Animation animation, ref PckAsset asset) { string anim = SerializeAnim(animation); - asset.SetProperty("ANIM", anim); + asset.SetParameter("ANIM", anim); Image texture = SerializeTexture(animation); asset.SetTexture(texture); } diff --git a/PckStudio.Core/Skin/SkinBOX.cs b/PckStudio.Core/Skin/SkinBOX.cs index f224099d..8802bb2c 100644 --- a/PckStudio.Core/Skin/SkinBOX.cs +++ b/PckStudio.Core/Skin/SkinBOX.cs @@ -140,7 +140,7 @@ namespace PckStudio.Core.Skin public static bool IsOverlayPart(string type) => OverlayTypes.Contains(type); - public KeyValuePair ToProperty() + public KeyValuePair ToParameter() { return new KeyValuePair("BOX", ToString()); } diff --git a/PckStudio.Core/Skin/SkinPartOffset.cs b/PckStudio.Core/Skin/SkinPartOffset.cs index ccdc3eab..836773d4 100644 --- a/PckStudio.Core/Skin/SkinPartOffset.cs +++ b/PckStudio.Core/Skin/SkinPartOffset.cs @@ -72,7 +72,7 @@ namespace PckStudio.Core.Skin return new SkinPartOffset(type, value); } - public KeyValuePair ToProperty() + public KeyValuePair ToParameter() { string value = $"{Type} Y {Value}"; return new KeyValuePair("OFFSET", value.Replace(',', '.')); diff --git a/Vendor/OMI-Lib b/Vendor/OMI-Lib index d9c866c2..982b5080 160000 --- a/Vendor/OMI-Lib +++ b/Vendor/OMI-Lib @@ -1 +1 @@ -Subproject commit d9c866c2953d4f56504e1ace954bf4fbef99bb77 +Subproject commit 982b50808ddab7da2a7517f81fac3dc0689a9930