From a78b2a1b8a7933d09b4724590217d13294506c90 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:00:44 +0200
Subject: [PATCH] Move StreamData{Reader/Writer} to `Classes/IO`

---
 MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs      | 1 -
 MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs      | 1 -
 MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs      | 1 -
 MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs      | 3 ---
 MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs | 8 +++-----
 MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs | 4 ----
 MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs      | 2 --
 MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs      | 3 ---
 .../Classes/{Utils => IO}/StreamDataReader.cs             | 2 +-
 .../Classes/{Utils => IO}/StreamDataWriter.cs             | 2 +-
 10 files changed, 5 insertions(+), 22 deletions(-)
 rename MinecraftUSkinEditor/Classes/{Utils => IO}/StreamDataReader.cs (98%)
 rename MinecraftUSkinEditor/Classes/{Utils => IO}/StreamDataWriter.cs (98%)

diff --git a/MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs b/MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs
index 696a60f0..efa4e214 100644
--- a/MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs
@@ -1,5 +1,4 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System.IO;
 using System.Text;
 using static PckStudio.Classes.FileTypes.COLFile;
diff --git a/MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs
index 4e4bce3b..8b254257 100644
--- a/MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs
@@ -1,5 +1,4 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System;
 using System.IO;
 using System.Text;
diff --git a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs b/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs
index fa12766f..632f7a6f 100644
--- a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 
 namespace PckStudio.Classes.IO.LOC
 {
diff --git a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs
index 0faf244b..64f52b32 100644
--- a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs
@@ -1,9 +1,6 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace PckStudio.Classes.IO.LOC
diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs
index 8b704a0a..6b8e9ac8 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs
@@ -1,11 +1,9 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace PckStudio.Classes.IO.PCK
 {
@@ -20,6 +18,7 @@ namespace PckStudio.Classes.IO.PCK
     {
         private PCKAudioFile _file;
         private List<string> LUT = new List<string>();
+        private List<PCKAudioFile.AudioCategory.EAudioType> _OriginalAudioTypeOrder = new List<PCKAudioFile.AudioCategory.EAudioType>();
 
 
         public static PCKAudioFile Read(Stream stream, bool isLittleEndian)
@@ -56,7 +55,6 @@ namespace PckStudio.Classes.IO.PCK
             }
         }
 
-        private List<PCKAudioFile.AudioCategory.EAudioType> original_audio_types = new List<PCKAudioFile.AudioCategory.EAudioType>();
         private void ReadCategories(Stream stream)
         {
             int categoryEntryCount = ReadInt(stream);
@@ -67,7 +65,7 @@ namespace PckStudio.Classes.IO.PCK
                 string name = ReadString(stream);
                 // AddCategory puts the file's categories out of order and causes some songs to be put in the wrong categories
                 // This is my simple fix for the issue.
-                original_audio_types.Add(audioType);
+                _OriginalAudioTypeOrder.Add(audioType);
                 _file.AddCategory(parameterType, audioType, name);
             }
         }
@@ -76,7 +74,7 @@ namespace PckStudio.Classes.IO.PCK
         {
             List<string> credits = new List<string>();
             List<string> creditIds = new List<string>();
-            foreach (var c in original_audio_types)
+            foreach (var c in _OriginalAudioTypeOrder)
             {
                 int audioCount = ReadInt(stream);
                 for (; 0 < audioCount; audioCount--)
diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs
index 18628ec4..379fb533 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs
@@ -1,11 +1,7 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace PckStudio.Classes.IO.PCK
 {
diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
index c99fb787..7e7900f6 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs
@@ -1,10 +1,8 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Windows;
 
 namespace PckStudio.Classes.IO
 {
diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
index 7fd038bd..e5f4706a 100644
--- a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs
@@ -1,11 +1,8 @@
 using PckStudio.Classes.FileTypes;
-using PckStudio.Classes.Utils;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace PckStudio.Classes.IO
 {
diff --git a/MinecraftUSkinEditor/Classes/Utils/StreamDataReader.cs b/MinecraftUSkinEditor/Classes/IO/StreamDataReader.cs
similarity index 98%
rename from MinecraftUSkinEditor/Classes/Utils/StreamDataReader.cs
rename to MinecraftUSkinEditor/Classes/IO/StreamDataReader.cs
index c601290b..13a1dc73 100644
--- a/MinecraftUSkinEditor/Classes/Utils/StreamDataReader.cs
+++ b/MinecraftUSkinEditor/Classes/IO/StreamDataReader.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PckStudio.Classes.Utils
+namespace PckStudio.Classes.IO
 {
     public class StreamDataReader
     {
diff --git a/MinecraftUSkinEditor/Classes/Utils/StreamDataWriter.cs b/MinecraftUSkinEditor/Classes/IO/StreamDataWriter.cs
similarity index 98%
rename from MinecraftUSkinEditor/Classes/Utils/StreamDataWriter.cs
rename to MinecraftUSkinEditor/Classes/IO/StreamDataWriter.cs
index 5bc2f054..df1b3b20 100644
--- a/MinecraftUSkinEditor/Classes/Utils/StreamDataWriter.cs
+++ b/MinecraftUSkinEditor/Classes/IO/StreamDataWriter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PckStudio.Classes.Utils
+namespace PckStudio.Classes.IO
 {
     internal class StreamDataWriter
     {