From e3e12db152686c17123d8a11b8b3d640d5f6afb0 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 26 Jun 2022 20:15:06 +0200 Subject: [PATCH] Update addnewskin properties --- .../Forms/Skins-And-Textures/addnewskin.cs | 8 ++++++-- MinecraftUSkinEditor/MainForm.cs | 11 +++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs index e1b08100..cbbf425b 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs +++ b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs @@ -11,8 +11,12 @@ namespace PckStudio public partial class addNewSkin : MetroFramework.Forms.MetroForm { LOCFile currentLoc; - public PCKFile.FileData skin { get; private set; } = new PCKFile.FileData("skin", 0); - public PCKFile.FileData cape { get; private set; } = new PCKFile.FileData("cape", 1); + PCKFile.FileData skin = new PCKFile.FileData("dlcskin", 0); + PCKFile.FileData cape = new PCKFile.FileData("dlccape", 1); + + public PCKFile.FileData Skin => skin; + public PCKFile.FileData Cape => cape; + eSkinType skinType; public bool useCape = false; string localID = "0"; diff --git a/MinecraftUSkinEditor/MainForm.cs b/MinecraftUSkinEditor/MainForm.cs index d545e6b9..fe28050e 100644 --- a/MinecraftUSkinEditor/MainForm.cs +++ b/MinecraftUSkinEditor/MainForm.cs @@ -407,11 +407,10 @@ namespace PckStudio if (add.ShowDialog() == DialogResult.OK) { if (add.useCape) - currentPCK.file_entries.Add(add.cape); + currentPCK.file_entries.Add(add.Cape); if (!(treeViewMain.SelectedNode.Tag is PCKFile.FileData)) - add.skin.name = $"{treeViewMain.SelectedNode.FullPath}/{add.skin.name}"; - currentPCK.file_entries.Add(add.skin); - + add.Skin.name = $"{treeViewMain.SelectedNode.FullPath}/{add.Skin.name}"; + currentPCK.file_entries.Add(add.Skin); TrySetLocFile(locFile); saved = false; BuildMainTreeView(); @@ -533,10 +532,10 @@ namespace PckStudio diag.Dispose(); } - //Checks to see if selected minefile is a binka file //System.Threading.ThreadStart starter; //System.Threading.Thread binkam; + //Checks to see if selected minefile is a binka file if (Path.GetExtension(file.name) == ".binka") { MessageBox.Show(".binka Editor Coming Soon!"); @@ -547,7 +546,7 @@ namespace PckStudio { var node = e.Node; if (node == null || !(node.Tag is ValueTuple)) return; - var property = (ValueTuple)node.Tag;; + var property = (ValueTuple)node.Tag; entryTypeTextBox.Text = property.Item1; entryDataTextBox.Text = property.Item2; }