LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-27 13:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SkinModelImporter - Small code clean up inside 'ImportBedrockJson'

Browse Source
This commit is contained in:
miku-666
2024-08-20 20:21:12 +02:00
parent d9fe5ac589
commit 65fc0aa371
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PCK-Studio/Internal/SkinModelImporter.cs
View File

@@ -232,12 +232,11 @@ namespace PckStudio.Internal
var availableModels = bedrockModel.Models.Select(m => m.Description.Identifier).ToArray();
if (availableModels.Length > 1)
{
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
using ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && bedrockModel.Models.IndexInRange(itemSelectionPopUp.SelectedIndex))
{
selectedGeometry = bedrockModel.Models[itemSelectionPopUp.SelectedIndex];
}
itemSelectionPopUp.Dispose();
}
else
{
@@ -252,12 +251,11 @@ namespace PckStudio.Internal
var availableModels = bedrockModel.Select(m => m.Key).ToArray();
if (availableModels.Length > 1)
{
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && itemSelectionPopUp.SelectedItem is not null)
using ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && bedrockModel.ContainsKey(itemSelectionPopUp.SelectedItem))
{
selectedGeometry = bedrockModel[itemSelectionPopUp.SelectedItem];
}
itemSelectionPopUp.Dispose();
}
else
{
@@ -269,8 +267,8 @@ namespace PckStudio.Internal
if (selectedGeometry is not null)
{
modelInfo = LoadGeometry(selectedGeometry);
}
modelInfo.Texture = SwapBoxBottomTexture(modelInfo);
}
return modelInfo;
}