From fb1bde2257af1fe86e047e5f979ebf47a7bc76ee Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:25:27 +0200
Subject: [PATCH] Update PCKFileReader/Writer

---
 MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs | 8 +++-----
 MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
index 507ac7fc..5ceffc6a 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
@@ -61,8 +61,6 @@ namespace PckStudio.Classes.IO
             foreach (var file_entry in _file.file_entries)
             {
                 int property_count = ReadInt(stream);
-
-                var properties = new PCKProperties();
                 for (; 0 < property_count; property_count--)
                 {
                     int index = ReadInt(stream);
@@ -70,11 +68,11 @@ namespace PckStudio.Classes.IO
                         throw new Exception("Value not found");
                     string key = GetKeyFromValue(_file.meta_data, index);
                     string value = ReadString(stream);
-                    properties.Add(new Tuple<string, string>(key, value));
+                    file_entry.properties.Add(new ValueTuple<string, string>(key, value));
                     ReadInt(stream); // padding ???
                 }
-                file_entry.properties = properties;
-                stream.Read(file_entry.data, 0, file_entry.size); // file data buffer is only allocated when FileData is constructed with `dataSize`
+                // file data buffer is only allocated when FileData is constructed with `dataSize`
+                stream.Read(file_entry.data, 0, file_entry.size);
             }
         }
         private static T1 GetKeyFromValue<T1, T2>(Dictionary<T1, T2> dict, T2 value)
diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
index 76c25b15..f2f35853 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
@@ -36,7 +36,7 @@ namespace PckStudio.Classes.IO
             byte[] buffer = BitConverter.GetBytes(value);
             if (BitConverter.IsLittleEndian && !isLittleEndian)
                 Array.Reverse(buffer);
-            stream.Write(buffer, 0, buffer.Length);
+            stream.Write(buffer, 0, 4);
         }
 
         internal void WriteString(Stream stream, string s)