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

MainForm - Improved pck file access by specifing the filetype

Browse Source
This commit is contained in:
miku-666
2023-06-03 17:53:18 +02:00
parent 8e312d4ae4
commit 7d57ef70fc
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PCK-Studio/MainForm.cs
View File

@@ -348,7 +348,7 @@ namespace PckStudio
if (!(file.Filename.StartsWith("res/textures/blocks/") || file.Filename.StartsWith("res/textures/items/")))
return;
if (file.IsMipmappedFile() && currentPCK.Files.TryGetValue(file.GetNormalPath(), out PckFile.FileData originalAnimationFile))
if (file.IsMipmappedFile() && currentPCK.Files.TryGetValue(file.GetNormalPath(), PckFile.FileData.FileType.TextureFile, out PckFile.FileData originalAnimationFile))
{
file = originalAnimationFile;
}
@@ -424,18 +424,18 @@ namespace PckStudio
using (var ms = new MemoryStream(file.Data))
{
var texture = Image.FromStream(ms);
if (file.Properties.HasProperty("BOX"))
{
using generateModel generate = new generateModel(file.Properties, texture);
if (generate.ShowDialog() == DialogResult.OK)
{
entryDataTextBox.Text = entryTypeTextBox.Text = string.Empty;
wasModified = true;
ReloadMetaTreeView();
}
}
else
{
if (file.Properties.HasProperty("BOX"))
{
using generateModel generate = new generateModel(file.Properties, texture);
if (generate.ShowDialog() == DialogResult.OK)
{
entryDataTextBox.Text = entryTypeTextBox.Text = string.Empty;
wasModified = true;
ReloadMetaTreeView();
}
}
else
{
SkinPreview frm = new SkinPreview(texture, file.Properties.GetPropertyValue("ANIM", SkinANIM.FromString));
frm.ShowDialog(this);
frm.Dispose();
@@ -836,7 +836,7 @@ namespace PckStudio
// MessageBox.Show("There is already an music cues PCK present in this PCK!", "Can't create audio.pck");
// return;
//}
if (currentPCK.Files.Contains("audio.pck"))
if (currentPCK.Files.Contains("audio.pck", PckFile.FileData.FileType.AudioFile))
{
// the chance of this happening is really really slim but just in case
MessageBox.Show("There is already a file in this PCK named \"audio.pck\"!", "Can't create audio.pck");

2
Vendor/OMI-Lib vendored

Submodule Vendor/OMI-Lib updated: cf6ccf9365...ad926eeca1