diff --git a/CSM Visualiser/Form1.cs b/CSM Visualiser/Form1.cs index ee618cd2..0dc53672 100644 --- a/CSM Visualiser/Form1.cs +++ b/CSM Visualiser/Form1.cs @@ -81,7 +81,6 @@ namespace CSM_Visualiser sw.Write(""); sw.Close(); string data = System.IO.File.ReadAllText(url); - int splitnum = 11; string[] data0 = data.Split('\n'); foreach (string str in data0) diff --git a/MinecraftUSkinEditor/Classes/FileTypes/LOC.cs b/MinecraftUSkinEditor/Classes/FileTypes/LOC.cs index e8fca16b..f94edb7d 100644 --- a/MinecraftUSkinEditor/Classes/FileTypes/LOC.cs +++ b/MinecraftUSkinEditor/Classes/FileTypes/LOC.cs @@ -75,7 +75,7 @@ namespace PckStudio int unk1 = f.readInt(); if (unk1 != 2) - throw new NotImplementedException("Not localization data"); + throw new NotImplementedException("Unsupported localization data"); int langCount = f.readInt(); f.skip(1); diff --git a/MinecraftUSkinEditor/Classes/FileTypes/PCK.cs b/MinecraftUSkinEditor/Classes/FileTypes/PCK.cs deleted file mode 100644 index a9f245c2..00000000 --- a/MinecraftUSkinEditor/Classes/FileTypes/PCK.cs +++ /dev/null @@ -1,369 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Windows.Forms; - -namespace PckStudio -{ - - public class PCK - { - - public class MineFile - { - public int filesize; - public int type; - public string name; - public byte[] data; - public List entries = new List(); - } - - public Dictionary types = new Dictionary(); - public Dictionary typeCodes = new Dictionary(); - public List mineFiles = new List(); - public bool IsLittleEndian = false; - public int pckType = 0; - - public PCK() - { - - } - - public PCK(string filename) - { - try - { - IsLittleEndian = !(Read(File.ReadAllBytes(filename))); - if (IsLittleEndian) - ReadVita(File.ReadAllBytes(filename)); - } - catch (Exception err) - { - Console.WriteLine(err.Message); - } - } - - #region NormalPCK - - private static byte[] endianReverseUnicode(byte[] str) - { - byte[] newStr = new byte[str.Length]; - for (int i = 0; i < str.Length; i += 2) - { - newStr[i] = str[i + 1]; - newStr[i + 1] = str[i]; - } - return newStr; - } - - static string readMineString(FileData f) - { - int length = f.readInt() * 2; - return Encoding.Unicode.GetString(endianReverseUnicode(f.readBytes(length))); - } - - public bool Read(byte[] data, bool isAudio = false) - { - try - { - pckType = 0; - types = new Dictionary(); - typeCodes = new Dictionary(); - mineFiles = new List(); - - FileData fileData = new FileData(data); - fileData.Endian = Endianness.Big; - - fileData.readInt(); - int entryTypeCount = fileData.readInt(); - for (int i = 0; i < entryTypeCount; i++) - { - int unk = fileData.readInt(); - string text = ""; - try - { - text = readMineString(fileData); - } - catch - { - text = "Hello!"; - } - types.Add(unk, text); - typeCodes.Add(text, unk); - fileData.skip(4); - } - - int itemCount = fileData.readInt(); - - // no metadata - if (entryTypeCount == 0) - { - Console.WriteLine("PckType0"); - } - // type 1 or 2 - else if (itemCount < 3) - { - pckType = itemCount; - if (pckType == 1) - { - Console.WriteLine("PckType1"); - /* Not really sure if this is accurate or not - * but it seems that when there is only one file in the pck, - * the following line causes it to fail. Since I don't want to potentially break PCK loading for this type, - * I simply added this parameter to the read function. Since the parameter is false by default, - * you won't have to worry about setting it. -MattNL - */ - if (!isAudio) itemCount = fileData.readInt(); - } - if (pckType == 2) - Console.WriteLine("PckType2"); - } - // regular pck - else - { - Console.WriteLine("NormalPCK"); - } - - for (int i = 0; i < itemCount; i++) - { - MineFile mf = new MineFile(); - mf.filesize = fileData.readInt(); - mf.type = fileData.readInt(); - int length = fileData.readInt() * 2; - mf.name = Encoding.Unicode.GetString(endianReverseUnicode(fileData.readBytes(length))); - fileData.skip(4); - mineFiles.Add(mf); - } - - foreach (MineFile mf in mineFiles) - { - int entryCount = fileData.readInt(); - for (int i = 0; i < entryCount; i++) - { - object[] temp = new object[2]; - int entryTypeInt = fileData.readInt(); - temp[0] = types[entryTypeInt]; //Entry type - temp[1] = readMineString(fileData); //Entry data - - fileData.skip(4); - mf.entries.Add(temp); - } - mf.data = fileData.readBytes(mf.filesize); - } - return true; - } - catch - { - return false; - } - } - - private static void writeMinecraftString(FileOutput f, string str) - { - byte[] d = Encoding.Unicode.GetBytes(str); - f.writeInt(d.Length / 2); - f.writeBytes(endianReverseUnicode(d)); - f.writeInt(0); - } - - public byte[] Rebuild() - { - FileOutput f = new FileOutput(); - f.Endian = Endianness.Big; - - f.writeInt(3); - f.writeInt(types.Count); - foreach (int type in types.Keys) - { - f.writeInt(type); - writeMinecraftString(f, types[type]); - } - - f.writeInt(mineFiles.Count); - foreach (MineFile mf in mineFiles) - { - f.writeInt(mf.data.Length); - f.writeInt(mf.type); - writeMinecraftString(f, mf.name); - } - - foreach (MineFile mf in mineFiles) - { - string missing = ""; - try - { - f.writeInt(mf.entries.Count); - foreach (object[] entry in mf.entries) - { - missing = entry[0].ToString(); - f.writeInt(typeCodes[(string)entry[0]]); - writeMinecraftString(f, (string)entry[1]); - } - - f.writeBytes(mf.data); - } - catch (Exception) - { - MessageBox.Show(missing + " is not in the main metadatabase"); - break; - } - } - - - return f.getBytes(); - } - - #endregion - - #region Vita/PS4 PCK - - static string readMineStringVita(FileData f) - { - int length = f.readIntVita() * 2; - Console.WriteLine(length.ToString()); - return Encoding.Unicode.GetString((f.readBytes(length))); - } - - public void ReadVita(byte[] data, bool isAudio = false) - { - pckType = 0; - types = new Dictionary(); - typeCodes = new Dictionary(); - mineFiles = new List(); - - FileData fileData = new FileData(data); - fileData.Endian = Endianness.Big; - fileData.readIntVita(); - int entryTypeCount = fileData.readIntVita(); - //int a = 0; - for (int i = 0; i < entryTypeCount; i++) - { - int unk = fileData.readIntVita(); - string text = ""; - try - { - text = readMineStringVita(fileData); - //File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + "\\exp\\PCKDump" + a + ".bin", text); - //a++; - } - catch - { - text = "Hello!"; - } - types.Add(unk, text); - typeCodes.Add(text, unk); - fileData.skip(4); - } - - int itemCount = fileData.readIntVita(); - - Console.WriteLine(itemCount); - // no metadata - if (entryTypeCount == 0) - { - Console.WriteLine("PckType0"); - } - // type 1 or 2 - else if (itemCount < 3) - { - pckType = itemCount; - if (pckType == 1) - { - /* Not really sure if this is accurate or not - * but it seems that when there is only one file in the pck, - * the following line causes it to fail. Since I don't want to potentially break PCK loading for this type, - * I simply added this defaultly disabled parameter to the read function. -MattNL - */ - if (!isAudio) itemCount = fileData.readIntVita(); - } - if (pckType == 2) - Console.WriteLine("PckType2"); - } - // regular pck - else - { - Console.WriteLine("NormalPCK"); - } - - - for (int j = 0; j < itemCount; j++) - { - MineFile mineFile = new MineFile(); - mineFile.filesize = fileData.readIntVita(); - mineFile.type = fileData.readIntVita(); - int length = fileData.readIntVita() * 2; - mineFile.name = Encoding.Unicode.GetString((fileData.readBytes(length))); - fileData.skip(4); - mineFiles.Add(mineFile); - } - - foreach (MineFile mineFile2 in mineFiles) - { - int num4 = fileData.readIntVita(); - for (int k = 0; k < num4; k++) - { - object[] array = new object[2]; - int key = fileData.readIntVita(); - array[0] = types[key]; - array[1] = readMineStringVita(fileData); - fileData.skip(4); - mineFile2.entries.Add(array); - } - mineFile2.data = fileData.readBytes(mineFile2.filesize); - } - } - - private static void writeMinecraftStringVita(FileOutput f, string str) - { - Console.WriteLine("WriteVita -- " + str); - byte[] bytes = Encoding.Unicode.GetBytes(str); - f.writeIntVita(bytes.Length / 2); - f.writeBytes((bytes)); - f.writeIntVita(0); - } - - public byte[] RebuildVita() - { - FileOutput fileOutput = new FileOutput(); - fileOutput.Endian = Endianness.Big; - fileOutput.writeIntVita(3); - fileOutput.writeIntVita(this.types.Count); - foreach (int num in this.types.Keys) - { - fileOutput.writeIntVita(num); - PCK.writeMinecraftStringVita(fileOutput, this.types[num]); - } - fileOutput.writeIntVita(this.mineFiles.Count); - foreach (PCK.MineFile mineFile in this.mineFiles) - { - fileOutput.writeIntVita(mineFile.data.Length); - fileOutput.writeIntVita(mineFile.type); - PCK.writeMinecraftStringVita(fileOutput, mineFile.name); - } - foreach (PCK.MineFile mineFile2 in this.mineFiles) - { - string str = ""; - try - { - fileOutput.writeIntVita(mineFile2.entries.Count); - foreach (object[] array in mineFile2.entries) - { - str = array[0].ToString(); - fileOutput.writeIntVita(this.typeCodes[(string)array[0]]); - PCK.writeMinecraftStringVita(fileOutput, (string)array[1]); - } - fileOutput.writeBytes(mineFile2.data); - } - catch (Exception) - { - MessageBox.Show(str + " is not in the main metadatabase"); - break; - } - } - return fileOutput.getBytes(); - } - - #endregion - } -} diff --git a/MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs b/MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs new file mode 100644 index 00000000..af1836d0 --- /dev/null +++ b/MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PckStudio.Classes.FileTypes +{ + using PCKProperties = Dictionary; + public class PCKFile + { + public int type { get; } = -1; + public Dictionary meta_data { get; } = new Dictionary(); + public List file_entries { get; set; } = new List(); + public bool isLittleEndian { get; } = false; + + + public class FileData + { + public enum EDLCType : int + { + DLCSkinFile, + DLCCapeFile, + DLCTextureFile, + DLCUIDataFile, + DLCLocalisationFile = 6, + DLCGameRulesFile, + DLCAudioFile, + DLCColourTableFile, + DLCGameRulesHeader, + DLCModelsFile = 12, + DLCBehavioursFile, + DLCMaterialFile, + } + + public string name; + public int type { get; } + public byte[] data { get; set; } = null; + public int size { get; set; } + public PCKProperties properties { get; set; } = new PCKProperties(); + + public FileData(string name, int type, int size) + { + this.type = type; + this.name = name; + this.size = size; + } + public FileData(int type) + { + name = "no_name"; + this.type = type; + } + } + + public PCKFile(Stream stream, bool isLittleEndian = false) + { + this.isLittleEndian = isLittleEndian; + type = ReadInt(stream); + ReadMetaData(stream); + ReadFileEntries(stream); + } + + public PCKFile(int type, bool isLittleEndian = false) + { + this.type = type; + this.isLittleEndian = isLittleEndian; + } + + internal void ReadMetaData(Stream stream) + { + int meta_entry_count = ReadInt(stream); + bool has_xml_tag = false; + for (; 0 < meta_entry_count; meta_entry_count--) + { + int index = ReadInt(stream); + string value = ReadString(stream); + if (value.Equals("XMLVERSION")) has_xml_tag = true; + meta_data[index] = value; + ReadInt(stream); // padding ???? + } + if (has_xml_tag) + Console.WriteLine(ReadInt(stream).ToString("X08")); + } + + internal void ReadFileEntries(Stream stream) + { + int file_entry_count = ReadInt(stream); + for (;0 < file_entry_count; file_entry_count--) + { + int file_size = ReadInt(stream); + int file_type = ReadInt(stream); + string name = ReadString(stream); + file_entries.Add(new FileData(name, file_type, file_size)); + ReadInt(stream); + } + foreach (var file_entry in file_entries) + { + int property_count = ReadInt(stream); + var properties = new PCKProperties(); + for(;0 < property_count; property_count--) + { + int index = ReadInt(stream); + string key = meta_data[index]; + string value = ReadString(stream); + ReadInt(stream); // padding ??? + properties[key] = value; + } + file_entry.properties = properties; + file_entry.data = new byte[file_entry.size]; + stream.Read(file_entry.data, 0, file_entry.size); + } + + } + + internal string ReadString(Stream stream) + { + int len = ReadInt(stream); + byte[] stringBuffer = new byte[len * 2]; + stream.Read(stringBuffer, 0, len * 2); + return Encoding.BigEndianUnicode.GetString(stringBuffer, 0, len * 2); + } + + internal int ReadInt(Stream stream) + { + byte[] buffer = new byte[4]; + stream.Read(buffer, 0, 4); + if (BitConverter.IsLittleEndian && !isLittleEndian) + Array.Reverse(buffer); + return BitConverter.ToInt32(buffer, 0); + } + internal short ReadShort(Stream stream) + { + byte[] buffer = new byte[2]; + stream.Read(buffer, 0, 2); + if (BitConverter.IsLittleEndian && !isLittleEndian) + Array.Reverse(buffer); + return BitConverter.ToInt16(buffer, 0); + } + + public override string ToString() + { + return $"type: {type}\nmeta entry count: {meta_data.Count}\nfile entry count: {file_entries.Count}"; + } + + } +} diff --git a/MinecraftUSkinEditor/Classes/IO/FileData.cs b/MinecraftUSkinEditor/Classes/IO/FileData.cs index 536dfd43..20fc0576 100644 --- a/MinecraftUSkinEditor/Classes/IO/FileData.cs +++ b/MinecraftUSkinEditor/Classes/IO/FileData.cs @@ -51,9 +51,7 @@ namespace PckStudio { return (b[p++] & 0xFF) | ((b[p++] & 0xFF) << 8) | ((b[p++] & 0xFF) << 16) | ((b[p++] & 0xFF) << 24); } - int d = p; - int oot = ((b[p++] & 0xFF) << 24) | ((b[p++] & 0xFF) << 16) | ((b[p++] & 0xFF) << 8) | (b[p++] & 0xFF); - return oot; + return ((b[p++] & 0xFF) << 24) | ((b[p++] & 0xFF) << 16) | ((b[p++] & 0xFF) << 8) | (b[p++] & 0xFF); } public int readThree() diff --git a/MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs b/MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs index e5030f42..9db070ad 100644 --- a/MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs +++ b/MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs @@ -14,13 +14,8 @@ namespace PckStudio.Classes.IO public string[] GetLocalCategories() { string cat = ""; - try - { + if (File.Exists(cache + "PCKCategories.txt")) cat = File.ReadAllText(cache + "PCKCategories.txt"); - } - catch - { - } return cat.Split(new[] { "\n", "\r\n" }, StringSplitOptions.RemoveEmptyEntries); } diff --git a/MinecraftUSkinEditor/Classes/Misc/KeyValuePair.cs b/MinecraftUSkinEditor/Classes/Misc/KeyValuePair.cs deleted file mode 100644 index 11c23bcb..00000000 --- a/MinecraftUSkinEditor/Classes/Misc/KeyValuePair.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace PckStudio -{ - internal class KeyValuePair - { - } -} \ No newline at end of file diff --git a/MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs b/MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs index da920234..8fa66b4d 100644 --- a/MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs +++ b/MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs @@ -1,4 +1,5 @@ -using System.Runtime.InteropServices; +using System; +using System.Runtime.InteropServices; using DiscordRPC; namespace RichPresenceClient @@ -8,31 +9,36 @@ namespace RichPresenceClient public static DiscordRpcClient client; - public static void SetRPC(string ClientID, string details, string state, string imageLarge, string imageLargeText, string imageSmall) + public static void Initialize(string ClientID) { - client = new DiscordRpcClient(ClientID); + //client = new DiscordRpcClient(ClientID); + //if (!client.Initialize()) + //{ + // throw new Exception("ERROR initializing Discord RPC"); + //} + } - - client.Initialize(); - - - client.SetPresence(new RichPresence() - { - Details = details, - State = state, - Assets = new Assets() - { - LargeImageKey = imageLarge, - LargeImageText = imageLargeText, - SmallImageKey = imageSmall - } - }); + public static void SetRPC(string details, string state, string imageLarge, string imageLargeText, string imageSmall) + { + //if (client == null) return; + //client.SetPresence(new RichPresence() + //{ + // Details = details, + // State = state, + // Assets = new Assets() + // { + // LargeImageKey = imageLarge, + // LargeImageText = imageLargeText, + // SmallImageKey = imageSmall + // } + //}); } public static void CloseRPC() { - if (client != null) - client.Dispose(); + //if (client != null) + // client.Deinitialize(); + // client.Dispose(); } } diff --git a/MinecraftUSkinEditor/Classes/Program.cs b/MinecraftUSkinEditor/Classes/Program.cs index 0377f656..0864735c 100644 --- a/MinecraftUSkinEditor/Classes/Program.cs +++ b/MinecraftUSkinEditor/Classes/Program.cs @@ -16,29 +16,14 @@ namespace PckStudio public static string baseurl = "https://www.pckstudio.xyz/studio/PCK/api/"; public static string backurl = "https://raw.githubusercontent.com/PhoenixARC/pckstudio.tk/main/studio/PCK/api/"; public static string Appdata = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/PCK Studio/"; - public static bool IsDev = false; - public static FormMain formMain; + public static bool IsDev; /// /// The main entry point for the application. /// [STAThread] static void Main(string[] args) { - try - { - if (args[0] == "-dev") - IsDev = true; - } - catch { } - - PckStudio.Forms.goodbye gg = new PckStudio.Forms.goodbye(); - PckStudio.Forms.Job gj = new PckStudio.Forms.Job(); - - - if(!System.IO.File.Exists(Appdata + "\\goodbyemark")) - gg.ShowDialog(); - if(!System.IO.File.Exists(Appdata + "\\discordmark")) - gj.ShowDialog(); + IsDev = args.Length > 0 && args[0] == "-dev"; Application.Run(new PckStudio.FormMain()); } } diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs index 9e07172e..6413ae65 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs @@ -8,16 +8,16 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using MetroFramework.Forms; +using PckStudio.Classes.FileTypes; namespace PckStudio.Forms { public partial class AddPCKPassword : MetroForm { - PckStudio.PCK currentPCK; - PckStudio.PCK.MineFile file; - public AddPCKPassword(PckStudio.PCK.MineFile fileIn, PckStudio.PCK currentPCKIn) + PCKFile currentPCK; + PCKFile.FileData file; + public AddPCKPassword(PCKFile.FileData fileIn, PCKFile currentPCKIn) { - InitializeComponent(); file = fileIn; currentPCK = currentPCKIn; @@ -25,9 +25,8 @@ namespace PckStudio.Forms private void buttonUnlocked_Click(object sender, EventArgs e) { - object[] obj = { "LOCK", MD5(textBoxPass.Text) }; - file.entries.Add(obj); - this.Close(); + file.properties.Add("LOCK", MD5(textBoxPass.Text)); + Close(); } public string MD5(string s) diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/MetaADD.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/MetaADD.cs index 28486c81..72a5e5d2 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/MetaADD.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/MetaADD.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,10 +13,10 @@ namespace PckStudio { public partial class MetaADD : Form { - PCK currentPCK; + PCKFile currentPCK; TreeView treeView1; - public MetaADD(PCK currentPCKIn, TreeView treeView1In) + public MetaADD(PCKFile currentPCKIn, TreeView treeView1In) { InitializeComponent(); @@ -26,16 +27,13 @@ namespace PckStudio private void button1_Click(object sender, EventArgs e) { - try - { - currentPCK.typeCodes.Add(textBox1.Text, treeView1.Nodes.Count); - currentPCK.types.Add(treeView1.Nodes.Count, textBox1.Text); - } - catch (Exception) + if (currentPCK.meta_data.ContainsValue(textBox1.Text)) { MessageBox.Show("This metatag already exits"); + return; } - this.Close(); + currentPCK.meta_data.Add(currentPCK.meta_data.Count, textBox1.Text); + Close(); } } } diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs index a40dfdd1..d4878172 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,9 @@ namespace PckStudio { public partial class meta : MetroFramework.Forms.MetroForm { - PCK currentPCK; + PCKFile currentPCK; - public meta(PCK currentPCKIn) + public meta(PCKFile currentPCKIn) { InitializeComponent(); @@ -32,17 +33,17 @@ namespace PckStudio { try { - treeView1.Nodes.Clear(); - foreach (string key in currentPCK.typeCodes.Keys) + foreach (string key in currentPCK.meta_data.Values) { treeView1.Nodes.Add(key); } } - catch (Exception) + catch (Exception ex) { - this.Close(); + MessageBox.Show(ex.ToString()); + Close(); } } @@ -65,7 +66,8 @@ namespace PckStudio { try { - currentPCK.typeCodes.Remove(treeView1.SelectedNode.Text); + MessageBox.Show("TODO"); + //currentPCK.meta_data.Remove(); refresh(); }catch (Exception) { diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs index 1edac6a5..b2bd37c2 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs @@ -15,7 +15,7 @@ namespace PckStudio.Forms { string pass; - public pckLocked(string pass, bool correct) + public pckLocked(string pass) { this.pass = pass; @@ -31,12 +31,13 @@ namespace PckStudio.Forms { if (MD5(textBoxPass.Text) == pass || MD5(textBoxPass.Text) == MD5(pass)) { - FormMain.correct = true; - this.Close(); + DialogResult = DialogResult.OK; + Close(); } else { MessageBox.Show("Incorrect password!"); + DialogResult = DialogResult.Abort; textBoxPass.Text = ""; } } diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/presetMeta.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/presetMeta.cs index cc18ce9e..fcaa8533 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/presetMeta.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/presetMeta.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -13,15 +14,13 @@ namespace PckStudio { public partial class presetMeta : MetroFramework.Forms.MetroForm { - PCK currentPCK; - PCK.MineFile file; - string appData = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/PCK Studio/"; + PCKFile.FileData file; + string appData = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/PCK Studio/"; - public presetMeta(PCK.MineFile fileIn, PCK currentPCKIn) + public presetMeta(PCKFile.FileData fileIn) { InitializeComponent(); file = fileIn; - currentPCK = currentPCKIn; FormBorderStyle = FormBorderStyle.None; } @@ -90,8 +89,7 @@ namespace PckStudio } else { - object[] ENTRY = { entryName, entryValue }; - file.entries.Add(ENTRY); + file.properties.Add(entryName, entryValue); entryName = ""; entryValue = ""; entryStart = true; diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/rename.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/rename.cs index 26681de1..2f110774 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/rename.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/rename.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -13,8 +14,8 @@ namespace PckStudio { public partial class rename : MetroFramework.Forms.MetroForm { - String oldName; - String newName; + string oldName; + string newName; TreeNode node; public rename(TreeNode nodeIn) @@ -41,7 +42,7 @@ namespace PckStudio fixDirectoryNameForFiles(n); continue; } - PCK.MineFile mf = (PCK.MineFile)n.Tag; + PCKFile.FileData mf = (PCKFile.FileData)n.Tag; string fullNew = mf.name.Replace(oldName + "/", newName + "/"); Console.WriteLine("Full old - " + mf.name + " - Old: " + oldName + " - New: " + newName + " - " + fullNew); mf.name = fullNew; @@ -56,7 +57,7 @@ namespace PckStudio if (node.Tag == null) fixDirectoryNameForFiles(node); else { - PCK.MineFile mf = (PCK.MineFile)node.Tag; + PCKFile.FileData mf = (PCKFile.FileData)node.Tag; string path = Path.GetDirectoryName(node.FullPath.Replace("\\", "/")); string fullNew = path + "/" + newName; mf.name = fullNew; diff --git a/MinecraftUSkinEditor/Forms/Form1.Designer.cs b/MinecraftUSkinEditor/Forms/Form1.Designer.cs index f9c5288e..b55bb105 100644 --- a/MinecraftUSkinEditor/Forms/Form1.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Form1.Designer.cs @@ -28,147 +28,142 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); - this.contextMenuPCKEntries = new System.Windows.Forms.ContextMenuStrip(this.components); - this.createToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.folderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.skinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.createAnimatedTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.audiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.normalAudiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.vitaPS4AudiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cloneFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importSkinsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importSkinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importExtractedSkinsFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.extractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.renameFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveDownToolStripMenuItem = 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(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.extractToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.metaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addPasswordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertPCTextrurePackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.advancedMetaAddingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertToBedrockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.videosToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToMakeABasicSkinPackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToMakeACustomSkinModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToMakeCustomSkinModelsbedrockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToMakeCustomMusicToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToInstallPcksDirectlyToWiiUToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pCKCenterReleaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howPCKsWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.programInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.binkaConversionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tutorialsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.installationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fAQToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.donateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toNobledezJackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toPhoenixARCDeveloperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forMattNLContributorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.administrativeToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.storeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.wiiUPCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PS3PCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.VitaPCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.joinDevelopmentDiscordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.uPDATEToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.tSTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.label1 = new MetroFramework.Controls.MetroLabel(); - this.contextMenuMetaTree = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addPresetToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.addEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.labelVersion = new MetroFramework.Controls.MetroLabel(); - this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); - this.directorySearcher1 = new System.DirectoryServices.DirectorySearcher(); - this.openedPCKS = new MetroFramework.Controls.MetroTabControl(); - this.tabPage1 = new MetroFramework.Controls.MetroTabPage(); - this.myTablePanelPckEdit = new PckStudio.Forms.MyTablePanel(); - this.treeViewMain = new System.Windows.Forms.TreeView(); - this.pictureBoxImagePreview = new PckStudio.PictureBoxWithInterpolationMode(); - this.labelAmount = new MetroFramework.Controls.MetroLabel(); - this.tabDataDisplay = new System.Windows.Forms.TabControl(); - this.tabMetaDisplay = new System.Windows.Forms.TabPage(); - this.myTablePanel1 = new PckStudio.Forms.MyTablePanel(); - this.treeMeta = new System.Windows.Forms.TreeView(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.label2 = new MetroFramework.Controls.MetroLabel(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.labelEntryType = new MetroFramework.Controls.MetroLabel(); - this.label3 = new MetroFramework.Controls.MetroLabel(); - this.labelEntryData = new MetroFramework.Controls.MetroLabel(); - this.buttonEdit = new System.Windows.Forms.Button(); - this.labelImageSize = new MetroFramework.Controls.MetroLabel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.DBGLabel = new MetroFramework.Controls.MetroLabel(); - this.metroTabControl1 = new MetroFramework.Controls.MetroTabControl(); - this.metroTabPage1 = new MetroFramework.Controls.MetroTabPage(); - this.myTablePanel2 = new PckStudio.Forms.MyTablePanel(); - this.treeView1 = new System.Windows.Forms.TreeView(); - this.pictureBoxWithInterpolationMode1 = new PckStudio.PictureBoxWithInterpolationMode(); - this.label4 = new MetroFramework.Controls.MetroLabel(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.myTablePanel3 = new PckStudio.Forms.MyTablePanel(); - this.treeView2 = new System.Windows.Forms.TreeView(); - this.comboBox2 = new System.Windows.Forms.ComboBox(); - this.label6 = new MetroFramework.Controls.MetroLabel(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label7 = new MetroFramework.Controls.MetroLabel(); - this.label8 = new MetroFramework.Controls.MetroLabel(); - this.label9 = new MetroFramework.Controls.MetroLabel(); - this.button1 = new System.Windows.Forms.Button(); - this.label10 = new MetroFramework.Controls.MetroLabel(); - this.label11 = new MetroFramework.Controls.MetroLabel(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.ChangeURL = new MetroFramework.Controls.MetroLabel(); - this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); - this.myTablePanelStartScreen = new PckStudio.Forms.MyTablePanel(); - this.richTextBoxChangelog = new System.Windows.Forms.RichTextBox(); - this.label5 = new MetroFramework.Controls.MetroLabel(); - this.pckOpen = new System.Windows.Forms.PictureBox(); - this.contextMenuPCKEntries.SuspendLayout(); - this.menuStrip.SuspendLayout(); - this.contextMenuMetaTree.SuspendLayout(); - this.openedPCKS.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.myTablePanelPckEdit.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImagePreview)).BeginInit(); - this.tabDataDisplay.SuspendLayout(); - this.tabMetaDisplay.SuspendLayout(); - this.myTablePanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.metroTabControl1.SuspendLayout(); - this.metroTabPage1.SuspendLayout(); - this.myTablePanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWithInterpolationMode1)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.myTablePanel3.SuspendLayout(); - this.myTablePanelStartScreen.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pckOpen)).BeginInit(); - this.SuspendLayout(); - // - // contextMenuPCKEntries - // - this.contextMenuPCKEntries.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + this.contextMenuPCKEntries = new System.Windows.Forms.ContextMenuStrip(this.components); + this.createToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.folderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.skinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.createAnimatedTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.audiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.normalAudiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.vitaPS4AudiopckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cloneFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importSkinsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importSkinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importExtractedSkinsFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.extractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.renameFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.moveDownToolStripMenuItem = 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(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.extractToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.metaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addPasswordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.convertPCTextrurePackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.advancedMetaAddingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.convertToBedrockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.videosToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToMakeABasicSkinPackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToMakeACustomSkinModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToMakeCustomSkinModelsbedrockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToMakeCustomMusicToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToInstallPcksDirectlyToWiiUToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pCKCenterReleaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howPCKsWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.programInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.binkaConversionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tutorialsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.installationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fAQToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.donateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toNobledezJackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toPhoenixARCDeveloperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forMattNLContributorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.administrativeToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.storeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.wiiUPCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PS3PCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.VitaPCKInstallerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.joinDevelopmentDiscordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.label1 = new MetroFramework.Controls.MetroLabel(); + this.contextMenuMetaTree = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addPresetToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.addEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.labelVersion = new MetroFramework.Controls.MetroLabel(); + this.openedPCKS = new MetroFramework.Controls.MetroTabControl(); + this.tabPage1 = new MetroFramework.Controls.MetroTabPage(); + this.myTablePanelPckEdit = new PckStudio.Forms.MyTablePanel(); + this.treeViewMain = new System.Windows.Forms.TreeView(); + this.pictureBoxImagePreview = new PckStudio.PictureBoxWithInterpolationMode(); + this.labelAmount = new MetroFramework.Controls.MetroLabel(); + this.tabDataDisplay = new System.Windows.Forms.TabControl(); + this.tabMetaDisplay = new System.Windows.Forms.TabPage(); + this.myTablePanel1 = new PckStudio.Forms.MyTablePanel(); + this.treeMeta = new System.Windows.Forms.TreeView(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label2 = new MetroFramework.Controls.MetroLabel(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.labelEntryType = new MetroFramework.Controls.MetroLabel(); + this.label3 = new MetroFramework.Controls.MetroLabel(); + this.labelEntryData = new MetroFramework.Controls.MetroLabel(); + this.buttonEdit = new System.Windows.Forms.Button(); + this.labelImageSize = new MetroFramework.Controls.MetroLabel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.DBGLabel = new MetroFramework.Controls.MetroLabel(); + this.metroTabControl1 = new MetroFramework.Controls.MetroTabControl(); + this.metroTabPage1 = new MetroFramework.Controls.MetroTabPage(); + this.myTablePanel2 = new PckStudio.Forms.MyTablePanel(); + this.treeView1 = new System.Windows.Forms.TreeView(); + this.pictureBoxWithInterpolationMode1 = new PckStudio.PictureBoxWithInterpolationMode(); + this.label4 = new MetroFramework.Controls.MetroLabel(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.myTablePanel3 = new PckStudio.Forms.MyTablePanel(); + this.treeView2 = new System.Windows.Forms.TreeView(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.label6 = new MetroFramework.Controls.MetroLabel(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label7 = new MetroFramework.Controls.MetroLabel(); + this.label8 = new MetroFramework.Controls.MetroLabel(); + this.label9 = new MetroFramework.Controls.MetroLabel(); + this.button1 = new System.Windows.Forms.Button(); + this.label10 = new MetroFramework.Controls.MetroLabel(); + this.label11 = new MetroFramework.Controls.MetroLabel(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); + this.myTablePanelStartScreen = new PckStudio.Forms.MyTablePanel(); + this.richTextBoxChangelog = new System.Windows.Forms.RichTextBox(); + this.label5 = new MetroFramework.Controls.MetroLabel(); + this.pckOpen = new System.Windows.Forms.PictureBox(); + this.contextMenuPCKEntries.SuspendLayout(); + this.menuStrip.SuspendLayout(); + this.contextMenuMetaTree.SuspendLayout(); + this.openedPCKS.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.myTablePanelPckEdit.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImagePreview)).BeginInit(); + this.tabDataDisplay.SuspendLayout(); + this.tabMetaDisplay.SuspendLayout(); + this.myTablePanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.metroTabControl1.SuspendLayout(); + this.metroTabPage1.SuspendLayout(); + this.myTablePanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWithInterpolationMode1)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.myTablePanel3.SuspendLayout(); + this.myTablePanelStartScreen.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pckOpen)).BeginInit(); + this.SuspendLayout(); + // + // contextMenuPCKEntries + // + this.contextMenuPCKEntries.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.createToolStripMenuItem, this.cloneFileToolStripMenuItem, this.importSkinsToolStripMenuItem, @@ -178,145 +173,143 @@ this.moveUpToolStripMenuItem, this.deleteFileToolStripMenuItem, this.moveDownToolStripMenuItem}); - this.contextMenuPCKEntries.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuPCKEntries, "contextMenuPCKEntries"); - // - // createToolStripMenuItem - // - this.createToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.contextMenuPCKEntries.Name = "contextMenuStrip1"; + resources.ApplyResources(this.contextMenuPCKEntries, "contextMenuPCKEntries"); + // + // createToolStripMenuItem + // + this.createToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.folderToolStripMenuItem, this.skinToolStripMenuItem, this.createAnimatedTextureToolStripMenuItem, this.audiopckToolStripMenuItem}); - resources.ApplyResources(this.createToolStripMenuItem, "createToolStripMenuItem"); - this.createToolStripMenuItem.Name = "createToolStripMenuItem"; - // - // folderToolStripMenuItem - // - resources.ApplyResources(this.folderToolStripMenuItem, "folderToolStripMenuItem"); - this.folderToolStripMenuItem.Name = "folderToolStripMenuItem"; - this.folderToolStripMenuItem.Click += new System.EventHandler(this.folderToolStripMenuItem_Click); - // - // skinToolStripMenuItem - // - resources.ApplyResources(this.skinToolStripMenuItem, "skinToolStripMenuItem"); - this.skinToolStripMenuItem.Name = "skinToolStripMenuItem"; - this.skinToolStripMenuItem.Click += new System.EventHandler(this.createSkinToolStripMenuItem_Click); - // - // createAnimatedTextureToolStripMenuItem - // - resources.ApplyResources(this.createAnimatedTextureToolStripMenuItem, "createAnimatedTextureToolStripMenuItem"); - this.createAnimatedTextureToolStripMenuItem.Name = "createAnimatedTextureToolStripMenuItem"; - this.createAnimatedTextureToolStripMenuItem.Click += new System.EventHandler(this.createAnimatedTextureToolStripMenuItem_Click); - // - // audiopckToolStripMenuItem - // - this.audiopckToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + resources.ApplyResources(this.createToolStripMenuItem, "createToolStripMenuItem"); + this.createToolStripMenuItem.Name = "createToolStripMenuItem"; + // + // folderToolStripMenuItem + // + resources.ApplyResources(this.folderToolStripMenuItem, "folderToolStripMenuItem"); + this.folderToolStripMenuItem.Name = "folderToolStripMenuItem"; + this.folderToolStripMenuItem.Click += new System.EventHandler(this.folderToolStripMenuItem_Click); + // + // skinToolStripMenuItem + // + resources.ApplyResources(this.skinToolStripMenuItem, "skinToolStripMenuItem"); + this.skinToolStripMenuItem.Name = "skinToolStripMenuItem"; + this.skinToolStripMenuItem.Click += new System.EventHandler(this.createSkinToolStripMenuItem_Click); + // + // createAnimatedTextureToolStripMenuItem + // + resources.ApplyResources(this.createAnimatedTextureToolStripMenuItem, "createAnimatedTextureToolStripMenuItem"); + this.createAnimatedTextureToolStripMenuItem.Name = "createAnimatedTextureToolStripMenuItem"; + this.createAnimatedTextureToolStripMenuItem.Click += new System.EventHandler(this.createAnimatedTextureToolStripMenuItem_Click); + // + // audiopckToolStripMenuItem + // + this.audiopckToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.normalAudiopckToolStripMenuItem, this.vitaPS4AudiopckToolStripMenuItem}); - this.audiopckToolStripMenuItem.Image = global::PckStudio.Properties.Resources.music; - this.audiopckToolStripMenuItem.Name = "audiopckToolStripMenuItem"; - resources.ApplyResources(this.audiopckToolStripMenuItem, "audiopckToolStripMenuItem"); - this.audiopckToolStripMenuItem.Click += new System.EventHandler(this.audiopckToolStripMenuItem_Click); - // - // normalAudiopckToolStripMenuItem - // - this.normalAudiopckToolStripMenuItem.Name = "normalAudiopckToolStripMenuItem"; - resources.ApplyResources(this.normalAudiopckToolStripMenuItem, "normalAudiopckToolStripMenuItem"); - this.normalAudiopckToolStripMenuItem.Click += new System.EventHandler(this.normalAudiopckToolStripMenuItem_Click); - // - // vitaPS4AudiopckToolStripMenuItem - // - this.vitaPS4AudiopckToolStripMenuItem.Name = "vitaPS4AudiopckToolStripMenuItem"; - resources.ApplyResources(this.vitaPS4AudiopckToolStripMenuItem, "vitaPS4AudiopckToolStripMenuItem"); - this.vitaPS4AudiopckToolStripMenuItem.Click += new System.EventHandler(this.vitaPS4AudiopckToolStripMenuItem_Click); - // - // cloneFileToolStripMenuItem - // - resources.ApplyResources(this.cloneFileToolStripMenuItem, "cloneFileToolStripMenuItem"); - this.cloneFileToolStripMenuItem.Name = "cloneFileToolStripMenuItem"; - this.cloneFileToolStripMenuItem.Click += new System.EventHandler(this.cloneFileToolStripMenuItem_Click); - // - // importSkinsToolStripMenuItem - // - this.importSkinsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.audiopckToolStripMenuItem.Image = global::PckStudio.Properties.Resources.music; + this.audiopckToolStripMenuItem.Name = "audiopckToolStripMenuItem"; + resources.ApplyResources(this.audiopckToolStripMenuItem, "audiopckToolStripMenuItem"); + this.audiopckToolStripMenuItem.Click += new System.EventHandler(this.audiopckToolStripMenuItem_Click); + // + // normalAudiopckToolStripMenuItem + // + this.normalAudiopckToolStripMenuItem.Name = "normalAudiopckToolStripMenuItem"; + resources.ApplyResources(this.normalAudiopckToolStripMenuItem, "normalAudiopckToolStripMenuItem"); + this.normalAudiopckToolStripMenuItem.Click += new System.EventHandler(this.normalAudiopckToolStripMenuItem_Click); + // + // vitaPS4AudiopckToolStripMenuItem + // + this.vitaPS4AudiopckToolStripMenuItem.Name = "vitaPS4AudiopckToolStripMenuItem"; + resources.ApplyResources(this.vitaPS4AudiopckToolStripMenuItem, "vitaPS4AudiopckToolStripMenuItem"); + this.vitaPS4AudiopckToolStripMenuItem.Click += new System.EventHandler(this.vitaPS4AudiopckToolStripMenuItem_Click); + // + // cloneFileToolStripMenuItem + // + resources.ApplyResources(this.cloneFileToolStripMenuItem, "cloneFileToolStripMenuItem"); + this.cloneFileToolStripMenuItem.Name = "cloneFileToolStripMenuItem"; + this.cloneFileToolStripMenuItem.Click += new System.EventHandler(this.cloneFileToolStripMenuItem_Click); + // + // importSkinsToolStripMenuItem + // + this.importSkinsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.importSkinToolStripMenuItem, this.importExtractedSkinsFolderToolStripMenuItem, this.importFileToolStripMenuItem}); - resources.ApplyResources(this.importSkinsToolStripMenuItem, "importSkinsToolStripMenuItem"); - this.importSkinsToolStripMenuItem.Name = "importSkinsToolStripMenuItem"; - // - // importSkinToolStripMenuItem - // - resources.ApplyResources(this.importSkinToolStripMenuItem, "importSkinToolStripMenuItem"); - this.importSkinToolStripMenuItem.Name = "importSkinToolStripMenuItem"; - this.importSkinToolStripMenuItem.Click += new System.EventHandler(this.importSkin); - // - // importExtractedSkinsFolderToolStripMenuItem - // - resources.ApplyResources(this.importExtractedSkinsFolderToolStripMenuItem, "importExtractedSkinsFolderToolStripMenuItem"); - this.importExtractedSkinsFolderToolStripMenuItem.Name = "importExtractedSkinsFolderToolStripMenuItem"; - this.importExtractedSkinsFolderToolStripMenuItem.Click += new System.EventHandler(this.importExtractedSkinsFolder); - // - // importFileToolStripMenuItem - // - resources.ApplyResources(this.importFileToolStripMenuItem, "importFileToolStripMenuItem"); - this.importFileToolStripMenuItem.Name = "importFileToolStripMenuItem"; - this.importFileToolStripMenuItem.Click += new System.EventHandler(this.addFileToolStripMenuItem_Click); - // - // extractToolStripMenuItem - // - resources.ApplyResources(this.extractToolStripMenuItem, "extractToolStripMenuItem"); - this.extractToolStripMenuItem.Name = "extractToolStripMenuItem"; - this.extractToolStripMenuItem.Click += new System.EventHandler(this.extractToolStripMenuItem_Click); - // - // renameFileToolStripMenuItem - // - resources.ApplyResources(this.renameFileToolStripMenuItem, "renameFileToolStripMenuItem"); - this.renameFileToolStripMenuItem.Name = "renameFileToolStripMenuItem"; - this.renameFileToolStripMenuItem.Click += new System.EventHandler(this.renameFileToolStripMenuItem_Click); - // - // replaceToolStripMenuItem - // - resources.ApplyResources(this.replaceToolStripMenuItem, "replaceToolStripMenuItem"); - this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; - this.replaceToolStripMenuItem.Click += new System.EventHandler(this.replaceToolStripMenuItem_Click); - // - // moveUpToolStripMenuItem - // - resources.ApplyResources(this.moveUpToolStripMenuItem, "moveUpToolStripMenuItem"); - this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); - // - // deleteFileToolStripMenuItem - // - resources.ApplyResources(this.deleteFileToolStripMenuItem, "deleteFileToolStripMenuItem"); - this.deleteFileToolStripMenuItem.Name = "deleteFileToolStripMenuItem"; - this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); - // - // moveDownToolStripMenuItem - // - resources.ApplyResources(this.moveDownToolStripMenuItem, "moveDownToolStripMenuItem"); - this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); - // - // menuStrip - // - resources.ApplyResources(this.menuStrip, "menuStrip"); - this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + resources.ApplyResources(this.importSkinsToolStripMenuItem, "importSkinsToolStripMenuItem"); + this.importSkinsToolStripMenuItem.Name = "importSkinsToolStripMenuItem"; + // + // importSkinToolStripMenuItem + // + resources.ApplyResources(this.importSkinToolStripMenuItem, "importSkinToolStripMenuItem"); + this.importSkinToolStripMenuItem.Name = "importSkinToolStripMenuItem"; + this.importSkinToolStripMenuItem.Click += new System.EventHandler(this.importSkin); + // + // importExtractedSkinsFolderToolStripMenuItem + // + resources.ApplyResources(this.importExtractedSkinsFolderToolStripMenuItem, "importExtractedSkinsFolderToolStripMenuItem"); + this.importExtractedSkinsFolderToolStripMenuItem.Name = "importExtractedSkinsFolderToolStripMenuItem"; + this.importExtractedSkinsFolderToolStripMenuItem.Click += new System.EventHandler(this.importExtractedSkinsFolder); + // + // importFileToolStripMenuItem + // + resources.ApplyResources(this.importFileToolStripMenuItem, "importFileToolStripMenuItem"); + this.importFileToolStripMenuItem.Name = "importFileToolStripMenuItem"; + this.importFileToolStripMenuItem.Click += new System.EventHandler(this.addFileToolStripMenuItem_Click); + // + // extractToolStripMenuItem + // + resources.ApplyResources(this.extractToolStripMenuItem, "extractToolStripMenuItem"); + this.extractToolStripMenuItem.Name = "extractToolStripMenuItem"; + this.extractToolStripMenuItem.Click += new System.EventHandler(this.extractToolStripMenuItem_Click); + // + // renameFileToolStripMenuItem + // + resources.ApplyResources(this.renameFileToolStripMenuItem, "renameFileToolStripMenuItem"); + this.renameFileToolStripMenuItem.Name = "renameFileToolStripMenuItem"; + this.renameFileToolStripMenuItem.Click += new System.EventHandler(this.renameFileToolStripMenuItem_Click); + // + // replaceToolStripMenuItem + // + resources.ApplyResources(this.replaceToolStripMenuItem, "replaceToolStripMenuItem"); + this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; + this.replaceToolStripMenuItem.Click += new System.EventHandler(this.replaceToolStripMenuItem_Click); + // + // moveUpToolStripMenuItem + // + resources.ApplyResources(this.moveUpToolStripMenuItem, "moveUpToolStripMenuItem"); + this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; + this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); + // + // deleteFileToolStripMenuItem + // + resources.ApplyResources(this.deleteFileToolStripMenuItem, "deleteFileToolStripMenuItem"); + this.deleteFileToolStripMenuItem.Name = "deleteFileToolStripMenuItem"; + this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); + // + // moveDownToolStripMenuItem + // + resources.ApplyResources(this.moveDownToolStripMenuItem, "moveDownToolStripMenuItem"); + this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; + this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); + // + // menuStrip + // + resources.ApplyResources(this.menuStrip, "menuStrip"); + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, this.videosToolStripMenuItem, this.helpToolStripMenuItem, - this.storeToolStripMenuItem, - this.uPDATEToolStripMenuItem1, - this.tSTToolStripMenuItem}); - this.menuStrip.Name = "menuStrip"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.storeToolStripMenuItem}); + this.menuStrip.Name = "menuStrip"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.openToolStripMenuItem, this.extractToolStripMenuItem1, @@ -325,82 +318,82 @@ this.metaToolStripMenuItem, this.addPasswordToolStripMenuItem, this.convertPCTextrurePackToolStripMenuItem}); - this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); - // - // newToolStripMenuItem - // - resources.ApplyResources(this.newToolStripMenuItem, "newToolStripMenuItem"); - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.skinPackToolStripMenuItem_Click); - // - // openToolStripMenuItem - // - resources.ApplyResources(this.openToolStripMenuItem, "openToolStripMenuItem"); - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); - // - // extractToolStripMenuItem1 - // - resources.ApplyResources(this.extractToolStripMenuItem1, "extractToolStripMenuItem1"); - this.extractToolStripMenuItem1.Name = "extractToolStripMenuItem1"; - this.extractToolStripMenuItem1.Click += new System.EventHandler(this.extractToolStripMenuItem1_Click); - // - // saveToolStripMenuItem1 - // - resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); - this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; - this.saveToolStripMenuItem1.Click += new System.EventHandler(this.savePCK); - // - // saveToolStripMenuItem - // - resources.ApplyResources(this.saveToolStripMenuItem, "saveToolStripMenuItem"); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveAsPCK); - // - // metaToolStripMenuItem - // - resources.ApplyResources(this.metaToolStripMenuItem, "metaToolStripMenuItem"); - this.metaToolStripMenuItem.Name = "metaToolStripMenuItem"; - this.metaToolStripMenuItem.Click += new System.EventHandler(this.metaToolStripMenuItem_Click); - // - // addPasswordToolStripMenuItem - // - resources.ApplyResources(this.addPasswordToolStripMenuItem, "addPasswordToolStripMenuItem"); - this.addPasswordToolStripMenuItem.Name = "addPasswordToolStripMenuItem"; - this.addPasswordToolStripMenuItem.Click += new System.EventHandler(this.addPasswordToolStripMenuItem_Click); - // - // convertPCTextrurePackToolStripMenuItem - // - this.convertPCTextrurePackToolStripMenuItem.Name = "convertPCTextrurePackToolStripMenuItem"; - resources.ApplyResources(this.convertPCTextrurePackToolStripMenuItem, "convertPCTextrurePackToolStripMenuItem"); - this.convertPCTextrurePackToolStripMenuItem.Click += new System.EventHandler(this.convertPCTextrurePackToolStripMenuItem_Click); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); + // + // newToolStripMenuItem + // + resources.ApplyResources(this.newToolStripMenuItem, "newToolStripMenuItem"); + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.skinPackToolStripMenuItem_Click); + // + // openToolStripMenuItem + // + resources.ApplyResources(this.openToolStripMenuItem, "openToolStripMenuItem"); + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + // + // extractToolStripMenuItem1 + // + resources.ApplyResources(this.extractToolStripMenuItem1, "extractToolStripMenuItem1"); + this.extractToolStripMenuItem1.Name = "extractToolStripMenuItem1"; + this.extractToolStripMenuItem1.Click += new System.EventHandler(this.extractToolStripMenuItem1_Click); + // + // saveToolStripMenuItem1 + // + resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); + this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; + this.saveToolStripMenuItem1.Click += new System.EventHandler(this.savePCK); + // + // saveToolStripMenuItem + // + resources.ApplyResources(this.saveToolStripMenuItem, "saveToolStripMenuItem"); + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveAsPCK); + // + // metaToolStripMenuItem + // + resources.ApplyResources(this.metaToolStripMenuItem, "metaToolStripMenuItem"); + this.metaToolStripMenuItem.Name = "metaToolStripMenuItem"; + this.metaToolStripMenuItem.Click += new System.EventHandler(this.metaToolStripMenuItem_Click); + // + // addPasswordToolStripMenuItem + // + resources.ApplyResources(this.addPasswordToolStripMenuItem, "addPasswordToolStripMenuItem"); + this.addPasswordToolStripMenuItem.Name = "addPasswordToolStripMenuItem"; + this.addPasswordToolStripMenuItem.Click += new System.EventHandler(this.addPasswordToolStripMenuItem_Click); + // + // convertPCTextrurePackToolStripMenuItem + // + this.convertPCTextrurePackToolStripMenuItem.Name = "convertPCTextrurePackToolStripMenuItem"; + resources.ApplyResources(this.convertPCTextrurePackToolStripMenuItem, "convertPCTextrurePackToolStripMenuItem"); + this.convertPCTextrurePackToolStripMenuItem.Click += new System.EventHandler(this.convertPCTextrurePackToolStripMenuItem_Click); + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.advancedMetaAddingToolStripMenuItem, this.convertToBedrockToolStripMenuItem}); - this.editToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - resources.ApplyResources(this.editToolStripMenuItem, "editToolStripMenuItem"); - // - // advancedMetaAddingToolStripMenuItem - // - resources.ApplyResources(this.advancedMetaAddingToolStripMenuItem, "advancedMetaAddingToolStripMenuItem"); - this.advancedMetaAddingToolStripMenuItem.Name = "advancedMetaAddingToolStripMenuItem"; - this.advancedMetaAddingToolStripMenuItem.Click += new System.EventHandler(this.advancedMetaAddingToolStripMenuItem_Click); - // - // convertToBedrockToolStripMenuItem - // - resources.ApplyResources(this.convertToBedrockToolStripMenuItem, "convertToBedrockToolStripMenuItem"); - this.convertToBedrockToolStripMenuItem.Name = "convertToBedrockToolStripMenuItem"; - this.convertToBedrockToolStripMenuItem.Click += new System.EventHandler(this.convertToBedrockToolStripMenuItem_Click); - // - // videosToolStripMenuItem - // - this.videosToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + resources.ApplyResources(this.editToolStripMenuItem, "editToolStripMenuItem"); + // + // advancedMetaAddingToolStripMenuItem + // + resources.ApplyResources(this.advancedMetaAddingToolStripMenuItem, "advancedMetaAddingToolStripMenuItem"); + this.advancedMetaAddingToolStripMenuItem.Name = "advancedMetaAddingToolStripMenuItem"; + this.advancedMetaAddingToolStripMenuItem.Click += new System.EventHandler(this.advancedMetaAddingToolStripMenuItem_Click); + // + // convertToBedrockToolStripMenuItem + // + resources.ApplyResources(this.convertToBedrockToolStripMenuItem, "convertToBedrockToolStripMenuItem"); + this.convertToBedrockToolStripMenuItem.Name = "convertToBedrockToolStripMenuItem"; + this.convertToBedrockToolStripMenuItem.Click += new System.EventHandler(this.convertToBedrockToolStripMenuItem_Click); + // + // videosToolStripMenuItem + // + this.videosToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.howToMakeABasicSkinPackToolStripMenuItem, this.howToMakeACustomSkinModelToolStripMenuItem, this.howToMakeCustomSkinModelsbedrockToolStripMenuItem, @@ -408,62 +401,62 @@ this.howToInstallPcksDirectlyToWiiUToolStripMenuItem, this.pCKCenterReleaseToolStripMenuItem, this.howPCKsWorkToolStripMenuItem}); - this.videosToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.videosToolStripMenuItem.Name = "videosToolStripMenuItem"; - resources.ApplyResources(this.videosToolStripMenuItem, "videosToolStripMenuItem"); - // - // howToMakeABasicSkinPackToolStripMenuItem - // - this.howToMakeABasicSkinPackToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howToMakeABasicSkinPackToolStripMenuItem.Name = "howToMakeABasicSkinPackToolStripMenuItem"; - resources.ApplyResources(this.howToMakeABasicSkinPackToolStripMenuItem, "howToMakeABasicSkinPackToolStripMenuItem"); - this.howToMakeABasicSkinPackToolStripMenuItem.Click += new System.EventHandler(this.howToMakeABasicSkinPackToolStripMenuItem_Click); - // - // howToMakeACustomSkinModelToolStripMenuItem - // - this.howToMakeACustomSkinModelToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howToMakeACustomSkinModelToolStripMenuItem.Name = "howToMakeACustomSkinModelToolStripMenuItem"; - resources.ApplyResources(this.howToMakeACustomSkinModelToolStripMenuItem, "howToMakeACustomSkinModelToolStripMenuItem"); - this.howToMakeACustomSkinModelToolStripMenuItem.Click += new System.EventHandler(this.howToMakeACustomSkinModelToolStripMenuItem_Click); - // - // howToMakeCustomSkinModelsbedrockToolStripMenuItem - // - this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Name = "howToMakeCustomSkinModelsbedrockToolStripMenuItem"; - resources.ApplyResources(this.howToMakeCustomSkinModelsbedrockToolStripMenuItem, "howToMakeCustomSkinModelsbedrockToolStripMenuItem"); - this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Click += new System.EventHandler(this.howToMakeCustomSkinModelsbedrockToolStripMenuItem_Click); - // - // howToMakeCustomMusicToolStripMenuItem - // - this.howToMakeCustomMusicToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howToMakeCustomMusicToolStripMenuItem.Name = "howToMakeCustomMusicToolStripMenuItem"; - resources.ApplyResources(this.howToMakeCustomMusicToolStripMenuItem, "howToMakeCustomMusicToolStripMenuItem"); - this.howToMakeCustomMusicToolStripMenuItem.Click += new System.EventHandler(this.howToMakeCustomMusicToolStripMenuItem_Click); - // - // howToInstallPcksDirectlyToWiiUToolStripMenuItem - // - this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Name = "howToInstallPcksDirectlyToWiiUToolStripMenuItem"; - resources.ApplyResources(this.howToInstallPcksDirectlyToWiiUToolStripMenuItem, "howToInstallPcksDirectlyToWiiUToolStripMenuItem"); - this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Click += new System.EventHandler(this.howToInstallPcksDirectlyToWiiUToolStripMenuItem_Click); - // - // pCKCenterReleaseToolStripMenuItem - // - this.pCKCenterReleaseToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.pCKCenterReleaseToolStripMenuItem.Name = "pCKCenterReleaseToolStripMenuItem"; - resources.ApplyResources(this.pCKCenterReleaseToolStripMenuItem, "pCKCenterReleaseToolStripMenuItem"); - this.pCKCenterReleaseToolStripMenuItem.Click += new System.EventHandler(this.pCKCenterReleaseToolStripMenuItem_Click); - // - // howPCKsWorkToolStripMenuItem - // - this.howPCKsWorkToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.howPCKsWorkToolStripMenuItem.Name = "howPCKsWorkToolStripMenuItem"; - resources.ApplyResources(this.howPCKsWorkToolStripMenuItem, "howPCKsWorkToolStripMenuItem"); - this.howPCKsWorkToolStripMenuItem.Click += new System.EventHandler(this.howPCKsWorkToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.videosToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.videosToolStripMenuItem.Name = "videosToolStripMenuItem"; + resources.ApplyResources(this.videosToolStripMenuItem, "videosToolStripMenuItem"); + // + // howToMakeABasicSkinPackToolStripMenuItem + // + this.howToMakeABasicSkinPackToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howToMakeABasicSkinPackToolStripMenuItem.Name = "howToMakeABasicSkinPackToolStripMenuItem"; + resources.ApplyResources(this.howToMakeABasicSkinPackToolStripMenuItem, "howToMakeABasicSkinPackToolStripMenuItem"); + this.howToMakeABasicSkinPackToolStripMenuItem.Click += new System.EventHandler(this.howToMakeABasicSkinPackToolStripMenuItem_Click); + // + // howToMakeACustomSkinModelToolStripMenuItem + // + this.howToMakeACustomSkinModelToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howToMakeACustomSkinModelToolStripMenuItem.Name = "howToMakeACustomSkinModelToolStripMenuItem"; + resources.ApplyResources(this.howToMakeACustomSkinModelToolStripMenuItem, "howToMakeACustomSkinModelToolStripMenuItem"); + this.howToMakeACustomSkinModelToolStripMenuItem.Click += new System.EventHandler(this.howToMakeACustomSkinModelToolStripMenuItem_Click); + // + // howToMakeCustomSkinModelsbedrockToolStripMenuItem + // + this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Name = "howToMakeCustomSkinModelsbedrockToolStripMenuItem"; + resources.ApplyResources(this.howToMakeCustomSkinModelsbedrockToolStripMenuItem, "howToMakeCustomSkinModelsbedrockToolStripMenuItem"); + this.howToMakeCustomSkinModelsbedrockToolStripMenuItem.Click += new System.EventHandler(this.howToMakeCustomSkinModelsbedrockToolStripMenuItem_Click); + // + // howToMakeCustomMusicToolStripMenuItem + // + this.howToMakeCustomMusicToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howToMakeCustomMusicToolStripMenuItem.Name = "howToMakeCustomMusicToolStripMenuItem"; + resources.ApplyResources(this.howToMakeCustomMusicToolStripMenuItem, "howToMakeCustomMusicToolStripMenuItem"); + this.howToMakeCustomMusicToolStripMenuItem.Click += new System.EventHandler(this.howToMakeCustomMusicToolStripMenuItem_Click); + // + // howToInstallPcksDirectlyToWiiUToolStripMenuItem + // + this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Name = "howToInstallPcksDirectlyToWiiUToolStripMenuItem"; + resources.ApplyResources(this.howToInstallPcksDirectlyToWiiUToolStripMenuItem, "howToInstallPcksDirectlyToWiiUToolStripMenuItem"); + this.howToInstallPcksDirectlyToWiiUToolStripMenuItem.Click += new System.EventHandler(this.howToInstallPcksDirectlyToWiiUToolStripMenuItem_Click); + // + // pCKCenterReleaseToolStripMenuItem + // + this.pCKCenterReleaseToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.pCKCenterReleaseToolStripMenuItem.Name = "pCKCenterReleaseToolStripMenuItem"; + resources.ApplyResources(this.pCKCenterReleaseToolStripMenuItem, "pCKCenterReleaseToolStripMenuItem"); + this.pCKCenterReleaseToolStripMenuItem.Click += new System.EventHandler(this.pCKCenterReleaseToolStripMenuItem_Click); + // + // howPCKsWorkToolStripMenuItem + // + this.howPCKsWorkToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.howPCKsWorkToolStripMenuItem.Name = "howPCKsWorkToolStripMenuItem"; + resources.ApplyResources(this.howPCKsWorkToolStripMenuItem, "howPCKsWorkToolStripMenuItem"); + this.howPCKsWorkToolStripMenuItem.Click += new System.EventHandler(this.howPCKsWorkToolStripMenuItem_Click); + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.programInfoToolStripMenuItem, this.binkaConversionToolStripMenuItem, this.tutorialsToolStripMenuItem, @@ -472,631 +465,604 @@ this.donateToolStripMenuItem, this.settingsToolStripMenuItem, this.administrativeToolsToolStripMenuItem}); - this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); - // - // programInfoToolStripMenuItem - // - resources.ApplyResources(this.programInfoToolStripMenuItem, "programInfoToolStripMenuItem"); - this.programInfoToolStripMenuItem.Name = "programInfoToolStripMenuItem"; - this.programInfoToolStripMenuItem.Click += new System.EventHandler(this.programInfoToolStripMenuItem_Click); - // - // binkaConversionToolStripMenuItem - // - resources.ApplyResources(this.binkaConversionToolStripMenuItem, "binkaConversionToolStripMenuItem"); - this.binkaConversionToolStripMenuItem.Name = "binkaConversionToolStripMenuItem"; - this.binkaConversionToolStripMenuItem.Click += new System.EventHandler(this.binkaConversionToolStripMenuItem_Click); - // - // tutorialsToolStripMenuItem - // - this.tutorialsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; - this.tutorialsToolStripMenuItem.Name = "tutorialsToolStripMenuItem"; - resources.ApplyResources(this.tutorialsToolStripMenuItem, "tutorialsToolStripMenuItem"); - this.tutorialsToolStripMenuItem.Click += new System.EventHandler(this.tutorialsToolStripMenuItem_Click); - // - // installationToolStripMenuItem - // - resources.ApplyResources(this.installationToolStripMenuItem, "installationToolStripMenuItem"); - this.installationToolStripMenuItem.Name = "installationToolStripMenuItem"; - this.installationToolStripMenuItem.Click += new System.EventHandler(this.installationToolStripMenuItem_Click); - // - // fAQToolStripMenuItem1 - // - resources.ApplyResources(this.fAQToolStripMenuItem1, "fAQToolStripMenuItem1"); - this.fAQToolStripMenuItem1.Name = "fAQToolStripMenuItem1"; - this.fAQToolStripMenuItem1.Click += new System.EventHandler(this.fAQToolStripMenuItem1_Click); - // - // donateToolStripMenuItem - // - this.donateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + // + // programInfoToolStripMenuItem + // + resources.ApplyResources(this.programInfoToolStripMenuItem, "programInfoToolStripMenuItem"); + this.programInfoToolStripMenuItem.Name = "programInfoToolStripMenuItem"; + this.programInfoToolStripMenuItem.Click += new System.EventHandler(this.programInfoToolStripMenuItem_Click); + // + // binkaConversionToolStripMenuItem + // + resources.ApplyResources(this.binkaConversionToolStripMenuItem, "binkaConversionToolStripMenuItem"); + this.binkaConversionToolStripMenuItem.Name = "binkaConversionToolStripMenuItem"; + this.binkaConversionToolStripMenuItem.Click += new System.EventHandler(this.binkaConversionToolStripMenuItem_Click); + // + // tutorialsToolStripMenuItem + // + this.tutorialsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.youtube_PNG15; + this.tutorialsToolStripMenuItem.Name = "tutorialsToolStripMenuItem"; + resources.ApplyResources(this.tutorialsToolStripMenuItem, "tutorialsToolStripMenuItem"); + this.tutorialsToolStripMenuItem.Click += new System.EventHandler(this.tutorialsToolStripMenuItem_Click); + // + // installationToolStripMenuItem + // + resources.ApplyResources(this.installationToolStripMenuItem, "installationToolStripMenuItem"); + this.installationToolStripMenuItem.Name = "installationToolStripMenuItem"; + this.installationToolStripMenuItem.Click += new System.EventHandler(this.installationToolStripMenuItem_Click); + // + // fAQToolStripMenuItem1 + // + resources.ApplyResources(this.fAQToolStripMenuItem1, "fAQToolStripMenuItem1"); + this.fAQToolStripMenuItem1.Name = "fAQToolStripMenuItem1"; + this.fAQToolStripMenuItem1.Click += new System.EventHandler(this.fAQToolStripMenuItem1_Click); + // + // donateToolStripMenuItem + // + this.donateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toNobledezJackToolStripMenuItem, this.toPhoenixARCDeveloperToolStripMenuItem, this.forMattNLContributorToolStripMenuItem}); - this.donateToolStripMenuItem.Name = "donateToolStripMenuItem"; - resources.ApplyResources(this.donateToolStripMenuItem, "donateToolStripMenuItem"); - this.donateToolStripMenuItem.Click += new System.EventHandler(this.donateToolStripMenuItem_Click); - // - // toNobledezJackToolStripMenuItem - // - this.toNobledezJackToolStripMenuItem.Name = "toNobledezJackToolStripMenuItem"; - resources.ApplyResources(this.toNobledezJackToolStripMenuItem, "toNobledezJackToolStripMenuItem"); - this.toNobledezJackToolStripMenuItem.Click += new System.EventHandler(this.toNobledezJackToolStripMenuItem_Click); - // - // toPhoenixARCDeveloperToolStripMenuItem - // - this.toPhoenixARCDeveloperToolStripMenuItem.Name = "toPhoenixARCDeveloperToolStripMenuItem"; - resources.ApplyResources(this.toPhoenixARCDeveloperToolStripMenuItem, "toPhoenixARCDeveloperToolStripMenuItem"); - this.toPhoenixARCDeveloperToolStripMenuItem.Click += new System.EventHandler(this.toPhoenixARCDeveloperToolStripMenuItem_Click); - // - // forMattNLContributorToolStripMenuItem - // - this.forMattNLContributorToolStripMenuItem.Name = "forMattNLContributorToolStripMenuItem"; - resources.ApplyResources(this.forMattNLContributorToolStripMenuItem, "forMattNLContributorToolStripMenuItem"); - this.forMattNLContributorToolStripMenuItem.Click += new System.EventHandler(this.forMattNLContributorToolStripMenuItem_Click); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); - this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); - // - // administrativeToolsToolStripMenuItem - // - this.administrativeToolsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.pckCenterHeader; - this.administrativeToolsToolStripMenuItem.Name = "administrativeToolsToolStripMenuItem"; - resources.ApplyResources(this.administrativeToolsToolStripMenuItem, "administrativeToolsToolStripMenuItem"); - this.administrativeToolsToolStripMenuItem.Click += new System.EventHandler(this.administrativeToolsToolStripMenuItem_Click); - // - // storeToolStripMenuItem - // - this.storeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.donateToolStripMenuItem.Name = "donateToolStripMenuItem"; + resources.ApplyResources(this.donateToolStripMenuItem, "donateToolStripMenuItem"); + this.donateToolStripMenuItem.Click += new System.EventHandler(this.donateToolStripMenuItem_Click); + // + // toNobledezJackToolStripMenuItem + // + this.toNobledezJackToolStripMenuItem.Name = "toNobledezJackToolStripMenuItem"; + resources.ApplyResources(this.toNobledezJackToolStripMenuItem, "toNobledezJackToolStripMenuItem"); + this.toNobledezJackToolStripMenuItem.Click += new System.EventHandler(this.toNobledezJackToolStripMenuItem_Click); + // + // toPhoenixARCDeveloperToolStripMenuItem + // + this.toPhoenixARCDeveloperToolStripMenuItem.Name = "toPhoenixARCDeveloperToolStripMenuItem"; + resources.ApplyResources(this.toPhoenixARCDeveloperToolStripMenuItem, "toPhoenixARCDeveloperToolStripMenuItem"); + this.toPhoenixARCDeveloperToolStripMenuItem.Click += new System.EventHandler(this.toPhoenixARCDeveloperToolStripMenuItem_Click); + // + // forMattNLContributorToolStripMenuItem + // + this.forMattNLContributorToolStripMenuItem.Name = "forMattNLContributorToolStripMenuItem"; + resources.ApplyResources(this.forMattNLContributorToolStripMenuItem, "forMattNLContributorToolStripMenuItem"); + this.forMattNLContributorToolStripMenuItem.Click += new System.EventHandler(this.forMattNLContributorToolStripMenuItem_Click); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // + // administrativeToolsToolStripMenuItem + // + this.administrativeToolsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.pckCenterHeader; + this.administrativeToolsToolStripMenuItem.Name = "administrativeToolsToolStripMenuItem"; + resources.ApplyResources(this.administrativeToolsToolStripMenuItem, "administrativeToolsToolStripMenuItem"); + this.administrativeToolsToolStripMenuItem.Click += new System.EventHandler(this.administrativeToolsToolStripMenuItem_Click); + // + // storeToolStripMenuItem + // + this.storeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openToolStripMenuItem1, this.wiiUPCKInstallerToolStripMenuItem, this.PS3PCKInstallerToolStripMenuItem, this.VitaPCKInstallerToolStripMenuItem, this.joinDevelopmentDiscordToolStripMenuItem}); - this.storeToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.storeToolStripMenuItem.Image = global::PckStudio.Properties.Resources.MROE; - this.storeToolStripMenuItem.Name = "storeToolStripMenuItem"; - resources.ApplyResources(this.storeToolStripMenuItem, "storeToolStripMenuItem"); - // - // openToolStripMenuItem1 - // - this.openToolStripMenuItem1.Image = global::PckStudio.Properties.Resources.pckCenterHeader; - this.openToolStripMenuItem1.Name = "openToolStripMenuItem1"; - resources.ApplyResources(this.openToolStripMenuItem1, "openToolStripMenuItem1"); - this.openToolStripMenuItem1.Click += new System.EventHandler(this.openToolStripMenuItem1_Click); - // - // wiiUPCKInstallerToolStripMenuItem - // - this.wiiUPCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; - this.wiiUPCKInstallerToolStripMenuItem.Name = "wiiUPCKInstallerToolStripMenuItem"; - resources.ApplyResources(this.wiiUPCKInstallerToolStripMenuItem, "wiiUPCKInstallerToolStripMenuItem"); - this.wiiUPCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.wiiUPCKInstallerToolStripMenuItem_Click); - // - // PS3PCKInstallerToolStripMenuItem - // - resources.ApplyResources(this.PS3PCKInstallerToolStripMenuItem, "PS3PCKInstallerToolStripMenuItem"); - this.PS3PCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; - this.PS3PCKInstallerToolStripMenuItem.Name = "PS3PCKInstallerToolStripMenuItem"; - this.PS3PCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.PS3PCKInstallerToolStripMenuItem_Click); - // - // VitaPCKInstallerToolStripMenuItem - // - resources.ApplyResources(this.VitaPCKInstallerToolStripMenuItem, "VitaPCKInstallerToolStripMenuItem"); - this.VitaPCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; - this.VitaPCKInstallerToolStripMenuItem.Name = "VitaPCKInstallerToolStripMenuItem"; - this.VitaPCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.VitaPCKInstallerToolStripMenuItem_Click); - // - // joinDevelopmentDiscordToolStripMenuItem - // - this.joinDevelopmentDiscordToolStripMenuItem.Image = global::PckStudio.Properties.Resources.discord; - this.joinDevelopmentDiscordToolStripMenuItem.Name = "joinDevelopmentDiscordToolStripMenuItem"; - resources.ApplyResources(this.joinDevelopmentDiscordToolStripMenuItem, "joinDevelopmentDiscordToolStripMenuItem"); - this.joinDevelopmentDiscordToolStripMenuItem.Click += new System.EventHandler(this.joinDevelopmentDiscordToolStripMenuItem_Click); - // - // uPDATEToolStripMenuItem1 - // - this.uPDATEToolStripMenuItem1.ForeColor = System.Drawing.SystemColors.Control; - this.uPDATEToolStripMenuItem1.Name = "uPDATEToolStripMenuItem1"; - resources.ApplyResources(this.uPDATEToolStripMenuItem1, "uPDATEToolStripMenuItem1"); - this.uPDATEToolStripMenuItem1.Click += new System.EventHandler(this.uPDATEToolStripMenuItem1_Click); - // - // tSTToolStripMenuItem - // - this.tSTToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ButtonFace; - this.tSTToolStripMenuItem.Name = "tSTToolStripMenuItem"; - resources.ApplyResources(this.tSTToolStripMenuItem, "tSTToolStripMenuItem"); - this.tSTToolStripMenuItem.Click += new System.EventHandler(this.tSTToolStripMenuItem_Click); - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // contextMenuMetaTree - // - this.contextMenuMetaTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.storeToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.storeToolStripMenuItem.Image = global::PckStudio.Properties.Resources.MROE; + this.storeToolStripMenuItem.Name = "storeToolStripMenuItem"; + resources.ApplyResources(this.storeToolStripMenuItem, "storeToolStripMenuItem"); + // + // openToolStripMenuItem1 + // + this.openToolStripMenuItem1.Image = global::PckStudio.Properties.Resources.pckCenterHeader; + this.openToolStripMenuItem1.Name = "openToolStripMenuItem1"; + resources.ApplyResources(this.openToolStripMenuItem1, "openToolStripMenuItem1"); + this.openToolStripMenuItem1.Click += new System.EventHandler(this.openToolStripMenuItem1_Click); + // + // wiiUPCKInstallerToolStripMenuItem + // + this.wiiUPCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; + this.wiiUPCKInstallerToolStripMenuItem.Name = "wiiUPCKInstallerToolStripMenuItem"; + resources.ApplyResources(this.wiiUPCKInstallerToolStripMenuItem, "wiiUPCKInstallerToolStripMenuItem"); + this.wiiUPCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.wiiUPCKInstallerToolStripMenuItem_Click); + // + // PS3PCKInstallerToolStripMenuItem + // + resources.ApplyResources(this.PS3PCKInstallerToolStripMenuItem, "PS3PCKInstallerToolStripMenuItem"); + this.PS3PCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; + this.PS3PCKInstallerToolStripMenuItem.Name = "PS3PCKInstallerToolStripMenuItem"; + this.PS3PCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.PS3PCKInstallerToolStripMenuItem_Click); + // + // VitaPCKInstallerToolStripMenuItem + // + resources.ApplyResources(this.VitaPCKInstallerToolStripMenuItem, "VitaPCKInstallerToolStripMenuItem"); + this.VitaPCKInstallerToolStripMenuItem.Image = global::PckStudio.Properties.Resources.wii_u_games_tool; + this.VitaPCKInstallerToolStripMenuItem.Name = "VitaPCKInstallerToolStripMenuItem"; + this.VitaPCKInstallerToolStripMenuItem.Click += new System.EventHandler(this.VitaPCKInstallerToolStripMenuItem_Click); + // + // joinDevelopmentDiscordToolStripMenuItem + // + this.joinDevelopmentDiscordToolStripMenuItem.Image = global::PckStudio.Properties.Resources.discord; + this.joinDevelopmentDiscordToolStripMenuItem.Name = "joinDevelopmentDiscordToolStripMenuItem"; + resources.ApplyResources(this.joinDevelopmentDiscordToolStripMenuItem, "joinDevelopmentDiscordToolStripMenuItem"); + this.joinDevelopmentDiscordToolStripMenuItem.Click += new System.EventHandler(this.joinDevelopmentDiscordToolStripMenuItem_Click); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // contextMenuMetaTree + // + this.contextMenuMetaTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addPresetToolStripMenuItem1, this.addEntryToolStripMenuItem, this.deleteEntryToolStripMenuItem}); - this.contextMenuMetaTree.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuMetaTree, "contextMenuMetaTree"); - // - // addPresetToolStripMenuItem1 - // - resources.ApplyResources(this.addPresetToolStripMenuItem1, "addPresetToolStripMenuItem1"); - this.addPresetToolStripMenuItem1.Name = "addPresetToolStripMenuItem1"; - this.addPresetToolStripMenuItem1.Click += new System.EventHandler(this.addPresetToolStripMenuItem1_Click); - // - // addEntryToolStripMenuItem - // - resources.ApplyResources(this.addEntryToolStripMenuItem, "addEntryToolStripMenuItem"); - this.addEntryToolStripMenuItem.Name = "addEntryToolStripMenuItem"; - this.addEntryToolStripMenuItem.Click += new System.EventHandler(this.addEntryToolStripMenuItem_Click_1); - // - // deleteEntryToolStripMenuItem - // - resources.ApplyResources(this.deleteEntryToolStripMenuItem, "deleteEntryToolStripMenuItem"); - this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem"; - this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteEntryToolStripMenuItem_Click); - // - // labelVersion - // - resources.ApplyResources(this.labelVersion, "labelVersion"); - this.labelVersion.ForeColor = System.Drawing.Color.White; - this.labelVersion.Name = "labelVersion"; - this.labelVersion.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // directorySearcher1 - // - this.directorySearcher1.ClientTimeout = System.TimeSpan.Parse("-00:00:01"); - this.directorySearcher1.ServerPageTimeLimit = System.TimeSpan.Parse("-00:00:01"); - this.directorySearcher1.ServerTimeLimit = System.TimeSpan.Parse("-00:00:01"); - // - // openedPCKS - // - this.openedPCKS.Controls.Add(this.tabPage1); - resources.ApplyResources(this.openedPCKS, "openedPCKS"); - this.openedPCKS.Name = "openedPCKS"; - this.openedPCKS.SelectedIndex = 0; - this.openedPCKS.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.openedPCKS.Style = MetroFramework.MetroColorStyle.White; - this.openedPCKS.Theme = MetroFramework.MetroThemeStyle.Dark; - this.openedPCKS.UseSelectable = true; - // - // tabPage1 - // - this.tabPage1.BackColor = System.Drawing.Color.Transparent; - this.tabPage1.Controls.Add(this.myTablePanelPckEdit); - this.tabPage1.Controls.Add(this.labelImageSize); - this.tabPage1.Controls.Add(this.label1); - this.tabPage1.HorizontalScrollbarBarColor = true; - this.tabPage1.HorizontalScrollbarHighlightOnWheel = false; - this.tabPage1.HorizontalScrollbarSize = 0; - resources.ApplyResources(this.tabPage1, "tabPage1"); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Style = MetroFramework.MetroColorStyle.White; - this.tabPage1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.tabPage1.VerticalScrollbarBarColor = true; - this.tabPage1.VerticalScrollbarHighlightOnWheel = false; - this.tabPage1.VerticalScrollbarSize = 0; - // - // myTablePanelPckEdit - // - resources.ApplyResources(this.myTablePanelPckEdit, "myTablePanelPckEdit"); - this.myTablePanelPckEdit.Controls.Add(this.treeViewMain, 0, 0); - this.myTablePanelPckEdit.Controls.Add(this.pictureBoxImagePreview, 1, 0); - this.myTablePanelPckEdit.Controls.Add(this.labelAmount, 2, 0); - this.myTablePanelPckEdit.Controls.Add(this.tabDataDisplay, 1, 4); - this.myTablePanelPckEdit.Name = "myTablePanelPckEdit"; - // - // treeViewMain - // - this.treeViewMain.AllowDrop = true; - this.treeViewMain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeViewMain.ContextMenuStrip = this.contextMenuPCKEntries; - resources.ApplyResources(this.treeViewMain, "treeViewMain"); - this.treeViewMain.ForeColor = System.Drawing.Color.White; - this.treeViewMain.LabelEdit = true; - this.treeViewMain.Name = "treeViewMain"; - this.myTablePanelPckEdit.SetRowSpan(this.treeViewMain, 6); - this.treeViewMain.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeViewMain_ItemDrag); - this.treeViewMain.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.selectNode); - this.treeViewMain.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_DoubleClick); - this.treeViewMain.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragDrop); - this.treeViewMain.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragEnter); - this.treeViewMain.DragOver += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragOver); - this.treeViewMain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeViewMain_KeyDown); - // - // pictureBoxImagePreview - // - resources.ApplyResources(this.pictureBoxImagePreview, "pictureBoxImagePreview"); - this.pictureBoxImagePreview.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; - this.pictureBoxImagePreview.Name = "pictureBoxImagePreview"; - this.myTablePanelPckEdit.SetRowSpan(this.pictureBoxImagePreview, 4); - this.pictureBoxImagePreview.TabStop = false; - // - // labelAmount - // - resources.ApplyResources(this.labelAmount, "labelAmount"); - this.labelAmount.ForeColor = System.Drawing.Color.White; - this.labelAmount.Name = "labelAmount"; - // - // tabDataDisplay - // - this.myTablePanelPckEdit.SetColumnSpan(this.tabDataDisplay, 2); - this.tabDataDisplay.Controls.Add(this.tabMetaDisplay); - resources.ApplyResources(this.tabDataDisplay, "tabDataDisplay"); - this.tabDataDisplay.Name = "tabDataDisplay"; - this.myTablePanelPckEdit.SetRowSpan(this.tabDataDisplay, 2); - this.tabDataDisplay.SelectedIndex = 0; - // - // tabMetaDisplay - // - this.tabMetaDisplay.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.tabMetaDisplay.Controls.Add(this.myTablePanel1); - resources.ApplyResources(this.tabMetaDisplay, "tabMetaDisplay"); - this.tabMetaDisplay.Name = "tabMetaDisplay"; - // - // myTablePanel1 - // - resources.ApplyResources(this.myTablePanel1, "myTablePanel1"); - this.myTablePanel1.Controls.Add(this.treeMeta, 0, 0); - this.myTablePanel1.Controls.Add(this.comboBox1, 1, 1); - this.myTablePanel1.Controls.Add(this.label2, 1, 4); - this.myTablePanel1.Controls.Add(this.textBox1, 1, 3); - this.myTablePanel1.Controls.Add(this.labelEntryType, 1, 0); - this.myTablePanel1.Controls.Add(this.label3, 1, 5); - this.myTablePanel1.Controls.Add(this.labelEntryData, 1, 2); - this.myTablePanel1.Controls.Add(this.buttonEdit, 0, 6); - this.myTablePanel1.Name = "myTablePanel1"; - // - // treeMeta - // - this.treeMeta.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeMeta.ContextMenuStrip = this.contextMenuMetaTree; - resources.ApplyResources(this.treeMeta, "treeMeta"); - this.treeMeta.ForeColor = System.Drawing.Color.White; - this.treeMeta.Name = "treeMeta"; - this.myTablePanel1.SetRowSpan(this.treeMeta, 6); - this.treeMeta.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeMeta_AfterSelect); - this.treeMeta.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeMeta_KeyDown); - // - // comboBox1 - // - resources.ApplyResources(this.comboBox1, "comboBox1"); - this.comboBox1.BackColor = System.Drawing.Color.White; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Name = "comboBox1"; - this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Name = "label2"; - // - // textBox1 - // - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.BackColor = System.Drawing.Color.White; - this.textBox1.Name = "textBox1"; - this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // - // labelEntryType - // - resources.ApplyResources(this.labelEntryType, "labelEntryType"); - this.labelEntryType.ForeColor = System.Drawing.Color.White; - this.labelEntryType.Name = "labelEntryType"; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Name = "label3"; - // - // labelEntryData - // - resources.ApplyResources(this.labelEntryData, "labelEntryData"); - this.labelEntryData.ForeColor = System.Drawing.Color.White; - this.labelEntryData.Name = "labelEntryData"; - // - // buttonEdit - // - this.buttonEdit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.myTablePanel1.SetColumnSpan(this.buttonEdit, 2); - resources.ApplyResources(this.buttonEdit, "buttonEdit"); - this.buttonEdit.ForeColor = System.Drawing.Color.White; - this.buttonEdit.Name = "buttonEdit"; - this.buttonEdit.UseVisualStyleBackColor = false; - this.buttonEdit.Click += new System.EventHandler(this.buttonEditModel_Click); - // - // labelImageSize - // - resources.ApplyResources(this.labelImageSize, "labelImageSize"); - this.labelImageSize.Name = "labelImageSize"; - // - // pictureBox2 - // - resources.ApplyResources(this.pictureBox2, "pictureBox2"); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.TabStop = false; - // - // DBGLabel - // - resources.ApplyResources(this.DBGLabel, "DBGLabel"); - this.DBGLabel.FontWeight = MetroFramework.MetroLabelWeight.Bold; - this.DBGLabel.ForeColor = System.Drawing.Color.Red; - this.DBGLabel.Name = "DBGLabel"; - this.DBGLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // metroTabControl1 - // - this.metroTabControl1.Controls.Add(this.metroTabPage1); - resources.ApplyResources(this.metroTabControl1, "metroTabControl1"); - this.metroTabControl1.Name = "metroTabControl1"; - this.metroTabControl1.SelectedIndex = 0; - this.metroTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.metroTabControl1.Style = MetroFramework.MetroColorStyle.White; - this.metroTabControl1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroTabControl1.UseSelectable = true; - // - // metroTabPage1 - // - this.metroTabPage1.BackColor = System.Drawing.Color.Transparent; - this.metroTabPage1.Controls.Add(this.myTablePanel2); - this.metroTabPage1.Controls.Add(this.label10); - this.metroTabPage1.Controls.Add(this.label11); - this.metroTabPage1.HorizontalScrollbarBarColor = true; - this.metroTabPage1.HorizontalScrollbarHighlightOnWheel = false; - this.metroTabPage1.HorizontalScrollbarSize = 0; - resources.ApplyResources(this.metroTabPage1, "metroTabPage1"); - this.metroTabPage1.Name = "metroTabPage1"; - this.metroTabPage1.Style = MetroFramework.MetroColorStyle.White; - this.metroTabPage1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroTabPage1.VerticalScrollbarBarColor = true; - this.metroTabPage1.VerticalScrollbarHighlightOnWheel = false; - this.metroTabPage1.VerticalScrollbarSize = 0; - // - // myTablePanel2 - // - resources.ApplyResources(this.myTablePanel2, "myTablePanel2"); - this.myTablePanel2.Controls.Add(this.treeView1, 0, 0); - this.myTablePanel2.Controls.Add(this.pictureBoxWithInterpolationMode1, 1, 0); - this.myTablePanel2.Controls.Add(this.label4, 2, 0); - this.myTablePanel2.Controls.Add(this.tabControl1, 1, 4); - this.myTablePanel2.Name = "myTablePanel2"; - // - // treeView1 - // - this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeView1.ContextMenuStrip = this.contextMenuPCKEntries; - resources.ApplyResources(this.treeView1, "treeView1"); - this.treeView1.ForeColor = System.Drawing.Color.White; - this.treeView1.LabelEdit = true; - this.treeView1.Name = "treeView1"; - this.myTablePanel2.SetRowSpan(this.treeView1, 6); - // - // pictureBoxWithInterpolationMode1 - // - resources.ApplyResources(this.pictureBoxWithInterpolationMode1, "pictureBoxWithInterpolationMode1"); - this.pictureBoxWithInterpolationMode1.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; - this.pictureBoxWithInterpolationMode1.Name = "pictureBoxWithInterpolationMode1"; - this.myTablePanel2.SetRowSpan(this.pictureBoxWithInterpolationMode1, 4); - this.pictureBoxWithInterpolationMode1.TabStop = false; - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Name = "label4"; - // - // tabControl1 - // - this.myTablePanel2.SetColumnSpan(this.tabControl1, 2); - this.tabControl1.Controls.Add(this.tabPage2); - resources.ApplyResources(this.tabControl1, "tabControl1"); - this.tabControl1.Name = "tabControl1"; - this.myTablePanel2.SetRowSpan(this.tabControl1, 2); - this.tabControl1.SelectedIndex = 0; - // - // tabPage2 - // - this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.tabPage2.Controls.Add(this.myTablePanel3); - resources.ApplyResources(this.tabPage2, "tabPage2"); - this.tabPage2.Name = "tabPage2"; - // - // myTablePanel3 - // - resources.ApplyResources(this.myTablePanel3, "myTablePanel3"); - this.myTablePanel3.Controls.Add(this.treeView2, 0, 0); - this.myTablePanel3.Controls.Add(this.comboBox2, 1, 1); - this.myTablePanel3.Controls.Add(this.label6, 1, 4); - this.myTablePanel3.Controls.Add(this.textBox2, 1, 3); - this.myTablePanel3.Controls.Add(this.label7, 1, 0); - this.myTablePanel3.Controls.Add(this.label8, 1, 5); - this.myTablePanel3.Controls.Add(this.label9, 1, 2); - this.myTablePanel3.Controls.Add(this.button1, 0, 6); - this.myTablePanel3.Name = "myTablePanel3"; - // - // treeView2 - // - this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeView2.ContextMenuStrip = this.contextMenuMetaTree; - resources.ApplyResources(this.treeView2, "treeView2"); - this.treeView2.ForeColor = System.Drawing.Color.White; - this.treeView2.Name = "treeView2"; - this.myTablePanel3.SetRowSpan(this.treeView2, 6); - // - // comboBox2 - // - resources.ApplyResources(this.comboBox2, "comboBox2"); - this.comboBox2.BackColor = System.Drawing.Color.White; - this.comboBox2.FormattingEnabled = true; - this.comboBox2.Name = "comboBox2"; - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Name = "label6"; - // - // textBox2 - // - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.BackColor = System.Drawing.Color.White; - this.textBox2.Name = "textBox2"; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Name = "label7"; - // - // label8 - // - resources.ApplyResources(this.label8, "label8"); - this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Name = "label8"; - // - // label9 - // - resources.ApplyResources(this.label9, "label9"); - this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Name = "label9"; - // - // button1 - // - this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.myTablePanel3.SetColumnSpan(this.button1, 2); - resources.ApplyResources(this.button1, "button1"); - this.button1.ForeColor = System.Drawing.Color.White; - this.button1.Name = "button1"; - this.button1.UseVisualStyleBackColor = false; - // - // label10 - // - resources.ApplyResources(this.label10, "label10"); - this.label10.Name = "label10"; - // - // label11 - // - resources.ApplyResources(this.label11, "label11"); - this.label11.Name = "label11"; - // - // timer1 - // - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // - // ChangeURL - // - resources.ApplyResources(this.ChangeURL, "ChangeURL"); - this.ChangeURL.Name = "ChangeURL"; - this.ChangeURL.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // LittleEndianCheckBox - // - resources.ApplyResources(this.LittleEndianCheckBox, "LittleEndianCheckBox"); - this.LittleEndianCheckBox.Name = "LittleEndianCheckBox"; - this.LittleEndianCheckBox.Style = MetroFramework.MetroColorStyle.White; - this.LittleEndianCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.LittleEndianCheckBox.UseSelectable = true; - // - // myTablePanelStartScreen - // - resources.ApplyResources(this.myTablePanelStartScreen, "myTablePanelStartScreen"); - this.myTablePanelStartScreen.Controls.Add(this.richTextBoxChangelog, 1, 1); - this.myTablePanelStartScreen.Controls.Add(this.label5, 1, 0); - this.myTablePanelStartScreen.Controls.Add(this.pckOpen, 0, 0); - this.myTablePanelStartScreen.Name = "myTablePanelStartScreen"; - // - // richTextBoxChangelog - // - this.richTextBoxChangelog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(28)))), ((int)(((byte)(28))))); - this.richTextBoxChangelog.BorderStyle = System.Windows.Forms.BorderStyle.None; - resources.ApplyResources(this.richTextBoxChangelog, "richTextBoxChangelog"); - this.richTextBoxChangelog.ForeColor = System.Drawing.Color.White; - this.richTextBoxChangelog.Name = "richTextBoxChangelog"; - this.richTextBoxChangelog.ReadOnly = true; - // - // label5 - // - resources.ApplyResources(this.label5, "label5"); - this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Name = "label5"; - this.label5.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // pckOpen - // - resources.ApplyResources(this.pckOpen, "pckOpen"); - this.pckOpen.Image = global::PckStudio.Properties.Resources.pckClosed; - this.pckOpen.Name = "pckOpen"; - this.myTablePanelStartScreen.SetRowSpan(this.pckOpen, 2); - this.pckOpen.TabStop = false; - this.pckOpen.Click += new System.EventHandler(this.openToolStripMenuItem_Click); - this.pckOpen.DragDrop += new System.Windows.Forms.DragEventHandler(this.OpenPck_DragDrop); - this.pckOpen.DragEnter += new System.Windows.Forms.DragEventHandler(this.OpenPck_DragEnter); - this.pckOpen.DragLeave += new System.EventHandler(this.OpenPck_DragLeave); - this.pckOpen.MouseEnter += new System.EventHandler(this.OpenPck_MouseEnter); - this.pckOpen.MouseLeave += new System.EventHandler(this.OpenPck_MouseLeave); - // - // FormMain - // - this.ApplyImageInvert = true; - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.LittleEndianCheckBox); - this.Controls.Add(this.ChangeURL); - this.Controls.Add(this.myTablePanelStartScreen); - this.Controls.Add(this.metroTabControl1); - this.Controls.Add(this.DBGLabel); - this.Controls.Add(this.openedPCKS); - this.Controls.Add(this.pictureBox2); - this.Controls.Add(this.labelVersion); - this.Controls.Add(this.menuStrip); - this.MainMenuStrip = this.menuStrip; - this.Name = "FormMain"; - this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; - this.Style = MetroFramework.MetroColorStyle.Silver; - this.Theme = MetroFramework.MetroThemeStyle.Dark; - this.Activated += new System.EventHandler(this.FormMain_Activated); - this.Deactivate += new System.EventHandler(this.FormMain_Deactivate); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed); - this.Load += new System.EventHandler(this.Form1_Load); - this.contextMenuPCKEntries.ResumeLayout(false); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.contextMenuMetaTree.ResumeLayout(false); - this.openedPCKS.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.myTablePanelPckEdit.ResumeLayout(false); - this.myTablePanelPckEdit.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImagePreview)).EndInit(); - this.tabDataDisplay.ResumeLayout(false); - this.tabMetaDisplay.ResumeLayout(false); - this.myTablePanel1.ResumeLayout(false); - this.myTablePanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.metroTabControl1.ResumeLayout(false); - this.metroTabPage1.ResumeLayout(false); - this.metroTabPage1.PerformLayout(); - this.myTablePanel2.ResumeLayout(false); - this.myTablePanel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWithInterpolationMode1)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.myTablePanel3.ResumeLayout(false); - this.myTablePanel3.PerformLayout(); - this.myTablePanelStartScreen.ResumeLayout(false); - this.myTablePanelStartScreen.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pckOpen)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.contextMenuMetaTree.Name = "contextMenuStrip1"; + resources.ApplyResources(this.contextMenuMetaTree, "contextMenuMetaTree"); + // + // addPresetToolStripMenuItem1 + // + resources.ApplyResources(this.addPresetToolStripMenuItem1, "addPresetToolStripMenuItem1"); + this.addPresetToolStripMenuItem1.Name = "addPresetToolStripMenuItem1"; + this.addPresetToolStripMenuItem1.Click += new System.EventHandler(this.addPresetToolStripMenuItem1_Click); + // + // addEntryToolStripMenuItem + // + resources.ApplyResources(this.addEntryToolStripMenuItem, "addEntryToolStripMenuItem"); + this.addEntryToolStripMenuItem.Name = "addEntryToolStripMenuItem"; + this.addEntryToolStripMenuItem.Click += new System.EventHandler(this.addEntryToolStripMenuItem_Click_1); + // + // deleteEntryToolStripMenuItem + // + resources.ApplyResources(this.deleteEntryToolStripMenuItem, "deleteEntryToolStripMenuItem"); + this.deleteEntryToolStripMenuItem.Name = "deleteEntryToolStripMenuItem"; + this.deleteEntryToolStripMenuItem.Click += new System.EventHandler(this.deleteEntryToolStripMenuItem_Click); + // + // labelVersion + // + resources.ApplyResources(this.labelVersion, "labelVersion"); + this.labelVersion.ForeColor = System.Drawing.Color.White; + this.labelVersion.Name = "labelVersion"; + this.labelVersion.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // openedPCKS + // + this.openedPCKS.Controls.Add(this.tabPage1); + resources.ApplyResources(this.openedPCKS, "openedPCKS"); + this.openedPCKS.Name = "openedPCKS"; + this.openedPCKS.SelectedIndex = 0; + this.openedPCKS.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.openedPCKS.Style = MetroFramework.MetroColorStyle.White; + this.openedPCKS.Theme = MetroFramework.MetroThemeStyle.Dark; + this.openedPCKS.UseSelectable = true; + // + // tabPage1 + // + this.tabPage1.BackColor = System.Drawing.Color.Transparent; + this.tabPage1.Controls.Add(this.myTablePanelPckEdit); + this.tabPage1.Controls.Add(this.labelImageSize); + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.HorizontalScrollbarBarColor = true; + this.tabPage1.HorizontalScrollbarHighlightOnWheel = false; + this.tabPage1.HorizontalScrollbarSize = 0; + resources.ApplyResources(this.tabPage1, "tabPage1"); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Style = MetroFramework.MetroColorStyle.White; + this.tabPage1.Theme = MetroFramework.MetroThemeStyle.Dark; + this.tabPage1.VerticalScrollbarBarColor = true; + this.tabPage1.VerticalScrollbarHighlightOnWheel = false; + this.tabPage1.VerticalScrollbarSize = 0; + // + // myTablePanelPckEdit + // + resources.ApplyResources(this.myTablePanelPckEdit, "myTablePanelPckEdit"); + this.myTablePanelPckEdit.Controls.Add(this.treeViewMain, 0, 0); + this.myTablePanelPckEdit.Controls.Add(this.pictureBoxImagePreview, 1, 0); + this.myTablePanelPckEdit.Controls.Add(this.labelAmount, 2, 0); + this.myTablePanelPckEdit.Controls.Add(this.tabDataDisplay, 1, 4); + this.myTablePanelPckEdit.Name = "myTablePanelPckEdit"; + // + // treeViewMain + // + this.treeViewMain.AllowDrop = true; + this.treeViewMain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeViewMain.ContextMenuStrip = this.contextMenuPCKEntries; + resources.ApplyResources(this.treeViewMain, "treeViewMain"); + this.treeViewMain.ForeColor = System.Drawing.Color.White; + this.treeViewMain.LabelEdit = true; + this.treeViewMain.Name = "treeViewMain"; + this.myTablePanelPckEdit.SetRowSpan(this.treeViewMain, 6); + this.treeViewMain.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeViewMain_ItemDrag); + this.treeViewMain.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.selectNode); + this.treeViewMain.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_DoubleClick); + this.treeViewMain.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragDrop); + this.treeViewMain.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragEnter); + this.treeViewMain.DragOver += new System.Windows.Forms.DragEventHandler(this.treeViewMain_DragOver); + this.treeViewMain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeViewMain_KeyDown); + // + // pictureBoxImagePreview + // + resources.ApplyResources(this.pictureBoxImagePreview, "pictureBoxImagePreview"); + this.pictureBoxImagePreview.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; + this.pictureBoxImagePreview.Name = "pictureBoxImagePreview"; + this.myTablePanelPckEdit.SetRowSpan(this.pictureBoxImagePreview, 4); + this.pictureBoxImagePreview.TabStop = false; + // + // labelAmount + // + resources.ApplyResources(this.labelAmount, "labelAmount"); + this.labelAmount.ForeColor = System.Drawing.Color.White; + this.labelAmount.Name = "labelAmount"; + // + // tabDataDisplay + // + this.myTablePanelPckEdit.SetColumnSpan(this.tabDataDisplay, 2); + this.tabDataDisplay.Controls.Add(this.tabMetaDisplay); + resources.ApplyResources(this.tabDataDisplay, "tabDataDisplay"); + this.tabDataDisplay.Name = "tabDataDisplay"; + this.myTablePanelPckEdit.SetRowSpan(this.tabDataDisplay, 2); + this.tabDataDisplay.SelectedIndex = 0; + // + // tabMetaDisplay + // + this.tabMetaDisplay.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.tabMetaDisplay.Controls.Add(this.myTablePanel1); + resources.ApplyResources(this.tabMetaDisplay, "tabMetaDisplay"); + this.tabMetaDisplay.Name = "tabMetaDisplay"; + // + // myTablePanel1 + // + resources.ApplyResources(this.myTablePanel1, "myTablePanel1"); + this.myTablePanel1.Controls.Add(this.treeMeta, 0, 0); + this.myTablePanel1.Controls.Add(this.comboBox1, 1, 1); + this.myTablePanel1.Controls.Add(this.label2, 1, 4); + this.myTablePanel1.Controls.Add(this.textBox1, 1, 3); + this.myTablePanel1.Controls.Add(this.labelEntryType, 1, 0); + this.myTablePanel1.Controls.Add(this.label3, 1, 5); + this.myTablePanel1.Controls.Add(this.labelEntryData, 1, 2); + this.myTablePanel1.Controls.Add(this.buttonEdit, 0, 6); + this.myTablePanel1.Name = "myTablePanel1"; + // + // treeMeta + // + this.treeMeta.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeMeta.ContextMenuStrip = this.contextMenuMetaTree; + resources.ApplyResources(this.treeMeta, "treeMeta"); + this.treeMeta.ForeColor = System.Drawing.Color.White; + this.treeMeta.Name = "treeMeta"; + this.myTablePanel1.SetRowSpan(this.treeMeta, 6); + this.treeMeta.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeMeta_AfterSelect); + this.treeMeta.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeMeta_KeyDown); + // + // comboBox1 + // + resources.ApplyResources(this.comboBox1, "comboBox1"); + this.comboBox1.BackColor = System.Drawing.Color.White; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Name = "comboBox1"; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.ForeColor = System.Drawing.Color.White; + this.label2.Name = "label2"; + // + // textBox1 + // + resources.ApplyResources(this.textBox1, "textBox1"); + this.textBox1.BackColor = System.Drawing.Color.White; + this.textBox1.Name = "textBox1"; + this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + // + // labelEntryType + // + resources.ApplyResources(this.labelEntryType, "labelEntryType"); + this.labelEntryType.ForeColor = System.Drawing.Color.White; + this.labelEntryType.Name = "labelEntryType"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.ForeColor = System.Drawing.Color.White; + this.label3.Name = "label3"; + // + // labelEntryData + // + resources.ApplyResources(this.labelEntryData, "labelEntryData"); + this.labelEntryData.ForeColor = System.Drawing.Color.White; + this.labelEntryData.Name = "labelEntryData"; + // + // buttonEdit + // + this.buttonEdit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.myTablePanel1.SetColumnSpan(this.buttonEdit, 2); + resources.ApplyResources(this.buttonEdit, "buttonEdit"); + this.buttonEdit.ForeColor = System.Drawing.Color.White; + this.buttonEdit.Name = "buttonEdit"; + this.buttonEdit.UseVisualStyleBackColor = false; + this.buttonEdit.Click += new System.EventHandler(this.buttonEditModel_Click); + // + // labelImageSize + // + resources.ApplyResources(this.labelImageSize, "labelImageSize"); + this.labelImageSize.Name = "labelImageSize"; + // + // pictureBox2 + // + resources.ApplyResources(this.pictureBox2, "pictureBox2"); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.TabStop = false; + // + // DBGLabel + // + resources.ApplyResources(this.DBGLabel, "DBGLabel"); + this.DBGLabel.FontWeight = MetroFramework.MetroLabelWeight.Bold; + this.DBGLabel.ForeColor = System.Drawing.Color.Red; + this.DBGLabel.Name = "DBGLabel"; + this.DBGLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // metroTabControl1 + // + this.metroTabControl1.Controls.Add(this.metroTabPage1); + resources.ApplyResources(this.metroTabControl1, "metroTabControl1"); + this.metroTabControl1.Name = "metroTabControl1"; + this.metroTabControl1.SelectedIndex = 0; + this.metroTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.metroTabControl1.Style = MetroFramework.MetroColorStyle.White; + this.metroTabControl1.Theme = MetroFramework.MetroThemeStyle.Dark; + this.metroTabControl1.UseSelectable = true; + // + // metroTabPage1 + // + this.metroTabPage1.BackColor = System.Drawing.Color.Transparent; + this.metroTabPage1.Controls.Add(this.myTablePanel2); + this.metroTabPage1.Controls.Add(this.label10); + this.metroTabPage1.Controls.Add(this.label11); + this.metroTabPage1.HorizontalScrollbarBarColor = true; + this.metroTabPage1.HorizontalScrollbarHighlightOnWheel = false; + this.metroTabPage1.HorizontalScrollbarSize = 0; + resources.ApplyResources(this.metroTabPage1, "metroTabPage1"); + this.metroTabPage1.Name = "metroTabPage1"; + this.metroTabPage1.Style = MetroFramework.MetroColorStyle.White; + this.metroTabPage1.Theme = MetroFramework.MetroThemeStyle.Dark; + this.metroTabPage1.VerticalScrollbarBarColor = true; + this.metroTabPage1.VerticalScrollbarHighlightOnWheel = false; + this.metroTabPage1.VerticalScrollbarSize = 0; + // + // myTablePanel2 + // + resources.ApplyResources(this.myTablePanel2, "myTablePanel2"); + this.myTablePanel2.Controls.Add(this.treeView1, 0, 0); + this.myTablePanel2.Controls.Add(this.pictureBoxWithInterpolationMode1, 1, 0); + this.myTablePanel2.Controls.Add(this.label4, 2, 0); + this.myTablePanel2.Controls.Add(this.tabControl1, 1, 4); + this.myTablePanel2.Name = "myTablePanel2"; + // + // treeView1 + // + this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeView1.ContextMenuStrip = this.contextMenuPCKEntries; + resources.ApplyResources(this.treeView1, "treeView1"); + this.treeView1.ForeColor = System.Drawing.Color.White; + this.treeView1.LabelEdit = true; + this.treeView1.Name = "treeView1"; + this.myTablePanel2.SetRowSpan(this.treeView1, 6); + // + // pictureBoxWithInterpolationMode1 + // + resources.ApplyResources(this.pictureBoxWithInterpolationMode1, "pictureBoxWithInterpolationMode1"); + this.pictureBoxWithInterpolationMode1.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; + this.pictureBoxWithInterpolationMode1.Name = "pictureBoxWithInterpolationMode1"; + this.myTablePanel2.SetRowSpan(this.pictureBoxWithInterpolationMode1, 4); + this.pictureBoxWithInterpolationMode1.TabStop = false; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.ForeColor = System.Drawing.Color.White; + this.label4.Name = "label4"; + // + // tabControl1 + // + this.myTablePanel2.SetColumnSpan(this.tabControl1, 2); + this.tabControl1.Controls.Add(this.tabPage2); + resources.ApplyResources(this.tabControl1, "tabControl1"); + this.tabControl1.Name = "tabControl1"; + this.myTablePanel2.SetRowSpan(this.tabControl1, 2); + this.tabControl1.SelectedIndex = 0; + // + // tabPage2 + // + this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.tabPage2.Controls.Add(this.myTablePanel3); + resources.ApplyResources(this.tabPage2, "tabPage2"); + this.tabPage2.Name = "tabPage2"; + // + // myTablePanel3 + // + resources.ApplyResources(this.myTablePanel3, "myTablePanel3"); + this.myTablePanel3.Controls.Add(this.treeView2, 0, 0); + this.myTablePanel3.Controls.Add(this.comboBox2, 1, 1); + this.myTablePanel3.Controls.Add(this.label6, 1, 4); + this.myTablePanel3.Controls.Add(this.textBox2, 1, 3); + this.myTablePanel3.Controls.Add(this.label7, 1, 0); + this.myTablePanel3.Controls.Add(this.label8, 1, 5); + this.myTablePanel3.Controls.Add(this.label9, 1, 2); + this.myTablePanel3.Controls.Add(this.button1, 0, 6); + this.myTablePanel3.Name = "myTablePanel3"; + // + // treeView2 + // + this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeView2.ContextMenuStrip = this.contextMenuMetaTree; + resources.ApplyResources(this.treeView2, "treeView2"); + this.treeView2.ForeColor = System.Drawing.Color.White; + this.treeView2.Name = "treeView2"; + this.myTablePanel3.SetRowSpan(this.treeView2, 6); + // + // comboBox2 + // + resources.ApplyResources(this.comboBox2, "comboBox2"); + this.comboBox2.BackColor = System.Drawing.Color.White; + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Name = "comboBox2"; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.ForeColor = System.Drawing.Color.White; + this.label6.Name = "label6"; + // + // textBox2 + // + resources.ApplyResources(this.textBox2, "textBox2"); + this.textBox2.BackColor = System.Drawing.Color.White; + this.textBox2.Name = "textBox2"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.ForeColor = System.Drawing.Color.White; + this.label7.Name = "label7"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.ForeColor = System.Drawing.Color.White; + this.label8.Name = "label8"; + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.ForeColor = System.Drawing.Color.White; + this.label9.Name = "label9"; + // + // button1 + // + this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.myTablePanel3.SetColumnSpan(this.button1, 2); + resources.ApplyResources(this.button1, "button1"); + this.button1.ForeColor = System.Drawing.Color.White; + this.button1.Name = "button1"; + this.button1.UseVisualStyleBackColor = false; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // timer1 + // + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // LittleEndianCheckBox + // + resources.ApplyResources(this.LittleEndianCheckBox, "LittleEndianCheckBox"); + this.LittleEndianCheckBox.Name = "LittleEndianCheckBox"; + this.LittleEndianCheckBox.Style = MetroFramework.MetroColorStyle.White; + this.LittleEndianCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; + this.LittleEndianCheckBox.UseSelectable = true; + // + // myTablePanelStartScreen + // + resources.ApplyResources(this.myTablePanelStartScreen, "myTablePanelStartScreen"); + this.myTablePanelStartScreen.Controls.Add(this.richTextBoxChangelog, 1, 1); + this.myTablePanelStartScreen.Controls.Add(this.label5, 1, 0); + this.myTablePanelStartScreen.Controls.Add(this.pckOpen, 0, 0); + this.myTablePanelStartScreen.Name = "myTablePanelStartScreen"; + // + // richTextBoxChangelog + // + this.richTextBoxChangelog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(28)))), ((int)(((byte)(28))))); + this.richTextBoxChangelog.BorderStyle = System.Windows.Forms.BorderStyle.None; + resources.ApplyResources(this.richTextBoxChangelog, "richTextBoxChangelog"); + this.richTextBoxChangelog.ForeColor = System.Drawing.Color.White; + this.richTextBoxChangelog.Name = "richTextBoxChangelog"; + this.richTextBoxChangelog.ReadOnly = true; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.ForeColor = System.Drawing.Color.White; + this.label5.Name = "label5"; + this.label5.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // pckOpen + // + resources.ApplyResources(this.pckOpen, "pckOpen"); + this.pckOpen.Image = global::PckStudio.Properties.Resources.pckClosed; + this.pckOpen.Name = "pckOpen"; + this.myTablePanelStartScreen.SetRowSpan(this.pckOpen, 2); + this.pckOpen.TabStop = false; + this.pckOpen.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + this.pckOpen.DragDrop += new System.Windows.Forms.DragEventHandler(this.OpenPck_DragDrop); + this.pckOpen.DragEnter += new System.Windows.Forms.DragEventHandler(this.OpenPck_DragEnter); + this.pckOpen.DragLeave += new System.EventHandler(this.OpenPck_DragLeave); + this.pckOpen.MouseEnter += new System.EventHandler(this.OpenPck_MouseEnter); + this.pckOpen.MouseLeave += new System.EventHandler(this.OpenPck_MouseLeave); + // + // FormMain + // + this.ApplyImageInvert = true; + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.LittleEndianCheckBox); + this.Controls.Add(this.myTablePanelStartScreen); + this.Controls.Add(this.metroTabControl1); + this.Controls.Add(this.DBGLabel); + this.Controls.Add(this.openedPCKS); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.labelVersion); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; + this.Name = "FormMain"; + this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; + this.Style = MetroFramework.MetroColorStyle.Silver; + this.Theme = MetroFramework.MetroThemeStyle.Dark; + this.Activated += new System.EventHandler(this.FormMain_Activated); + this.Deactivate += new System.EventHandler(this.FormMain_Deactivate); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed); + this.Load += new System.EventHandler(this.Form1_Load); + this.contextMenuPCKEntries.ResumeLayout(false); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.contextMenuMetaTree.ResumeLayout(false); + this.openedPCKS.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.myTablePanelPckEdit.ResumeLayout(false); + this.myTablePanelPckEdit.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImagePreview)).EndInit(); + this.tabDataDisplay.ResumeLayout(false); + this.tabMetaDisplay.ResumeLayout(false); + this.myTablePanel1.ResumeLayout(false); + this.myTablePanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.metroTabControl1.ResumeLayout(false); + this.metroTabPage1.ResumeLayout(false); + this.metroTabPage1.PerformLayout(); + this.myTablePanel2.ResumeLayout(false); + this.myTablePanel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWithInterpolationMode1)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.myTablePanel3.ResumeLayout(false); + this.myTablePanel3.PerformLayout(); + this.myTablePanelStartScreen.ResumeLayout(false); + this.myTablePanelStartScreen.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pckOpen)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1125,9 +1091,7 @@ private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem programInfoToolStripMenuItem; private System.Windows.Forms.PictureBox OpenPck; - private System.ComponentModel.BackgroundWorker backgroundWorker1; private System.Windows.Forms.ToolStripMenuItem extractToolStripMenuItem1; - private System.DirectoryServices.DirectorySearcher directorySearcher1; private System.Windows.Forms.ToolStripMenuItem importSkinsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importSkinToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importExtractedSkinsFolderToolStripMenuItem; @@ -1166,7 +1130,6 @@ private MetroFramework.Controls.MetroLabel label9; private MetroFramework.Controls.MetroLabel label10; private MetroFramework.Controls.MetroLabel label11; - private MetroFramework.Controls.MetroLabel ChangeURL; private MetroFramework.Controls.MetroLabel label5; private System.Windows.Forms.TreeView treeViewMain; private System.Windows.Forms.TabControl tabDataDisplay; @@ -1200,14 +1163,12 @@ private System.Windows.Forms.ToolStripMenuItem PS3PCKInstallerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem administrativeToolsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem uPDATEToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem VitaPCKInstallerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toNobledezJackToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toPhoenixARCDeveloperToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addPasswordToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem joinDevelopmentDiscordToolStripMenuItem; private System.Windows.Forms.Timer timer1; - private System.Windows.Forms.ToolStripMenuItem tSTToolStripMenuItem; private System.Windows.Forms.RichTextBox richTextBoxChangelog; private PckStudio.Forms.MyTablePanel myTablePanelStartScreen; private System.Windows.Forms.PictureBox pckOpen; @@ -1216,6 +1177,6 @@ private System.Windows.Forms.ToolStripMenuItem audiopckToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem normalAudiopckToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem vitaPS4AudiopckToolStripMenuItem; - } + } } diff --git a/MinecraftUSkinEditor/Forms/Form1.cs b/MinecraftUSkinEditor/Forms/Form1.cs index e0024cec..d58a8979 100644 --- a/MinecraftUSkinEditor/Forms/Form1.cs +++ b/MinecraftUSkinEditor/Forms/Form1.cs @@ -13,121 +13,36 @@ using Ohana3DS_Rebirth.Ohana; using PckStudio.Forms; using System.Drawing.Imaging; using RichPresenceClient; +using PckStudio.Classes.FileTypes; namespace PckStudio { public partial class FormMain : MetroFramework.Forms.MetroForm { - #region Variables - string saveLocation;//Save location for pck file - int fileCount = 0;//variable for number of minefiles - string Version = Classes.Network.Version;//template for program version - string hosturl = ""; - string basurl = ""; - string PCKFile = ""; - string PCKFileBCKUP = "x"; - loadedTexture tex = new loadedTexture(); //3DS feature variable + string saveLocation; //Save location for pck file + string PCKFilePath = ""; + string PCKFileBCKUP = "x"; + loadedTexture tex = new loadedTexture(); //3DS feature variable - - PCK.MineFile mf;//Template minefile variable - PCK currentPCK;//currently opened pck - LOC l;//Locdata - PCK.MineFile mfLoc;//LOC minefile - Dictionary types;//Template list for metadata of a individual minefiles metadata - PCK.MineFile file;//template for a selected minefile + PCKFile.FileData mf;//Template minefile variable + PCKFile currentPCK;//currently opened pck + LOC l; //Locdata + PCKFile.FileData mfLoc; //LOC minefile + PCKFile.FileData file; //template for a selected minefile bool needsUpdate = false; bool saved = true; - string appData = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/PCK Studio/"; - public static bool correct = false; - bool isdebug = false; + string appData = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/PCK Studio/"; public class displayId { public string id; public string defaultName; } - #endregion - #region form startup page + #region Constructor public FormMain() { - Directory.CreateDirectory(appData + "\\template"); - if (!File.Exists(appData + "\\template\\UntitledSkinPCK.pck")) - File.WriteAllBytes(appData + "\\template\\UntitledSkinPCK.pck", Resources.UntitledSkinPCK); - if (!File.Exists(appData + "\\settings.ini")) - File.WriteAllText(appData + "\\settings.ini", Resources.settings); - hosturl = File.ReadAllText(appData + "\\settings.ini").Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)[0]; - - InitializeComponent(); - - if (Program.IsDev) - isdebug = true; - - FormBorderStyle = FormBorderStyle.None; - labelVersion.Text += Version; - pckOpen.AllowDrop = true; - } - #endregion - - #region opens and loads pck file - - private void openToolStripMenuItem_Click(object sender, EventArgs e) - { - try - { - using (var ofd = new OpenFileDialog()) - { - ofd.CheckFileExists = true; //makes sure opened pck exists - ofd.Filter = "PCK (Minecraft Console Package)|*.pck"; - - if (ofd.ShowDialog() == DialogResult.OK) - { - PCKFile = Path.GetFileName(ofd.FileName); - openPck(ofd.FileName); - } - } - } - catch (Exception err) - { - MessageBox.Show("The PCK you're trying to use currently isn't supported\n" + err.StackTrace + "\n\n" + err.Message);//Error handling for PCKs that give errors when trying to be opened - } - } - - private void openPck(string filePath) - { - new TabPage(); - treeViewMain.Nodes.Clear(); - treeViewMain.LabelEdit = false; - PCK pCK = (currentPCK = new PCK(filePath)); - foreach (PCK.MineFile mineFile in pCK.mineFiles) - { - Console.WriteLine(mineFile.name); - if (!(mineFile.name == "0")) - { - continue; - } - foreach (object[] entry in mineFile.entries) - { - if (entry[0].ToString() == "LOCK") - { - if((new pckLocked(entry[1].ToString(), correct).ShowDialog() != DialogResult.OK || !correct)) - { - return; - } - } - } - } - addPasswordToolStripMenuItem.Enabled = true; - openedPCKS.SelectedTab.Text = Path.GetFileName(filePath); - saveLocation = filePath; - _ = treeViewMain; - _ = pictureBoxImagePreview; - _ = treeMeta; - _ = textBox1; - _ = label1; - _ = label2; - _ = tabDataDisplay; ImageList imageList = new ImageList(); imageList.ColorDepth = ColorDepth.Depth32Bit; imageList.ImageSize = new Size(20, 20); @@ -138,7 +53,62 @@ namespace PckStudio imageList.Images.Add(Resources.PCK_ICON); imageList.Images.Add(Resources.ZUnknown); treeViewMain.ImageList = imageList; - foreach (PCK.MineFile mineFile2 in pCK.mineFiles) + FormBorderStyle = FormBorderStyle.None; + pckOpen.AllowDrop = true; + RPC.Initialize("825875166574673940"); + } + #endregion + + #region opens and loads pck file + + private void openToolStripMenuItem_Click(object sender, EventArgs e) + { + using (var ofd = new OpenFileDialog()) + { + ofd.CheckFileExists = true; //makes sure opened pck exists + ofd.Filter = "PCK (Minecraft Console Package)|*.pck"; + + if (ofd.ShowDialog() == DialogResult.OK) + { + //PCKFile = Path.GetFileName(ofd.FileName); + currentPCK = openPck(ofd.FileName); + } + } + xxxxxxxxxxx(); + } + + private PCKFile openPck(string filePath) + { + PCKFile pck = null; + using (var fileStream = File.OpenRead(filePath)) + { + pck = new PCKFile(fileStream); + MessageBox.Show(pck.ToString()); + } + return pck; + } + + private void xxxxxxxxxxx() + { + treeViewMain.Nodes.Clear(); + treeViewMain.LabelEdit = false; + foreach (var mineFile in currentPCK.file_entries) + { + Console.WriteLine(mineFile.name); + if (mineFile.name != "0") + continue; + + foreach (var entry in mineFile.properties) + { + if (entry.Key == "LOCK" && new pckLocked(entry.Value).ShowDialog() != DialogResult.OK) + { + return; + } + } + } + addPasswordToolStripMenuItem.Enabled = true; + //openedPCKS.SelectedTab.Text = Path.GetFileName(filePath); + foreach (var mineFile2 in currentPCK.file_entries) { TreeNode treeNode = new TreeNode(); treeNode.Text = mineFile2.name; @@ -229,23 +199,17 @@ namespace PckStudio { if (node.Text == "languages.loc") { - mfLoc = (PCK.MineFile)treeViewMain.Nodes[node.Index].Tag; + mfLoc = (PCKFile.FileData)treeViewMain.Nodes[node.Index].Tag; } if (node.Text == "localisation.loc") { - mfLoc = (PCK.MineFile)treeViewMain.Nodes[node.Index].Tag; + mfLoc = (PCKFile.FileData)treeViewMain.Nodes[node.Index].Tag; } } - fileCount = 0; - foreach (PCK.MineFile mineFile3 in currentPCK.mineFiles) - { - _ = mineFile3; - fileCount++; - } - labelAmount.Text = "Files:" + fileCount; + labelAmount.Text = "Files:" + currentPCK.file_entries.Count.ToString(); saved = false; LittleEndianCheckBox.Visible = true; - LittleEndianCheckBox.Checked = currentPCK.IsLittleEndian; + LittleEndianCheckBox.Checked = currentPCK.isLittleEndian; } #endregion @@ -256,55 +220,42 @@ namespace PckStudio int pictureBoxMaxHeight = (tabPage1.Height / 2) - (tabPage1.Height / 10); if (treeViewMain.SelectedNode.Tag != null) //"Selects" node if it has data/isn't a folder { - fileCount = 0;//Resets file count - //Gets file count based of all existing minefiles - foreach (PCK.MineFile file in currentPCK.mineFiles) - { - fileCount += 1; - } - labelAmount.Text = "Files:" + fileCount;//Displays amount - Dictionary pckTypes = currentPCK.types; //Retrieves metadatabase + labelAmount.Text = "Files:" + currentPCK.file_entries.Count.ToString(); - PCK.MineFile mf = (PCK.MineFile)e.Node.Tag; //Sets current minefile being read - - types = currentPCK.types; //metadatabase - file = mf; //minefile + PCKFile.FileData file = (PCKFile.FileData)e.Node.Tag; //Sets current minefile being read treeMeta.Nodes.Clear(); //clears minefile metadata treeview comboBox1.Items.Clear(); //clears metacombo(entry name) textBox1.Text = ""; //clears metatextbox(entry value) - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); //Adds available metadata names from metadatabase to the metacombo + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //Adds available metadata names from metadatabase to the metacombo //Retrieves metadata for currently selected mineifile and displays it within metatreeview int boxes = 0; - foreach (object[] entry in file.entries) //object = metadata entry(name:value) + foreach (var property in file.properties) //object = metadata entry(name:value) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; - meta.Tag = entry; + meta.Text = property.Key; + meta.Tag = property; treeMeta.Nodes.Add(meta); //Check for if file contains model data - if (entry[0].ToString()=="BOX") + if (property.Key.ToString()=="BOX") { boxes += 1; buttonEdit.Text = "EDIT BOXES"; buttonEdit.Visible = true; } - else if (entry[0].ToString() == "ANIM") + else if (property.Key.ToString() == "ANIM") { - Console.WriteLine(entry[1]); - Console.WriteLine((entry[1].ToString() == "0x80000").ToString() + " - " + entry[1]); - Console.WriteLine((entry[1].ToString() == "0x40000").ToString() + " - "+ entry[1]); + Console.WriteLine(property.Key); + Console.WriteLine((property.Key == "0x80000").ToString() + " - " + property.Value); + Console.WriteLine((property.Key == "0x40000").ToString() + " - "+ property.Value); - if ((entry[1].ToString() == "0x40000") || (entry[1].ToString() == "0x80000")) + if ((property.Value.ToString() == "0x40000") || (property.Value.ToString() == "0x80000")) { buttonEdit.Text = "View Skin"; boxes += 1; @@ -316,6 +267,7 @@ namespace PckStudio buttonEdit.Visible = false; } } + if (mf == null) return; //Check for Animated Texture if ((mf.name.StartsWith("res/textures/blocks/") || mf.name.StartsWith("res/textures/items/")) && (!mf.name.EndsWith("clock.png") && (!mf.name.EndsWith("compass.png")))) @@ -452,51 +404,49 @@ namespace PckStudio #endregion #region Parses boxes and opens model generator - public void editModel(PCK.MineFile skin) + public void editModel(PCKFile.FileData skin) { - List otherData = new List();//Creates list for backup data to be added to - List generatedData = new List();//Creates list for model data to be added to - foreach (object[] entry in skin.entries) //object = metadata entry(name:value) - { - //parses and sorts - if (entry[0].ToString() == "BOX") - { - generatedData.Add(entry); - } - else if (entry[0].ToString() == "OFFSET") - { - generatedData.Add(entry); - } - else if (entry[0].ToString() != "BOX" && entry[0].ToString() != "OFFSET") - { - otherData.Add(entry); - } - } - skin.entries = otherData; - generateModel generate = new generateModel(generatedData, new PictureBox()); - generate.ShowDialog();//Opens Model Generator Dialog - //Adds model data - foreach (object[] entry in generatedData) //object = metadata entry(name:value) - { - skin.entries.Add(entry); - } + MessageBox.Show("TODO!!!!"); + return; + //List otherData = new List();//Creates list for backup data to be added to + //List generatedData = new List();//Creates list for model data to be added to + //foreach (object[] entry in skin.entries) //object = metadata entry(name:value) + //{ + // //parses and sorts + // if (entry[0].ToString() == "BOX") + // { + // generatedData.Add(entry); + // } + // else if (entry[0].ToString() == "OFFSET") + // { + // generatedData.Add(entry); + // } + // else if (entry[0].ToString() != "BOX" && entry[0].ToString() != "OFFSET") + // { + // otherData.Add(entry); + // } + //} + //skin.properties = otherData; + //generateModel generate = new generateModel(generatedData, new PictureBox()); + //generate.ShowDialog();//Opens Model Generator Dialog + // //Adds model data + //foreach (object[] entry in generatedData) //object = metadata entry(name:value) + //{ + // skin.entries.Add(entry); + //} treeMeta.Nodes.Clear(); //clears minefile metadata treeview comboBox1.Items.Clear(); //clears metacombo(entry name) textBox1.Text = ""; //clears metatextbox(entry value) - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); //Adds available metadata names from metadatabase to the metacombo + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //Adds available metadata names from metadatabase to the metacombo //Retrieves metadata for currently selected mineifile and displays it within metatreeview - foreach (object[] entry in file.entries) //object = metadata entry(name:value) + foreach (var entry in file.properties) //object = metadata entry(name:value) { - object[] strings = (object[])entry; - TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -513,7 +463,7 @@ namespace PckStudio MessageBox.Show("Cannot extract folders!"); return; } - if (treeViewMain.SelectedNode.Tag is PCK.MineFile)//Makes sure item being extracted is minefile and not folder or null item + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData)//Makes sure item being extracted is minefile and not folder or null item { SaveFileDialog exFile = new SaveFileDialog();//extract location exFile.FileName = treeViewMain.SelectedNode.Text; @@ -525,7 +475,7 @@ namespace PckStudio if (!String.IsNullOrWhiteSpace(Path.GetDirectoryName(extractPath)))//Makes sure chosen directory isn't null or whitespace AKA makes sure its usable { - File.WriteAllBytes(extractPath, ((PCK.MineFile)treeViewMain.SelectedNode.Tag).data);//extracts minefile data to directory + File.WriteAllBytes(extractPath, ((PCKFile.FileData)treeViewMain.SelectedNode.Tag).data);//extracts minefile data to directory //Generates metadata file in form of txt file if metadata for the file exists if (treeViewMain.SelectedNode.Tag.ToString() != "") @@ -533,19 +483,17 @@ namespace PckStudio try { string metaData = ""; - types = currentPCK.types; - file = (PCK.MineFile)treeViewMain.SelectedNode.Tag; + file = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; var ms = new MemoryStream(File.ReadAllBytes(extractPath).ToArray()); MemoryStream ico = new MemoryStream(); Bitmap bmp = new Bitmap(Image.FromFile(extractPath)); - bmp.Save(ico, System.Drawing.Imaging.ImageFormat.Png); + bmp.Save(ico, ImageFormat.Png); - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; - metaData += (string)strings[0] + ":" + (string)strings[1] + Environment.NewLine; + metaData += entry.Key + ":" + entry.Value + Environment.NewLine; } File.WriteAllText(extractPath + ".txt", metaData); @@ -566,14 +514,14 @@ namespace PckStudio foreach (TreeNode item in treeViewMain.SelectedNode.Nodes) { - if (item.Tag is PCK.MineFile)//Makes sure item being extracted is minefile and not folder or null item + if (item.Tag is PCKFile.FileData)//Makes sure item being extracted is minefile and not folder or null item { - string extractPath = Path.Combine(appPath, ((PCK.MineFile)item.Tag).name);//combines file path with file path & name of minefile being extracted + string extractPath = Path.Combine(appPath, ((PCKFile.FileData)item.Tag).name);//combines file path with file path & name of minefile being extracted if (!String.IsNullOrWhiteSpace(Path.GetDirectoryName(extractPath)))//Makes sure chosen directory isn't null or whitespace AKA makes sure its usable { Directory.CreateDirectory(Path.GetDirectoryName(extractPath));//Creates directory variable out of generated/chosen extract path - File.WriteAllBytes(extractPath, ((PCK.MineFile)item.Tag).data);//extracts minefile data to directory + File.WriteAllBytes(extractPath, ((PCKFile.FileData)item.Tag).data);//extracts minefile data to directory //Generates metadata file in form of txt file if metadata for the file exists if (item.Tag.ToString() != "") @@ -581,19 +529,17 @@ namespace PckStudio try { string metaData = ""; - types = currentPCK.types; file = mf; var ms = new MemoryStream(File.ReadAllBytes(extractPath).ToArray()); MemoryStream ico = new MemoryStream(); Bitmap bmp = new Bitmap(Image.FromFile(extractPath)); - bmp.Save(ico, System.Drawing.Imaging.ImageFormat.Png); + bmp.Save(ico, ImageFormat.Png); - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; - metaData += (string)strings[0] + ":" + (string)strings[1] + Environment.NewLine; + metaData += entry.Key + ":" + entry.Value + Environment.NewLine; } File.WriteAllText(extractPath + ".txt", metaData); @@ -643,12 +589,12 @@ namespace PckStudio //Reassignes each node with its minefile data to make sure everything is synced foreach (TreeNode item in saveStructure.Nodes) { - currentPCK.mineFiles[item.Index] = (PCK.MineFile)item.Tag; + currentPCK.file_entries[item.Index] = (PCKFile.FileData)item.Tag; } //Syncs minefile name with nodes name for (int i = 0; i < saveStructure.Nodes.Count; i++) - currentPCK.mineFiles[i].name = saveStructure.Nodes[i].Text; + currentPCK.file_entries[i].name = saveStructure.Nodes[i].Text; if (saveLocation == appData + @"\templates\UntitledSkinPCK.pck") { @@ -661,23 +607,24 @@ namespace PckStudio { try { - Console.WriteLine(currentPCK.IsLittleEndian.ToString() + "--"); - if (LittleEndianCheckBox.Checked) - { - byte[] oouput = currentPCK.RebuildVita(); - oouput[0] = 0x03; - File.WriteAllBytes(ofd.FileName, currentPCK.RebuildVita()); - } - else - { - byte[] oouput = currentPCK.Rebuild(); - File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); - } - saveLocation = ofd.FileName; - openedPCKS.SelectedTab.Text = Path.GetFileName(ofd.FileName); - saved = true; - MessageBox.Show("PCK Saved!"); - PCKFile = Path.GetFileName(ofd.FileName); + MessageBox.Show("TODO!!!!"); + //Console.WriteLine(currentPCK.isLittleEndian.ToString() + "--"); + //if (LittleEndianCheckBox.Checked) + //{ + // byte[] oouput = currentPCK.RebuildVita(); + // oouput[0] = 0x03; + // File.WriteAllBytes(ofd.FileName, currentPCK.RebuildVita()); + //} + //else + //{ + // byte[] oouput = currentPCK.Rebuild(); + // File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); + //} + //saveLocation = ofd.FileName; + //openedPCKS.SelectedTab.Text = Path.GetFileName(ofd.FileName); + //saved = true; + //MessageBox.Show("PCK Saved!"); + //PCKFilePath = Path.GetFileName(ofd.FileName); } catch (Exception) { @@ -697,22 +644,23 @@ namespace PckStudio { try { - Console.WriteLine(currentPCK.IsLittleEndian.ToString() + "--"); - if (LittleEndianCheckBox.Checked) - { - byte[] oouput = currentPCK.RebuildVita(); - oouput[0] = 0x03; - File.WriteAllBytes(ofd.FileName, currentPCK.RebuildVita()); - } - else - { - byte[] oouput = currentPCK.Rebuild(); - File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); - } - saveLocation = ofd.FileName; - openedPCKS.SelectedTab.Text = Path.GetFileName(ofd.FileName); - saved = true; - MessageBox.Show("PCK Saved!"); + MessageBox.Show("TODO!!"); + //Console.WriteLine(currentPCK.isLittleEndian.ToString() + "--"); + //if (LittleEndianCheckBox.Checked) + //{ + // byte[] oouput = currentPCK.RebuildVita(); + // oouput[0] = 0x03; + // File.WriteAllBytes(ofd.FileName, currentPCK.RebuildVita()); + //} + //else + //{ + // byte[] oouput = currentPCK.Rebuild(); + // File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); + //} + //saveLocation = ofd.FileName; + //openedPCKS.SelectedTab.Text = Path.GetFileName(ofd.FileName); + //saved = true; + //MessageBox.Show("PCK Saved!"); } catch (Exception) { @@ -723,48 +671,49 @@ namespace PckStudio } else { - if (MessageBox.Show("Are you sure you wanna save?", "", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes) - { - try - { - Console.WriteLine(currentPCK.IsLittleEndian.ToString() + "--"); - if (LittleEndianCheckBox.Checked) - { - byte[] oouput = currentPCK.RebuildVita(); - oouput[0] = 0x03; - File.WriteAllBytes(saveLocation, currentPCK.RebuildVita()); - } - else - { - byte[] oouput = currentPCK.Rebuild(); - File.WriteAllBytes(saveLocation, currentPCK.Rebuild()); - } - } - catch (Exception) - { - for (int i = 0; i < saveStructure.Nodes.Count; i++) - currentPCK.mineFiles[i].name = saveStructure.Nodes[i].Text; + MessageBox.Show("TODO!!!"); + //if (MessageBox.Show("Are you sure you wanna save?", "", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes) + //{ + // try + // { + // Console.WriteLine(currentPCK.isLittleEndian.ToString() + "--"); + // if (LittleEndianCheckBox.Checked) + // { + // byte[] oouput = currentPCK.RebuildVita(); + // oouput[0] = 0x03; + // File.WriteAllBytes(saveLocation, currentPCK.RebuildVita()); + // } + // else + // { + // byte[] oouput = currentPCK.Rebuild(); + // File.WriteAllBytes(saveLocation, currentPCK.Rebuild()); + // } + // } + // catch (Exception) + // { + // for (int i = 0; i < saveStructure.Nodes.Count; i++) + // currentPCK.file_entries[i].name = saveStructure.Nodes[i].Text; - using (var ofd = new SaveFileDialog()) - { - ofd.Filter = "PCK (Minecraft Console Package)|*.pck"; + // using (var ofd = new SaveFileDialog()) + // { + // ofd.Filter = "PCK (Minecraft Console Package)|*.pck"; - if (ofd.ShowDialog() == DialogResult.OK) - { - try - { - File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); - saved = true; - MessageBox.Show("PCK Saved!"); - } - catch (Exception) - { - MessageBox.Show("No PCK loaded"); - } - } - } - } - } + // if (ofd.ShowDialog() == DialogResult.OK) + // { + // try + // { + // File.WriteAllBytes(ofd.FileName, currentPCK.Rebuild()); + // saved = true; + // MessageBox.Show("PCK Saved!"); + // } + // catch (Exception) + // { + // MessageBox.Show("No PCK loaded"); + // } + // } + // } + // } + //} } saveStructure.Dispose();//disposes temporarily made treeview } @@ -773,15 +722,15 @@ namespace PckStudio #region replaces pck entry with selected file private void replaceToolStripMenuItem_Click(object sender, EventArgs e) { - if (treeViewMain.SelectedNode.Tag is PCK.MineFile)//Makes sure file being replaced is an actual minefile or not null + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData)//Makes sure file being replaced is an actual minefile or not null { - PCK.MineFile mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag;//backups minefile data for node + PCKFile.FileData mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; //backups minefile data for node using (var ofd = new OpenFileDialog()) { if (ofd.ShowDialog() == DialogResult.OK) { mf.data = File.ReadAllBytes(ofd.FileName);//overwrites minefile data with chosen files data - mf.filesize = mf.data.Length;//updates file size + mf.size = mf.data.Length;//updates file size } } } @@ -789,23 +738,15 @@ namespace PckStudio } #endregion - #region ignore - private void treeView1_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) - { - //Does not work as intended. Renaming moved to save function - saved = false; - } - #endregion - - #region deletes pck entry from treeview and pck.minefiles + #region deletes pck entry from treeview and PCKFile.FileDatas private void deleteFileToolStripMenuItem_Click(object sender, EventArgs e) { //Removes selected from current pcks minefiles list and nodes - if (treeViewMain.SelectedNode.Tag is PCK.MineFile) + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) { - PCK.MineFile mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag; + PCKFile.FileData mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; treeViewMain.Nodes.Remove(treeViewMain.SelectedNode); - currentPCK.mineFiles.Remove(mf); + currentPCK.file_entries.Remove(mf); } else { @@ -818,11 +759,11 @@ namespace PckStudio MessageBox.Show("Can't fully delete directory with subdirectories"); return; } - if (item.Tag is PCK.MineFile)//makes sure selected node is a minefile + if (item.Tag is PCKFile.FileData)//makes sure selected node is a minefile { //removes minefile from minefile list - PCK.MineFile mf = (PCK.MineFile)item.Tag; - currentPCK.mineFiles.Remove(mf); + PCKFile.FileData mf = (PCKFile.FileData)item.Tag; + currentPCK.file_entries.Remove(mf); //removes minefile node item.Remove(); } @@ -834,7 +775,7 @@ namespace PckStudio } #endregion - #region renames pck entry from treeview and pck.minefiles + #region renames pck entry from treeview and PCKFile.FileDatas private void renameFileToolStripMenuItem_Click(object sender, EventArgs e) { TreeNode node = treeViewMain.SelectedNode; @@ -846,21 +787,18 @@ namespace PckStudio } #endregion - #region clones pck entry from treeview and pck.minefiles + #region clones pck entry from treeview and PCKFile.FileDatas private void cloneFileToolStripMenuItem_Click(object sender, EventArgs e) { if (treeViewMain.SelectedNode.Tag == null) return; - PCK.MineFile mfO = (PCK.MineFile)treeViewMain.SelectedNode.Tag; + PCKFile.FileData mfO = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; FileInfo mfCO = new FileInfo(mfO.name); - PCK.MineFile mf = new PCK.MineFile();//Creates new minefile template - mf.data = mfO.data;//adds file data to minefile - mf.filesize = mfO.data.Length;//gets filesize for minefile - mf.name = Path.GetDirectoryName(mfO.name).Replace("\\", "/") + "/" + Path.GetFileNameWithoutExtension(mfO.name) + "_clone" + mfCO.Extension;//sets minfile name to file name + string name = Path.GetDirectoryName(mfO.name).Replace("\\", "/") + "/" + Path.GetFileNameWithoutExtension(mfO.name) + "_clone" + mfCO.Extension;//sets minfile name to file name + PCKFile.FileData mf = new PCKFile.FileData(name, mfO.type, mfO.data.Length); //Creates new minefile template if (treeViewMain.SelectedNode.Parent == null && mf.name.StartsWith("/")) mf.name = mf.name.Remove(0, 1); - mf.entries = mfO.entries; - mf.type = mfO.type;//sets minefile type to default + mf.properties = mfO.properties; TreeNode add = new TreeNode(Path.GetFileName(mf.name)) { Tag = mf };//creates node for minefile //Gets proper file icon for minefile @@ -890,25 +828,23 @@ namespace PckStudio add.SelectedImageIndex = 5; } - currentPCK.mineFiles.Insert(currentPCK.mineFiles.IndexOf(mfO) + 1, mf); //inserts minefile into proper list index + currentPCK.file_entries.Insert(currentPCK.file_entries.IndexOf(mfO) + 1, mf); //inserts minefile into proper list index if (treeViewMain.SelectedNode.Parent == null) treeViewMain.Nodes.Insert(treeViewMain.SelectedNode.Index + 1, add); //adds generated minefile node else treeViewMain.SelectedNode.Parent.Nodes.Insert(treeViewMain.SelectedNode.Index + 1, add);//adds generated minefile node to selected folder } #endregion - #region adds file to treeview and pck.minefiles + #region adds file to treeview and PCKFile.FileDatas private void addFileToolStripMenuItem_Click(object sender, EventArgs e) { using (var ofd = new OpenFileDialog()) { if (ofd.ShowDialog() == DialogResult.OK) { - PCK.MineFile mf = new PCK.MineFile();//Creates new minefile template - mf.data = File.ReadAllBytes(ofd.FileName);//adds file data to minefile - mf.filesize = mf.data.Length;//gets filesize for minefile - mf.name = Path.GetFileName(ofd.FileName);//sets minfile name to file name - mf.type = 0;//sets minefile type to default - TreeNode add = new TreeNode(mf.name) { Tag = mf };//creates node for minefile + var data = File.ReadAllBytes(ofd.FileName);//adds file data to minefile + PCKFile.FileData mf = new PCKFile.FileData(Path.GetFileName(ofd.FileName), 0, data.Length);//Creates new minefile template + mf.data = data; + TreeNode add = new TreeNode(mf.name) { Tag = mf }; //Gets proper file icon for minefile if (Path.GetExtension(add.Text) == ".binka") @@ -940,7 +876,7 @@ namespace PckStudio if (treeViewMain.SelectedNode.Tag == null)//Detects if user selected a folder to add file to { treeViewMain.SelectedNode.Nodes.Add(add);//adds generated minefile node to selected folder - currentPCK.mineFiles.Insert(treeViewMain.SelectedNode.Nodes.Count - 1, mf);//inserts minefile into proper list index + currentPCK.file_entries.Insert(treeViewMain.SelectedNode.Nodes.Count - 1, mf);//inserts minefile into proper list index string itemPath = "";//item path template List path = new List();//directory template @@ -951,11 +887,11 @@ namespace PckStudio itemPath += dire.Text + "/"; } - currentPCK.mineFiles[treeViewMain.SelectedNode.Nodes.Count - 1].name = itemPath + treeViewMain.SelectedNode.Nodes[treeViewMain.SelectedNode.Nodes.Count - 1].Text;//updates minefile name with directory + currentPCK.file_entries[treeViewMain.SelectedNode.Nodes.Count - 1].name = itemPath + treeViewMain.SelectedNode.Nodes[treeViewMain.SelectedNode.Nodes.Count - 1].Text;//updates minefile name with directory } else//adds minefile to root of the pck { - currentPCK.mineFiles.Add(mf); + currentPCK.file_entries.Add(mf); treeViewMain.Nodes.Add(add); } } @@ -994,7 +930,7 @@ namespace PckStudio { tempIDD = 00000000;//sets temporary id to 0 if an id can't be generated off the treeviews last item } - PCK.MineFile mf = mfLoc;//Sets loc minefile + PCKFile.FileData mf = mfLoc;//Sets loc minefile try { @@ -1020,26 +956,22 @@ namespace PckStudio } - PCK.MineFile makeNewAudioPCK(bool isVita) + PCKFile.FileData makeNewAudioPCK(bool isVita) { - PCK audioPck = new PCK(); - audioPck.IsLittleEndian = isVita; - audioPck.pckType = 1; - audioPck.types.Add(0, "CUENAME"); - audioPck.types.Add(1, "CREDIT"); - audioPck.types.Add(2, "CREDITID"); + PCKFile audioPck = new PCKFile(1, isVita); + audioPck.meta_data.Add(0, "CUENAME"); + audioPck.meta_data.Add(1, "CREDIT"); + audioPck.meta_data.Add(2, "CREDITID"); for (int i = 0; i < 3; i++) { - PCK.MineFile mf = new PCK.MineFile(); - mf.name = ""; - mf.type = i; + PCKFile.FileData mf = new PCKFile.FileData("", i, 0); mf.data = new byte[0]; - audioPck.mineFiles.Add(mf); + //audioPCKFile.file_entries.Add(mf); } - PCK.MineFile audioMF = new PCK.MineFile(); - audioMF.name = "audio.pck"; - audioMF.type = 8; // This file will not load otherwise - audioMF.data = isVita ? audioPck.RebuildVita() : audioPck.Rebuild(); + PCKFile.FileData audioMF = new PCKFile.FileData("audio.pck", 8, 0); + //TODO!!!!!!!!!! + //audioMF.data = isVita ? audioPck.RebuildVita() : audioPck.Rebuild(); + audioMF.size = audioMF.data.Length; return audioMF; } @@ -1057,13 +989,13 @@ namespace PckStudio MessageBox.Show("There is already an audio.pck present in this file!", "Can't create audio.pck"); return; } - PCK.MineFile audioMF = makeNewAudioPCK(true); + PCKFile.FileData audioMF = makeNewAudioPCK(true); TreeNode node = new TreeNode(); node.Text = "audio.pck"; node.Tag = audioMF; node.ImageIndex = 4; node.SelectedImageIndex = 4; - PckStudio.Forms.Utilities.AudioEditor diag = new PckStudio.Forms.Utilities.AudioEditor(node.Tag as PCK.MineFile, true); + PckStudio.Forms.Utilities.AudioEditor diag = new PckStudio.Forms.Utilities.AudioEditor(node.Tag as PCKFile.FileData, true); diag.Text += " (PS4/Vita)"; diag.ShowDialog(this); if (diag.saved) treeViewMain.Nodes.Add(node); @@ -1085,13 +1017,13 @@ namespace PckStudio MessageBox.Show("There is already an audio.pck present in this file!", "Can't create audio.pck"); return; } - PCK.MineFile audioMF = makeNewAudioPCK(false); + PCKFile.FileData audioMF = makeNewAudioPCK(false); TreeNode node = new TreeNode(); node.Text = "audio.pck"; node.Tag = audioMF; node.ImageIndex = 4; node.SelectedImageIndex = 4; - PckStudio.Forms.Utilities.AudioEditor diag = new PckStudio.Forms.Utilities.AudioEditor(node.Tag as PCK.MineFile, false); + PckStudio.Forms.Utilities.AudioEditor diag = new PckStudio.Forms.Utilities.AudioEditor(node.Tag as PCKFile.FileData, false); diag.ShowDialog(this); if (diag.saved) treeViewMain.Nodes.Add(node); treeViewToMineFiles(treeViewMain, currentPCK); @@ -1118,16 +1050,14 @@ namespace PckStudio treeViewToMineFiles(treeViewMain, currentPCK); treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //loads all of selected minefiles metadata into metadata treeview - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); + TreeNode meta = new TreeNode(entry.Key); - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -1148,12 +1078,12 @@ namespace PckStudio { if (treeViewMain.SelectedNode != null && treeViewMain.SelectedNode.Tag != null) { - mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag; + mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; //Checks to see if selected minefile is a loc file if (Path.GetExtension(mf.name) == ".loc") { - if (treeViewMain.SelectedNode.Tag is PCK.MineFile) + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) { LOC l; try @@ -1174,7 +1104,7 @@ namespace PckStudio //Checks to see if selected minefile is an audio file if (Path.GetFileName(mf.name) == "audio.pck") { - if (treeViewMain.SelectedNode.Tag is PCK.MineFile) + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) { try { @@ -1197,7 +1127,7 @@ namespace PckStudio { //MessageBox.Show(".COL Editor Coming Soon!"); - if (treeViewMain.SelectedNode.Tag is PCK.MineFile) + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) { try { @@ -1216,9 +1146,9 @@ namespace PckStudio } //Checks to see if selected minefile is a binka file - System.Threading.ThreadStart starter; + //System.Threading.ThreadStart starter; - System.Threading.Thread binkam; + //System.Threading.Thread binkam; if (Path.GetExtension(mf.name) == ".binka") { MessageBox.Show(".binka Editor Coming Soon!"); @@ -1231,12 +1161,12 @@ namespace PckStudio #region updates combo and text boxes for metadata when a metadata entry is selected private void treeMeta_AfterSelect(object sender, TreeViewEventArgs e) { - comboBox1.Items.Clear();//Resets metadata combobox of selectable entry names - object[] strings = (object[])e.Node.Tag; - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]);//fills combobox with metadata from the main metadatabase - comboBox1.Text = (string)strings[0];//Sets currently selected metadata type to type selected in selected metadata node - textBox1.Text = (string)strings[1];//Sets currently selected metadata value to value selected in selected metadata node + comboBox1.Items.Clear(); //Resets metadata combobox of selectable entry names + var strings = (KeyValuePair)e.Node.Tag; + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]);//fills combobox with metadata from the main metadatabase + comboBox1.Text = strings.Key; //Sets currently selected metadata type to type selected in selected metadata node + textBox1.Text = strings.Value; //Sets currently selected metadata value to value selected in selected metadata node } #endregion @@ -1245,9 +1175,10 @@ namespace PckStudio { if (treeMeta.SelectedNode != null) { + MessageBox.Show("TODO"); //Sets metadata type to new chosen one - object[] strings = (object[])treeMeta.SelectedNode.Tag; - strings[0] = comboBox1.Text; + //var strings = (KeyValuePair)treeMeta.SelectedNode.Tag; + //strings.Key = comboBox1.Text; } saved = false; } @@ -1258,9 +1189,10 @@ namespace PckStudio { if (treeMeta.SelectedNode != null) { + MessageBox.Show("TODO"); //sets metadata value to new value - object[] strings = (object[])treeMeta.SelectedNode.Tag; - strings[1] = textBox1.Text; + //object[] strings = (object[])treeMeta.SelectedNode.Tag; + //strings[1] = textBox1.Text; } saved = false; } @@ -1271,11 +1203,8 @@ namespace PckStudio { if (treeMeta.SelectedNode != null)//Makes sure selected node is a minefile { - object[] temp = (object[])treeMeta.SelectedNode.Tag; - file.entries.Remove(temp);//removes minefile from minefile list + file.properties.Remove((string)treeMeta.SelectedNode.Tag);//removes minefile from minefile list treeMeta.Nodes.Remove(treeMeta.SelectedNode);//removes minefile node - -// treeMeta.Nodes.Clear();//Resets metadata treeview } saved = false; } @@ -1284,23 +1213,20 @@ namespace PckStudio #region adds metadata entry private void addEntryToolStripMenuItem_Click_1(object sender, EventArgs e) { - mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag;//Sets minefile to selected node - PckStudio.addMeta add = new PckStudio.addMeta(mf, currentPCK);//sets metadata adding dialog + mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag;//Sets minefile to selected node + PckStudio.addMeta add = new PckStudio.addMeta(mf);//sets metadata adding dialog add.ShowDialog();//displays metadata adding dialog add.Dispose();//diposes generated metadata adding dialog data //Sets up combobox for metadata entries from main metadatabase treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //loads all of selected minefiles metadata into metadata treeview - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -1390,11 +1316,11 @@ namespace PckStudio } } - public static void treeViewToMineFiles(TreeView tree, PCK pck) + public static void treeViewToMineFiles(TreeView tree, PCKFile pck) { int i = 1; List children = new List(); - List newMineFiles = new List(); + List newMineFiles = new List(); foreach (TreeNode node in tree.Nodes) { string nodePath = getFullMineFilePath(node); @@ -1408,11 +1334,11 @@ namespace PckStudio if(child.Tag != null) { - PCK.MineFile mf = (PCK.MineFile)child.Tag; + PCKFile.FileData mf = (PCKFile.FileData)child.Tag; mf.name = childPath; if (!newMineFiles.Contains(mf)) { - newMineFiles.Add((PCK.MineFile)child.Tag); + newMineFiles.Add((PCKFile.FileData)child.Tag); //Console.WriteLine("Minefile " + i + ": " + childPath); i++; } @@ -1421,17 +1347,17 @@ namespace PckStudio } else { - PCK.MineFile mf = (PCK.MineFile)node.Tag; + PCKFile.FileData mf = (PCKFile.FileData)node.Tag; mf.name = nodePath; if (!newMineFiles.Contains(mf)) { - newMineFiles.Add((PCK.MineFile)node.Tag); + newMineFiles.Add((PCKFile.FileData)node.Tag); //Console.WriteLine("Minefile " + i + ": " + nodePath); i++; } } } - pck.mineFiles = newMineFiles; + pck.file_entries = newMineFiles; } // Most of the code below is modified code from this link: https://docs.microsoft.com/en-us/dotnet/api/system.windows.forms.treeview.itemdrag?view=windowsdesktop-6.0 @@ -1555,23 +1481,19 @@ namespace PckStudio #region opens presets private void addPresetToolStripMenuItem1_Click(object sender, EventArgs e) { - mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag;//Sets selected minefile from node - PckStudio.presetMeta add = new PckStudio.presetMeta(mf, currentPCK);//sets data for preset adding dialog + mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag;//Sets selected minefile from node + PckStudio.presetMeta add = new PckStudio.presetMeta(mf);//sets data for preset adding dialog add.ShowDialog();//displays preset adding dialog add.Dispose();//disposes generated preset adding data //reloads treemeta data treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; - TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -1583,7 +1505,7 @@ namespace PckStudio private void skinPackToolStripMenuItem_Click(object sender, EventArgs e) { //Loads skin pack template - PCKFile = Path.GetFileName(appData + "\\template\\UntitledSkinPCK.pck"); + PCKFilePath = Path.GetFileName(appData + "\\template\\UntitledSkinPCK.pck"); openPck(appData + "\\template\\UntitledSkinPCK.pck"); saveLocation = ""; saved = false; @@ -1630,7 +1552,7 @@ namespace PckStudio { try { - RPC.SetRPC("825875166574673940", "Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); + RPC.SetRPC("Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); timer1.Start(); timer1.Enabled = true; } @@ -1638,86 +1560,12 @@ namespace PckStudio { Console.WriteLine("ERROR WITH RPC"); } - try - { - label1.Theme = this.Theme; - labelVersion.Theme = this.Theme; - 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; - DBGLabel.Theme = this.Theme; - label4.Theme = this.Theme; - label6.Theme = this.Theme; - label7.Theme = this.Theme; - label8.Theme = this.Theme; - label9.Theme = this.Theme; - label10.Theme = this.Theme; - label11.Theme = this.Theme; - ChangeURL.Theme = this.Theme; - label5.Theme = this.Theme; - openedPCKS.Theme = this.Theme; - tabPage1.Theme = this.Theme; - metroTabControl1.Theme = this.Theme; - metroTabPage1.Theme = this.Theme; - LittleEndianCheckBox.Theme = this.Theme; - - new WebClient().DownloadString(Program.baseurl + ChangeURL.Text); - basurl = Program.baseurl; - Console.WriteLine(basurl + ChangeURL.Text); - } - catch - { - try - { - new WebClient().DownloadString(Program.backurl + ChangeURL.Text); - basurl = Program.backurl; - Console.WriteLine(basurl + ChangeURL.Text); - } - catch - { - try - { - new WebClient().DownloadString("https://google.com"); - MessageBox.Show("PCK Studio Service is offline, the domain may have changed.\nOpening website"); - Process.Start("https://phoenixarc.github.io/pckstudio.tk/"); - } - catch - { - MessageBox.Show("Could not connect to service, internet may be offline"); - } - } - } - Directory.CreateDirectory(appData + "\\template"); if (!File.Exists(appData + "\\template\\UntitledSkinPCK.pck")) File.WriteAllBytes(appData + "\\template\\UntitledSkinPCK.pck", Resources.UntitledSkinPCK); - - - if (isdebug) - DBGLabel.Visible = true; - //runs creator spotlight once per day - //if (!File.Exists(appData + "date.txt")) - //{ - // File.WriteAllText(appData + "date.txt", DateTime.Now.ToString("MM/dd/yyyy")); - // creatorSpotlight shoutout = new creatorSpotlight(); - // shoutout.ShowDialog(); - //} - //else if (DateTime.Now.ToString("MM/dd/yyyy") != File.ReadAllText(appData + "date.txt")) - //{ - // creatorSpotlight shoutout = new creatorSpotlight(); - // File.WriteAllText(appData + "date.txt", DateTime.Now.ToString("MM/dd/yyyy")); - // shoutout.ShowDialog(); - //} - - - //Promo shoutout = new Promo(); - //shoutout.ShowDialog(); - + + DBGLabel.Visible = Program.IsDev; //Makes sure appdata exists if (!Directory.Exists(appData)) @@ -1729,50 +1577,6 @@ namespace PckStudio { Directory.CreateDirectory(appData + "\\cache\\mods\\"); } - - - //Checks to see if program version file exists, and creates one if it doesn't - //Latest changelog on program start-up - try - { - using (WebClient client = new WebClient()) - { - if (Classes.Network.Beta) - { - if (isdebug) - File.WriteAllText(appData + "pckStudioChangelog.txt", File.ReadAllText("C:\\WEBSITES\\PCKStudio\\studio\\PCK\\api\\" + ChangeURL.Text.Replace("ChangeLog", "BetaChangeLog"))) ; - else - File.WriteAllText(appData + "pckStudioChangelog.txt", client.DownloadString(basurl + ChangeURL.Text.Replace("ChangeLog", "BetaChangeLog"))); - richTextBoxChangelog.Text = File.ReadAllText(appData + "pckStudioChangelog.txt"); - - } - else - { - if (isdebug) - File.WriteAllText(appData + "pckStudioChangelog.txt", File.ReadAllText("C:\\WEBSITES\\PCKStudio\\studio\\PCK\\api\\" + ChangeURL.Text)); - else - File.WriteAllText(appData + "pckStudioChangelog.txt", client.DownloadString(basurl + ChangeURL.Text)); - richTextBoxChangelog.Text = File.ReadAllText(appData + "pckStudioChangelog.txt"); - } - } - } - catch - { - MessageBox.Show("Could not load changelog"); - } - - if (!File.Exists(appData + @"\ver.txt")) - { - File.WriteAllText(appData + @"\ver.txt", Version); - } - try - { - Classes.Network.CheckUpdate(); - } - catch - { - MessageBox.Show("Could not load Version Information"); - } } #endregion @@ -1781,11 +1585,11 @@ namespace PckStudio { if (e.KeyData == Keys.Delete)//checks to make sure pressed key was del { - if (treeViewMain.SelectedNode.Tag is PCK.MineFile)//makes sure selected node is a minefile + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData)//makes sure selected node is a minefile { //removes minefile from minefile list - PCK.MineFile mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag; - currentPCK.mineFiles.Remove(mf); + PCKFile.FileData mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; + currentPCK.file_entries.Remove(mf); //removes minefile node treeViewMain.Nodes.Remove(treeViewMain.SelectedNode); } @@ -1800,11 +1604,11 @@ namespace PckStudio MessageBox.Show("Can't fully delete directory with subdirectories"); return; } - if (item.Tag is PCK.MineFile)//makes sure selected node is a minefile + if (item.Tag is PCKFile.FileData)//makes sure selected node is a minefile { //removes minefile from minefile list - PCK.MineFile mf = (PCK.MineFile)item.Tag; - currentPCK.mineFiles.Remove(mf); + PCKFile.FileData mf = (PCKFile.FileData)item.Tag; + currentPCK.file_entries.Remove(mf); //removes minefile node item.Remove(); } @@ -1832,28 +1636,30 @@ namespace PckStudio { if (sfd.ShowDialog() == DialogResult.OK) { - foreach (PCK.MineFile mf in new PCK(ofd.FileName).mineFiles) + PCKFile pckfile = null; + using (var fs = File.OpenRead(ofd.FileName)) + { + pckfile = new PCKFile(fs); + + } + foreach (PCKFile.FileData mf in pckfile.file_entries) { - foreach (object[] entry in mf.entries) + foreach (var entry in mf.properties) { - if (entry[0].ToString() == "LOCK") // Check for lock on PCK File + if (entry.Key.ToString() == "LOCK" && new pckLocked(entry.Value.ToString()).ShowDialog() != DialogResult.OK) // Check for lock on PCK File { - if ((new pckLocked(entry[1].ToString(), correct).ShowDialog() != DialogResult.OK || !correct)) - { - return; // cancel extraction if password not provided - } + return; // cancel extraction if password not provided } } - System.IO.FileInfo file = new System.IO.FileInfo(sfd.SelectedPath + @"\" + mf.name); + FileInfo file = new FileInfo(sfd.SelectedPath + @"\" + mf.name); file.Directory.Create(); // If the directory already exists, this method does nothing. File.WriteAllBytes(sfd.SelectedPath + @"\" + mf.name, mf.data); //writes minefile to file //attempts to generate reimportable metadata file out of minefiles metadata string metaData = ""; - foreach (object[] entry in mf.entries) + foreach (var entry in mf.properties) { - object[] strings = (object[])entry; - metaData += (string)strings[0] + ":" + (string)strings[1] + Environment.NewLine; + metaData += entry.Key + ":" + entry.Value + Environment.NewLine; } File.WriteAllText(sfd.SelectedPath + @"\" + mf.name + ".txt", metaData); @@ -1875,22 +1681,17 @@ namespace PckStudio if (treeMeta.SelectedNode != null)//makes sure selected node is a minefile { //removes selected treemeta entry - object[] temp = (object[])treeMeta.SelectedNode.Tag; - file.entries.Remove(temp); + file.properties.Remove((string)treeMeta.SelectedNode.Tag); treeMeta.Nodes.Remove(treeMeta.SelectedNode); //reloads treemeta data treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; - TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -1933,15 +1734,22 @@ namespace PckStudio //gets all png files in selected path foreach (var file in d.GetFiles("*.png")) { - PCK.MineFile mfNew = new PCK.MineFile();//new minefile template ListViewItem Import = new ListViewItem();//listviewitem to store temporary data Import.Text = file.Name.Remove(file.Name.Length - 4, 4);//gets file name without extension + + //sets minefile type based on wether cape or skin + int type = 0; + if (Import.Text.Remove(7, Import.Text.Length - 7) == "dlccape" || Import.Text.Remove(7, Import.Text.Length - 7) == "DLCCAPE") + { + type = 1; + } + PCKFile.FileData mfNew = new PCKFile.FileData("", type, 0);//new minefile template mfNew.data = File.ReadAllBytes(contents.SelectedPath + @"\" + file.Name.Remove(file.Name.Length - 4, 4) + ".png");//sets minefile data to image data of current skin TreeNode skin = new TreeNode();//create template treenode for minefile - currentPCK.mineFiles.Add(mfNew);//adds new minefile to minefile list for skin - mfNew.filesize = mfNew.data.Length;//gets filesize of the skin image + currentPCK.file_entries.Add(mfNew);//adds new minefile to minefile list for skin + mfNew.size = mfNew.data.Length;//gets filesize of the skin image //Sets minefile directory based on pcks structure/type if (mashupStructure == true) @@ -1953,19 +1761,6 @@ namespace PckStudio mfNew.name = Import.Text + ".png"; } - //sets minefile type based on wether cape or skin - if (Import.Text.Remove(7, Import.Text.Length - 7) == "dlccape") - { - mfNew.type = 1; - } - else if (Import.Text.Remove(7, Import.Text.Length - 7) == "DLCCAPE") - { - mfNew.type = 1; - } - else - { - mfNew.type = 0; - } skin.Text = Import.Text + ".png";//adds file extension to minefile skin.Tag = mfNew;//sets nodes minefile data @@ -1977,7 +1772,6 @@ namespace PckStudio string locThemeId = ""; string locTheme = ""; bool entryStart = true;//assistant for parcing through metadata file data to import - int i = 0; foreach (char entry in File.ReadAllText(contents.SelectedPath + @"\" + Import.Text + ".png.txt").ToList()) { @@ -1997,8 +1791,7 @@ namespace PckStudio else { //adds minefiles metadata and presets loc data for minefile - object[] ENTRY = { entryName, entryValue }; - mfNew.entries.Add(ENTRY); + mfNew.properties.Add(entryName, entryValue); if (entryName == "DISPLAYNAMEID") { @@ -2112,10 +1905,11 @@ namespace PckStudio try { string skinNameImport = System.IO.Path.GetFileName(contents.FileName);//Gets skin name - PCK.MineFile mfNew = new PCK.MineFile();//new minefile template ListViewItem Import = new ListViewItem();//listviewitem to store temporary data Import.Text = skinNameImport.Remove(skinNameImport.Length - 4, 4);//gets file name without extension - mfNew.data = File.ReadAllBytes(contents.FileName.Remove(contents.FileName.Length - 4, 4));//sets minefile data to image data of current skin + byte[] data = File.ReadAllBytes(contents.FileName.Remove(contents.FileName.Length - 4, 4)); + PCKFile.FileData mfNew = new PCKFile.FileData("no_name", 0, data.Length);//new minefile template + mfNew.data = data;//sets minefile data to image data of current skin bool mashupStructure = false;//creates variable to indicate wether current pck skin structure is mashup or regular skin int skinsFolder = 0;//temporary index for skins folder for if structure is mashup @@ -2132,8 +1926,8 @@ namespace PckStudio TreeNode skin = new TreeNode();//create template treenode for minefile - currentPCK.mineFiles.Add(mfNew);//Adds minefile to minefile list - mfNew.filesize = mfNew.data.Length;//gets and sets minefile filesize + currentPCK.file_entries.Add(mfNew);//Adds minefile to minefile list + mfNew.size = mfNew.data.Length;//gets and sets minefile filesize if (mashupStructure == true) { mfNew.name = "Skins/" + Import.Text; @@ -2142,7 +1936,6 @@ namespace PckStudio { mfNew.name = Import.Text; } - mfNew.type = 0;//sets file type to default skin.Text = Import.Text;//sets nodes minefile name skin.Tag = mfNew;//sets nodes minefile data @@ -2174,9 +1967,7 @@ namespace PckStudio } else { - //adds minefiles metadata and presets loc data for minefile - object[] ENTRY = { entryName, entryValue }; - mfNew.entries.Add(ENTRY); + mfNew.properties.Add(entryName, entryValue); if (entryName == "DISPLAYNAMEID") { @@ -2303,7 +2094,7 @@ namespace PckStudio #region opens pck installation page private void installationToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start(hosturl + "pckStudio#install"); + //System.Diagnostics.Process.Start(hosturl + "pckStudio#install"); } #endregion @@ -2323,7 +2114,7 @@ namespace PckStudio #region opens pck faq page private void fAQToolStripMenuItem1_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start(hosturl + "pckStudio#faq"); + //System.Diagnostics.Process.Start(hosturl + "pckStudio#faq"); } #endregion @@ -2342,8 +2133,6 @@ namespace PckStudio { try { - bool latest = true; - string packName = openedPCKS.SelectedTab.Text.Remove(openedPCKS.SelectedTab.Text.Count() - 4, 4);//Determines skin packs name off of pck file name //Lets user choose were to put generated pack @@ -2366,9 +2155,9 @@ namespace PckStudio //MessageBox.Show(root);//debug thingy to make sure filepath is correct //add all skins to a list - List skinsList = new List(); - List capesList = new List(); - foreach (PCK.MineFile skin in currentPCK.mineFiles) + List skinsList = new List(); + List capesList = new List(); + foreach (PCKFile.FileData skin in currentPCK.file_entries) { if (skin.name.Count() == 19) { @@ -2402,24 +2191,24 @@ namespace PckStudio writeSkins.WriteLine(" \"skins\": ["); int skinAmount = 0; - foreach (PCK.MineFile newSkin in skinsList) + foreach (PCKFile.FileData newSkin in skinsList) { skinAmount += 1; string skinName = "skinName"; string capePath = ""; bool hasCape = false; - foreach (Object[] entry in newSkin.entries) + foreach (var entry in newSkin.properties) { - if (entry[0].ToString() == "DISPLAYNAME") + if (entry.Key == "DISPLAYNAME") { - skinName = entry[1].ToString(); - skinDisplayNames.Add(new Item() { Id = newSkin.name.Remove(15, 4), Name = entry[1].ToString() }); + skinName = entry.Value; + skinDisplayNames.Add(new Item() { Id = newSkin.name.Remove(15, 4), Name = skinName }); } - if (entry[0].ToString() == "CAPEPATH") + if (entry.Key == "CAPEPATH") { hasCape = true; - capePath = entry[1].ToString(); + capePath = entry.Value.ToString(); } } @@ -2459,7 +2248,7 @@ namespace PckStudio { writeSkins.WriteLine("{"); int newSkinCount = 0; - foreach (PCK.MineFile newSkin in skinsList) + foreach (PCKFile.FileData newSkin in skinsList) { newSkinCount += 1; @@ -2491,13 +2280,13 @@ namespace PckStudio if (skinPicture.Height == skinPicture.Width) { //determines skin type based on image dimensions, existence of BOX tags, and the ANIM value - foreach (Object[] entry in newSkin.entries) + foreach (var entry in newSkin.properties) { - if (entry[0].ToString() == "BOX") + if (entry.Key == "BOX") { string mClass = ""; string mData = ""; - foreach (char dCheck in entry[1].ToString()) + foreach (char dCheck in entry.Value) { if (dCheck.ToString() != " ") { @@ -2505,7 +2294,7 @@ namespace PckStudio } else { - mData = entry[1].ToString().Remove(0, mClass.Count() + 1); + mData = entry.Value.Remove(0, mClass.Count() + 1); break; } } @@ -2542,13 +2331,13 @@ namespace PckStudio } } - if (entry[0].ToString() == "OFFSET") + if (entry.Key.ToString() == "OFFSET") { string oClass = ""; string oData = ""; - foreach (char oCheck in entry[1].ToString()) + foreach (char oCheck in entry.Value.ToString()) { - oData = entry[1].ToString(); + oData = entry.Value.ToString(); if (oCheck.ToString() != " ") { oClass += oCheck.ToString(); @@ -2577,13 +2366,13 @@ namespace PckStudio } } - if (entry[0].ToString() == "ANIM") + if (entry.Key.ToString() == "ANIM") { - if (entry[1].ToString() == "0x40000") + if (entry.Value.ToString() == "0x40000") { } - else if (entry[1].ToString() == "0x80000") + else if (entry.Value.ToString() == "0x80000") { skinType = "alex"; } @@ -3248,7 +3037,7 @@ namespace PckStudio } //adds skin textures - foreach (PCK.MineFile skinTexture in skinsList) + foreach (PCKFile.FileData skinTexture in skinsList) { var ms = new MemoryStream(skinTexture.data); Bitmap saveSkin = new Bitmap(Image.FromStream(ms)); @@ -3268,7 +3057,7 @@ namespace PckStudio } //adds cape textures - foreach (PCK.MineFile capeTexture in capesList) + foreach (PCKFile.FileData capeTexture in capesList) { File.WriteAllBytes(root + "/" + capeTexture.name, capeTexture.data); } @@ -3415,151 +3204,151 @@ namespace PckStudio loadedBCH bch; - private void create3dstToolStripMenuItem_Click(object sender, EventArgs e) - { - if (treeViewMain.SelectedNode != null) - { + private void create3dstToolStripMenuItem_Click(object sender, EventArgs e) + { + if (treeViewMain.SelectedNode != null) + { - SaveFileDialog exportDs = new SaveFileDialog(); - exportDs.ShowDialog(); - string currentFile = exportDs.FileName; + SaveFileDialog exportDs = new SaveFileDialog(); + exportDs.ShowDialog(); + string currentFile = exportDs.FileName; - bch = new loadedBCH(); + bch = new loadedBCH(); - using (FileStream data = new FileStream(currentFile, FileMode.Open)) - { - BinaryReader input = new BinaryReader(data); - BinaryWriter output = new BinaryWriter(data); - - MemoryStream png = new MemoryStream(((PCK.MineFile)(treeViewMain.SelectedNode.Tag)).data); //Gets image data from minefile data - Image skinPicture = Image.FromStream(png); //Constructs image data into image - pictureBoxImagePreview.Image = skinPicture; //Sets image preview to image + using (FileStream data = new FileStream(currentFile, FileMode.Open)) + { + BinaryReader input = new BinaryReader(data); + BinaryWriter output = new BinaryWriter(data); - byte[] buffer = new byte[skinPicture.Width * skinPicture.Height * 4]; - input.Read(buffer, 0, buffer.Length); - Bitmap texture = TextureCodec.decode(buffer, skinPicture.Width, skinPicture.Height, RenderBase.OTextureFormat.rgba8); - tex.texture = new RenderBase.OTexture(texture, "Texure"); - - //tex.texture = treeViewMain.SelectedNode.Tag; - - for (int i = 0; i < bch.textures.Count; i++) - { - tex = bch.textures[i]; - tex.modified = true; + MemoryStream png = new MemoryStream(((PCKFile.FileData)(treeViewMain.SelectedNode.Tag)).data); //Gets image data from minefile data + Image skinPicture = Image.FromStream(png); //Constructs image data into image + pictureBoxImagePreview.Image = skinPicture; //Sets image preview to image - if (tex.modified) - { - byte[] bufferx = align(TextureCodec.encode(tex.texture.texture, RenderBase.OTextureFormat.rgba8)); - int diff = bufferx.Length - tex.length; + byte[] buffer = new byte[skinPicture.Width * skinPicture.Height * 4]; + input.Read(buffer, 0, buffer.Length); + Bitmap texture = TextureCodec.decode(buffer, skinPicture.Width, skinPicture.Height, RenderBase.OTextureFormat.rgba8); + tex.texture = new RenderBase.OTexture(texture, "Texure"); - replaceData(data, tex.offset, tex.length, bufferx); + //tex.texture = treeViewMain.SelectedNode.Tag; - //Update offsets of next textures - tex.length = bufferx.Length; - tex.modified = false; - updateTexture(i, tex); - for (int j = i; j < bch.textures.Count; j++) - { - loadedTexture next = bch.textures[j]; - next.offset = (uint)(next.offset + diff); - updateTexture(j, next); - } + for (int i = 0; i < bch.textures.Count; i++) + { + tex = bch.textures[i]; + tex.modified = true; - //Update all addresses poiting after the replaced data - bch.relocationTableOffset = (uint)(bch.relocationTableOffset + diff); - for (int index = 0; index < bch.relocationTableLength; index += 4) - { - data.Seek(bch.relocationTableOffset + index, SeekOrigin.Begin); - uint value = input.ReadUInt32(); - uint offset = value & 0x1ffffff; - byte flags = (byte)(value >> 25); + if (tex.modified) + { + byte[] bufferx = align(TextureCodec.encode(tex.texture.texture, RenderBase.OTextureFormat.rgba8)); + int diff = bufferx.Length - tex.length; - if ((flags & 0x20) > 0 || flags == 7 || flags == 0xc) - { - if ((flags & 0x20) > 0) - data.Seek((offset * 4) + bch.gpuCommandsOffset, SeekOrigin.Begin); - else - data.Seek((offset * 4) + bch.mainHeaderOffset, SeekOrigin.Begin); + replaceData(data, tex.offset, tex.length, bufferx); - uint address = input.ReadUInt32(); - if (address + bch.dataOffset > tex.offset) - { - address = (uint)(address + diff); - data.Seek(-4, SeekOrigin.Current); - output.Write(address); - } - } - } + //Update offsets of next textures + tex.length = bufferx.Length; + tex.modified = false; + updateTexture(i, tex); + for (int j = i; j < bch.textures.Count; j++) + { + loadedTexture next = bch.textures[j]; + next.offset = (uint)(next.offset + diff); + updateTexture(j, next); + } - uint newSize = (uint)((tex.texture.texture.Width << 16) | tex.texture.texture.Height); + //Update all addresses poiting after the replaced data + bch.relocationTableOffset = (uint)(bch.relocationTableOffset + diff); + for (int index = 0; index < bch.relocationTableLength; index += 4) + { + data.Seek(bch.relocationTableOffset + index, SeekOrigin.Begin); + uint value = input.ReadUInt32(); + uint offset = value & 0x1ffffff; + byte flags = (byte)(value >> 25); - //Update texture format - data.Seek(tex.gpuCommandsOffset, SeekOrigin.Begin); - for (int index = 0; index < tex.gpuCommandsWordCount * 3; index++) - { - uint command = input.ReadUInt32(); + if ((flags & 0x20) > 0 || flags == 7 || flags == 0xc) + { + if ((flags & 0x20) > 0) + data.Seek((offset * 4) + bch.gpuCommandsOffset, SeekOrigin.Begin); + else + data.Seek((offset * 4) + bch.mainHeaderOffset, SeekOrigin.Begin); - switch (command) - { - case 0xf008e: - case 0xf0096: - case 0xf009e: - replaceCommand(data, output, 0); //Set texture format to 0 = RGBA8888 - break; - case 0xf0082: - case 0xf0092: - case 0xf009a: - replaceCommand(data, output, newSize); //Set new texture size - break; - } - } + uint address = input.ReadUInt32(); + if (address + bch.dataOffset > tex.offset) + { + address = (uint)(address + diff); + data.Seek(-4, SeekOrigin.Current); + output.Write(address); + } + } + } - //Update material texture format - foreach (loadedMaterial mat in bch.materials) - { - data.Seek(mat.gpuCommandsOffset, SeekOrigin.Begin); - for (int index = 0; index < mat.gpuCommandsWordCount; index++) - { - uint command = input.ReadUInt32(); + uint newSize = (uint)((tex.texture.texture.Width << 16) | tex.texture.texture.Height); - switch (command) - { - case 0xf008e: if (mat.texture0 == tex.texture.name || mat.texture0 == "") replaceCommand(data, output, 0); break; - case 0xf0096: if (mat.texture1 == tex.texture.name || mat.texture1 == "") replaceCommand(data, output, 0); break; - case 0xf009e: if (mat.texture2 == tex.texture.name || mat.texture2 == "") replaceCommand(data, output, 0); break; - } - } - } + //Update texture format + data.Seek(tex.gpuCommandsOffset, SeekOrigin.Begin); + for (int index = 0; index < tex.gpuCommandsWordCount * 3; index++) + { + uint command = input.ReadUInt32(); - //Patch up BCH header for new offsets and lengths - data.Seek(4, SeekOrigin.Begin); - byte backwardCompatibility = input.ReadByte(); - byte forwardCompatibility = input.ReadByte(); + switch (command) + { + case 0xf008e: + case 0xf0096: + case 0xf009e: + replaceCommand(data, output, 0); //Set texture format to 0 = RGBA8888 + break; + case 0xf0082: + case 0xf0092: + case 0xf009a: + replaceCommand(data, output, newSize); //Set new texture size + break; + } + } - //Update Data Extended and Relocation Table offsets - data.Seek(18, SeekOrigin.Current); - if (backwardCompatibility > 0x20) updateAddress(data, input, output, diff); - updateAddress(data, input, output, diff); + //Update material texture format + foreach (loadedMaterial mat in bch.materials) + { + data.Seek(mat.gpuCommandsOffset, SeekOrigin.Begin); + for (int index = 0; index < mat.gpuCommandsWordCount; index++) + { + uint command = input.ReadUInt32(); - //Update data length - data.Seek(12, SeekOrigin.Current); - updateAddress(data, input, output, diff); - } - } - using (Stream file = File.Create(currentFile + ".tmp")) - { - CopyStream(output.BaseStream, file); - } + switch (command) + { + case 0xf008e: if (mat.texture0 == tex.texture.name || mat.texture0 == "") replaceCommand(data, output, 0); break; + case 0xf0096: if (mat.texture1 == tex.texture.name || mat.texture1 == "") replaceCommand(data, output, 0); break; + case 0xf009e: if (mat.texture2 == tex.texture.name || mat.texture2 == "") replaceCommand(data, output, 0); break; + } + } + } - } + //Patch up BCH header for new offsets and lengths + data.Seek(4, SeekOrigin.Begin); + byte backwardCompatibility = input.ReadByte(); + byte forwardCompatibility = input.ReadByte(); - MessageBox.Show("Done!", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); - } + //Update Data Extended and Relocation Table offsets + data.Seek(18, SeekOrigin.Current); + if (backwardCompatibility > 0x20) updateAddress(data, input, output, diff); + updateAddress(data, input, output, diff); - } + //Update data length + data.Seek(12, SeekOrigin.Current); + updateAddress(data, input, output, diff); + } + } + using (Stream file = File.Create(currentFile + ".tmp")) + { + CopyStream(output.BaseStream, file); + } + + } + + MessageBox.Show("Done!", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + } - public static void CopyStream(Stream input, Stream output) + public static void CopyStream(Stream input, Stream output) { byte[] buffer = new byte[8 * 1024]; int len; @@ -3586,7 +3375,7 @@ namespace PckStudio private void tutorialsToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start(hosturl + "pckStudio#tutorials"); + //System.Diagnostics.Process.Start(hosturl + "pckStudio#tutorials"); } private void wiiUPCKInstallerToolStripMenuItem_Click(object sender, EventArgs e) @@ -3597,37 +3386,37 @@ namespace PckStudio private void howToMakeABasicSkinPackToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=A43aHRHkKxk"); + Process.Start("https://www.youtube.com/watch?v=A43aHRHkKxk"); } private void howToMakeACustomSkinModelToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=pEC_ug55lag"); + Process.Start("https://www.youtube.com/watch?v=pEC_ug55lag"); } private void howToMakeCustomSkinModelsbedrockToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=6z8NTogw5x4"); + Process.Start("https://www.youtube.com/watch?v=6z8NTogw5x4"); } private void howToMakeCustomMusicToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=v6EYr4zc7rI"); + Process.Start("https://www.youtube.com/watch?v=v6EYr4zc7rI"); } private void howToInstallPcksDirectlyToWiiUToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=hRQagnEplec"); + Process.Start("https://www.youtube.com/watch?v=hRQagnEplec"); } private void pCKCenterReleaseToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=E_6bXSh6yqw"); + Process.Start("https://www.youtube.com/watch?v=E_6bXSh6yqw"); } private void howPCKsWorkToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=hTlImrRrCKQ"); + Process.Start("https://www.youtube.com/watch?v=hTlImrRrCKQ"); } private void PS3PCKInstallerToolStripMenuItem_Click(object sender, EventArgs e) @@ -3649,20 +3438,6 @@ namespace PckStudio pckm.Show(); } - private void uPDATEToolStripMenuItem1_Click(object sender, EventArgs e) - { - try - { - Classes.Network.CheckUpdate(); - uPDATEToolStripMenuItem1.Visible = false; - } - catch - { - MessageBox.Show("Could not load Version Information"); - uPDATEToolStripMenuItem1.Visible = false; - } - } - private void VitaPCKInstallerToolStripMenuItem_Click(object sender, EventArgs e) { @@ -3672,24 +3447,24 @@ namespace PckStudio private void toPhoenixARCDeveloperToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://cash.app/$PhoenixARC"); + Process.Start("https://cash.app/$PhoenixARC"); } private void toNobledezJackToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://www.paypal.me/realnobledez"); + Process.Start("https://www.paypal.me/realnobledez"); } private void addPasswordToolStripMenuItem_Click(object sender, EventArgs e) { treeViewMain.SelectedNode = treeViewMain.Nodes[0]; - mf = (PCK.MineFile)treeViewMain.Nodes[0].Tag;//Sets minefile to selected node - foreach (object[] entry in mf.entries) + mf = (PCKFile.FileData)treeViewMain.Nodes[0].Tag;//Sets minefile to selected node + foreach (var entry in mf.properties) { - if (entry[0].ToString() == "LOCK") + if (entry.Key == "LOCK") { MessageBox.Show("Remove current LOCK before adding a new one!"); - return; + return; } } AddPCKPassword add = new AddPCKPassword(mf, currentPCK);//sets metadata adding dialog @@ -3698,16 +3473,13 @@ namespace PckStudio //Sets up combobox for metadata entries from main metadatabase treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //loads all of selected minefiles metadata into metadata treeview - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -3716,13 +3488,7 @@ namespace PckStudio private void joinDevelopmentDiscordToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://discord.gg/aJtZNFVQTv"); - } - - private void tSTToolStripMenuItem_Click(object sender, EventArgs e) - { - Testx_12 form1 = new Testx_12(); - form1.Show(); + Process.Start("https://discord.gg/aJtZNFVQTv"); } private void convertPCTextrurePackToolStripMenuItem_Click(object sender, EventArgs e) @@ -3736,7 +3502,7 @@ namespace PckStudio private void buttonEditModel_Click(object sender, EventArgs e) { - PCK.MineFile mf = (PCK.MineFile)treeViewMain.SelectedNode.Tag; + PCKFile.FileData mf = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; if (Path.GetExtension(mf.name) == ".png") { @@ -3769,16 +3535,13 @@ namespace PckStudio pictureBoxImagePreview.Image = skinPicture; treeMeta.Nodes.Clear(); - foreach (int type in types.Keys) - comboBox1.Items.Add(types[type]); + foreach (int type in currentPCK.meta_data.Keys) + comboBox1.Items.Add(currentPCK.meta_data[type]); //loads all of selected minefiles metadata into metadata treeview - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeMeta.Nodes.Add(meta); } @@ -3829,7 +3592,7 @@ namespace PckStudio { //MessageBox.Show(".COL Editor Coming Soon!"); - if (treeViewMain.SelectedNode.Tag is PCK.MineFile) + if (treeViewMain.SelectedNode.Tag is PCKFile.FileData) { try { @@ -3922,13 +3685,12 @@ namespace PckStudio private void timer1_Tick(object sender, EventArgs e) { - if (PCKFile != PCKFileBCKUP) + if (PCKFilePath != PCKFileBCKUP) { - RPC.CloseRPC(); - if (string.IsNullOrWhiteSpace(PCKFile)) + if (string.IsNullOrWhiteSpace(PCKFilePath)) try { - RPC.SetRPC("825875166574673940", "Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); + RPC.SetRPC("Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); } catch { @@ -3938,23 +3700,19 @@ namespace PckStudio try { - RPC.SetRPC("825875166574673940", "Developing " + PCKFile, "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); + RPC.SetRPC("Developing " + PCKFilePath, "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); } catch { Console.WriteLine("ERROR WITH RPC"); } - PCKFileBCKUP = PCKFile; + PCKFileBCKUP = PCKFilePath; } } private void FormMain_FormClosing(object sender, FormClosingEventArgs e) { - try - { - RPC.CloseRPC(); - } - catch { } + RPC.CloseRPC(); } private void FormMain_Deactivate(object sender, EventArgs e) @@ -3972,7 +3730,7 @@ namespace PckStudio { try { - RPC.SetRPC("825875166574673940", "Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); + RPC.SetRPC("Sitting alone", "Program by PhoenixARC", "pcklgo", "PCK Studio", "pcklgo"); timer1.Start(); timer1.Enabled = true; } @@ -3981,10 +3739,7 @@ namespace PckStudio private void forMattNLContributorToolStripMenuItem_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("https://ko-fi.com/mattnl"); + Process.Start("https://ko-fi.com/mattnl"); } } -} - - - +} \ No newline at end of file diff --git a/MinecraftUSkinEditor/Forms/Form1.resx b/MinecraftUSkinEditor/Forms/Form1.resx index 1971a99d..e674dfba 100644 --- a/MinecraftUSkinEditor/Forms/Form1.resx +++ b/MinecraftUSkinEditor/Forms/Form1.resx @@ -130,7 +130,7 @@ - 180, 22 + 167, 22 Folder @@ -152,7 +152,7 @@ - 180, 22 + 167, 22 Skin @@ -174,25 +174,25 @@ - 180, 22 + 167, 22 Animated Texture - 180, 22 + 175, 22 Normal Audio.pck - 180, 22 + 175, 22 Vita/PS4 Audio.pck - 180, 22 + 167, 22 Audio.pck @@ -206,7 +206,7 @@ - 180, 22 + 138, 22 Create @@ -220,7 +220,7 @@ - 180, 22 + 138, 22 Clone @@ -290,7 +290,7 @@ - 180, 22 + 138, 22 Import @@ -305,7 +305,7 @@ - 180, 22 + 138, 22 Extract @@ -318,7 +318,7 @@ - 180, 22 + 138, 22 Rename @@ -334,7 +334,7 @@ - 180, 22 + 138, 22 Replace @@ -349,7 +349,7 @@ - 180, 22 + 138, 22 Move Up @@ -364,7 +364,7 @@ - 180, 22 + 138, 22 Delete @@ -379,13 +379,13 @@ - 180, 22 + 138, 22 Move Down - 181, 224 + 139, 202 contextMenuPCKEntries @@ -3263,24 +3263,6 @@ More - - 61, 20 - - - UPDATE - - - False - - - 37, 20 - - - TST - - - False - 20, 60 @@ -3303,7 +3285,7 @@ $this - 10 + 9 True @@ -3413,14 +3395,8 @@ $this - 9 + 8 - - 463, 23 - - - 627, 23 - 3 @@ -4053,7 +4029,7 @@ $this - 7 + 6 @@ -4739,7 +4715,7 @@ $this - 8 + 7 Bottom, Right @@ -4772,7 +4748,7 @@ $this - 6 + 5 3 @@ -5430,41 +5406,11 @@ $this - 5 + 4 - 781, 23 + 449, 27 - - True - - - 715, -10 - - - 116, 19 - - - 20 - - - PCKChangeLog.txt - - - False - - - ChangeURL - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 3 - True @@ -5619,7 +5565,7 @@ $this - 4 + 3 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="richTextBoxChangelog" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label5" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pckOpen" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,57.96915,Percent,42.03085" /><Rows Styles="Absolute,70,Percent,100" /></TableLayoutSettings> @@ -8487,18 +8433,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - uPDATEToolStripMenuItem1 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tSTToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - addPresetToolStripMenuItem1 @@ -8517,18 +8451,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - backgroundWorker1 - - - System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - directorySearcher1 - - - System.DirectoryServices.DirectorySearcher, System.DirectoryServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - timer1 diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs index 424560e2..0bd78d4a 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -13,10 +14,10 @@ namespace PckStudio { public partial class AdvancedOptions : MetroFramework.Forms.MetroForm { - PCK.MineFile mf; - PCK currentPCK; + PCKFile.FileData mf; + PCKFile currentPCK; - public AdvancedOptions(PCK currentPCKIn) + public AdvancedOptions(PCKFile currentPCKIn) { InitializeComponent(); currentPCK = currentPCKIn; @@ -52,19 +53,15 @@ namespace PckStudio { if (comboBox1.Text == "All") { - int count = treeMeta.Nodes.Count; - int i = 0; - do - { - foreach (PCK.MineFile mf in currentPCK.mineFiles) - { - object[] obj = { treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag }; - mf.entries.Add(obj); - } - i += 1; - count -= 1; - } while (count != 0); - MessageBox.Show("Data Added to All Entries"); + MessageBox.Show("TODO!!!!"); + //foreach (var node in treeMeta.Nodes) + //{ + // foreach (PCKFile.FileData mf in currentPCK.file_entries) + // { + // mf.properties.Add(node.Text, node.Tag); + // } + //} + //MessageBox.Show("Data Added to All Entries"); } else if (comboBox1.Text == "64x64") { @@ -72,15 +69,14 @@ namespace PckStudio int i = 0; do { - foreach (PCK.MineFile mf in currentPCK.mineFiles) + foreach (PCKFile.FileData mf in currentPCK.file_entries) { MemoryStream png = new MemoryStream(mf.data); if (Path.GetExtension(mf.name) == ".png") { if (Image.FromStream(png).Size.Height == Image.FromStream(png).Size.Width) { - object[] obj = { treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag }; - mf.entries.Add(obj); + mf.properties.Add(treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag.ToString()); } } } @@ -96,15 +92,14 @@ namespace PckStudio do { - foreach (PCK.MineFile mf in currentPCK.mineFiles) + foreach (PCKFile.FileData mf in currentPCK.file_entries) { MemoryStream png = new MemoryStream(mf.data); if (Path.GetExtension(mf.name) == ".png") { if (Image.FromStream(png).Size.Height == Image.FromStream(png).Size.Width / 2) { - object[] obj = { treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag }; - mf.entries.Add(obj); + mf.properties.Add(treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag.ToString()); } } } @@ -120,12 +115,11 @@ namespace PckStudio do { - foreach (PCK.MineFile mf in currentPCK.mineFiles) + foreach (PCKFile.FileData mf in currentPCK.file_entries) { if (Path.GetExtension(mf.name) == ".png") { - object[] obj = { treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag }; - mf.entries.Add(obj); + mf.properties.Add(treeMeta.Nodes[i].Text, treeMeta.Nodes[i].Tag.ToString()); } } i += 1; diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/EntryEditor.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/EntryEditor.cs index a5b50077..a26b18d8 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/EntryEditor.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/EntryEditor.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,7 +13,7 @@ namespace PckStudio { public partial class EntryEditor : Form { - public EntryEditor(Dictionary types, PCK.MineFile file) + public EntryEditor(Dictionary types, PCKFile.FileData file) { InitializeComponent(); this.types = types; @@ -20,8 +21,7 @@ namespace PckStudio } Dictionary types; - PCK.MineFile file; - string entryName = ""; + PCKFile.FileData file; private void renameProperly() { @@ -33,13 +33,10 @@ namespace PckStudio foreach(int type in types.Keys) comboBox1.Items.Add(types[type]); - foreach (object[] entry in file.entries) + foreach (var entry in file.properties) { - object[] strings = (object[])entry; - TreeNode meta = new TreeNode(); + TreeNode meta = new TreeNode(entry.Key); - foreach (object[] entryy in file.entries) - meta.Text = (string)strings[0]; meta.Tag = entry; treeView1.Nodes.Add(meta); } @@ -73,9 +70,8 @@ namespace PckStudio private void addEntryToolStripMenuItem_Click(object sender, EventArgs e) { - object[] obj = { "Replace me", "Or it won't save" }; - file.entries.Add(obj); - TreeNode t = new TreeNode("temp name") { Tag = obj }; + file.properties.Add("Replace me", "Or it won't save"); + TreeNode t = new TreeNode("temp name"); treeView1.Nodes.Add(t); renameProperly(); treeView1.SelectedNode = t; @@ -85,8 +81,8 @@ namespace PckStudio { if (treeView1.SelectedNode != null) { - object[] temp = (object[])treeView1.SelectedNode.Tag; - file.entries.Remove(temp); + var temp = (string)treeView1.SelectedNode.Tag; + file.properties.Remove(temp); treeView1.Nodes.Remove(treeView1.SelectedNode); } } diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs index 9a9378d0..63354567 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs @@ -21,16 +21,15 @@ namespace PckStudio.Forms } private void SkinPreview_Load(object sender, EventArgs e) { - Texture[] txt = new Texture[] { new Texture(Texture) }; - RenderModl(txt); + RenderModl(Texture); } - public void RenderModl(Texture[] Textures) + public void RenderModl(Image Source) { //RenderBox - System.Drawing.Image source = Textures[0].Source; + Image source = Source; Object3D object3D = new Box(source, new System.Drawing.Rectangle(8, 0, 0x10, 8), new System.Drawing.Rectangle(0, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); Object3D object3D2 = new Box(source, new System.Drawing.Rectangle(0x28, 0, 0x10, 8), new System.Drawing.Rectangle(0x20, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); Object3D object3D3 = new Box(source, new System.Drawing.Rectangle(0x2C, 0x10, 8, 4), new System.Drawing.Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.FlipHorizontally); diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs index a3f39aa1..7d58941f 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs @@ -86,7 +86,6 @@ this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; this.Style = MetroFramework.MetroColorStyle.Silver; this.Theme = MetroFramework.MetroThemeStyle.Dark; - this.Load += new System.EventHandler(this.addMeta_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs index 0e09b944..8d9486cb 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs @@ -1,4 +1,5 @@ -using System; +using PckStudio.Classes.FileTypes; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,27 +13,19 @@ namespace PckStudio { public partial class addMeta : MetroFramework.Forms.MetroForm { - PCK currentPCK; - PCK.MineFile file; + PCKFile.FileData file; - public addMeta(PCK.MineFile fileIn, PCK currentPCKIn) + public addMeta(PCKFile.FileData fileIn) { InitializeComponent(); file = fileIn; - currentPCK = currentPCKIn; FormBorderStyle = FormBorderStyle.None; } private void button1_Click(object sender, EventArgs e) { - object[] obj = { textBox1.Text, textBox2.Text }; - file.entries.Add(obj); - this.Close(); - } - - private void addMeta_Load(object sender, EventArgs e) - { - + file.properties.Add(textBox1.Text, textBox2.Text); + Close(); } } } diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs index bc3c5db3..2e13fb4c 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs @@ -12,16 +12,17 @@ using System.Drawing.Drawing2D; using MySql.Data.MySqlClient; using System.Net; using PckStudio; +using PckStudio.Classes.FileTypes; namespace PckStudio { public partial class addnewskin : MetroFramework.Forms.MetroForm { - PCK currentPCK; + PCKFile currentPCK; DataTable tbl; LOC currentLoc; - PCK.MineFile mf = new PCK.MineFile(); - PCK.MineFile mfc = new PCK.MineFile(); + PCKFile.FileData mf = null; + PCKFile.FileData mfc = null; TreeView treeView1; string skinId = ""; TreeNode skin = new TreeNode(); @@ -43,10 +44,12 @@ namespace PckStudio string skinid; List generatedModel = new List(); - public addnewskin(PCK currentPCKIn, TreeView treeView1In, string tempIDIn, LOC loc) + public addnewskin(PCKFile currentPCKIn, TreeView treeView1In, string tempIDIn, LOC loc) { InitializeComponent(); + mf = new PCKFile.FileData(0); + mfc = new PCKFile.FileData(0); currentLoc = loc; tbl = new DataTable(); tbl.Columns.Add(new DataColumn("Language") { ReadOnly = true }); @@ -67,7 +70,8 @@ namespace PckStudio private void checkImage() { //Checks image dimensions and sets things accordingly - if (Image.FromFile(ofd).Height == 64)//If skins is 64x64 + var img = Image.FromFile(ofd); + if (img.Height == 64) //If skins is 64x64 { MessageBox.Show("64x64 Skin Detected"); pictureBoxTexture.Width = pictureBoxTexture.Height; @@ -83,7 +87,7 @@ namespace PckStudio } skinType = "64x64"; } - else if (Image.FromFile(ofd).Height == 32)//If skins is 64x32 + else if (img.Height == 32)//If skins is 64x32 { MessageBox.Show("64x32 Skin Detected"); pictureBoxTexture.Width = pictureBoxTexture.Height * 2; @@ -99,7 +103,7 @@ namespace PckStudio comboBoxSkinType.Enabled = false; skinType = "64x32"; } - else if (Image.FromFile(ofd).Width == Image.FromFile(ofd).Height / 1)//If skins is 64x64 HD + else if (img.Width == img.Height / 1)//If skins is 64x64 HD { MessageBox.Show("64x64 HD Skin Detected"); pictureBoxTexture.Width = pictureBoxTexture.Height; @@ -115,7 +119,7 @@ namespace PckStudio } skinType = "64x64"; } - else if (Image.FromFile(ofd).Width == Image.FromFile(ofd).Height / 2)//If skins is 64x32 HD + else if (img.Width == img.Height / 2)//If skins is 64x32 HD { MessageBox.Show("64x32 HD Skin Detected"); pictureBoxTexture.Width = pictureBoxTexture.Height * 2; @@ -285,10 +289,10 @@ namespace PckStudio ofd1.Filter = "PNG Files | *.png"; ofd1.Title = "Select a PNG File"; - if (Image.FromFile(ofd1.FileName).Width == Image.FromFile(ofd1.FileName).Height * 2) + var img = Image.FromFile(ofd1.FileName); + if (img.Width == img.Height * 2) { useCape = true; - pictureBoxWithInterpolationMode1.SizeMode = PictureBoxSizeMode.StretchImage; pictureBoxWithInterpolationMode1.InterpolationMode = InterpolationMode.NearestNeighbor; pictureBoxWithInterpolationMode1.Image = Image.FromFile(ofd1.FileName); @@ -330,12 +334,11 @@ namespace PckStudio capePath.Text = "CAPEPATH"; capePath.Tag = "dlccape" + textSkinID.Text + ".png"; - object[] CAPE = { capePath.Text, capePath.Tag }; - mf.entries.Add(CAPE); + mf.properties.Add(capePath.Text, capePath.Tag.ToString()); - currentPCK.mineFiles.Add(mfc); + currentPCK.file_entries.Add(mfc); - mfc.filesize = mf.data.Length; if (mashupStructure == true) + mfc.size = mf.data.Length; if (mashupStructure == true) { mfc.name = "Skins/" + "dlccape" + textSkinID.Text + ".png"; } @@ -344,7 +347,7 @@ namespace PckStudio mfc.name = "dlccape" + textSkinID.Text + ".png"; } - mfc.type = 1; + //mfc.type = 1; cape.Text = "dlccape" + textSkinID.Text + ".png"; cape.Tag = mfc; @@ -367,7 +370,7 @@ namespace PckStudio } } - currentPCK.mineFiles.Add(mf); + currentPCK.file_entries.Add(mf); free.Text = "FREE"; free.Tag = "1"; themeName.Text = "THEMENAME"; @@ -378,12 +381,9 @@ namespace PckStudio skinName.Tag = textSkinName.Text; anim.Text = "ANIM"; + mf.properties.Add(skinName.Text, textSkinName.Text); - object[] DISPLAY = { skinName.Text, skinName.Tag }; - mf.entries.Add(DISPLAY); - - object[] DISPLAYID = { displayNameId.Text, displayNameId.Tag }; - mf.entries.Add(DISPLAYID); + mf.properties.Add(displayNameId.Text, "IDS_dlcskin" + textSkinID.Text + "_DISPLAYNAME"); if (comboBoxSkinType.Text == "Default (64x32)") @@ -395,31 +395,20 @@ namespace PckStudio anim.Tag = "0x80000"; object[] ANIM = { anim.Text, anim.Tag }; - mf.entries.Add(ANIM); + mf.properties.Add("ANIM", "0x80000"); } else if (comboBoxSkinType.Text == "Steve (64x64)" && skinType != "64x32") { - anim.Tag = "0x40000"; - - object[] ANIM = { anim.Text, anim.Tag }; - mf.entries.Add(ANIM); + mf.properties.Add("ANIM", "0x40000"); } else if (comboBoxSkinType.Text == "Custom") { - anim.Tag = "0x7ff5fc10"; - //mf.entries.Add(new object[2] { (object)"BOX", new ListViewItem() { Tag = ((object)(listViewItem.Tag.ToString() + " " + listViewItem.SubItems[1].Text + " " + listViewItem.SubItems[2].Text + " " + listViewItem.SubItems[3].Text + " " + listViewItem.SubItems[4].Text + " " + listViewItem.SubItems[5].Text + " " + listViewItem.SubItems[6].Text + " " + listViewItem.SubItems[7].Text + " " + listViewItem.SubItems[8].Text)) }.Tag }); - foreach (object[] item in generatedModel) - { - mf.entries.Add((object[])item); - } - - object[] ANIM = { anim.Text, anim.Tag }; - mf.entries.Add(ANIM); - } - else - { - + //foreach (object[] item in generatedModel) + //{ + // mf.properties.Add((object[])item); + //} + mf.properties.Add("ANIM", "0x7ff5fc10"); } if (generatedModel != null) { @@ -428,17 +417,13 @@ namespace PckStudio if (themeName.Tag.ToString() != "") { - object[] THEME = { themeName.Text, themeName.Tag }; - mf.entries.Add(THEME); + mf.properties.Add(themeName.Text, themeName.Tag.ToString()); } - object[] GAMEFLAGS = { "GAME_FLAGS", "0x18" }; - mf.entries.Add(GAMEFLAGS); + mf.properties.Add("GAME_FLAGS", "0x18"); + mf.properties.Add("FREE", "1"); - object[] FREE = { free.Text, free.Tag }; - mf.entries.Add(FREE); - - mf.filesize = mf.data.Length; + mf.size = mf.data.Length; if (mashupStructure == true) { mf.name = "Skins/" + "dlcskin" + textSkinID.Text + ".png"; @@ -447,7 +432,7 @@ namespace PckStudio { mf.name = "dlcskin" + textSkinID.Text + ".png"; } - mf.type = 0; + //mf.type = 0; skin.Text = "dlcskin" + textSkinID.Text + ".png"; skin.Tag = mf; @@ -594,7 +579,6 @@ namespace PckStudio { try { - string tempstr = ""; Random random = new Random(); int num = random.Next(10000000, 99999999); textSkinID.Text = num.ToString(); diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx index 0e287b23..877b32ec 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx @@ -137,10 +137,19 @@ 17, 17 + + 116, 26 + + + contextMenuSkin + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAAC/SURBVDhPlVHB + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAAC/SURBVDhPlVHB DQMhDEOIfwfoOuzFoPxhAd5c6/SMAgq0tRQFmdgXfA5IKUkBMcbHPxyJCxVCkK7rm+EwaK1dQO9dClzO WfpOTM7hy1oMGNvY4pucxNY2p6cAWzFw2oZuMmiJweGeHM634UdLg50YwD05vQ2fYoaoDTEMrJyIfw3R 4qYQWUZgg6OwlDJyMH8LcwF2T8FZ5kYQb4Lde/9Et8S6Dy1z0LUGi7VpWGvl3Lw2V98ZrtwIUYktwwPn @@ -153,22 +162,22 @@ Replace - - 116, 26 - - - contextMenuSkin - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 172, 17 + + 127, 26 + + + contextMenuCape + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAA3SURBVDhPY/j/ + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAA3SURBVDhPY/j/ /z9FGKsgGIsCKWSMTQ0QYxUE45FmALpiYvFwMgAbxqIYG8YqCMajBhCJ/zMAAPGwpV/Xje8RAAAAAElF TkSuQmCC @@ -179,15 +188,6 @@ Add Cape - - 127, 26 - - - contextMenuCape - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - False diff --git a/MinecraftUSkinEditor/Forms/Testx-12.Designer.cs b/MinecraftUSkinEditor/Forms/Testx-12.Designer.cs deleted file mode 100644 index 6bd1fc6a..00000000 --- a/MinecraftUSkinEditor/Forms/Testx-12.Designer.cs +++ /dev/null @@ -1,74 +0,0 @@ - -namespace PckStudio.Forms -{ - partial class Testx_12 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.minecraftModelView1 = new PckStudio.Models.MinecraftModelView(this.components); - this.SuspendLayout(); - // - // minecraftModelView1 - // - this.minecraftModelView1.BackColor = System.Drawing.Color.Black; - this.minecraftModelView1.BackGradientColor1 = System.Drawing.SystemColors.ActiveCaptionText; - this.minecraftModelView1.BackGradientColor2 = System.Drawing.SystemColors.ActiveCaptionText; - this.minecraftModelView1.BackgroundType = PckStudio.Models.BackgroundTypes.Color; - this.minecraftModelView1.DegreesX = 0; - this.minecraftModelView1.DegreesY = 0; - this.minecraftModelView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.minecraftModelView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.minecraftModelView1.ForeColor = System.Drawing.Color.Black; - this.minecraftModelView1.FOV = 70; - this.minecraftModelView1.Location = new System.Drawing.Point(0, 0); - this.minecraftModelView1.Name = "minecraftModelView1"; - this.minecraftModelView1.Projection = PckStudio.Models.ProjectionTypes.Perspective; - this.minecraftModelView1.ShowUsername = false; - this.minecraftModelView1.Size = new System.Drawing.Size(323, 375); - this.minecraftModelView1.TabIndex = 0; - this.minecraftModelView1.Text = "minecraftModelView1"; - this.minecraftModelView1.Username = ""; - // - // Testx_12 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(323, 375); - this.Controls.Add(this.minecraftModelView1); - this.Name = "Testx_12"; - this.Text = "Skin Preview"; - this.Load += new System.EventHandler(this.Testx_12_Load); - this.ResumeLayout(false); - - } - - #endregion - - private PckStudio.Models.MinecraftModelView minecraftModelView1; - } -} \ No newline at end of file diff --git a/MinecraftUSkinEditor/Forms/Testx-12.cs b/MinecraftUSkinEditor/Forms/Testx-12.cs deleted file mode 100644 index abab4fd0..00000000 --- a/MinecraftUSkinEditor/Forms/Testx-12.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.IO; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using PckStudio.Models; - -namespace PckStudio.Forms -{ - public partial class Testx_12 : Form - { - public Testx_12() - { - InitializeComponent(); - foreach (ModelBase modelBase in this.models) - { - modelBase.Updated += this.model_Updated; - } - } - - - private void model_Updated(object sender, EventArgs e) - { - this.minecraftModelView1.Model = (sender as ModelBase); - } - - private void Testx_12_Load(object sender, EventArgs e) - { - PckStudio.Classes.CSM.TryParse(File.ReadAllText(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\export.CSM"), minecraftModelView1); - //ModelBase modelBase = models[0]; - //this.minecraftModelView1.Model = modelBase; - //this.minecraftModelView1.Invalidate(); - - } - - private ModelBase[] models = new ModelBase[] - { - new CharacterModel() - }; - } -} diff --git a/MinecraftUSkinEditor/Forms/Testx-12.resx b/MinecraftUSkinEditor/Forms/Testx-12.resx deleted file mode 100644 index 1af7de15..00000000 --- a/MinecraftUSkinEditor/Forms/Testx-12.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs b/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs index b04b3f75..a26befe9 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs @@ -1,6 +1,7 @@ using MetroFramework.Forms; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PckStudio.Classes.FileTypes; using System; using System.Collections.Generic; using System.Drawing; @@ -14,7 +15,7 @@ namespace PckStudio public partial class AnimationEditor : MetroForm { TreeView treeViewMain = new TreeView(); - PCK.MineFile mf = new PCK.MineFile(); + PCKFile.FileData mf = null; List frames = new List(); Newtonsoft.Json.Linq.JObject tileData = Newtonsoft.Json.Linq.JObject.Parse(System.Text.Encoding.Default.GetString(Properties.Resources.tileData)); Image texture; @@ -38,11 +39,11 @@ namespace PckStudio { InitializeComponent(); treeViewMain = treeViewIn; - if (String.IsNullOrEmpty(createdFileName)) + if (string.IsNullOrEmpty(createdFileName)) { newTileName = Path.GetFileNameWithoutExtension(treeViewMain.SelectedNode.Text); if (treeViewMain.SelectedNode.Parent.Text.ToLower() == "items") isItem = true; - mf = treeViewMain.SelectedNode.Tag as PCK.MineFile; + mf = treeViewMain.SelectedNode.Tag as PCKFile.FileData; if (newTileName.EndsWith("MipMapLevel2") || newTileName.EndsWith("MipMapLevel3")) { string mipMapLvl = newTileName.Last().ToString(); @@ -54,12 +55,10 @@ namespace PckStudio else { create = true; - PCK.MineFile newMf = new PCK.MineFile(); - object[] animEntry = { "ANIM", "" }; - newMf.entries.Add(animEntry); + PCKFile.FileData newMf = new PCKFile.FileData("", 2, 0); + newMf.properties.Add("ANIM", ""); newMf.data = File.ReadAllBytes(createdFileName); - newMf.filesize = newMf.data.Length;//gets filesize for minefile - newMf.type = 2; + newMf.size = newMf.data.Length;//gets filesize for minefile mf = newMf; Forms.Utilities.AnimationEditor.ChangeTile diag = new Forms.Utilities.AnimationEditor.ChangeTile(); diag.ShowDialog(this); @@ -73,14 +72,11 @@ namespace PckStudio List strEntries = new List(); List strEntryData = new List(); - foreach (object[] entry in mf.entries) //object = metadata entry(name:value) + foreach (var entry in mf.properties) //object = metadata entry(name:value) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in mf.entries) - strEntries.Add((string)strings[0]); - strEntryData.Add((string)strings[1]); + strEntries.Add(entry.Value); + strEntryData.Add(entry.Value); } //if (strEntries.Find(entry => entry == "ANIM") == null) throw new System.Exception("ANIM tag is missing. No animation code is present."); @@ -417,7 +413,7 @@ namespace PckStudio { texture.Save(m, texture.RawFormat); mf.data = m.ToArray(); - mf.filesize = mf.data.Length; + mf.size = mf.data.Length; } if (metroCheckBox2.Checked) @@ -427,7 +423,6 @@ namespace PckStudio if (!create && treeViewMain.SelectedNode.Tag != null) treeViewMain.SelectedNode.Text = newTileName + ".png"; - int animIndex = mf.entries.FindIndex(entry => (string)entry[0] == "ANIM"); string animationData = ""; if (metroCheckBox1.Checked) animationData += "#"; // does the animation interpolate? foreach (TreeNode node in treeView1.Nodes) @@ -435,14 +430,9 @@ namespace PckStudio Tuple frameData = node.Tag as Tuple; animationData += frameData.Item1 + "*" + frameData.Item2 + ","; } - animationData.TrimEnd(','); - object[] newEntry = new object[] - { - "ANIM", - animationData - }; - if (animIndex != -1) mf.entries[animIndex] = newEntry; - else mf.entries.Add(newEntry); + animationData.TrimEnd(','); + if (mf.properties.ContainsKey("ANIM")) mf.properties["ANIM"] = animationData; + else mf.properties.Add("ANIM", animationData); if (create) { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs b/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs index c5f76ab7..807496e8 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs @@ -3,12 +3,14 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using MetroFramework.Forms; using PckStudio; +using PckStudio.Classes.FileTypes; // Audio Editor by MattNL @@ -65,10 +67,10 @@ namespace PckStudio.Forms.Utilities } } - PCK audioPCK = new PCK(); + PCKFile audioPCK; bool isVita; - PCK.MineFile mf; - public AudioEditor(PCK.MineFile MineFile, bool littleEndian) + PCKFile.FileData mf; + public AudioEditor(PCKFile.FileData MineFile, bool littleEndian) { isVita = littleEndian; ImageList catImages = new ImageList(); @@ -87,36 +89,37 @@ namespace PckStudio.Forms.Utilities treeView1.ImageList = catImages; mf = MineFile; - if (isVita) audioPCK.ReadVita(mf.data, true); - else audioPCK.Read(mf.data, true); - defaultType = audioPCK.types[0]; - int check; // This is needed for the TryGetValue function which is annoying - if (!audioPCK.typeCodes.TryGetValue("CUENAME", out check)) + using (var stream = new MemoryStream(mf.data)) + { + if (isVita) audioPCK = new PCKFile(stream, true); + else audioPCK = new PCKFile(stream); + } + defaultType = audioPCK.meta_data[0]; + if (!audioPCK.meta_data.ContainsValue("CUENAME")) { - throw new System.Exception("This is not a valid audio.pck file"); + throw new Exception("This is not a valid audio.pck file"); } int index = 0; - List tempMineFiles = audioPCK.mineFiles; - foreach (PCK.MineFile mineFile in tempMineFiles) + List tempMineFiles = audioPCK.file_entries; + foreach (PCKFile.FileData mineFile in tempMineFiles) { mineFile.name = getCatString(mineFile.type); Console.WriteLine("Category Found: " + mineFile.name); - if (cats.Contains(mineFile.type)) + if (cats.Contains(mineFile.type)) { Console.WriteLine("Duplicate category found, " + getCatString(mineFile.type) + ". Combining..."); - List newEntries = mineFile.entries; - audioPCK.mineFiles.Remove(mineFile); - audioPCK.mineFiles.Find(category => category.name == getCatString(mineFile.type)).entries.AddRange(newEntries); + audioPCK.file_entries.Remove(mineFile); + audioPCK.file_entries.Find(category => category.name == getCatString(mineFile.type)).properties = mineFile.properties; } else { TreeNode treeNode = new TreeNode(); treeNode.Text = mineFile.name; treeNode.Tag = mineFile; - treeNode.ImageIndex = mineFile.type; - treeNode.SelectedImageIndex = mineFile.type; + //treeNode.ImageIndex = mineFile.type; + //treeNode.SelectedImageIndex = mineFile.type; treeView1.Nodes.Add(treeNode); - cats.Add(mineFile.type); + cats.Add((int)mineFile.type); } index++; @@ -129,18 +132,17 @@ namespace PckStudio.Forms.Utilities private void treeView2_AfterSelect(object sender, TreeViewEventArgs e) { comboBox1.Items.Clear();//Resets metadata combobox of selectable entry names - object[] strings = (object[])e.Node.Tag; - string type = audioPCK.types[0]; + if (e.Node.Tag == null) return; + var strings = (KeyValuePair)e.Node.Tag; + string type = audioPCK.meta_data[0]; defaultType = type; string value = ""; - if (strings != null) - { - type = (string)strings[0]; - value = (string)strings[1]; - } + type = (string)strings.Key; + value = (string)strings.Value; + - foreach (int metaType in audioPCK.types.Keys) - comboBox1.Items.Add(audioPCK.types[metaType]);//fills combobox with metadata from the main metadatabase + foreach (int metaType in audioPCK.meta_data.Keys) + comboBox1.Items.Add(audioPCK.meta_data[metaType]);//fills combobox with metadata from the main metadatabase comboBox1.Text = type;//Sets currently selected metadata type to type selected in selected metadata node textBox1.Text = value;//Sets currently selected metadata value to value selected in selected metadata node } @@ -148,14 +150,11 @@ namespace PckStudio.Forms.Utilities private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) { treeView2.Nodes.Clear(); - PCK.MineFile mineFile = (PCK.MineFile)e.Node.Tag; - foreach (object[] entry in mineFile.entries) //object = metadata entry(name:value) + PCKFile.FileData mineFile = (PCKFile.FileData)e.Node.Tag; + foreach (var entry in mineFile.properties) //object = metadata entry(name:value) { - object[] strings = (object[])entry; TreeNode meta = new TreeNode(); - - foreach (object[] entryy in mineFile.entries) - meta.Text = (string)strings[0]; + meta.Text = entry.Key; meta.Tag = entry; treeView2.Nodes.Add(meta); } @@ -166,8 +165,8 @@ namespace PckStudio.Forms.Utilities { if (treeView2.SelectedNode != null) { - object[] strings = (object[])treeView2.SelectedNode.Tag; - strings[1] = textBox1.Text; + //object[] strings = (object[])treeView2.SelectedNode.Tag; + //strings[1] = textBox1.Text; } } @@ -176,9 +175,9 @@ namespace PckStudio.Forms.Utilities if (treeView2.SelectedNode != null) { //Sets metadata type to new chosen one - object[] strings = (object[])treeView2.SelectedNode.Tag; - treeView2.SelectedNode.Text = comboBox1.Text; - strings[0] = comboBox1.Text; + //object[] strings = (object[])treeView2.SelectedNode.Tag; + //treeView2.SelectedNode.Text = comboBox1.Text; + //strings[0] = comboBox1.Text; } } @@ -194,19 +193,13 @@ namespace PckStudio.Forms.Utilities add.Dispose();//diposes generated metadata adding dialog data if (!cats.Contains(getCatID(cat))) cats.Add(getCatID(cat)); else return; - PCK.MineFile mf = new PCK.MineFile();//Creates new minefile template + PCKFile.FileData mf = new PCKFile.FileData(cat, getCatID(cat), 0); //Creates new minefile template + mf.data = new byte[0]; //adds file data to minefile - var emptyBytes = new List(); // the category files are empty to not take up space - byte[] emptyBytesArray = emptyBytes.ToArray(); - - mf.data = emptyBytesArray;//adds file data to minefile - mf.filesize = mf.data.Length;//gets filesize for minefile - mf.name = cat;//sets minfile name to file name - mf.type = getCatID(cat);//sets minefile type to default TreeNode addNode = new TreeNode(mf.name) { Tag = mf };//creates node for minefile - addNode.ImageIndex = mf.type; - addNode.SelectedImageIndex = mf.type; - //audioPCK.mineFiles.Add(mf); + //addNode.ImageIndex = mf.type; + //addNode.SelectedImageIndex = mf.type; + //audioPCKFile.FileDatas.Add(mf); treeView1.Nodes.Add(addNode); treeView1.Sort(); } @@ -220,20 +213,18 @@ namespace PckStudio.Forms.Utilities private void addEntryMenuItem_Click(object sender, EventArgs e) { if (treeView1.SelectedNode == null) return; - object[] obj = { defaultType, "New Entry" }; - TreeNode meta = new TreeNode(); - meta.Text = "New Entry"; - meta.Tag = obj; + TreeNode meta = new TreeNode("New Entry"); + //meta.Tag = obj; treeView2.Nodes.Add(meta); - ((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Add(obj); + ((PCKFile.FileData)treeView1.SelectedNode.Tag).properties.Add(defaultType, "New Entry"); } public void treeView2_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Delete && treeView2.SelectedNode != null) { if (treeView1.SelectedNode == null) return; // makes sure you don't run this if there is nothing to delete - ((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Remove((object[])treeView2.SelectedNode.Tag); + ((PCKFile.FileData)treeView1.SelectedNode.Tag).properties.Remove((string)treeView2.SelectedNode.Tag); treeView2.SelectedNode.Remove(); } } @@ -242,19 +233,15 @@ namespace PckStudio.Forms.Utilities { if (treeView1.SelectedNode == null) return; // makes sure you don't run this if there is nothing to delete cats.Remove(getCatID(treeView1.SelectedNode.Text)); - //audioPCK.mineFiles.Remove((PCK.MineFile)treeView1.SelectedNode.Tag); + //audioPCKFile.FileDatas.Remove((PCKFile.FileData)treeView1.SelectedNode.Tag); treeView1.SelectedNode.Remove(); treeView2.Nodes.Clear(); if(treeView1.SelectedNode != null) { - PCK.MineFile mineFile = (PCK.MineFile)treeView1.SelectedNode.Tag; - foreach (object[] entry in mineFile.entries) //object = metadata entry(name:value) + PCKFile.FileData mineFile = (PCKFile.FileData)treeView1.SelectedNode.Tag; + foreach (var entry in mineFile.properties) { - object[] strings = (object[])entry; - TreeNode meta = new TreeNode(); - - foreach (object[] entryy in mineFile.entries) - meta.Text = (string)strings[0]; + TreeNode meta = new TreeNode(entry.Key); meta.Tag = entry; treeView2.Nodes.Add(meta); } @@ -263,7 +250,7 @@ namespace PckStudio.Forms.Utilities private void removeEntryMenuItem_Click(object sender, EventArgs e) { - ((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Remove((object[])treeView2.SelectedNode.Tag); + //((PCKFile.FileData)treeView1.SelectedNode.Tag).properties.Remove((object[])treeView2.SelectedNode.Tag); treeView2.SelectedNode.Remove(); } @@ -277,34 +264,23 @@ namespace PckStudio.Forms.Utilities { if(System.IO.Path.GetExtension(binka) == ".binka") { - object[] obj = { "CUENAME", System.IO.Path.GetFileNameWithoutExtension(binka) }; + object[] obj = { }; TreeNode meta = new TreeNode(); meta.Text = "CUENAME"; meta.Tag = obj; treeView2.Nodes.Add(meta); - ((PCK.MineFile)treeView1.SelectedNode.Tag).entries.Add(obj); + ((PCKFile.FileData)treeView1.SelectedNode.Tag).properties.Add("CUENAME", System.IO.Path.GetFileNameWithoutExtension(binka)); } } } } - private static byte[] endianReverseUnicode(byte[] str) - { - byte[] newStr = new byte[str.Length]; - for (int i = 0; i < str.Length; i += 2) - { - newStr[i] = str[i + 1]; - newStr[i + 1] = str[i]; - } - return newStr; - } - private static void writeMinecraftString(FileOutput f, string str) { - byte[] d = Encoding.Unicode.GetBytes(str); + byte[] d = Encoding.BigEndianUnicode.GetBytes(str); f.writeInt(d.Length / 2); - f.writeBytes(endianReverseUnicode(d)); + f.writeBytes(d); f.writeInt(0); } @@ -317,92 +293,92 @@ namespace PckStudio.Forms.Utilities f.writeIntVita(0); } - public static byte[] buildAudioPCKVita(PCK pck) + public static byte[] buildAudioPCKVita(PCKFile pck) { FileOutput fileOutput = new FileOutput(); fileOutput.Endian = Endianness.Big; fileOutput.writeIntVita(1); - fileOutput.writeIntVita(pck.types.Count); - foreach (int num in pck.types.Keys) + fileOutput.writeIntVita(pck.meta_data.Count); + foreach (int num in pck.meta_data.Keys) { fileOutput.writeIntVita(num); - writeMinecraftStringVita(fileOutput, pck.types[num]); - } - fileOutput.writeIntVita(pck.mineFiles.Count); - foreach (PCK.MineFile mineFile in pck.mineFiles) - { - mineFile.name = ""; - fileOutput.writeIntVita(mineFile.data.Length); - fileOutput.writeIntVita(mineFile.type); - writeMinecraftStringVita(fileOutput, mineFile.name); - } - foreach (PCK.MineFile mineFile2 in pck.mineFiles) - { - string str = ""; - try - { - fileOutput.writeIntVita(mineFile2.entries.Count); - foreach (object[] array in mineFile2.entries) - { - str = array[0].ToString(); - fileOutput.writeIntVita(pck.typeCodes[(string)array[0]]); - writeMinecraftStringVita(fileOutput, (string)array[1]); - } - fileOutput.writeBytes(mineFile2.data); - } - catch (Exception) - { - MessageBox.Show(str + " is not in the main metadatabase"); - break; - } + writeMinecraftStringVita(fileOutput, pck.meta_data[num]); } + //fileOutput.writeIntVita(PCKFile.FileDatas.Count); + //foreach (PCKFile.FileData mineFile in PCKFile.FileDatas) + //{ + // mineFile.name = ""; + // fileOutput.writeIntVita(mineFile.data.Length); + // fileOutput.writeIntVita(mineFile.type); + // writeMinecraftStringVita(fileOutput, mineFile.name); + //} + //foreach (PCKFile.FileData mineFile2 in PCKFile.FileDatas) + //{ + // string str = ""; + // try + // { + // fileOutput.writeIntVita(mineFile2.properties.Count); + // foreach (var array in mineFile2.properties) + // { + // str = array.Key; + // fileOutput.writeIntVita(pck.typeCodes[array.Key]); + // writeMinecraftStringVita(fileOutput, array.Value); + // } + // fileOutput.writeBytes(mineFile2.data); + // } + // catch (Exception) + // { + // MessageBox.Show(str + " is not in the main metadatabase"); + // break; + // } + //} return fileOutput.getBytes(); } - public static byte[] buildAudioPCK(PCK pck) + public static byte[] buildAudioPCK(PCKFile pck) { FileOutput f = new FileOutput(); - f.Endian = pck.IsLittleEndian ? Endianness.Little : Endianness.Big; + f.Endian = pck.isLittleEndian ? Endianness.Little : Endianness.Big; f.writeInt(1); - f.writeInt(pck.types.Count); - foreach (int type in pck.types.Keys) + f.writeInt(pck.meta_data.Count); + foreach (int type in pck.meta_data.Keys) { f.writeInt(type); - writeMinecraftString(f, pck.types[type]); + writeMinecraftString(f, pck.meta_data[type]); } - f.writeInt(pck.mineFiles.Count); - Console.WriteLine(pck.mineFiles.Count); - foreach (PCK.MineFile mf in pck.mineFiles) - { - mf.name = ""; - f.writeInt(mf.data.Length); - f.writeInt(mf.type); - writeMinecraftString(f, mf.name); - } + //f.writeInt(PCKFile.FileDatas.Count); + //Console.WriteLine(PCKFile.FileDatas.Count); + //foreach (PCKFile.FileData mf in PCKFile.FileDatas) + //{ + // mf.name = ""; + // f.writeInt(mf.data.Length); + // f.writeInt(mf.type); + // writeMinecraftString(f, mf.name); + //} - foreach (PCK.MineFile mf in pck.mineFiles) - { - string missing = ""; - try - { - f.writeInt(mf.entries.Count); - foreach (object[] entry in mf.entries) - { - missing = entry[0].ToString(); - f.writeInt(pck.typeCodes[(string)entry[0]]); - writeMinecraftString(f, (string)entry[1]); - } + //foreach (PCKFile.FileData mf in PCKFile.FileDatas) + //{ + // string missing = ""; + // try + // { + // f.writeInt(mf.properties.Count); + // foreach (var entry in mf.properties) + // { + // missing = entry.Key; + // f.writeInt(pck.typeCodes[entry.Key]); + // writeMinecraftString(f, entry.Value); + // } - f.writeBytes(mf.data); - } - catch (Exception) - { - MessageBox.Show(missing + " is not in the main metadatabase"); - break; - } - } + // f.writeBytes(mf.data); + // } + // catch (Exception) + // { + // MessageBox.Show(missing + " is not in the main metadatabase"); + // break; + // } + //} return f.getBytes(); } @@ -418,7 +394,8 @@ namespace PckStudio.Forms.Utilities bool emptyCat = false; - foreach (PCK.MineFile mf in audioPCK.mineFiles) if (mf.entries.Count == 0) emptyCat = true; + foreach (PCKFile.FileData mf in audioPCK.file_entries) + emptyCat = mf.properties.Count == 0; if (emptyCat) { @@ -426,7 +403,7 @@ namespace PckStudio.Forms.Utilities return; } - mf.data = isVita ? buildAudioPCKVita(audioPCK) : buildAudioPCK(audioPCK); + //mf.data = isVita ? buildAudioPCKVita(audioPCK) : buildAudioPCK(audioPCK); saved = true; } diff --git a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.Designer.cs b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.Designer.cs index 4865f4f3..9c0ca1a1 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.Designer.cs @@ -29,247 +29,247 @@ namespace PckStudio.Forms.Utilities /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(COLEditor)); - this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); - this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); - this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); - this.metroTextBox1 = new MetroFramework.Controls.MetroTextBox(); - this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.tabControl = new MetroFramework.Controls.MetroTabControl(); - this.colorsTab = new System.Windows.Forms.TabPage(); - this.waterTab = new System.Windows.Forms.TabPage(); - this.metroPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.menuStrip.SuspendLayout(); - this.tabControl.SuspendLayout(); - this.SuspendLayout(); - // - // metroPanel1 - // - this.metroPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.metroPanel1.Controls.Add(this.numericUpDown5); - this.metroPanel1.Controls.Add(this.numericUpDown4); - this.metroPanel1.Controls.Add(this.numericUpDown3); - this.metroPanel1.Controls.Add(this.numericUpDown2); - this.metroPanel1.Controls.Add(this.metroLabel6); - this.metroPanel1.Controls.Add(this.metroLabel5); - this.metroPanel1.Controls.Add(this.metroLabel4); - this.metroPanel1.Controls.Add(this.metroLabel3); - this.metroPanel1.Controls.Add(this.metroTextBox1); - this.metroPanel1.Controls.Add(this.metroLabel1); - this.metroPanel1.Controls.Add(this.pictureBox1); - resources.ApplyResources(this.metroPanel1, "metroPanel1"); - this.metroPanel1.HorizontalScrollbarBarColor = true; - this.metroPanel1.HorizontalScrollbarHighlightOnWheel = false; - this.metroPanel1.HorizontalScrollbarSize = 10; - this.metroPanel1.Name = "metroPanel1"; - this.metroPanel1.Style = MetroFramework.MetroColorStyle.Silver; - this.metroPanel1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroPanel1.VerticalScrollbarBarColor = true; - this.metroPanel1.VerticalScrollbarHighlightOnWheel = false; - this.metroPanel1.VerticalScrollbarSize = 10; - // - // numericUpDown5 - // - this.numericUpDown5.BackColor = System.Drawing.SystemColors.Desktop; - this.numericUpDown5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - resources.ApplyResources(this.numericUpDown5, "numericUpDown5"); - this.numericUpDown5.Maximum = new decimal(new int[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(COLEditor)); + this.metroPanel1 = new MetroFramework.Controls.MetroPanel(); + this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.metroLabel6 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel5 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel4 = new MetroFramework.Controls.MetroLabel(); + this.metroLabel3 = new MetroFramework.Controls.MetroLabel(); + this.metroTextBox1 = new MetroFramework.Controls.MetroTextBox(); + this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControl = new MetroFramework.Controls.MetroTabControl(); + this.colorsTab = new System.Windows.Forms.TabPage(); + this.waterTab = new System.Windows.Forms.TabPage(); + this.metroPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.menuStrip.SuspendLayout(); + this.tabControl.SuspendLayout(); + this.SuspendLayout(); + // + // metroPanel1 + // + this.metroPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.metroPanel1.Controls.Add(this.numericUpDown5); + this.metroPanel1.Controls.Add(this.numericUpDown4); + this.metroPanel1.Controls.Add(this.numericUpDown3); + this.metroPanel1.Controls.Add(this.numericUpDown2); + this.metroPanel1.Controls.Add(this.metroLabel6); + this.metroPanel1.Controls.Add(this.metroLabel5); + this.metroPanel1.Controls.Add(this.metroLabel4); + this.metroPanel1.Controls.Add(this.metroLabel3); + this.metroPanel1.Controls.Add(this.metroTextBox1); + this.metroPanel1.Controls.Add(this.metroLabel1); + this.metroPanel1.Controls.Add(this.pictureBox1); + resources.ApplyResources(this.metroPanel1, "metroPanel1"); + this.metroPanel1.HorizontalScrollbarBarColor = true; + this.metroPanel1.HorizontalScrollbarHighlightOnWheel = false; + this.metroPanel1.HorizontalScrollbarSize = 10; + this.metroPanel1.Name = "metroPanel1"; + this.metroPanel1.Style = MetroFramework.MetroColorStyle.Silver; + this.metroPanel1.Theme = MetroFramework.MetroThemeStyle.Dark; + this.metroPanel1.VerticalScrollbarBarColor = true; + this.metroPanel1.VerticalScrollbarHighlightOnWheel = false; + this.metroPanel1.VerticalScrollbarSize = 10; + // + // numericUpDown5 + // + this.numericUpDown5.BackColor = System.Drawing.SystemColors.Desktop; + this.numericUpDown5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + resources.ApplyResources(this.numericUpDown5, "numericUpDown5"); + this.numericUpDown5.Maximum = new decimal(new int[] { 255, 0, 0, 0}); - this.numericUpDown5.Name = "numericUpDown5"; - this.numericUpDown5.ValueChanged += new System.EventHandler(this.color_ValueChanged); - // - // numericUpDown4 - // - this.numericUpDown4.BackColor = System.Drawing.SystemColors.Desktop; - this.numericUpDown4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - resources.ApplyResources(this.numericUpDown4, "numericUpDown4"); - this.numericUpDown4.Maximum = new decimal(new int[] { + this.numericUpDown5.Name = "numericUpDown5"; + this.numericUpDown5.ValueChanged += new System.EventHandler(this.color_ValueChanged); + // + // numericUpDown4 + // + this.numericUpDown4.BackColor = System.Drawing.SystemColors.Desktop; + this.numericUpDown4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + resources.ApplyResources(this.numericUpDown4, "numericUpDown4"); + this.numericUpDown4.Maximum = new decimal(new int[] { 255, 0, 0, 0}); - this.numericUpDown4.Name = "numericUpDown4"; - this.numericUpDown4.ValueChanged += new System.EventHandler(this.color_ValueChanged); - // - // numericUpDown3 - // - this.numericUpDown3.BackColor = System.Drawing.SystemColors.Desktop; - this.numericUpDown3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); - this.numericUpDown3.Maximum = new decimal(new int[] { + this.numericUpDown4.Name = "numericUpDown4"; + this.numericUpDown4.ValueChanged += new System.EventHandler(this.color_ValueChanged); + // + // numericUpDown3 + // + this.numericUpDown3.BackColor = System.Drawing.SystemColors.Desktop; + this.numericUpDown3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); + this.numericUpDown3.Maximum = new decimal(new int[] { 255, 0, 0, 0}); - this.numericUpDown3.Name = "numericUpDown3"; - this.numericUpDown3.ValueChanged += new System.EventHandler(this.color_ValueChanged); - // - // numericUpDown2 - // - this.numericUpDown2.BackColor = System.Drawing.SystemColors.Desktop; - this.numericUpDown2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); - this.numericUpDown2.Maximum = new decimal(new int[] { + this.numericUpDown3.Name = "numericUpDown3"; + this.numericUpDown3.ValueChanged += new System.EventHandler(this.color_ValueChanged); + // + // numericUpDown2 + // + this.numericUpDown2.BackColor = System.Drawing.SystemColors.Desktop; + this.numericUpDown2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); + this.numericUpDown2.Maximum = new decimal(new int[] { 255, 0, 0, 0}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.ValueChanged += new System.EventHandler(this.color_ValueChanged); - // - // metroLabel6 - // - resources.ApplyResources(this.metroLabel6, "metroLabel6"); - this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // metroLabel5 - // - resources.ApplyResources(this.metroLabel5, "metroLabel5"); - this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // metroLabel4 - // - resources.ApplyResources(this.metroLabel4, "metroLabel4"); - this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // metroLabel3 - // - resources.ApplyResources(this.metroLabel3, "metroLabel3"); - this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // metroTextBox1 - // - // - // - // - 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); - // - // metroLabel1 - // - resources.ApplyResources(this.metroLabel1, "metroLabel1"); - this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.Gray; - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // menuStrip - // - resources.ApplyResources(this.menuStrip, "menuStrip"); - this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.ValueChanged += new System.EventHandler(this.color_ValueChanged); + // + // metroLabel6 + // + resources.ApplyResources(this.metroLabel6, "metroLabel6"); + this.metroLabel6.Name = "metroLabel6"; + this.metroLabel6.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // metroLabel5 + // + resources.ApplyResources(this.metroLabel5, "metroLabel5"); + this.metroLabel5.Name = "metroLabel5"; + this.metroLabel5.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // metroLabel4 + // + resources.ApplyResources(this.metroLabel4, "metroLabel4"); + this.metroLabel4.Name = "metroLabel4"; + this.metroLabel4.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // metroLabel3 + // + resources.ApplyResources(this.metroLabel3, "metroLabel3"); + this.metroLabel3.Name = "metroLabel3"; + this.metroLabel3.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // metroTextBox1 + // + // + // + // + 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); + // + // metroLabel1 + // + resources.ApplyResources(this.metroLabel1, "metroLabel1"); + this.metroLabel1.Name = "metroLabel1"; + this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.Gray; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; + // + // menuStrip + // + resources.ApplyResources(this.menuStrip, "menuStrip"); + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem}); - this.menuStrip.Name = "menuStrip"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.Name = "menuStrip"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveToolStripMenuItem1}); - this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); - // - // saveToolStripMenuItem1 - // - resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); - this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; - this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click); - // - // tabControl - // - this.tabControl.Controls.Add(this.colorsTab); - this.tabControl.Controls.Add(this.waterTab); - resources.ApplyResources(this.tabControl, "tabControl"); - this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 0; - this.tabControl.Style = MetroFramework.MetroColorStyle.White; - this.tabControl.Theme = MetroFramework.MetroThemeStyle.Dark; - this.tabControl.UseSelectable = true; - // - // colorsTab - // - this.colorsTab.BackColor = System.Drawing.SystemColors.WindowFrame; - resources.ApplyResources(this.colorsTab, "colorsTab"); - this.colorsTab.Name = "colorsTab"; - // - // waterTab - // - this.waterTab.BackColor = System.Drawing.SystemColors.WindowFrame; - resources.ApplyResources(this.waterTab, "waterTab"); - this.waterTab.Name = "waterTab"; - // - // COLEditor - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.menuStrip); - this.Controls.Add(this.tabControl); - this.Controls.Add(this.metroPanel1); - this.ForeColor = System.Drawing.SystemColors.ControlText; - this.Name = "COLEditor"; - this.Style = MetroFramework.MetroColorStyle.Silver; - this.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroPanel1.ResumeLayout(false); - this.metroPanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.tabControl.ResumeLayout(false); - this.ResumeLayout(false); + this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); + // + // saveToolStripMenuItem1 + // + resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); + this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; + this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click); + // + // tabControl + // + this.tabControl.Controls.Add(this.colorsTab); + this.tabControl.Controls.Add(this.waterTab); + resources.ApplyResources(this.tabControl, "tabControl"); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.Style = MetroFramework.MetroColorStyle.White; + this.tabControl.Theme = MetroFramework.MetroThemeStyle.Dark; + this.tabControl.UseSelectable = true; + // + // colorsTab + // + this.colorsTab.BackColor = System.Drawing.SystemColors.WindowFrame; + resources.ApplyResources(this.colorsTab, "colorsTab"); + this.colorsTab.Name = "colorsTab"; + // + // waterTab + // + this.waterTab.BackColor = System.Drawing.SystemColors.WindowFrame; + resources.ApplyResources(this.waterTab, "waterTab"); + this.waterTab.Name = "waterTab"; + // + // COLEditor + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.menuStrip); + this.Controls.Add(this.tabControl); + this.Controls.Add(this.metroPanel1); + this.ForeColor = System.Drawing.SystemColors.ControlText; + this.Name = "COLEditor"; + this.Style = MetroFramework.MetroColorStyle.Silver; + this.Theme = MetroFramework.MetroThemeStyle.Dark; + this.metroPanel1.ResumeLayout(false); + this.metroPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.tabControl.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.cs b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.cs index 22b2a6f5..7d6b852f 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.cs @@ -9,16 +9,17 @@ using System.Threading.Tasks; using System.Windows.Forms; using MetroFramework.Forms; using PckStudio; +using PckStudio.Classes.FileTypes; namespace PckStudio.Forms.Utilities { public partial class COLEditor : MetroForm { Classes.COL.COLFile cf = new Classes.COL.COLFile(); - PCK.MineFile mf; + PCKFile.FileData mf; TreeView treeView1 = new TreeView(); // Normal Color Table TreeView treeView2 = new TreeView(); // Water Color Table - public COLEditor(byte[] data, PCK.MineFile MineFile) + public COLEditor(byte[] data, PCKFile.FileData MineFile) { InitializeComponent(); metroLabel6.Visible = false; diff --git a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.resx b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.resx index 2d8909c7..4ff3803a 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/COLEditor.resx +++ b/MinecraftUSkinEditor/Forms/Utilities/COLEditor.resx @@ -117,171 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - numericUpDown5 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - metroPanel1 - - - 2 - - - numericUpDown4 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - metroPanel1 - - - 3 - - - numericUpDown3 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - metroPanel1 - - - 4 - - - numericUpDown2 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - metroPanel1 - - - 5 - - - metroLabel6 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 6 - - - metroLabel5 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 7 - - - metroLabel4 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 8 - - - metroLabel3 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 9 - - - metroTextBox1 - - - MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 10 - - - metroLabel1 - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 11 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - metroPanel1 - - - 12 - - - - Fill - - - 20, 60 - - - 612, 523 - - - - 0 - - - metroPanel1 - - - MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 2 - - 373, 338 + 341, 406 127, 20 + 21 @@ -298,7 +141,7 @@ 2 - 373, 312 + 341, 380 127, 20 @@ -319,7 +162,7 @@ 3 - 373, 286 + 341, 354 127, 20 @@ -340,7 +183,7 @@ 4 - 373, 260 + 341, 328 127, 20 @@ -364,7 +207,7 @@ True - 350, 260 + 318, 328 21, 19 @@ -391,7 +234,7 @@ True - 350, 335 + 318, 403 20, 19 @@ -418,7 +261,7 @@ True - 350, 310 + 318, 378 21, 19 @@ -445,7 +288,7 @@ True - 350, 285 + 318, 353 20, 19 @@ -468,6 +311,7 @@ 9 + @@ -487,7 +331,7 @@ False - 373, 231 + 341, 299 127, 23 @@ -511,7 +355,7 @@ True - 327, 231 + 295, 299 46, 19 @@ -535,7 +379,7 @@ 11 - 327, 38 + 295, 106 173, 163 @@ -555,12 +399,58 @@ 12 + + Fill + + + 20, 60 + + + 612, 523 + + + 0 + + + metroPanel1 + + + MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 2 + 17, 17 False + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8 + QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C + y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga + QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN + 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC + + + + 98, 22 + + + Save + + + 37, 20 + + + File + 20, 60 @@ -585,73 +475,6 @@ 0 - - 37, 20 - - - File - - - - 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 - - - - 98, 22 - - - Save - - - colorsTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 0 - - - waterTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - - - 20, 83 - - - 194, 500 - - - 22 - - - tabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 1 - 4, 38 @@ -700,6 +523,27 @@ 1 + + 20, 83 + + + 194, 500 + + + 22 + + + tabControl + + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 1 + True diff --git a/MinecraftUSkinEditor/Forms/Utilities/Pref.cs b/MinecraftUSkinEditor/Forms/Utilities/Pref.cs index 9d913d4f..d5a871d8 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Pref.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/Pref.cs @@ -21,11 +21,13 @@ namespace PckStudio.Forms private void Pref_Load(object sender, EventArgs e) { - string host = File.ReadAllText(Environment.CurrentDirectory + "\\settings.ini").Split(new[] { "\r\n", "\n"}, StringSplitOptions.None)[0]; - metroTextBox1.Text = host; - string host1 = File.ReadAllText(Environment.CurrentDirectory + "\\settings.ini").Split(new[] { "\r\n", "\n"}, StringSplitOptions.None)[1]; - metroTextBox2.Text = host1; - + if (File.Exists(Environment.CurrentDirectory + "\\settings.ini")) + { + string host = File.ReadAllText(Environment.CurrentDirectory + "\\settings.ini").Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)[0]; + metroTextBox1.Text = host; + string host1 = File.ReadAllText(Environment.CurrentDirectory + "\\settings.ini").Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)[1]; + metroTextBox2.Text = host1; + } } private void buttonDonate_Click(object sender, EventArgs e) diff --git a/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs b/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs index 357b39a3..8050a482 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs @@ -23,12 +23,13 @@ using PckStudio; using PckStudio.Forms; using System.IO.Packaging; using RichPresenceClient; +using PckStudio.Classes.FileTypes; namespace PckStudio.Forms.Utilities { public partial class TextureConverterUtility : MetroForm { - public TextureConverterUtility(TreeView tv0, PckStudio.PCK pck) + public TextureConverterUtility(TreeView tv0, PCKFile pck) { InitializeComponent(); TView = tv0; @@ -43,7 +44,7 @@ namespace PckStudio.Forms.Utilities bool ToPC = true; - PckStudio.PCK Pck; + PCKFile Pck; TreeView TView; @@ -329,13 +330,13 @@ namespace PckStudio.Forms.Utilities switch (tn.Text) { case ("terrain.png"): - Terrain = Image.FromStream(new MemoryStream(((PckStudio.PCK.MineFile)(tn.Tag)).data)); + Terrain = Image.FromStream(new MemoryStream(((PCKFile.FileData)(tn.Tag)).data)); break; case ("items.png"): - Items = Image.FromStream(new MemoryStream(((PckStudio.PCK.MineFile)(tn.Tag)).data)); + Items = Image.FromStream(new MemoryStream(((PCKFile.FileData)(tn.Tag)).data)); break; case ("art"): - painting = Image.FromStream(new MemoryStream(((PckStudio.PCK.MineFile)(tn.Nodes[0].Tag)).data)); + painting = Image.FromStream(new MemoryStream(((PCKFile.FileData)(tn.Nodes[0].Tag)).data)); break; case ("mob"): EntityNode = tn; @@ -448,7 +449,7 @@ namespace PckStudio.Forms.Utilities string Outpath = "assets\\minecraft\\textures\\"; - foreach (PckStudio.PCK.MineFile mf in Pck.mineFiles) + foreach (PCKFile.FileData mf in Pck.file_entries) { System.IO.FileInfo file = new System.IO.FileInfo(Environment.CurrentDirectory + "\\Temp\\" + @"\" + mf.name); file.Directory.Create(); // If the directory already exists, this method does nothing. @@ -473,7 +474,7 @@ namespace PckStudio.Forms.Utilities string Outpath = "assets\\minecraft\\textures\\"; - foreach (PckStudio.PCK.MineFile mf in Pck.mineFiles) + foreach (PCKFile.FileData mf in Pck.file_entries) { System.IO.FileInfo file = new System.IO.FileInfo(Environment.CurrentDirectory + "\\Temp\\" + @"\" + mf.name); file.Directory.Create(); // If the directory already exists, this method does nothing. @@ -498,7 +499,7 @@ namespace PckStudio.Forms.Utilities string Outpath = "assets\\minecraft\\textures\\"; - foreach (PckStudio.PCK.MineFile mf in Pck.mineFiles) + foreach (PCKFile.FileData mf in Pck.file_entries) { System.IO.FileInfo file = new System.IO.FileInfo(Environment.CurrentDirectory + "\\Temp\\" + @"\" + mf.name); file.Directory.Create(); // If the directory already exists, this method does nothing. diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs b/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs index 9132be6f..bfac00f2 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs @@ -252,7 +252,6 @@ namespace PckStudio.Forms List pckFiles = Directory.GetFiles(appData + "/PCK Center/myPcks/", "*.*", SearchOption.AllDirectories).Where(file => new string[] { ".pck" }.Contains(Path.GetExtension(file))).ToList(); foreach (string pck in pckFiles) { - int line = 0; string pckName = ""; string author = ""; string desc = ""; @@ -309,7 +308,7 @@ namespace PckStudio.Forms try { - RPC.SetRPC("825875166574673940", "Viewing the PCK Center", "Program by PhoenixARC", "pcklogo", "PCK Studio", "pcklogo"); + RPC.SetRPC("Viewing the PCK Center", "Program by PhoenixARC", "pcklogo", "PCK Studio", "pcklogo"); } catch { diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs b/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs index f08af118..9ea92902 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs +++ b/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs @@ -16,6 +16,7 @@ using System.IO.Packaging; using PckStudio; using System.IO.Compression; using static PckStudio.FormMain; +using PckStudio.Classes.FileTypes; namespace PckStudio.Forms { @@ -132,11 +133,16 @@ namespace PckStudio.Forms //MessageBox.Show(root);//debug thingy to make sure filepath is correct //add all skins to a list - List skinsList = new List(); - List capesList = new List(); - PCK pck = new PCK(appData + "/PCK Center/myPcks/" + mod + ".pck"); //sets opened pck - PCK currentPCK = pck; //sets opened pck - foreach (PCK.MineFile skin in currentPCK.mineFiles) + List skinsList = new List(); + List capesList = new List(); + + PCKFile pck = null; + using (var stream = File.OpenRead(appData + "/PCK Center/myPcks/" + mod + ".pck")) + { + pck = new PCKFile(stream); //sets opened pck + } + PCKFile currentPCK = pck; //sets opened pck + foreach (PCKFile.FileData skin in currentPCK.file_entries) { if (skin.name.Count() == 19) { @@ -170,24 +176,24 @@ namespace PckStudio.Forms writeSkins.WriteLine(" \"skins\": ["); int skinAmount = 0; - foreach (PCK.MineFile newSkin in skinsList) + foreach (PCKFile.FileData newSkin in skinsList) { skinAmount += 1; string skinName = "skinName"; string capePath = ""; bool hasCape = false; - foreach (Object[] entry in newSkin.entries) + foreach (var entry in newSkin.properties) { - if (entry[0].ToString() == "DISPLAYNAME") + if (entry.Key.ToString() == "DISPLAYNAME") { - skinName = entry[1].ToString(); - skinDisplayNames.Add(new Item() { Id = newSkin.name.Remove(15, 4), Name = entry[1].ToString() }); + skinName = entry.Value.ToString(); + skinDisplayNames.Add(new Item() { Id = newSkin.name.Remove(15, 4), Name = entry.Value.ToString() }); } - if (entry[0].ToString() == "CAPEPATH") + if (entry.Key.ToString() == "CAPEPATH") { hasCape = true; - capePath = entry[1].ToString(); + capePath = entry.Value.ToString(); } } @@ -227,7 +233,7 @@ namespace PckStudio.Forms { writeSkins.WriteLine("{"); int newSkinCount = 0; - foreach (PCK.MineFile newSkin in skinsList) + foreach (PCKFile.FileData newSkin in skinsList) { newSkinCount += 1; @@ -259,13 +265,13 @@ namespace PckStudio.Forms if (skinPicture.Height == skinPicture.Width) { //determines skin type based on image dimensions, existence of BOX tags, and the ANIM value - foreach (Object[] entry in newSkin.entries) + foreach (var entry in newSkin.properties) { - if (entry[0].ToString() == "BOX") + if (entry.Key.ToString() == "BOX") { string mClass = ""; string mData = ""; - foreach (char dCheck in entry[1].ToString()) + foreach (char dCheck in entry.Value.ToString()) { if (dCheck.ToString() != " ") { @@ -273,7 +279,7 @@ namespace PckStudio.Forms } else { - mData = entry[1].ToString().Remove(0, mClass.Count() + 1); + mData = entry.Value.ToString().Remove(0, mClass.Count() + 1); break; } } @@ -310,13 +316,13 @@ namespace PckStudio.Forms } } - if (entry[0].ToString() == "OFFSET") + if (entry.Key.ToString() == "OFFSET") { string oClass = ""; string oData = ""; - foreach (char oCheck in entry[1].ToString()) + foreach (char oCheck in entry.Value.ToString()) { - oData = entry[1].ToString(); + oData = entry.Value.ToString(); if (oCheck.ToString() != " ") { oClass += oCheck.ToString(); @@ -345,13 +351,13 @@ namespace PckStudio.Forms } } - if (entry[0].ToString() == "ANIM") + if (entry.Key.ToString() == "ANIM") { - if (entry[1].ToString() == "0x40000") + if (entry.Value.ToString() == "0x40000") { } - else if (entry[1].ToString() == "0x80000") + else if (entry.Value.ToString() == "0x80000") { skinType = "alex"; } @@ -1015,7 +1021,7 @@ namespace PckStudio.Forms } //adds skin textures - foreach (PCK.MineFile skinTexture in skinsList) + foreach (PCKFile.FileData skinTexture in skinsList) { var ms = new MemoryStream(skinTexture.data); Bitmap saveSkin = new Bitmap(Image.FromStream(ms)); @@ -1035,7 +1041,7 @@ namespace PckStudio.Forms } //adds cape textures - foreach (PCK.MineFile capeTexture in capesList) + foreach (PCKFile.FileData capeTexture in capesList) { File.WriteAllBytes(root + "/" + capeTexture.name, capeTexture.data); } diff --git a/MinecraftUSkinEditor/Forms/ZipArchive.cs b/MinecraftUSkinEditor/Forms/ZipArchive.cs deleted file mode 100644 index e02ce7ff..00000000 --- a/MinecraftUSkinEditor/Forms/ZipArchive.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace PckStudio -{ - internal class ZipArchive - { - } -} \ No newline at end of file diff --git a/MinecraftUSkinEditor/PckStudio.csproj b/MinecraftUSkinEditor/PckStudio.csproj index 1fc9611c..a1749118 100644 --- a/MinecraftUSkinEditor/PckStudio.csproj +++ b/MinecraftUSkinEditor/PckStudio.csproj @@ -139,6 +139,7 @@ + @@ -168,7 +169,6 @@ - @@ -270,12 +270,6 @@ SkinPreview.cs - - Form - - - Testx-12.cs - Form @@ -378,7 +372,6 @@ TextureConverterUtility.cs - True True @@ -387,7 +380,6 @@ Component - Form @@ -502,9 +494,6 @@ SkinPreview.cs - - Testx-12.cs - AnimationEditor.cs @@ -635,7 +624,7 @@ - + @@ -649,7 +638,6 @@ - @@ -665,13 +653,10 @@ - - - @@ -679,6 +664,8 @@ + + @@ -714,9 +701,6 @@ false - - -