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

Fix for loss of data in rebuilt sub-pcks

Browse Source
This commit is contained in:
MattN-L
2024-03-30 15:48:07 -04:00
parent 613795d960
commit b0ed143843
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/Internal/ApplicationBuildInfo.cs
View File

@@ -25,7 +25,7 @@ namespace PckStudio.Internal
{
// this is to specify which build release this is. This is manually updated for now
// TODO: add different chars for different configurations
private const string BuildType = "b";
private const string BuildType = "c";
private static System.Globalization.Calendar _buildCalendar;
private static DateTime date = new FileInfo(Assembly.GetExecutingAssembly().Location).LastWriteTime;
private static string _betaBuildVersion;

30
PCK-Studio/MainForm.cs
View File

@@ -929,7 +929,6 @@ namespace PckStudio
using AddNewSkin add = new AddNewSkin(locFile);
if (add.ShowDialog() == DialogResult.OK)
{
if (currentPCK.HasFile("Skins.pck", PckFileType.SkinDataFile)) // Prioritize Skins.pck
{
TreeNode subPCK = treeViewMain.Nodes.Find("Skins.pck", false).FirstOrDefault();
@@ -1096,16 +1095,38 @@ namespace PckStudio
if (parent == null) return;
PckFileData parent_file = parent.Tag as PckFileData;
PckFile parent_file_pck =
new PckFileReader(
LittleEndianCheckBox.Checked ?
OMI.Endianness.LittleEndian :
OMI.Endianness.BigEndian
).FromStream(new MemoryStream(parent_file.Data));
if (parent_file.Filetype is PckFileType.TexturePackInfoFile || parent_file.Filetype is PckFileType.SkinDataFile)
{
Debug.WriteLine("Rebuilding " + parent_file.Filename);
PckFile newPCKFile = new PckFile(3, parent_file.Filetype is PckFileType.SkinDataFile);
bool hasSkinsFolder = false;
// add original pck files to prevent data loss
foreach (PckFileData _fd in parent_file_pck.GetFiles())
{
PckFileData new_file = newPCKFile.CreateNewFile(_fd.Filename, _fd.Filetype);
// check for skins folder so files are placed consistently in final pck
if (_fd.Filename.StartsWith("Skins/") && parent_file.Filetype is PckFileType.SkinDataFile) hasSkinsFolder = true;
foreach (var prop in _fd.GetProperties())
new_file.AddProperty(prop);
new_file.SetData(_fd.Data);
}
foreach (TreeNode node in GetAllChildNodes(parent.Nodes))
{
if (node.Tag is PckFileData node_file)
{
PckFileData new_file = newPCKFile.CreateNewFile(node_file.Filename.Replace(parent_file.Filename + "/", String.Empty), node_file.Filetype);
PckFileData new_file = newPCKFile.CreateNewFile(
(hasSkinsFolder ? "Skins/" : String.Empty)
+ node_file.Filename.Replace(parent_file.Filename + "/", String.Empty), node_file.Filetype);
foreach (var prop in node_file.GetProperties())
new_file.AddProperty(prop);
new_file.SetData(node_file.Data);
@@ -1115,7 +1136,12 @@ namespace PckStudio
parent_file.SetData(new PckFileWriter(newPCKFile, LittleEndianCheckBox.Checked ? OMI.Endianness.LittleEndian : OMI.Endianness.BigEndian));
parent.Tag = parent_file;
// erase hidden sub-pck nodes to prevent duplication
parent.Nodes.Clear();
BuildMainTreeView();
MessageBox.Show(this, $"Files added successfully to {parent_file.Filename}");
}
}