Numerous changes

Audio Editor has been patched up some more and a new category combining feature has been introduced. Fixed a few bus and typos on the Main Form too. Added myself to the credits and general project info. (:
2026-08-02 15:32:15 +00:00 · 2022-02-09 19:15:25 -05:00
parent 3e8ef87cdd
commit 3b3c9b385d
9 changed files with 2293 additions and 1697 deletions
--- a/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.Designer.cs
+++ b/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.Designer.cs
@@ -28,91 +28,92 @@
        /// </summary>
        private void InitializeComponent()
        {
-            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
-            this.metroLabel2 = new MetroFramework.Controls.MetroLabel();
-            this.metroLabel3 = new MetroFramework.Controls.MetroLabel();
-            this.metroLabel4 = new MetroFramework.Controls.MetroLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Image = global::PckStudio.Properties.Resources.Splash;
-            this.pictureBox1.Location = new System.Drawing.Point(4, 33);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(575, 293);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
-            // 
-            // metroLabel1
-            // 
-            this.metroLabel1.AutoSize = true;
-            this.metroLabel1.Location = new System.Drawing.Point(4, 333);
-            this.metroLabel1.Name = "metroLabel1";
-            this.metroLabel1.Size = new System.Drawing.Size(250, 19);
-            this.metroLabel1.TabIndex = 1;
-            this.metroLabel1.Text = "Restored and maintained By PhoenixARC";
-            this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
-            // 
-            // metroLabel2
-            // 
-            this.metroLabel2.AutoSize = true;
-            this.metroLabel2.Location = new System.Drawing.Point(310, 333);
-            this.metroLabel2.Name = "metroLabel2";
-            this.metroLabel2.Size = new System.Drawing.Size(269, 19);
-            this.metroLabel2.TabIndex = 2;
-            this.metroLabel2.Text = "Utilizing the Nobledez Website by Newagent";
-            this.metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark;
-            // 
-            // metroLabel3
-            // 
-            this.metroLabel3.AutoSize = true;
-            this.metroLabel3.Location = new System.Drawing.Point(4, 363);
-            this.metroLabel3.Name = "metroLabel3";
-            this.metroLabel3.Size = new System.Drawing.Size(212, 19);
-            this.metroLabel3.TabIndex = 3;
-            this.metroLabel3.Text = "3D skin renderer by Łukasz Rejman";
-            this.metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark;
-            // 
-            // metroLabel4
-            // 
-            this.metroLabel4.AutoSize = true;
-            this.metroLabel4.Location = new System.Drawing.Point(310, 363);
-            this.metroLabel4.Name = "metroLabel4";
-            this.metroLabel4.Size = new System.Drawing.Size(199, 19);
-            this.metroLabel4.TabIndex = 4;
-            this.metroLabel4.Text = "3D renderer found by Newagent";
-            this.metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark;
-            // 
-            // programInfo
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle;
-            this.ClientSize = new System.Drawing.Size(582, 392);
-            this.Controls.Add(this.metroLabel4);
-            this.Controls.Add(this.metroLabel3);
-            this.Controls.Add(this.metroLabel2);
-            this.Controls.Add(this.metroLabel1);
-            this.Controls.Add(this.pictureBox1);
-            this.DisplayHeader = false;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "programInfo";
-            this.Padding = new System.Windows.Forms.Padding(20, 30, 20, 20);
-            this.Resizable = false;
-            this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow;
-            this.Style = MetroFramework.MetroColorStyle.Silver;
-            this.Text = "programInfo";
-            this.Theme = MetroFramework.MetroThemeStyle.Dark;
-            this.Load += new System.EventHandler(this.programInfo_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
+			this.metroLabel2 = new MetroFramework.Controls.MetroLabel();
+			this.metroLabel3 = new MetroFramework.Controls.MetroLabel();
+			this.metroLabel4 = new MetroFramework.Controls.MetroLabel();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = global::PckStudio.Properties.Resources.Splash;
+			this.pictureBox1.Location = new System.Drawing.Point(14, 33);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(575, 293);
+			this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+			this.pictureBox1.TabIndex = 0;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+			// 
+			// metroLabel1
+			// 
+			this.metroLabel1.AutoSize = true;
+			this.metroLabel1.Location = new System.Drawing.Point(6, 333);
+			this.metroLabel1.Name = "metroLabel1";
+			this.metroLabel1.Size = new System.Drawing.Size(323, 19);
+			this.metroLabel1.TabIndex = 1;
+			this.metroLabel1.Text = "Restored and maintained By PhoenixARC and MattNL";
+			this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
+			this.metroLabel1.Click += new System.EventHandler(this.metroLabel1_Click);
+			// 
+			// metroLabel2
+			// 
+			this.metroLabel2.AutoSize = true;
+			this.metroLabel2.Location = new System.Drawing.Point(331, 333);
+			this.metroLabel2.Name = "metroLabel2";
+			this.metroLabel2.Size = new System.Drawing.Size(269, 19);
+			this.metroLabel2.TabIndex = 2;
+			this.metroLabel2.Text = "Utilizing the Nobledez Website by Newagent";
+			this.metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark;
+			// 
+			// metroLabel3
+			// 
+			this.metroLabel3.AutoSize = true;
+			this.metroLabel3.Location = new System.Drawing.Point(4, 363);
+			this.metroLabel3.Name = "metroLabel3";
+			this.metroLabel3.Size = new System.Drawing.Size(212, 19);
+			this.metroLabel3.TabIndex = 3;
+			this.metroLabel3.Text = "3D skin renderer by Łukasz Rejman";
+			this.metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark;
+			// 
+			// metroLabel4
+			// 
+			this.metroLabel4.AutoSize = true;
+			this.metroLabel4.Location = new System.Drawing.Point(331, 363);
+			this.metroLabel4.Name = "metroLabel4";
+			this.metroLabel4.Size = new System.Drawing.Size(199, 19);
+			this.metroLabel4.TabIndex = 4;
+			this.metroLabel4.Text = "3D renderer found by Newagent";
+			this.metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark;
+			// 
+			// programInfo
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle;
+			this.ClientSize = new System.Drawing.Size(602, 392);
+			this.Controls.Add(this.metroLabel4);
+			this.Controls.Add(this.metroLabel3);
+			this.Controls.Add(this.metroLabel2);
+			this.Controls.Add(this.metroLabel1);
+			this.Controls.Add(this.pictureBox1);
+			this.DisplayHeader = false;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "programInfo";
+			this.Padding = new System.Windows.Forms.Padding(20, 30, 20, 20);
+			this.Resizable = false;
+			this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow;
+			this.Style = MetroFramework.MetroColorStyle.Silver;
+			this.Text = "programInfo";
+			this.Theme = MetroFramework.MetroThemeStyle.Dark;
+			this.Load += new System.EventHandler(this.programInfo_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();

        }

--- a/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.cs
+++ b/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.cs
@@ -26,5 +26,10 @@ namespace PckStudio
        {

        }
-    }
+
+		private void metroLabel1_Click(object sender, EventArgs e)
+		{
+
+		}
+	}
 }
--- a/MinecraftUSkinEditor/Forms/Form1.Designer.cs
+++ b/MinecraftUSkinEditor/Forms/Form1.Designer.cs
--- a/MinecraftUSkinEditor/Forms/Form1.cs
+++ b/MinecraftUSkinEditor/Forms/Form1.cs
@@ -1341,6 +1341,7 @@ namespace PckStudio
 				label2.Theme = this.Theme;
 				label3.Theme = this.Theme;
 				labelImageSize.Theme = this.Theme;
+				labelImageSize.Text = "";
 				labelAmount.Theme = this.Theme;
 				labelEntryType.Theme = this.Theme;
 				labelEntryData.Theme = this.Theme;
@@ -3372,11 +3373,6 @@ namespace PckStudio
 			System.Diagnostics.Process.Start("https://www.paypal.me/realnobledez");
 		}

-		private void menuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
-		{
-
-		}
-
 		private void addPasswordToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			treeViewMain.SelectedNode = treeViewMain.Nodes[0];
@@ -3555,11 +3551,6 @@ namespace PckStudio
 			save("Save As");
 		}

-		private void openPck(object sender, EventArgs e)
-		{
-
-		}
-
 		private void timer1_Tick(object sender, EventArgs e)
 		{
 			if (PCKFile != PCKFileBCKUP)
@@ -3618,6 +3609,11 @@ namespace PckStudio
 			}
 			catch { }
 		}
+
+		private void forMattNLContributorToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			System.Diagnostics.Process.Start("https://www.paypal.com/donate?business=X7Z3PMXC4L5LY&no_recurring=1&item_name=Consider+this+my+tip+jar.+It%27s+completely+optional+but+is+absolutely+appreciated.+%28%3A&currency_code=USD");
+		}
 	}
 }

--- a/MinecraftUSkinEditor/Forms/Form1.resx
+++ b/MinecraftUSkinEditor/Forms/Form1.resx
--- a/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.Designer.cs
+++ b/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.Designer.cs
@@ -44,6 +44,8 @@ namespace PckStudio.Forms.Utilities
 			this.removeEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.comboBox1 = new System.Windows.Forms.ComboBox();
 			this.textBox1 = new System.Windows.Forms.TextBox();
+			this.metroLabel2 = new MetroFramework.Controls.MetroLabel();
+			this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
 			this.contextMenuStrip1.SuspendLayout();
 			this.menuStrip.SuspendLayout();
 			this.contextMenuStrip2.SuspendLayout();
@@ -110,6 +112,7 @@ namespace PckStudio.Forms.Utilities
 			resources.ApplyResources(this.treeView2, "treeView2");
 			this.treeView2.Name = "treeView2";
 			this.treeView2.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView2_AfterSelect);
+			this.treeView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown);
 			// 
 			// contextMenuStrip2
 			// 
@@ -146,10 +149,25 @@ namespace PckStudio.Forms.Utilities
 			this.textBox1.Name = "textBox1";
 			this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
 			// 
+			// metroLabel2
+			// 
+			resources.ApplyResources(this.metroLabel2, "metroLabel2");
+			this.metroLabel2.Name = "metroLabel2";
+			this.metroLabel2.Theme = MetroFramework.MetroThemeStyle.Dark;
+			this.metroLabel2.Click += new System.EventHandler(this.metroLabel2_Click);
+			// 
+			// 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.metroLabel2);
 			this.Controls.Add(this.treeView1);
 			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.comboBox1);
@@ -182,5 +200,7 @@ namespace PckStudio.Forms.Utilities
 		private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
 		private System.Windows.Forms.ToolStripMenuItem addEntryMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem removeEntryMenuItem;
+		private MetroFramework.Controls.MetroLabel metroLabel2;
+		private MetroFramework.Controls.MetroLabel metroLabel1;
 	}
 }
--- a/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.cs
+++ b/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.cs
@@ -19,7 +19,7 @@ namespace PckStudio.Forms.Utilities
 		public string defaultType;
 		public string cat;
 		public List<int> cats = new List<int>();
-
+		public List<int> totalCats = new List<int>();
 		public string getCatString(int cat)
 		{
 			switch (cat)
@@ -32,7 +32,7 @@ namespace PckStudio.Forms.Utilities
 				case 5: return "Battle"; break;
 				case 6: return "Tumble"; break;
 				case 7: return "Glide"; break;
-				case 8: return "Unused"; break;
+				case 8: return "Unused"; break; // Unknown what this is used for. Probably the scrapped Mini Game 4 referenced in the code
 				default: return "Not valid"; break;
 			}
 		}
@@ -49,7 +49,7 @@ namespace PckStudio.Forms.Utilities
 				case "Battle": return 5; break;
 				case "Tumble": return 6; break;
 				case "Glide": return 7; break;
-				case "Unused": return 8; break;
+				case "Unused": return 8; break; // Unknown what this is used for. Probably the scrapped Mini Game 4 referenced in the code
 				default: return -1; break;
 			}
 		}
@@ -60,16 +60,35 @@ namespace PckStudio.Forms.Utilities
 		{
 			InitializeComponent();
 			audioPCK.Read(data);
-			mf = MineFile;
-			TreeNode treeViewMain = new TreeNode();
-			foreach (PCK.MineFile mineFile in audioPCK.mineFiles)
+			int check; // This is needed for the TryGetValue function which is annoying
+			if(!audioPCK.typeCodes.TryGetValue("CUENAME", out check))
 			{
-				Console.WriteLine(mineFile.name);
-				TreeNode treeNode = new TreeNode();
-				if (!cats.Contains<int>(mineFile.type)) cats.Add(mineFile.type);
-				treeNode.Text = getCatString(mineFile.type);
-				treeNode.Tag = mineFile;
-				treeView1.Nodes.Add(treeNode);
+				throw new System.Exception("This is not a valid audio.pck file");
+			}
+			mf = MineFile;
+			int index = 0;
+			List<PCK.MineFile> tempMineFiles = audioPCK.mineFiles.ToList();
+			foreach (PCK.MineFile mineFile in tempMineFiles)
+			{
+				mineFile.name = getCatString(mineFile.type);
+				Console.WriteLine("Category Found: " + mineFile.name);
+				if (cats.Contains<int>(mineFile.type))
+				{
+					Console.WriteLine("Duplicate category found, " + getCatString(mineFile.type) + ". Combining...");
+					List<object[]> newEntries = mineFile.entries.ToList();
+					audioPCK.mineFiles.Remove(mineFile);
+					audioPCK.mineFiles.Find(category => category.name == getCatString(mineFile.type)).entries.AddRange(newEntries);
+				}
+				else
+				{
+					TreeNode treeNode = new TreeNode();
+					treeNode.Text = mineFile.name;
+					treeNode.Tag = mineFile;
+					treeView1.Nodes.Add(treeNode);
+					cats.Add(mineFile.type);
+				}
+
+				index++;
 				continue;
 			}
 		}
@@ -171,12 +190,21 @@ namespace PckStudio.Forms.Utilities
 			treeView2.Nodes.Insert(treeView2.SelectedNode == null ? 0 : treeView2.SelectedNode.Index + 1, meta);
 			((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Add(obj);
 		}
+		public void treeView2_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.KeyCode == Keys.Delete && treeView2.SelectedNode != null)
+			{
+				((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Remove((object[])treeView2.SelectedNode.Tag);
+				treeView2.SelectedNode.Remove();
+			}
+		}

 		private void removeCategoryStripMenuItem_Click(object sender, EventArgs e)
 		{
 			cats.Remove(getCatID(treeView1.SelectedNode.Text));
 			audioPCK.mineFiles.Remove((PCK.MineFile)treeView1.SelectedNode.Tag);
 			treeView1.SelectedNode.Remove();
+			treeView2.Nodes.Clear();
 		}

 		private void removeEntryMenuItem_Click(object sender, EventArgs e)
@@ -220,6 +248,7 @@ namespace PckStudio.Forms.Utilities
 			f.writeInt(audioPCK.mineFiles.Count);
 			foreach (PCK.MineFile mf in audioPCK.mineFiles)
 			{
+				mf.name = "";
 				f.writeInt(mf.data.Length);
 				f.writeInt(mf.type);
 				writeMinecraftString(f, mf.name);
@@ -250,5 +279,10 @@ namespace PckStudio.Forms.Utilities

 			mf.data = f.getBytes();
 		}
+
+		private void metroLabel2_Click(object sender, EventArgs e)
+		{
+
+		}
 	}
 }
--- a/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.resx
+++ b/MinecraftUSkinEditor/Forms/Utilities/AudioEditor.resx
@@ -121,26 +121,6 @@
    <value>127, 8</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="addCategoryStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
-        DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
-        jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="addCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
-  </data>
-  <data name="addCategoryStripMenuItem.Text" xml:space="preserve">
-    <value>Add Category</value>
-  </data>
-  <data name="removeCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
-  </data>
-  <data name="removeCategoryStripMenuItem.Text" xml:space="preserve">
-    <value>Remove Category</value>
-  </data>
  <data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>169, 48</value>
  </data>
@@ -177,7 +157,27 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;treeView1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
+  </data>
+  <data name="addCategoryStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
+        DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
+        jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="addCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
+  </data>
+  <data name="addCategoryStripMenuItem.Text" xml:space="preserve">
+    <value>Add Category</value>
+  </data>
+  <data name="removeCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
+  </data>
+  <data name="removeCategoryStripMenuItem.Text" xml:space="preserve">
+    <value>Remove Category</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>
@@ -185,28 +185,6 @@
  <data name="menuStrip.AutoSize" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <data name="saveToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8
-        QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C
-        y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga
-        QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN
-        38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="saveToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
-  </data>
-  <data name="saveToolStripMenuItem1.Text" xml:space="preserve">
-    <value>Save</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="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
    <value>20, 60</value>
  </data>
@@ -229,31 +207,33 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</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>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8
+        QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C
+        y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga
+        QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN
+        38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="saveToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 22</value>
+  </data>
+  <data name="saveToolStripMenuItem1.Text" xml:space="preserve">
+    <value>Save</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>
  </metadata>
-  <data name="addEntryMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
-        DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
-        jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="addEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 22</value>
-  </data>
-  <data name="addEntryMenuItem.Text" xml:space="preserve">
-    <value>Add Entry</value>
-  </data>
-  <data name="removeEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 22</value>
-  </data>
-  <data name="removeEntryMenuItem.Text" xml:space="preserve">
-    <value>Remove Entry</value>
-  </data>
  <data name="contextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
    <value>148, 48</value>
  </data>
@@ -282,7 +262,27 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;treeView2.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
+  </data>
+  <data name="addEntryMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
+        DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
+        jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="addEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 22</value>
+  </data>
+  <data name="addEntryMenuItem.Text" xml:space="preserve">
+    <value>Add Entry</value>
+  </data>
+  <data name="removeEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 22</value>
+  </data>
+  <data name="removeEntryMenuItem.Text" xml:space="preserve">
+    <value>Remove Entry</value>
  </data>
  <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
    <value>290, 155</value>
@@ -303,7 +303,7 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;comboBox1.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
  </data>
  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
    <value>290, 209</value>
@@ -324,7 +324,61 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
+  </data>
+  <data name="metroLabel2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="metroLabel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>325, 133</value>
+  </data>
+  <data name="metroLabel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>70, 19</value>
+  </data>
+  <data name="metroLabel2.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <data name="metroLabel2.Text" xml:space="preserve">
+    <value>Entry Type</value>
+  </data>
+  <data name="&gt;&gt;metroLabel2.Name" xml:space="preserve">
+    <value>metroLabel2</value>
+  </data>
+  <data name="&gt;&gt;metroLabel2.Type" xml:space="preserve">
+    <value>MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
+  </data>
+  <data name="&gt;&gt;metroLabel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;metroLabel2.ZOrder" xml:space="preserve">
+    <value>1</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>325, 187</value>
+  </data>
+  <data name="metroLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>70, 19</value>
+  </data>
+  <data name="metroLabel1.TabIndex" type="System.Int32, mscorlib">
+    <value>17</value>
+  </data>
+  <data name="metroLabel1.Text" xml:space="preserve">
+    <value>Entry Data</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>0</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
--- a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs
+++ b/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs
@@ -471,51 +471,35 @@ namespace PckStudio.Forms

        protected override void OnMouseEnter(EventArgs e)
        {
-            try
+            if (parentPreview != null)
            {
-                //parentPreview.setHover(true);
-                //base.OnMouseEnter(e);
-            }
-            catch (Exception)
-            {
-
+                parentPreview.setHover(true);
+                base.OnMouseLeave(e);
            }
        }
        protected override void OnMouseLeave(EventArgs e)
        {
-            try
+            if(parentPreview != null)
            {
-                //parentPreview.setHover(false);
-                //base.OnMouseLeave(e);
-            }
-            catch (Exception)
-            {
-
+                parentPreview.setHover(false);
+                base.OnMouseLeave(e);
            }
        }
        protected override void OnMouseClick(MouseEventArgs e)
        {
-            try
+            if (parentPreview != null)
            {
                parentPreview.onClick();
                base.OnMouseClick(e);
            }
-            catch (Exception)
-            {
-
-            }
        }
        protected override void OnMouseDoubleClick(MouseEventArgs e)
        {
-            try
+            if (parentPreview != null)
            {
                parentPreview.onDoubleClick();
                base.OnMouseDoubleClick(e);
            }
-            catch (Exception)
-            {
-
-            }
        }
    }