From 08971ac69fbee0aec336a3dce7b22c9e5f2a226c Mon Sep 17 00:00:00 2001 From: MattNL Date: Sun, 25 Sep 2022 17:45:34 -0400 Subject: [PATCH] Added Create->Colours.col feature --- PCK-Studio/MainForm.Designer.cs | 22 +- PCK-Studio/MainForm.cs | 14 + PCK-Studio/MainForm.resx | 1130 ++++++++++------- PCK-Studio/PckStudio.csproj | 3 +- PCK-Studio/Properties/Resources.Designer.cs | 32 +- PCK-Studio/Properties/Resources.resx | 3 + .../Resources/fileTemplates/colours.col | Bin 0 -> 12564 bytes 7 files changed, 694 insertions(+), 510 deletions(-) create mode 100644 PCK-Studio/Resources/fileTemplates/colours.col diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index 3eda3aff..9517da39 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -61,6 +61,7 @@ this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewFileInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.generateMipMapTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -130,7 +131,7 @@ this.imageList = new System.Windows.Forms.ImageList(this.components); this.pictureBoxImagePreview = new PckStudio.PictureBoxWithInterpolationMode(); this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); - this.generateMipMapTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.colourscolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuPCKEntries.SuspendLayout(); this.menuStrip.SuspendLayout(); this.contextMenuMetaTree.SuspendLayout(); @@ -168,7 +169,8 @@ this.folderToolStripMenuItem, this.skinToolStripMenuItem, this.createAnimatedTextureToolStripMenuItem, - this.audiopckToolStripMenuItem}); + this.audiopckToolStripMenuItem, + this.colourscolToolStripMenuItem}); resources.ApplyResources(this.createToolStripMenuItem, "createToolStripMenuItem"); this.createToolStripMenuItem.Name = "createToolStripMenuItem"; // @@ -349,6 +351,12 @@ resources.ApplyResources(this.viewFileInfoToolStripMenuItem, "viewFileInfoToolStripMenuItem"); this.viewFileInfoToolStripMenuItem.Click += new System.EventHandler(this.viewFileInfoToolStripMenuItem_Click); // + // generateMipMapTextureToolStripMenuItem + // + this.generateMipMapTextureToolStripMenuItem.Name = "generateMipMapTextureToolStripMenuItem"; + resources.ApplyResources(this.generateMipMapTextureToolStripMenuItem, "generateMipMapTextureToolStripMenuItem"); + this.generateMipMapTextureToolStripMenuItem.Click += new System.EventHandler(this.generateMipMapTextureToolStripMenuItem_Click); + // // menuStrip // resources.ApplyResources(this.menuStrip, "menuStrip"); @@ -952,11 +960,12 @@ this.LittleEndianCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.LittleEndianCheckBox.UseSelectable = true; // - // generateMipMapTextureToolStripMenuItem + // colourscolToolStripMenuItem // - this.generateMipMapTextureToolStripMenuItem.Name = "generateMipMapTextureToolStripMenuItem"; - resources.ApplyResources(this.generateMipMapTextureToolStripMenuItem, "generateMipMapTextureToolStripMenuItem"); - this.generateMipMapTextureToolStripMenuItem.Click += new System.EventHandler(this.generateMipMapTextureToolStripMenuItem_Click); + this.colourscolToolStripMenuItem.Image = global::PckStudio.Properties.Resources.COL_ICON; + this.colourscolToolStripMenuItem.Name = "colourscolToolStripMenuItem"; + resources.ApplyResources(this.colourscolToolStripMenuItem, "colourscolToolStripMenuItem"); + this.colourscolToolStripMenuItem.Click += new System.EventHandler(this.colourscolToolStripMenuItem_Click); // // MainForm // @@ -1098,6 +1107,7 @@ private MetroFramework.Controls.MetroLabel labelVersion; private System.Windows.Forms.RichTextBox ChangelogRichTextBox; private System.Windows.Forms.ToolStripMenuItem generateMipMapTextureToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem colourscolToolStripMenuItem; } } diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 049c22a7..ff68d980 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -2928,5 +2928,19 @@ namespace PckStudio } } } + + private void colourscolToolStripMenuItem_Click(object sender, EventArgs e) + { + PCKFile.FileData NewColorFile; + if (currentPCK.TryGetFile("colours.col", PCKFile.FileData.FileType.ColourTableFile, out NewColorFile)) + { + MessageBox.Show("A color table file already exists in this PCK and a new one cannot be created.", "Operation aborted"); + return; + } + NewColorFile = new PCKFile.FileData("colours.col", PCKFile.FileData.FileType.ColourTableFile); + NewColorFile.SetData(Resources.colours); + currentPCK.Files.Add(NewColorFile); + BuildMainTreeView(); + } } } \ No newline at end of file diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index c408c933..f1625313 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -130,7 +130,7 @@ - 167, 22 + 180, 22 Folder @@ -152,7 +152,7 @@ - 167, 22 + 180, 22 Skin @@ -174,7 +174,7 @@ - 167, 22 + 180, 22 Animated Texture @@ -188,11 +188,17 @@ - 167, 22 + 180, 22 Audio.pck + + 180, 22 + + + Colours.col + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -207,52 +213,6 @@ Create - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAIkSURBVDhPpdLf - T1JxGMfxc1n8qtzcyglCWhFS1PLGHAgisDmktZZtabRSEYhDZ8xpiSWVpaSxLpoXyWquLvzV+oGZq+iy - /6Stm7qsm+DT830YMJw3rbO9Djs7z/P+wob03xcAyWbUwqLXotWgha1pDzPr1axl/y52uEHFrAY1z4l5 - sVsK0IK1UVMbaKQAOXhgN2tuKLHQTKtBh6M0XwmIxe1OtexjXZa9pA6dlnomlgXx7WoCo/1eTF3pwfRQ - gM3HLmD+Wh8yIwE8CgcwFznLJs67cLPPgeMmXW1gKRXCZjqGfCbBvi6kWH6OnoXMKFsd68fa2CW0Haqr - BpYnh5G7F8PGtIyV2yG2NhXHeuo6nioD5CI+pRMsG+nFYqSHVQKrt0LYKAcmhyCeX6Vklk0MsI9phQIK - Bfy07OfPSkAs/v7xDcViEd6OZ/C2LyOXHMb75Agtlk72nF6hdy/FEgrFP3yI2OVA7r6MXz+/04siPB3P - aXgJ75JhbFIgP5PAZwr42lcp8IJnioUCBcLVQHbQizfjQTr1Kj7cTbBIpw1R54mK/GwMXwjqaYWkzrVV - A4uDPry+QYGJIN7eUVjMcQyyvWrrQRxbM/GdA4+Dbjy57MJC0AmnUQ2XUYPZXjse+qvKi9vRHZLisUJx - WyB3m0sBkwZuvYr56A8j7LQs0B2S7LMg2n0EUY8ZdpMaDgo4mlSsq1lXo7w4fuZk6Sf861U5mS9J+gsp - e+98+xbVEAAAAABJRU5ErkJggg== - - - - 228, 22 - - - Import Skin - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAEnSURBVDhPYxgc - 4P8Chv8YeKWUIFSaMPi/W+r//1MapOGTOixQ7UADkCS05Xjh2FhFEIydtIT+22uJAsX4wBimFqod04Bt - nTn/9/YV/T82rQGM93YXAfkl/1eVRYPl8RqwuTnn/5aW3P8r69L+r67P+7+mIf//rIKo/7s7i/7PyfT9 - PzvTC78BW6AGrKpN+7+2IReM5xTF/N/VWQA0wAdogA8BA4Ca//7799/VauH/TdUZ/7dVp//fA7Td3XLV - //+iwNgBYXwGbCiP+7+5Oun/9qai/5n2+v+zHAzAeG9HDnEGTIl3/D8tzuG/owLP/w5f2/9dPrYIjWgY - qh3VgAJnrf+5Lhr/HRV5/jvLcoExNs0gDNWOagBeDNMM5UO1Ew8wbB4EgIEBABiEccKRdcoAAAAAAElF - TkSuQmCC - - - - 228, 22 - - - Import Extracted Skins Folder - - - 228, 22 - - - Add Texture - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -268,78 +228,6 @@ Import - - 222, 22 - - - Skin (.PNG) - - - 222, 22 - - - Cape (.PNG) - - - 222, 22 - - - Texture (.PNG) - - - 222, 22 - - - Languages File (.LOC) - - - 222, 22 - - - Game Rules File (.GRF) - - - 222, 22 - - - Music Cues File (audio.PCK) - - - 222, 22 - - - Colour Table File (.COL) - - - 222, 22 - - - Game Rules Header (.GRH) - - - 222, 22 - - - Skins PCK (.PCK) - - - 222, 22 - - - Models File (.BIN) - - - 222, 22 - - - Behaviours File (.BIN) - - - 222, 22 - - - Entity Materials File (.BIN) - 210, 22 @@ -462,6 +350,124 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAIkSURBVDhPpdLf + T1JxGMfxc1n8qtzcyglCWhFS1PLGHAgisDmktZZtabRSEYhDZ8xpiSWVpaSxLpoXyWquLvzV+oGZq+iy + /6Stm7qsm+DT830YMJw3rbO9Djs7z/P+wob03xcAyWbUwqLXotWgha1pDzPr1axl/y52uEHFrAY1z4l5 + sVsK0IK1UVMbaKQAOXhgN2tuKLHQTKtBh6M0XwmIxe1OtexjXZa9pA6dlnomlgXx7WoCo/1eTF3pwfRQ + gM3HLmD+Wh8yIwE8CgcwFznLJs67cLPPgeMmXW1gKRXCZjqGfCbBvi6kWH6OnoXMKFsd68fa2CW0Haqr + BpYnh5G7F8PGtIyV2yG2NhXHeuo6nioD5CI+pRMsG+nFYqSHVQKrt0LYKAcmhyCeX6Vklk0MsI9phQIK + Bfy07OfPSkAs/v7xDcViEd6OZ/C2LyOXHMb75Agtlk72nF6hdy/FEgrFP3yI2OVA7r6MXz+/04siPB3P + aXgJ75JhbFIgP5PAZwr42lcp8IJnioUCBcLVQHbQizfjQTr1Kj7cTbBIpw1R54mK/GwMXwjqaYWkzrVV + A4uDPry+QYGJIN7eUVjMcQyyvWrrQRxbM/GdA4+Dbjy57MJC0AmnUQ2XUYPZXjse+qvKi9vRHZLisUJx + WyB3m0sBkwZuvYr56A8j7LQs0B2S7LMg2n0EUY8ZdpMaDgo4mlSsq1lXo7w4fuZk6Sf861U5mS9J+gsp + e+98+xbVEAAAAABJRU5ErkJggg== + + + + 228, 22 + + + Import Skin + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAEnSURBVDhPYxgc + 4P8Chv8YeKWUIFSaMPi/W+r//1MapOGTOixQ7UADkCS05Xjh2FhFEIydtIT+22uJAsX4wBimFqod04Bt + nTn/9/YV/T82rQGM93YXAfkl/1eVRYPl8RqwuTnn/5aW3P8r69L+r67P+7+mIf//rIKo/7s7i/7PyfT9 + PzvTC78BW6AGrKpN+7+2IReM5xTF/N/VWQA0wAdogA8BA4Ca//7799/VauH/TdUZ/7dVp//fA7Td3XLV + //+iwNgBYXwGbCiP+7+5Oun/9qai/5n2+v+zHAzAeG9HDnEGTIl3/D8tzuG/owLP/w5f2/9dPrYIjWgY + qh3VgAJnrf+5Lhr/HRV5/jvLcoExNs0gDNWOagBeDNMM5UO1Ew8wbB4EgIEBABiEccKRdcoAAAAAAElF + TkSuQmCC + + + + 228, 22 + + + Import Extracted Skins Folder + + + 228, 22 + + + Add Texture + + + 222, 22 + + + Skin (.PNG) + + + 222, 22 + + + Cape (.PNG) + + + 222, 22 + + + Texture (.PNG) + + + 222, 22 + + + Languages File (.LOC) + + + 222, 22 + + + Game Rules File (.GRF) + + + 222, 22 + + + Music Cues File (audio.PCK) + + + 222, 22 + + + Colour Table File (.COL) + + + 222, 22 + + + Game Rules Header (.GRH) + + + 222, 22 + + + Skins PCK (.PCK) + + + 222, 22 + + + Models File (.BIN) + + + 222, 22 + + + Behaviours File (.BIN) + + + 222, 22 + + + Entity Materials File (.BIN) + 17, 17 @@ -476,6 +482,53 @@ None + + 24, 44 + + + 1016, 24 + + + 2 + + + menuStrip1 + + + menuStrip + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 37, 20 + + + File + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADuSURBVFhH7ZbB + CsMgEERDbv5A/v83e2jNTmCKGdegJk0heHgUn7vrKBQyxRj/iivJPM9WMTWjc45wJeAwhAghVJEG1nkl + XNkziLCvtteXphFCfQ08nOi+4kvTeFL1NfBQ/BLuefjS9NkAADOwPnpNX14UADBEaV4mNnkygN34Y/1v + AgeWZXll9So2eTLAEVm9ik2a7g1Qgn9t9bvFV/4gAOZdHgB1RPeUEeAZAeBr0d4R4JIACuqI7ikjwDMD + tDACNAfo/Sou0fQ9wGKvoQfO8i61W6SkTXi+XtLLgOwcFSna3It3c+LKO3HlfcRpBa3JBjU5E8DiAAAA + AElFTkSuQmCC + + + + 217, 22 + + + New + 151, 22 @@ -494,23 +547,6 @@ Mash-Up Pack - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADuSURBVFhH7ZbB - CsMgEERDbv5A/v83e2jNTmCKGdegJk0heHgUn7vrKBQyxRj/iivJPM9WMTWjc45wJeAwhAghVJEG1nkl - XNkziLCvtteXphFCfQ08nOi+4kvTeFL1NfBQ/BLuefjS9NkAADOwPnpNX14UADBEaV4mNnkygN34Y/1v - AgeWZXll9So2eTLAEVm9ik2a7g1Qgn9t9bvFV/4gAOZdHgB1RPeUEeAZAeBr0d4R4JIACuqI7ikjwDMD - tDACNAfo/Sou0fQ9wGKvoQfO8i61W6SkTXi+XtLLgOwcFSna3It3c+LKO3HlfcRpBa3JBjU5E8DiAAAA - AElFTkSuQmCC - - - - 217, 22 - - - New - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -629,11 +665,11 @@ False - - 37, 20 + + 39, 20 - - File + + Edit False @@ -679,11 +715,11 @@ Convert to Bedrock - - 39, 20 + + 44, 20 - - Edit + + Help @@ -1225,6 +1261,20 @@ Binka Conversion + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKdJREFUOE+1 + jzEKwzAQBNUEXKQIBOwifcgTUvkDbt2p9qP0Ev1E31FYkVXOx2FLRRYWi7NnTnZ/z/MxZPY7aguhbZlq + myQafL+ubRINshCwnO0kFqi3HkpwWOf7DkC1RBfvx9slV4ElscqbxBiz9/4nwOBIQjCEUL7FswhwDYAp + JVMiN0oYs/ILiCXRIGHOwVQBoiXsKSgjJdzaBMpQ0g3KEOoG++PcBx9PFJGNjU4vAAAAAElFTkSuQmCC + + + + 181, 22 + + + Tutorials + iVBORw0KGgoAAAANSUhEUgAACOAAAAaoCAYAAAAgNTafAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -21910,20 +21960,6 @@ How PCKs work - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKdJREFUOE+1 - jzEKwzAQBNUEXKQIBOwifcgTUvkDbt2p9qP0Ev1E31FYkVXOx2FLRRYWi7NnTnZ/z/MxZPY7aguhbZlq - myQafL+ubRINshCwnO0kFqi3HkpwWOf7DkC1RBfvx9slV4ElscqbxBiz9/4nwOBIQjCEUL7FswhwDYAp - JVMiN0oYs/ILiCXRIGHOwVQBoiXsKSgjJdzaBMpQ0g3KEOoG++PcBx9PFJGNjU4vAAAAAElFTkSuQmCC - - - - 181, 22 - - - Tutorials - iVBORw0KGgoAAAANSUhEUgAABkAAAAZACAYAAAAhDI6nAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -23927,6 +23963,12 @@ FAQ + + 181, 22 + + + Buy a coffee + 253, 22 @@ -23945,12 +23987,6 @@ For MattNL (Other Developer) - - 181, 22 - - - Buy a coffee - 181, 22 @@ -25798,11 +25834,18 @@ Administrative Tools - - 44, 20 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAAAuSURBVDhPY/j/ + /z9FGMYgFwwbA8gFcANARpEJho0B5AK4ASCjyATDyQAy8X8GAKAaUNpxMP6IAAAAAElFTkSuQmCC + - - Help + + 63, 20 + + + More @@ -28501,46 +28544,18 @@ Join Development Discord - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAAAuSURBVDhPY/j/ - /z9FGMYgFwwbA8gFcANARpEJho0B5AK4ASCjyATDyQAy8X8GAKAaUNpxMP6IAAAAAElFTkSuQmCC - - - - 63, 20 - - - More - - - 24, 44 - - - 1016, 24 - - - 2 - - - menuStrip1 - - - menuStrip - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 298, 17 + + 138, 70 + + + contextMenuMetaTree + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -28584,15 +28599,6 @@ Delete Entry - - 138, 70 - - - contextMenuMetaTree - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - iVBORw0KGgoAAAANSUhEUgAAAbYAAAB7CAYAAAAYCKWuAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -29279,6 +29285,324 @@ 7 + + pckOpen + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openTab + + + 2 + + + label5 + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + openTab + + + 3 + + + labelVersion + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + openTab + + + 4 + + + ChangelogRichTextBox + + + System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openTab + + + 5 + + + 4, 38 + + + 18, 30, 20, 5 + + + 1016, 558 + + + 1 + + + openTab + + + MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + tabControl + + + 0 + + + None + + + Top, Right + + + True + + + 935, 252 + + + 0, 0 + + + 19 + + + labelImageSize + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + editorTab + + + 2 + + + Top, Right + + + True + + + 913, 53 + + + 0, 0 + + + 17 + + + fileEntryCountLabel + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + editorTab + + + 3 + + + Top, Bottom, Right + + + MetaTab + + + MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + PropertiesTabControl + + + 0 + + + 413, 277 + + + 596, 282 + + + 11 + + + PropertiesTabControl + + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + editorTab + + + 4 + + + True + + + True + + + 433, 71 + + + 0, 0 + + + 3 + + + label11 + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + editorTab + + + 5 + + + Top, Bottom, Left, Right + + + False + + + 0 + + + 467, 14 + + + 32, 32 + + + 5, 50 + + + 0, 0, 0, 0 + + + 0 + + + 405, 501 + + + 10 + + + treeViewMain + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + editorTab + + + 6 + + + Top, Right + + + None + + + NoControl + + + 413, 50 + + + 231, 218 + + + Zoom + + + 18 + + + pictureBoxImagePreview + + + PckStudio.PictureBoxWithInterpolationMode, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null + + + editorTab + + + 8 + + + 4, 38 + + + 5, 50, 5, 7 + + + 1016, 558 + + + 0 + + + editorTab + + + MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + tabControl + + + 1 + + + Fill + + + 20, 30 + + + 0, 0, 0, 0 + + + 1024, 600 + + + 0 + + + tabControl + + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 4 + None @@ -29408,89 +29732,104 @@ 5 - - 4, 38 + + metroLabel2 - - 18, 30, 20, 5 - - - 1016, 558 - - - 1 - - - openTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - tabControl - - - 0 - - - None - - - Top, Right - - - True - - - 935, 252 - - - 0, 0 - - - 19 - - - labelImageSize - - + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - editorTab + + MetaTab - + 2 - - Top, Right + + treeMeta - - True + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 913, 53 + + MetaTab - - 0, 0 - - - 17 - - - fileEntryCountLabel - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - editorTab - - + 3 - - Top, Bottom, Right + + entryTypeTextBox + + + MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + MetaTab + + + 4 + + + entryDataTextBox + + + MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + MetaTab + + + 5 + + + buttonEdit + + + MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + MetaTab + + + 6 + + + metroLabel1 + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + MetaTab + + + 7 + + + 4, 38 + + + 3, 3, 3, 3 + + + 588, 240 + + + 0 + + + Properties + + + MetaTab + + + MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + PropertiesTabControl + + + 0 Top, Right @@ -29693,207 +30032,6 @@ 7 - - 4, 38 - - - 3, 3, 3, 3 - - - 588, 240 - - - 0 - - - Properties - - - MetaTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - PropertiesTabControl - - - 0 - - - 413, 277 - - - 596, 282 - - - 11 - - - PropertiesTabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - editorTab - - - 4 - - - True - - - True - - - 433, 71 - - - 0, 0 - - - 3 - - - label11 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - editorTab - - - 5 - - - Top, Bottom, Left, Right - - - False - - - 0 - - - 467, 14 - - - 32, 32 - - - 5, 50 - - - 0, 0, 0, 0 - - - 0 - - - 405, 501 - - - 10 - - - treeViewMain - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - editorTab - - - 6 - - - Top, Right - - - None - - - NoControl - - - 413, 50 - - - 231, 218 - - - Zoom - - - 18 - - - pictureBoxImagePreview - - - PckStudio.PictureBoxWithInterpolationMode, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null - - - editorTab - - - 8 - - - 4, 38 - - - 5, 50, 5, 7 - - - 1016, 558 - - - 0 - - - editorTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - tabControl - - - 1 - - - Fill - - - 20, 30 - - - 0, 0, 0, 0 - - - 1024, 600 - - - 0 - - - tabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 4 - Top, Right @@ -32634,6 +32772,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + generateMipMapTextureToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + fileToolStripMenuItem @@ -32904,10 +33048,10 @@ System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - generateMipMapTextureToolStripMenuItem + + colourscolToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 510ed62c..4a935b9d 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -17,7 +17,7 @@ 1.0.0.%2a false true - true + true Debug @@ -632,6 +632,7 @@ + diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs index 1e761afb..ccf6158d 100644 --- a/PCK-Studio/Properties/Resources.Designer.cs +++ b/PCK-Studio/Properties/Resources.Designer.cs @@ -141,15 +141,17 @@ namespace PckStudio.Properties { } /// - /// Looks up a localized string similar to 6.5 - ///=== - ///-Audio.pck Editor is now the Music Editor with plenty of new features - ///-The Animation Editor now plays animations more accurately - ///-Added MipMap support to the Animation Editor - ///-Added some text to display the common name of the animation that you're working with - ///-Fixed several incorrect internal names for the change tile list - ///-Removed Barrier (Item) from the Change Tile list - ///-Clicking "Cancel" in the Change Tile dialog will no longer overwrite the original tile's name with noth [rest of string was truncated]";. + /// Looks up a localized string similar to 7.0 (BETA) + ///========== + ///Some features may be completely missing or incomplete at this point in time! + /// + ///-Massive codebase overhaul and optimization lead by miku-666 (aka NessieHax)!!! + ///-Some UI redesigned by yaboiFoxx + ///-Improved the changelog! + ///-New icons for each of the file types, with unique image icons for skin, texture, and cape files + ///-Added the ability to create Texture and Mash-Up packs + ///-Added a feature to see stats about any given file, including file type + ///-Added a feature set [rest of string was truncated]";. /// public static string CHANGELOG { get { @@ -197,6 +199,16 @@ namespace PckStudio.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] colours { + get { + object obj = ResourceManager.GetObject("colours", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -511,7 +523,7 @@ namespace PckStudio.Properties { /// Looks up a localized string similar to { /// "COMMENT_1": "Tile data research by MattNL", /// "COMMENT_2": "JSON conversion by PhoenixARC", - /// "Blocks": [ + /// "blocks": [ /// { "grass_top": "Grass Block (Top)" }, /// { "stone": "Stone" }, /// { "dirt": "Dirt" }, diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx index 7c045a1b..541aac8b 100644 --- a/PCK-Studio/Properties/Resources.resx +++ b/PCK-Studio/Properties/Resources.resx @@ -274,4 +274,7 @@ ..\Resources\iconImageList\SKINS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fileTemplates\colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/PCK-Studio/Resources/fileTemplates/colours.col b/PCK-Studio/Resources/fileTemplates/colours.col new file mode 100644 index 0000000000000000000000000000000000000000..bd65c21aa13c887bbc72547fb98d08b120c21ff2 GIT binary patch literal 12564 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 X(oPoLQYQX>UWlx@Iywy0Q274