diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs index f37cc217..8723c4db 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs @@ -33,7 +33,7 @@ namespace PckStudio.Forms.Editor { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(COLEditor)); - this.metroTextBox1 = new MetroFramework.Controls.MetroTextBox(); + this.filterTextBox = new MetroFramework.Controls.MetroTextBox(); this.alphaLabel = new MetroFramework.Controls.MetroLabel(); this.blueLabel = new MetroFramework.Controls.MetroLabel(); this.greenLabel = new MetroFramework.Controls.MetroLabel(); @@ -75,10 +75,10 @@ namespace PckStudio.Forms.Editor this.SetColorButton = new CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton(); this.colorSliderVertical1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorSliderVertical(); this.colorBox2D1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorBox2D(); - this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.blueUpDown = new System.Windows.Forms.NumericUpDown(); + this.greenUpDown = new System.Windows.Forms.NumericUpDown(); + this.redUpDown = new System.Windows.Forms.NumericUpDown(); + this.alphaUpDown = new System.Windows.Forms.NumericUpDown(); this.crEaTiiOn_ModernSlider3 = new CBH.Controls.CrEaTiiOn_ModernSlider(); this.crEaTiiOn_ModernSlider4 = new CBH.Controls.CrEaTiiOn_ModernSlider(); this.crEaTiiOn_ModernSlider2 = new CBH.Controls.CrEaTiiOn_ModernSlider(); @@ -92,42 +92,42 @@ namespace PckStudio.Forms.Editor this.underwaterTab.SuspendLayout(); this.fogTab.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.alphaUpDown)).BeginInit(); this.SuspendLayout(); // - // metroTextBox1 + // filterTextBox // // // // - this.metroTextBox1.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); - this.metroTextBox1.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); - this.metroTextBox1.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); - this.metroTextBox1.CustomButton.Name = ""; - this.metroTextBox1.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); - this.metroTextBox1.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.metroTextBox1.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex"))); - this.metroTextBox1.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.metroTextBox1.CustomButton.UseSelectable = true; - this.metroTextBox1.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); - this.metroTextBox1.Lines = new string[0]; - resources.ApplyResources(this.metroTextBox1, "metroTextBox1"); - this.metroTextBox1.MaxLength = 32767; - this.metroTextBox1.Name = "metroTextBox1"; - this.metroTextBox1.PasswordChar = '\0'; - this.metroTextBox1.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.metroTextBox1.SelectedText = ""; - this.metroTextBox1.SelectionLength = 0; - this.metroTextBox1.SelectionStart = 0; - this.metroTextBox1.ShortcutsEnabled = true; - this.metroTextBox1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroTextBox1.UseSelectable = true; - this.metroTextBox1.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.metroTextBox1.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); - this.metroTextBox1.TextChanged += new System.EventHandler(this.metroTextBox1_TextChanged); + this.filterTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); + this.filterTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); + this.filterTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); + this.filterTextBox.CustomButton.Name = ""; + this.filterTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); + this.filterTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.filterTextBox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex"))); + this.filterTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.filterTextBox.CustomButton.UseSelectable = true; + this.filterTextBox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); + this.filterTextBox.Lines = new string[0]; + resources.ApplyResources(this.filterTextBox, "filterTextBox"); + this.filterTextBox.MaxLength = 32767; + this.filterTextBox.Name = "filterTextBox"; + this.filterTextBox.PasswordChar = '\0'; + this.filterTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.filterTextBox.SelectedText = ""; + this.filterTextBox.SelectionLength = 0; + this.filterTextBox.SelectionStart = 0; + this.filterTextBox.ShortcutsEnabled = true; + this.filterTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; + this.filterTextBox.UseSelectable = true; + this.filterTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.filterTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.filterTextBox.TextChanged += new System.EventHandler(this.metroTextBox1_TextChanged); // // alphaLabel // @@ -432,10 +432,10 @@ namespace PckStudio.Forms.Editor this.panel1.Controls.Add(this.SetColorButton); this.panel1.Controls.Add(this.colorSliderVertical1); this.panel1.Controls.Add(this.colorBox2D1); - this.panel1.Controls.Add(this.numericUpDown4); - this.panel1.Controls.Add(this.numericUpDown3); - this.panel1.Controls.Add(this.numericUpDown2); - this.panel1.Controls.Add(this.numericUpDown1); + this.panel1.Controls.Add(this.blueUpDown); + this.panel1.Controls.Add(this.greenUpDown); + this.panel1.Controls.Add(this.redUpDown); + this.panel1.Controls.Add(this.alphaUpDown); this.panel1.Controls.Add(this.crEaTiiOn_ModernSlider3); this.panel1.Controls.Add(this.crEaTiiOn_ModernSlider4); this.panel1.Controls.Add(this.crEaTiiOn_ModernSlider2); @@ -487,37 +487,57 @@ namespace PckStudio.Forms.Editor resources.ApplyResources(this.colorBox2D1, "colorBox2D1"); this.colorBox2D1.Name = "colorBox2D1"; // - // numericUpDown4 + // blueUpDown // - this.numericUpDown4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown4.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown4, "numericUpDown4"); - this.numericUpDown4.Name = "numericUpDown4"; + this.blueUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.blueUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.blueUpDown.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.blueUpDown, "blueUpDown"); + this.blueUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.blueUpDown.Name = "blueUpDown"; // - // numericUpDown3 + // greenUpDown // - this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown3.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); - this.numericUpDown3.Name = "numericUpDown3"; + this.greenUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.greenUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.greenUpDown.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.greenUpDown, "greenUpDown"); + this.greenUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.greenUpDown.Name = "greenUpDown"; // - // numericUpDown2 + // redUpDown // - this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown2.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); - this.numericUpDown2.Name = "numericUpDown2"; + this.redUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.redUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.redUpDown.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.redUpDown, "redUpDown"); + this.redUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.redUpDown.Name = "redUpDown"; // - // numericUpDown1 + // alphaUpDown // - this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown1.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown1, "numericUpDown1"); - this.numericUpDown1.Name = "numericUpDown1"; + this.alphaUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.alphaUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.alphaUpDown.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.alphaUpDown, "alphaUpDown"); + this.alphaUpDown.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.alphaUpDown.Name = "alphaUpDown"; // // crEaTiiOn_ModernSlider3 // @@ -614,7 +634,7 @@ namespace PckStudio.Forms.Editor this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); this.Controls.Add(this.tabControl); this.Controls.Add(this.panel1); - this.Controls.Add(this.metroTextBox1); + this.Controls.Add(this.filterTextBox); this.Controls.Add(this.menuStrip); this.ForeColor = System.Drawing.Color.White; this.Name = "COLEditor"; @@ -629,10 +649,10 @@ namespace PckStudio.Forms.Editor this.fogTab.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.alphaUpDown)).EndInit(); this.ResumeLayout(false); } @@ -659,7 +679,7 @@ namespace PckStudio.Forms.Editor private MetroFramework.Controls.MetroLabel metroLabel1; private MetroFramework.Controls.MetroContextMenu ColorContextMenu; private ToolStripMenuItem restoreOriginalColorToolStripMenuItem; - private MetroFramework.Controls.MetroTextBox metroTextBox1; + private MetroFramework.Controls.MetroTextBox filterTextBox; private ToolStripMenuItem targetUpdateToolToolStripMenuItem; private ToolStripMenuItem TU12ToolStripMenuItem; private ToolStripMenuItem TU13ToolStripMenuItem; @@ -679,10 +699,10 @@ namespace PckStudio.Forms.Editor private Panel panel1; private MechanikaDesign.WinForms.UI.ColorPicker.ColorSliderVertical colorSliderVertical1; private MechanikaDesign.WinForms.UI.ColorPicker.ColorBox2D colorBox2D1; - private NumericUpDown numericUpDown4; - private NumericUpDown numericUpDown3; - private NumericUpDown numericUpDown2; - private NumericUpDown numericUpDown1; + private NumericUpDown blueUpDown; + private NumericUpDown greenUpDown; + private NumericUpDown redUpDown; + private NumericUpDown alphaUpDown; private CBH.Controls.CrEaTiiOn_ModernSlider crEaTiiOn_ModernSlider3; private CBH.Controls.CrEaTiiOn_ModernSlider crEaTiiOn_ModernSlider4; private CBH.Controls.CrEaTiiOn_ModernSlider crEaTiiOn_ModernSlider2; diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index 79124751..f35f3ab0 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; @@ -24,7 +25,33 @@ namespace PckStudio.Forms.Editor List underwaterCache = new List(); List fogCache = new List(); - public COLEditor(PckFile.FileData file) + private static ICollection PS4Biomes = new List + { + "bamboo_jungle", + "bamboo_jungle_hills", + "mesa_mutated", + "mega_spruce_taiga_mutated", + "mega_taiga_mutated" + }; + + private enum TitleVersion + { + TU12, + TU13, + TU14, + TU19, + TU31, + TU32, + TU43, + TU46, + TU51, + TU53, + TU54, + TU69, + _1_91_, + } + + public COLEditor(PckFile.FileData file) { InitializeComponent(); _file = file; @@ -35,246 +62,278 @@ namespace PckStudio.Forms.Editor colourfile = reader.FromStream(stream); } - TU12ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 0); - TU13ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 1); - TU14ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 2); - TU19ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 3); - TU31ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 4); - TU32ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 5); - TU43ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 6); - TU46ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 7); - TU51ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 8); - TU53ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 9); - TU54ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 10); - TU69ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 11); - _1_9_1ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 12); + TU12ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU12); + TU13ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU13); + TU14ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU14); + TU19ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU19); + TU31ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU31); + TU32ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU32); + TU43ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU43); + TU46ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU46); + TU51ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU51); + TU53ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU53); + TU54ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU54); + TU69ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion.TU69); + _1_9_1ToolStripMenuItem.Click += (sender, e) => SetUpDefaultColourFile(sender, e, TitleVersion._1_91_); - SetUpDefaultFile(null, EventArgs.Empty, 11, false); + SetUpDefaultColourFile(null, EventArgs.Empty, TitleVersion.TU69, false); } - private void SetUpDefaultFile(object sender, EventArgs e, int ID, bool targetVersion = true) + private void SetUpDefaultColourFile(object sender, EventArgs e, TitleVersion id, bool useTargetVersion = true) { - if(targetVersion) + if (useTargetVersion) { - var result = MessageBox.Show(this, "This function will set up your colour table to match that of the chosen version. You may lose some entries in the table. Are you sure you would like to continue?", "Target update version?", MessageBoxButtons.YesNo); - if (result == DialogResult.No) return; + var result = MessageBox.Show(this, + "This function will set up your colour table to match that of the chosen version." + + "You may lose some entries in the table. Are you sure you would like to continue?", + "Target update version?", MessageBoxButtons.YesNo); + if (result == DialogResult.No) + return; } - - var reader = new COLFileReader(); - - switch (ID) - { - case 0: using (var stream = new MemoryStream(Properties.Resources.tu12colours)) default_colourfile = reader.FromStream(stream); break; - case 1: using (var stream = new MemoryStream(Properties.Resources.tu13colours)) default_colourfile = reader.FromStream(stream); break; - case 2: using (var stream = new MemoryStream(Properties.Resources.tu14colours)) default_colourfile = reader.FromStream(stream); break; - case 3: using (var stream = new MemoryStream(Properties.Resources.tu19colours)) default_colourfile = reader.FromStream(stream); break; - case 4: using (var stream = new MemoryStream(Properties.Resources.tu31colours)) default_colourfile = reader.FromStream(stream); break; - case 5: using (var stream = new MemoryStream(Properties.Resources.tu32colours)) default_colourfile = reader.FromStream(stream); break; - case 6: using (var stream = new MemoryStream(Properties.Resources.tu43colours)) default_colourfile = reader.FromStream(stream); break; - case 7: using (var stream = new MemoryStream(Properties.Resources.tu46colours)) default_colourfile = reader.FromStream(stream); break; - case 8: using (var stream = new MemoryStream(Properties.Resources.tu51colours)) default_colourfile = reader.FromStream(stream); break; - case 9: using (var stream = new MemoryStream(Properties.Resources.tu53colours)) default_colourfile = reader.FromStream(stream); break; - case 10: using (var stream = new MemoryStream(Properties.Resources.tu54colours)) default_colourfile = reader.FromStream(stream); break; - case 11: using (var stream = new MemoryStream(Properties.Resources.tu69colours)) default_colourfile = reader.FromStream(stream); break; - case 12: using (var stream = new MemoryStream(Properties.Resources._1_91_colours)) default_colourfile = reader.FromStream(stream); break; - default: return; - } - SetUpTable(targetVersion); + SetDefaultColourFile(id); + SetUpTable(useTargetVersion ? default_colourfile : colourfile); } - void SetUpTable(bool targetVersion) + private void SetDefaultColourFile(TitleVersion titleVer) + { + var reader = new COLFileReader(); + var data = titleVer switch + { + TitleVersion.TU12 => Properties.Resources.tu12colours, + TitleVersion.TU13 => Properties.Resources.tu13colours, + TitleVersion.TU14 => Properties.Resources.tu14colours, + TitleVersion.TU19 => Properties.Resources.tu19colours, + TitleVersion.TU31 => Properties.Resources.tu31colours, + TitleVersion.TU32 => Properties.Resources.tu32colours, + TitleVersion.TU43 => Properties.Resources.tu43colours, + TitleVersion.TU46 => Properties.Resources.tu46colours, + TitleVersion.TU51 => Properties.Resources.tu51colours, + TitleVersion.TU53 => Properties.Resources.tu53colours, + TitleVersion.TU54 => Properties.Resources.tu54colours, + TitleVersion.TU69 => Properties.Resources.tu69colours, + TitleVersion._1_91_ => Properties.Resources._1_91_colours, + _ => throw new InvalidDataException(titleVer.ToString()), + }; + + using (var stream = new MemoryStream(data)) + default_colourfile = reader.FromStream(stream); + } + + + void SetUpTable(ColorContainer colorFile) { colorTreeView.Nodes.Clear(); waterTreeView.Nodes.Clear(); underwaterTreeView.Nodes.Clear(); fogTreeView.Nodes.Clear(); - ColorContainer temp = targetVersion ? default_colourfile : colourfile; + List currentEntries = new List(); - List CurrentEntries = new List(); - - foreach (var obj in temp.Colors) + foreach (var color in colorFile.Colors) { - var entry = colourfile.Colors.Find(color => color.Name == obj.Name); - TreeNode tn = new TreeNode(obj.Name); - tn.Tag = entry != null ? entry : obj; - if (CurrentEntries.Contains(obj.Name)) continue; - CurrentEntries.Add(obj.Name); - colorTreeView.Nodes.Add(tn); - colorCache.Add(tn); + var entry = colourfile.Colors.Find(c => c.Name == color.Name); + if (currentEntries.Contains(color.Name)) + continue; + + currentEntries.Add(color.Name); + + TreeNode colorNode = new TreeNode(color.Name); + colorNode.Tag = entry ?? color; + colorTreeView.Nodes.Add(colorNode); + colorCache.Add(colorNode); } - CurrentEntries.Clear(); - foreach (var obj in temp.WaterColors) + currentEntries.Clear(); + foreach (var waterColor in colorFile.WaterColors) { - var entry = colourfile.WaterColors.Find(color => color.Name == obj.Name); - TreeNode tn = new TreeNode(obj.Name); - tn.Tag = entry != null ? entry : obj; - if (CurrentEntries.Contains(obj.Name)) continue; - CurrentEntries.Add(obj.Name); - waterTreeView.Nodes.Add(tn); - waterCache.Add(tn); - TreeNode tnB = new TreeNode(obj.Name); - tnB.Tag = entry != null ? entry : obj; - underwaterTreeView.Nodes.Add(tnB); - underwaterCache.Add(tnB); - TreeNode tnC = new TreeNode(obj.Name); - tnC.Tag = entry != null ? entry : obj; - fogTreeView.Nodes.Add(tnC); - fogCache.Add(tnC); + var entry = colourfile.WaterColors.Find(c => c.Name == waterColor.Name); + if (currentEntries.Contains(waterColor.Name)) + continue; + currentEntries.Add(waterColor.Name); + + TreeNode waterNode = new TreeNode(waterColor.Name); + waterNode.Tag = entry ?? waterColor; + waterTreeView.Nodes.Add(waterNode); + waterCache.Add(waterNode); + + TreeNode underWaterNode = new TreeNode(waterColor.Name); + underWaterNode.Tag = entry ?? waterColor; + underwaterTreeView.Nodes.Add(underWaterNode); + underwaterCache.Add(underWaterNode); + + TreeNode fogNode = new TreeNode(waterColor.Name); + fogNode.Tag = entry ?? waterColor; + fogTreeView.Nodes.Add(fogNode); + fogCache.Add(fogNode); } } - void SetUpValueChanged(bool add) + void SetValueChangedEventActive(bool activate) { - if(add) + if (activate) { - //NML Miku PhoenixARC, more errors - //alphaUpDown.ValueChanged += color_ValueChanged; - //redUpDown.ValueChanged += color_ValueChanged; - //greenUpDown.ValueChanged += color_ValueChanged; - //blueUpDown.ValueChanged += color_ValueChanged; - } + alphaUpDown.ValueChanged += color_ValueChanged; + redUpDown.ValueChanged += color_ValueChanged; + greenUpDown.ValueChanged += color_ValueChanged; + blueUpDown.ValueChanged += color_ValueChanged; + } else { - //alphaUpDown.ValueChanged -= color_ValueChanged; - //redUpDown.ValueChanged -= color_ValueChanged; - //greenUpDown.ValueChanged -= color_ValueChanged; - //blueUpDown.ValueChanged -= color_ValueChanged; - } + alphaUpDown.ValueChanged -= color_ValueChanged; + redUpDown.ValueChanged -= color_ValueChanged; + greenUpDown.ValueChanged -= color_ValueChanged; + blueUpDown.ValueChanged -= color_ValueChanged; + } } - private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) + private void color_ValueChanged(object sender, EventArgs e) + { + Color fixed_color = new Color(); + if (tabControl.SelectedTab == colorsTab) + { + var colorEntry = (ColorContainer.Color)colorTreeView.SelectedNode.Tag; + colorEntry.ColorPallette = fixed_color = Color.FromArgb(255, (int)redUpDown.Value, (int)greenUpDown.Value, (int)blueUpDown.Value); + } + else if (tabControl.SelectedTab != null && waterTreeView.SelectedNode != null) // just in case + { + var colorEntry = (ColorContainer.WaterColor)waterTreeView.SelectedNode.Tag; + fixed_color = Color.FromArgb((int)alphaUpDown.Value, + (int)redUpDown.Value, + (int)greenUpDown.Value, + (int)blueUpDown.Value); + if (tabControl.SelectedTab == waterTab) + colorEntry.SurfaceColor = fixed_color; + else if (tabControl.SelectedTab == underwaterTab) + colorEntry.UnderwaterColor = fixed_color; + else + colorEntry.FogColor = fixed_color; + } + + pictureBox1.BackColor = fixed_color; + } + + private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) { - if (colorTreeView.SelectedNode.Tag == null) + if (colorTreeView.SelectedNode?.Tag is null) return; var colorEntry = (ColorContainer.Color)colorTreeView.SelectedNode.Tag; - var color = colorEntry.ColorPallette.ToArgb(); - SetUpValueChanged(false); - //alphaUpDown.Visible = false; - //alphaLabel.Visible = false; - //redUpDown.Value = color >> 16 & 0xff; - //greenUpDown.Value = color >> 8 & 0xff; - //blueUpDown.Value = color & 0xff; - pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)color); - SetUpValueChanged(true); + var color = colorEntry.ColorPallette; + SetValueChangedEventActive(false); + alphaUpDown.Visible = false; + alphaLabel.Visible = false; + UpdateDisplayColor(color); + SetValueChangedEventActive(true); } private void treeView2_AfterSelect(object sender, TreeViewEventArgs e) { - if (waterTreeView.SelectedNode.Tag == null) + if (waterTreeView.SelectedNode?.Tag is null) return; var colorEntry = (ColorContainer.WaterColor)waterTreeView.SelectedNode.Tag; - int color = colorEntry.SurfaceColor.ToArgb(); - SetUpValueChanged(false); - //alphaUpDown.Enabled = true; - //alphaUpDown.Visible = true; - //alphaLabel.Visible = true; - //alphaUpDown.Value = color >> 24 & 0xff; - //redUpDown.Value = color >> 16 & 0xff; - //greenUpDown.Value = color >> 8 & 0xff; - //blueUpDown.Value = color & 0xff; - pictureBox1.BackColor = Color.FromArgb(color); - SetUpValueChanged(true); + var color = colorEntry.SurfaceColor; + SetValueChangedEventActive(false); + alphaUpDown.Enabled = true; + alphaUpDown.Visible = true; + alphaLabel.Visible = true; + alphaUpDown.Value = color.A; + UpdateDisplayColor(color); + SetValueChangedEventActive(true); } private void treeView3_AfterSelect(object sender, TreeViewEventArgs e) { - if (underwaterTreeView.SelectedNode.Tag == null) + if (underwaterTreeView.SelectedNode?.Tag is null) return; var colorEntry = (ColorContainer.WaterColor)underwaterTreeView.SelectedNode.Tag; - int color = colorEntry.UnderwaterColor.ToArgb(); - SetUpValueChanged(false); - //alphaUpDown.Visible = false; - alphaLabel.Visible = false; - //redUpDown.Value = color >> 16 & 0xff; - //greenUpDown.Value = color >> 8 & 0xff; - //blueUpDown.Value = color & 0xff; - //pictureBox1.BackColor = Color.FromArgb(255, Color.FromArgb(0xff << 24 | color)); - SetUpValueChanged(true); + var color = colorEntry.UnderwaterColor; + SetValueChangedEventActive(false); + alphaUpDown.Visible = false; + alphaLabel.Visible = false; + UpdateDisplayColor(color); + SetValueChangedEventActive(true); } private void treeView4_AfterSelect(object sender, TreeViewEventArgs e) { - if (fogTreeView.SelectedNode.Tag == null) + if (fogTreeView.SelectedNode?.Tag is null) return; var colorEntry = (ColorContainer.WaterColor)fogTreeView.SelectedNode.Tag; - int color = colorEntry.FogColor.ToArgb(); - SetUpValueChanged(false); - //alphaUpDown.Visible = false; + var color = colorEntry.FogColor; + SetValueChangedEventActive(false); alphaLabel.Visible = false; - //redUpDown.Value = color >> 16 & 0xff; - //greenUpDown.Value = color >> 8 & 0xff; - //blueUpDown.Value = color & 0xff; - pictureBox1.BackColor = Color.FromArgb(255, Color.FromArgb(0xff << 24 | color)); - SetUpValueChanged(true); + alphaUpDown.Visible = false; + UpdateDisplayColor(color); + SetValueChangedEventActive(true); } private void saveToolStripMenuItem1_Click(object sender, EventArgs e) { - List PS4Biomes = new List - { - "bamboo_jungle", - "bamboo_jungle_hills", - "mesa_mutated", - "mega_spruce_taiga_mutated", - "mega_taiga_mutated" - }; - if (colourfile.WaterColors.Find(e => PS4Biomes.Contains(e.Name)) != null) { - var result = MessageBox.Show(this, "Biomes exclusive to PS4 Edition v1.91 were found in the water section of this colour table. This will crash all other editions of the game and PS4 Edition v1.90 and below. Would you like to remove them?", "Potentially unsupported biomes found", MessageBoxButtons.YesNoCancel); - switch (result) + var result = MessageBox.Show(this, + "Biomes exclusive to PS4 Edition v1.91 were found in the water section of this colour table. " + + "This will crash all other editions of the game and PS4 Edition v1.90 and below. " + + "Would you like to remove them?", + "Potentially unsupported biomes found", MessageBoxButtons.YesNoCancel); + if (result == DialogResult.Yes) { - case DialogResult.Yes: - foreach (var col in colourfile.WaterColors.ToList()) - { - if(PS4Biomes.Contains(col.Name)) colourfile.WaterColors.Remove(col); - } - break; - case DialogResult.No: - break; - default: - return; + foreach (var col in colourfile.WaterColors) + { + if (PS4Biomes.Contains(col.Name)) + colourfile.WaterColors.Remove(col); + } } } + using (var stream = new MemoryStream()) { var writer = new COLFileWriter(colourfile); writer.WriteToStream(stream); _file.SetData(stream.ToArray()); } + DialogResult = DialogResult.OK; } public void treeView1_KeyDown(object sender, KeyEventArgs e) { var node = colorTreeView.SelectedNode; - if (e.KeyCode == Keys.Delete && node.Tag is ColorContainer.Color) + + if (node?.Tag is not ColorContainer.Color) + return; + + const Keys CTRL_C = Keys.Control | Keys.C; + const Keys CTRL_V = Keys.Control | Keys.V; + + switch (e.KeyCode) { - restoreOriginalColorToolStripMenuItem_Click(sender, e); - } - else if (e.Control && e.KeyCode == Keys.C && node.Tag is ColorContainer.Color) - { - copyColorToolStripMenuItem_Click(sender, e); - } - else if (e.Control && e.KeyCode == Keys.V && node.Tag is ColorContainer.Color) - { - pasteColorToolStripMenuItem_Click(sender, e); - } + case Keys.Delete: + restoreOriginalColorToolStripMenuItem_Click(sender, e); + break; + case CTRL_C: + copyColorToolStripMenuItem_Click(sender, e); + break; + case CTRL_V: + pasteColorToolStripMenuItem_Click(sender, e); + break; + }; } private void treeView2_KeyDown(object sender, KeyEventArgs e) { var node = waterTreeView.SelectedNode; - if (e.KeyCode == Keys.Delete && node.Tag is ColorContainer.WaterColor) + + if (node?.Tag is not ColorContainer.WaterColor) + return; + + if (e.KeyCode == Keys.Delete) { restoreOriginalColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.C && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.C) { copyColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.V && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.V) { pasteColorToolStripMenuItem_Click(sender, e); } @@ -283,15 +342,19 @@ namespace PckStudio.Forms.Editor private void treeView3_KeyDown(object sender, KeyEventArgs e) { var node = underwaterTreeView.SelectedNode; - if (e.KeyCode == Keys.Delete && node.Tag is ColorContainer.WaterColor) + + if (node?.Tag is not ColorContainer.WaterColor) + return; + + if (e.KeyCode == Keys.Delete) { restoreOriginalColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.C && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.C) { copyColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.V && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.V) { pasteColorToolStripMenuItem_Click(sender, e); } @@ -300,15 +363,19 @@ namespace PckStudio.Forms.Editor private void treeView4_KeyDown(object sender, KeyEventArgs e) { var node = fogTreeView.SelectedNode; - if (e.KeyCode == Keys.Delete && node.Tag is ColorContainer.WaterColor) + + if (node?.Tag is not ColorContainer.WaterColor) + return; + + if (e.KeyCode == Keys.Delete) { restoreOriginalColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.C && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.C) { copyColorToolStripMenuItem_Click(sender, e); } - else if (e.Control && e.KeyCode == Keys.V && node.Tag is ColorContainer.WaterColor) + else if (e.Control && e.KeyCode == Keys.V) { pasteColorToolStripMenuItem_Click(sender, e); } @@ -325,7 +392,7 @@ namespace PckStudio.Forms.Editor //greenUpDown.Value = StringToByteArrayFastest(colorTextbox.Text)[!hasAlpha ? 1 : 2]; //blueUpDown.Value = StringToByteArrayFastest(colorTextbox.Text)[!hasAlpha ? 2 : 3]; //int color = 0; /*colorEntry.color*/; - // int argb = (int)((0xff000000u) | (color >> 24)); + //int argb = (int)((0xff000000u) | (color >> 24)); //colorTextbox.MaxLength = hasAlpha ? 8 : 6; //alphaLabel.Visible = false; //alphaUpDown.Visible = false; @@ -345,13 +412,13 @@ namespace PckStudio.Forms.Editor waterTreeView.SelectedNode.Tag != null && waterTreeView.SelectedNode.Tag is ColorContainer.WaterColor) { var colorEntry = (ColorContainer.WaterColor)waterTreeView.SelectedNode.Tag; - //pictureBox1.BackColor = colorEntry.SurfaceColor = Color.FromArgb((int)alphaUpDown.Value, colorEntry.SurfaceColor); + pictureBox1.BackColor = colorEntry.SurfaceColor = Color.FromArgb((int)alphaUpDown.Value, colorEntry.SurfaceColor); } } private void restoreOriginalColorToolStripMenuItem_Click(object sender, EventArgs e) { - SetUpValueChanged(false); + SetValueChangedEventActive(false); if (tabControl.SelectedTab == colorsTab && colorTreeView.SelectedNode != null && colorTreeView.SelectedNode.Tag != null && colorTreeView.SelectedNode.Tag is ColorContainer.Color colorInfoD) { @@ -380,16 +447,16 @@ namespace PckStudio.Forms.Editor colorInfoC.FogColor = entry.FogColor; UpdateDisplayColor(entry.FogColor); } - SetUpValueChanged(true); + SetValueChangedEventActive(true); } private void UpdateDisplayColor(Color color) { - //alphaUpDown.Value = color.A; - //redUpDown.Value = color.R; - //greenUpDown.Value = color.G; - //blueUpDown.Value = color.B; - pictureBox1.BackColor = Color.FromArgb(tabControl.SelectedTab == colorsTab ? 0xFF : color.A, color); + alphaUpDown.Value = color.A; + redUpDown.Value = color.R; + greenUpDown.Value = color.G; + blueUpDown.Value = color.B; + pictureBox1.BackColor = Color.FromArgb(0xff, color); } private void metroTextBox1_TextChanged(object sender, EventArgs e) @@ -406,54 +473,54 @@ namespace PckStudio.Forms.Editor underwaterTreeView.Nodes.Clear(); fogTreeView.BeginUpdate(); fogTreeView.Nodes.Clear(); - if (!string.IsNullOrEmpty(metroTextBox1.Text)) + if (!string.IsNullOrEmpty(filterTextBox.Text)) { - foreach (TreeNode _node in colorCache) + foreach (TreeNode cachedNode in colorCache) { - if (_node.Text.ToLower().Contains(metroTextBox1.Text.ToLower())) + if (cachedNode.Text.ToLower().Contains(filterTextBox.Text.ToLower())) { - colorTreeView.Nodes.Add((TreeNode)_node.Clone()); + colorTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } } - foreach (TreeNode _node in waterCache) + foreach (TreeNode cachedNode in waterCache) { - if (_node.Text.ToLower().Contains(metroTextBox1.Text.ToLower())) + if (cachedNode.Text.ToLower().Contains(filterTextBox.Text.ToLower())) { - waterTreeView.Nodes.Add((TreeNode)_node.Clone()); + waterTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } } - foreach (TreeNode _node in underwaterCache) + foreach (TreeNode cachedNode in underwaterCache) { - if (_node.Text.ToLower().Contains(metroTextBox1.Text.ToLower())) + if (cachedNode.Text.ToLower().Contains(filterTextBox.Text.ToLower())) { - underwaterTreeView.Nodes.Add((TreeNode)_node.Clone()); + underwaterTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } } - foreach (TreeNode _node in fogCache) + foreach (TreeNode cachedNode in fogCache) { - if (_node.Text.ToLower().Contains(metroTextBox1.Text.ToLower())) + if (cachedNode.Text.ToLower().Contains(filterTextBox.Text.ToLower())) { - fogTreeView.Nodes.Add((TreeNode)_node.Clone()); + fogTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } } } else { - foreach (TreeNode _node in colorCache) + foreach (TreeNode cachedNode in colorCache) { - colorTreeView.Nodes.Add((TreeNode)_node.Clone()); + colorTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } - foreach (TreeNode _node in waterCache) + foreach (TreeNode cachedNode in waterCache) { - waterTreeView.Nodes.Add((TreeNode)_node.Clone()); + waterTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } - foreach (TreeNode _node in underwaterCache) + foreach (TreeNode cachedNode in underwaterCache) { - underwaterTreeView.Nodes.Add((TreeNode)_node.Clone()); + underwaterTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } - foreach (TreeNode _node in fogCache) + foreach (TreeNode cachedNode in fogCache) { - fogTreeView.Nodes.Add((TreeNode)_node.Clone()); + fogTreeView.Nodes.Add((TreeNode)cachedNode.Clone()); } } //enables redrawing tree after all objects have been added @@ -467,7 +534,7 @@ namespace PckStudio.Forms.Editor { var colorToCopy = new ColorContainer.Color() { - Name = "", + Name = string.Empty, ColorPallette = new Color() }; if (tabControl.SelectedTab == colorsTab && colorTreeView.SelectedNode.Tag is ColorContainer.Color colorInfoD) @@ -492,7 +559,7 @@ namespace PckStudio.Forms.Editor private void pasteColorToolStripMenuItem_Click(object sender, EventArgs e) { if (clipboard_color == null) return; - SetUpValueChanged(false); + SetValueChangedEventActive(false); Color fixed_color = Color.FromArgb(255, Color.FromArgb(0xff, clipboard_color.ColorPallette)); if (tabControl.SelectedTab == waterTab && waterTreeView.SelectedNode != null && @@ -520,12 +587,12 @@ namespace PckStudio.Forms.Editor colorEntry.ColorPallette = fixed_color; } - //redUpDown.Value = clipboard_color.color >> 16 & 0xff; - //greenUpDown.Value = clipboard_color.color >> 8 & 0xff; - //blueUpDown.Value = clipboard_color.color & 0xff; - //pictureBox1.BackColor = fixed_color; - //SetUpValueChanged(true); - } + redUpDown.Value = clipboard_color.ColorPallette.R; + greenUpDown.Value = clipboard_color.ColorPallette.G; + blueUpDown.Value = clipboard_color.ColorPallette.B; + pictureBox1.BackColor = fixed_color; + SetValueChangedEventActive(true); + } private void SetColorButton_Click(object sender, EventArgs e) { @@ -543,40 +610,39 @@ namespace PckStudio.Forms.Editor Color fixed_color = Color.FromArgb(colorEntry.SurfaceColor.A, colorPick.Color); colorEntry.SurfaceColor = fixed_color; pictureBox1.BackColor = fixed_color; - //redUpDown.Value = colorPick.Color.R; - //greenUpDown.Value = colorPick.Color.G; - //blueUpDown.Value = colorPick.Color.B; - //MNL Miku or PhoenixARC all of these were errors - } + redUpDown.Value = colorPick.Color.R; + greenUpDown.Value = colorPick.Color.G; + blueUpDown.Value = colorPick.Color.B; + } else if (tabControl.SelectedTab == underwaterTab && underwaterTreeView.SelectedNode != null && underwaterTreeView.SelectedNode.Tag != null && underwaterTreeView.SelectedNode.Tag is ColorContainer.WaterColor) { var colorEntry = ((ColorContainer.WaterColor)underwaterTreeView.SelectedNode.Tag); // the game doesn't care about the alpha value for underwater colors colorEntry.UnderwaterColor = Color.FromArgb(0, colorPick.Color); - //redUpDown.Value = colorPick.Color.R; - //greenUpDown.Value = colorPick.Color.G; - //blueUpDown.Value = colorPick.Color.B; - } - else if (tabControl.SelectedTab == fogTab && fogTreeView.SelectedNode != null && + redUpDown.Value = colorPick.Color.R; + greenUpDown.Value = colorPick.Color.G; + blueUpDown.Value = colorPick.Color.B; + } + else if (tabControl.SelectedTab == fogTab && fogTreeView.SelectedNode != null && fogTreeView.SelectedNode.Tag != null && fogTreeView.SelectedNode.Tag is ColorContainer.WaterColor) { var colorEntry = ((ColorContainer.WaterColor)fogTreeView.SelectedNode.Tag); // the game doesn't care about the alpha value for fog colors colorEntry.FogColor = Color.FromArgb(0, colorPick.Color); - //redUpDown.Value = colorPick.Color.R; - //greenUpDown.Value = colorPick.Color.G; - //blueUpDown.Value = colorPick.Color.B; - } + redUpDown.Value = colorPick.Color.R; + greenUpDown.Value = colorPick.Color.G; + blueUpDown.Value = colorPick.Color.B; + } else if (tabControl.SelectedTab == colorsTab && colorTreeView.SelectedNode != null && colorTreeView.SelectedNode.Tag != null && colorTreeView.SelectedNode.Tag is ColorContainer.Color) { var colorEntry = ((ColorContainer.Color)colorTreeView.SelectedNode.Tag); colorEntry.ColorPallette = colorPick.Color; - //redUpDown.Value = colorPick.Color.R; - //greenUpDown.Value = colorPick.Color.G; - //blueUpDown.Value = colorPick.Color.B; - } + redUpDown.Value = colorPick.Color.R; + greenUpDown.Value = colorPick.Color.G; + blueUpDown.Value = colorPick.Color.B; + } colorPick.Dispose(); } } diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx index 6db27444..9da0eb05 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.resx +++ b/PCK-Studio/Forms/Editor/COLEditor.resx @@ -138,25 +138,25 @@ False - + 16, 31 - + 324, 23 - + 24 - - metroTextBox1 + + filterTextBox - + MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - + $this - + 3 @@ -851,88 +851,88 @@ 2 - + 358, 391 - + 50, 22 - + 31 - - numericUpDown4 + + blueUpDown - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - + 3 - + 358, 367 - + 50, 22 - + 30 - - numericUpDown3 + + greenUpDown - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - + 4 - + 358, 341 - + 50, 22 - + 29 - - numericUpDown2 + + redUpDown - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - + 5 - + 358, 316 - + 50, 22 - + 28 - - numericUpDown1 + + alphaUpDown - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - + 6