From 3f0ee70b7136df09848cb59223355a0dd01b170a Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 30 Oct 2025 23:30:45 -0400
Subject: [PATCH] Quantum model cleanup

---
 SabreTools.Serialization/Models/Quantum/Archive.cs  |  6 +++---
 .../Models/Quantum/Constants.cs                     |  2 +-
 .../Models/Quantum/FileDescriptor.cs                | 12 ++++++------
 SabreTools.Serialization/Models/Quantum/Header.cs   |  4 ++--
 .../Wrappers/Quantum.Printing.cs                    | 13 +++----------
 SabreTools.Serialization/Wrappers/Quantum.cs        |  6 +++---
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/SabreTools.Serialization/Models/Quantum/Archive.cs b/SabreTools.Serialization/Models/Quantum/Archive.cs
index a114e7ba..b198c939 100644
--- a/SabreTools.Serialization/Models/Quantum/Archive.cs
+++ b/SabreTools.Serialization/Models/Quantum/Archive.cs
@@ -9,16 +9,16 @@ namespace SabreTools.Data.Models.Quantum
         /// <summary>
         /// Quantum header
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; }
 
         /// <summary>
         /// This is immediately followed by the list of files
         /// </summary>
-        public FileDescriptor[]? FileList { get; set; }
+        public FileDescriptor[] FileList { get; set; }
 
         /// <summary>
         /// Immediately following the list of files is the compressed data
         /// </summary>
         public long CompressedDataOffset { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/Quantum/Constants.cs b/SabreTools.Serialization/Models/Quantum/Constants.cs
index 413e568f..e9725ff9 100644
--- a/SabreTools.Serialization/Models/Quantum/Constants.cs
+++ b/SabreTools.Serialization/Models/Quantum/Constants.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.Quantum
 
         public const ushort SignatureUInt16 = 0x5344;
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/Quantum/FileDescriptor.cs b/SabreTools.Serialization/Models/Quantum/FileDescriptor.cs
index 48f02ca0..51c89e35 100644
--- a/SabreTools.Serialization/Models/Quantum/FileDescriptor.cs
+++ b/SabreTools.Serialization/Models/Quantum/FileDescriptor.cs
@@ -10,11 +10,11 @@ namespace SabreTools.Data.Models.Quantum
         /// Length of file name
         /// </summary>
         public int FileNameSize { get; set; }
-        
+
         /// <summary>
         /// File name, variable length string, not zero-terminated
         /// </summary>
-        public string? FileName { get; set; }
+        public string FileName { get; set; }
 
         /// <summary>
         /// Length of comment field
@@ -24,7 +24,7 @@ namespace SabreTools.Data.Models.Quantum
         /// <summary>
         /// Comment field, variable length string, not zero-terminated
         /// </summary>
-        public string? CommentField { get; set; }
+        public string CommentField { get; set; }
 
         /// <summary>
         /// Fully expanded file size in bytes
@@ -32,12 +32,12 @@ namespace SabreTools.Data.Models.Quantum
         public uint ExpandedFileSize { get; set; }
 
         /// <summary>
-        /// File time (DOS format) 
+        /// File time (DOS format)
         /// </summary>
         public ushort FileTime { get; set; }
 
         /// <summary>
-        /// File date (DOS format) 
+        /// File date (DOS format)
         /// </summary>
         public ushort FileDate { get; set; }
 
@@ -47,4 +47,4 @@ namespace SabreTools.Data.Models.Quantum
         /// <remarks>Minor version 22</remarks>
         public ushort? Unknown { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/Quantum/Header.cs b/SabreTools.Serialization/Models/Quantum/Header.cs
index ca893911..ffb592a7 100644
--- a/SabreTools.Serialization/Models/Quantum/Header.cs
+++ b/SabreTools.Serialization/Models/Quantum/Header.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Data.Models.Quantum
         /// Quantum signature: 0x44 0x53
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 2)]
-        public string? Signature;
+        public string Signature;
 
         /// <summary>
         /// Quantum major version number
@@ -40,4 +40,4 @@ namespace SabreTools.Data.Models.Quantum
         /// </summary>
         public byte CompressionFlags;
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Wrappers/Quantum.Printing.cs b/SabreTools.Serialization/Wrappers/Quantum.Printing.cs
index d22a802e..83ed3302 100644
--- a/SabreTools.Serialization/Wrappers/Quantum.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/Quantum.Printing.cs
@@ -24,17 +24,10 @@ namespace SabreTools.Serialization.Wrappers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, Header? header)
+        private static void Print(StringBuilder builder, Header header)
         {
             builder.AppendLine("  Header Information:");
             builder.AppendLine("  -------------------------");
-            if (header == null)
-            {
-                builder.AppendLine("  No header");
-                builder.AppendLine();
-                return;
-            }
-
             builder.AppendLine(header.Signature, "  Signature");
             builder.AppendLine(header.MajorVersion, "  Major version");
             builder.AppendLine(header.MinorVersion, "  Minor version");
@@ -44,11 +37,11 @@ namespace SabreTools.Serialization.Wrappers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, FileDescriptor[]? entries)
+        private static void Print(StringBuilder builder, FileDescriptor[] entries)
         {
             builder.AppendLine("  File List Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No file list items");
                 builder.AppendLine();
diff --git a/SabreTools.Serialization/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs
index a655134b..03c96d85 100644
--- a/SabreTools.Serialization/Wrappers/Quantum.cs
+++ b/SabreTools.Serialization/Wrappers/Quantum.cs
@@ -18,13 +18,13 @@ namespace SabreTools.Serialization.Wrappers
         public long CompressedDataOffset => Model.CompressedDataOffset;
 
         /// <inheritdoc cref="Header.FileCount"/>
-        public ushort FileCount => Header?.FileCount ?? 0;
+        public ushort FileCount => Header.FileCount;
 
         /// <inheritdoc cref="Archive.FileList"/>
-        public FileDescriptor[] FileList => Model.FileList ?? [];
+        public FileDescriptor[] FileList => Model.FileList;
 
         /// <inheritdoc cref="Archive.Header"/>
-        public Header? Header => Model.Header;
+        public Header Header => Model.Header;
 
         #endregion