From 2d319747a96d29284655e75c20dcd1bc4454e515 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Thu, 14 Jul 2022 14:34:10 +0200 Subject: [PATCH] Simplefied XMLVERSION check in PCKFileReader/Writer --- MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs | 4 +--- MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs index a7b3bf88..3f1cc441 100644 --- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs +++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs @@ -32,16 +32,14 @@ namespace PckStudio.Classes.IO internal void ReadMetaData(Stream stream) { int meta_entry_count = ReadInt(stream); - bool has_xml_tag = false; _file.meta_data.Capacity = meta_entry_count; for (; 0 < meta_entry_count; meta_entry_count--) { int index = ReadInt(stream); string value = ReadString(stream); - if (value.Equals("XMLVERSION")) has_xml_tag = true; _file.meta_data.Insert(index, value); } - if (has_xml_tag) + if (_file.meta_data.Contains("XMLVERSION")) Console.WriteLine(ReadInt(stream)); // xml version num ?? } diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs index f4505115..8e21ea33 100644 --- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs +++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs @@ -40,14 +40,12 @@ namespace PckStudio.Classes.IO internal void WriteMetaEntries(Stream stream) { WriteInt(stream, _file.meta_data.Count); - bool has_xmlverion_tag = false; - foreach (var metaEntry in _file.meta_data) + _file.meta_data.ForEach(entry => { - if (metaEntry == "XMLVERSION") has_xmlverion_tag = true; - WriteInt(stream, _file.meta_data.IndexOf(metaEntry)); - WriteString(stream, metaEntry); - } - if (has_xmlverion_tag) + WriteInt(stream, _file.meta_data.IndexOf(entry)); + WriteString(stream, entry); + }); + if (_file.meta_data.Contains("XMLVERSION")) WriteInt(stream, 0x1337); // :^) }