LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-16 01:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

CustomSkinEditor - Rename 'skinModelFileFilters' to 'AvailableModelFileFilters' and add check when importing blockbench model

Browse Source
This commit is contained in:
miku-666
2024-04-16 20:15:27 +02:00
parent 50959fe7cf
commit fd1f64a5f9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PCK-Studio/Forms/Editor/CustomSkinEditor.cs
View File

@@ -42,7 +42,7 @@ namespace PckStudio.Forms.Editor
new ("Bedrock Legacy Model(*.json)", "*.json"),
];
private string skinModelFileFilters => string.Join("|", fileFilters);
private string AvailableModelFileFilters => string.Join("|", fileFilters);
private BindingSource skinPartListBindingSource;
private BindingSource skinOffsetListBindingSource;
@@ -176,7 +176,7 @@ namespace PckStudio.Forms.Editor
{
SaveFileDialog saveFileDialog = new SaveFileDialog();
saveFileDialog.Title = "Save Model File";
saveFileDialog.Filter = skinModelFileFilters;
saveFileDialog.Filter = AvailableModelFileFilters;
if (saveFileDialog.ShowDialog() != DialogResult.OK)
return;
string fileExtension = Path.GetExtension(saveFileDialog.FileName);
@@ -195,7 +195,7 @@ namespace PckStudio.Forms.Editor
{
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.Title = "Select Model File";
openFileDialog.Filter = skinModelFileFilters;
openFileDialog.Filter = AvailableModelFileFilters;
if (MessageBox.Show("Import custom model project file? Your current work will be lost!", "", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1) == DialogResult.Yes && openFileDialog.ShowDialog() == DialogResult.OK)
{
string fileExtension = Path.GetExtension(openFileDialog.FileName);
@@ -243,7 +243,7 @@ namespace PckStudio.Forms.Editor
if (token.Type == JTokenType.String && Guid.TryParse((string)token, out Guid tokenGuid))
{
Element element = blockBenchModel.Elements.First(e => e.Uuid.Equals(tokenGuid));
if (!SkinBOX.IsValidType(element.Name))
if (!SkinBOX.IsValidType(element.Name) || element.Type != "cube")
continue;
LoadElement(element.Name, element);
continue;