From c930c59524c5d1fc2880e8a117df3e7e4c171dec Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:47:17 +0200 Subject: [PATCH] MainForm - Small code refactor --- PCK-Studio/MainForm.cs | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 963fbae4..fcbb965e 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -573,11 +573,11 @@ namespace PckStudio public void HandleSkinFile(PckAsset asset) { - var skin = asset.GetSkin(); + Skin skin = asset.GetSkin(); if (asset.HasProperty("CAPEPATH")) { string capePath = asset.GetProperty("CAPEPATH"); - if (currentPCK.TryGetAsset(capePath, PckAssetType.CapeFile, out var cape)) + if (currentPCK.TryGetAsset(capePath, PckAssetType.CapeFile, out PckAsset cape)) { skin.CapeTexture = cape.GetTexture(); } @@ -586,7 +586,7 @@ namespace PckStudio using CustomSkinEditor skinEditor = new CustomSkinEditor(skin, currentPCK.HasVerionString); if (skinEditor.ShowDialog() == DialogResult.OK) { - if (!TryGetLocFile(out var locFile)) + if (!TryGetLocFile(out LOCFile locFile)) Debug.Fail("Failed to aquire loc file."); asset.SetSkin(skinEditor.ResultSkin, locFile); @@ -605,20 +605,6 @@ namespace PckStudio return; } -#if false - Dictionary modelMetaData = new(); - foreach (Model model in modelContainer.Models.Values) - { - bool hasMetaData = ModelImporter.ModelTextureLocations.ContainsKey(model.Name); - if (!hasMetaData) - { - Debug.WriteLine("No meta data found for: " + model.Name); - modelMetaData.Add(model.Name, new JsonModelMetaData() { TextureLocations = new string[1] }); - } - } - Debug.WriteLineIf(modelMetaData.Count > 0, JsonConvert.SerializeObject(modelMetaData, Formatting.Indented)); -#endif - using ItemSelectionPopUp itemSelection = new ItemSelectionPopUp(modelContainer.GetModelNames().ToArray()); if (itemSelection.ShowDialog() == DialogResult.OK && modelContainer.ContainsModel(itemSelection.SelectedItem)) {