diff --git a/SabreTools.Serialization/Models/PAK/Constants.cs b/SabreTools.Serialization/Models/PAK/Constants.cs
index 5728c810..dc1003ae 100644
--- a/SabreTools.Serialization/Models/PAK/Constants.cs
+++ b/SabreTools.Serialization/Models/PAK/Constants.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.PAK
public const uint SignatureUInt32 = 0x4b434150;
}
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/PAK/DirectoryItem.cs b/SabreTools.Serialization/Models/PAK/DirectoryItem.cs
index 0727b274..90ba1e91 100644
--- a/SabreTools.Serialization/Models/PAK/DirectoryItem.cs
+++ b/SabreTools.Serialization/Models/PAK/DirectoryItem.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Data.Models.PAK
/// Item Name
///
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 56)]
- public string? ItemName;
+ public string ItemName;
///
/// Item Offset
diff --git a/SabreTools.Serialization/Models/PAK/File.cs b/SabreTools.Serialization/Models/PAK/File.cs
index f6b01b10..54f46984 100644
--- a/SabreTools.Serialization/Models/PAK/File.cs
+++ b/SabreTools.Serialization/Models/PAK/File.cs
@@ -9,11 +9,11 @@ namespace SabreTools.Data.Models.PAK
///
/// Deserialized directory header data
///
- public Header? Header { get; set; }
+ public Header Header { get; set; }
///
/// Deserialized directory items data
///
- public DirectoryItem[]? DirectoryItems { get; set; }
+ public DirectoryItem[] DirectoryItems { get; set; }
}
}
diff --git a/SabreTools.Serialization/Models/PAK/Header.cs b/SabreTools.Serialization/Models/PAK/Header.cs
index c22e7909..80950ae1 100644
--- a/SabreTools.Serialization/Models/PAK/Header.cs
+++ b/SabreTools.Serialization/Models/PAK/Header.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Data.Models.PAK
/// Signature
///
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
- public string? Signature;
+ public string Signature;
///
/// Directory Offset
diff --git a/SabreTools.Serialization/Wrappers/PAK.Extraction.cs b/SabreTools.Serialization/Wrappers/PAK.Extraction.cs
index c0523da1..de744eed 100644
--- a/SabreTools.Serialization/Wrappers/PAK.Extraction.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.Extraction.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Serialization.Wrappers
public bool Extract(string outputDirectory, bool includeDebug)
{
// If we have no directory items
- if (DirectoryItems == null || DirectoryItems.Length == 0)
+ if (DirectoryItems.Length == 0)
return false;
// Loop through and extract all files to the output
@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.Wrappers
public bool ExtractFile(int index, string outputDirectory, bool includeDebug)
{
// If we have no directory items
- if (DirectoryItems == null || DirectoryItems.Length == 0)
+ if (DirectoryItems.Length == 0)
return false;
// If the directory item index is invalid
@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.Wrappers
return false;
// Ensure directory separators are consistent
- string filename = directoryItem.ItemName ?? $"file{index}";
+ string filename = directoryItem.ItemName.Length == 0 ? $"file{index}" : directoryItem.ItemName;
if (Path.DirectorySeparatorChar == '\\')
filename = filename.Replace('/', '\\');
else if (Path.DirectorySeparatorChar == '/')
diff --git a/SabreTools.Serialization/Wrappers/PAK.Printing.cs b/SabreTools.Serialization/Wrappers/PAK.Printing.cs
index f6e24e63..647fc9ba 100644
--- a/SabreTools.Serialization/Wrappers/PAK.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.Printing.cs
@@ -22,28 +22,21 @@ namespace SabreTools.Serialization.Wrappers
Print(builder, Model.DirectoryItems);
}
- 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.DirectoryOffset, " Directory offset");
builder.AppendLine(header.DirectoryLength, " Directory length");
builder.AppendLine();
}
- private static void Print(StringBuilder builder, DirectoryItem[]? entries)
+ private static void Print(StringBuilder builder, DirectoryItem[] entries)
{
builder.AppendLine(" Directory Items Information:");
builder.AppendLine(" -------------------------");
- if (entries == null || entries.Length == 0)
+ if (entries.Length == 0)
{
builder.AppendLine(" No directory items");
builder.AppendLine();
diff --git a/SabreTools.Serialization/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs
index 267d5e45..971dcdf9 100644
--- a/SabreTools.Serialization/Wrappers/PAK.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.cs
@@ -15,7 +15,7 @@ namespace SabreTools.Serialization.Wrappers
#region Extension Properties
///
- public DirectoryItem[] DirectoryItems => Model.DirectoryItems ?? [];
+ public DirectoryItem[] DirectoryItems => Model.DirectoryItems;
#endregion