Replace BinaryWriter instances with BinaryWriter2

Minor additional updates to AttribSys writing. Also does further cleanup and normalization.
burninrubber0 · Aug 24, 2023 · 1d2259a · 1d2259a
1 parent 0fd8f41
commit 1d2259a
Show file tree

Hide file tree

Showing 39 changed files with 784 additions and 890 deletions.
diff --git a/BaseHandlers/AptData.cs b/BaseHandlers/AptData.cs
@@ -669,7 +669,7 @@ public static Character Read(BinaryReader2 br, uint dataStart)
             return result;
         }
 
-        public void Write(BinaryWriter bw)
+        public void Write(BinaryWriter2 bw)
         {
             bw.Write((uint)Type);
             bw.Write(Signature);
@@ -779,7 +779,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             // TODO: Write
 

diff --git a/BaseHandlers/IDList.cs b/BaseHandlers/IDList.cs
@@ -66,7 +66,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(ReferenceEntryIDOffset);
             bw.Write(Unknown2);

diff --git a/BaseHandlers/InstanceList.cs b/BaseHandlers/InstanceList.cs
@@ -38,7 +38,7 @@ public static ModelInstance Read(BinaryReader2 br)
             return result;
         }
 
-        public void Write(BinaryWriter bw)
+        public void Write(BinaryWriter2 bw)
         {
             bw.Write(ModelEntryPtr);
             bw.Write(Unknown2);
@@ -120,7 +120,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(Unknown1);
             bw.Write(Instances.Count);

diff --git a/BaseHandlers/ProgressionData.cs b/BaseHandlers/ProgressionData.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using BundleFormat;
@@ -603,7 +603,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             // TODO: Write
 

diff --git a/BaseHandlers/StreetData.cs b/BaseHandlers/StreetData.cs
@@ -263,7 +263,8 @@ public bool Read(BundleEntry entry, ILoader loader = null)
         public bool Write(BundleEntry entry)
         {
             MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter2 bw = new BinaryWriter2(ms);
+            bw.BigEndian = entry.Console;
 
             bw.Write(Unknown1);
             long fileSizeOffset = bw.BaseStream.Position;