diff --git a/SabreTools.Serialization/Models/GCF/BlockEntry.cs b/SabreTools.Serialization/Models/GCF/BlockEntry.cs index def8650d..b90e91f5 100644 --- a/SabreTools.Serialization/Models/GCF/BlockEntry.cs +++ b/SabreTools.Serialization/Models/GCF/BlockEntry.cs @@ -41,4 +41,4 @@ namespace SabreTools.Data.Models.GCF /// public uint DirectoryIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/BlockEntryHeader.cs b/SabreTools.Serialization/Models/GCF/BlockEntryHeader.cs index 1bc8ad36..250ae8e5 100644 --- a/SabreTools.Serialization/Models/GCF/BlockEntryHeader.cs +++ b/SabreTools.Serialization/Models/GCF/BlockEntryHeader.cs @@ -46,4 +46,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/BlockEntryMap.cs b/SabreTools.Serialization/Models/GCF/BlockEntryMap.cs index a0e87263..335ff1d6 100644 --- a/SabreTools.Serialization/Models/GCF/BlockEntryMap.cs +++ b/SabreTools.Serialization/Models/GCF/BlockEntryMap.cs @@ -19,4 +19,4 @@ namespace SabreTools.Data.Models.GCF /// public uint NextBlockEntryIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/BlockEntryMapHeader.cs b/SabreTools.Serialization/Models/GCF/BlockEntryMapHeader.cs index aced1514..306f091c 100644 --- a/SabreTools.Serialization/Models/GCF/BlockEntryMapHeader.cs +++ b/SabreTools.Serialization/Models/GCF/BlockEntryMapHeader.cs @@ -34,4 +34,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/ChecksumEntry.cs b/SabreTools.Serialization/Models/GCF/ChecksumEntry.cs index 53ddc674..cce275ef 100644 --- a/SabreTools.Serialization/Models/GCF/ChecksumEntry.cs +++ b/SabreTools.Serialization/Models/GCF/ChecksumEntry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/ChecksumHeader.cs b/SabreTools.Serialization/Models/GCF/ChecksumHeader.cs index e7031d6d..80aa8c32 100644 --- a/SabreTools.Serialization/Models/GCF/ChecksumHeader.cs +++ b/SabreTools.Serialization/Models/GCF/ChecksumHeader.cs @@ -16,4 +16,4 @@ namespace SabreTools.Data.Models.GCF /// public uint ChecksumSize; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/ChecksumMapEntry.cs b/SabreTools.Serialization/Models/GCF/ChecksumMapEntry.cs index d65154d0..a5ec3727 100644 --- a/SabreTools.Serialization/Models/GCF/ChecksumMapEntry.cs +++ b/SabreTools.Serialization/Models/GCF/ChecksumMapEntry.cs @@ -16,4 +16,4 @@ namespace SabreTools.Data.Models.GCF /// public uint FirstChecksumIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/ChecksumMapHeader.cs b/SabreTools.Serialization/Models/GCF/ChecksumMapHeader.cs index 93e18918..ef8022b6 100644 --- a/SabreTools.Serialization/Models/GCF/ChecksumMapHeader.cs +++ b/SabreTools.Serialization/Models/GCF/ChecksumMapHeader.cs @@ -26,4 +26,4 @@ namespace SabreTools.Data.Models.GCF /// public uint ChecksumCount; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/Constants.cs b/SabreTools.Serialization/Models/GCF/Constants.cs index 3fdcb3d5..21a8973b 100644 --- a/SabreTools.Serialization/Models/GCF/Constants.cs +++ b/SabreTools.Serialization/Models/GCF/Constants.cs @@ -7,4 +7,4 @@ namespace SabreTools.Data.Models.GCF /// public const int HL_GCF_CHECKSUM_LENGTH = 0x00008000; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DataBlockHeader.cs b/SabreTools.Serialization/Models/GCF/DataBlockHeader.cs index 5b328a3c..277ace92 100644 --- a/SabreTools.Serialization/Models/GCF/DataBlockHeader.cs +++ b/SabreTools.Serialization/Models/GCF/DataBlockHeader.cs @@ -36,4 +36,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryCopyEntry.cs b/SabreTools.Serialization/Models/GCF/DirectoryCopyEntry.cs index 1d3e0e6a..3c7330ec 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryCopyEntry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryCopyEntry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint DirectoryIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryEntry.cs b/SabreTools.Serialization/Models/GCF/DirectoryEntry.cs index 2382a966..f5e1d692 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryEntry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryEntry.cs @@ -42,4 +42,4 @@ namespace SabreTools.Data.Models.GCF /// public uint FirstIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryHeader.cs b/SabreTools.Serialization/Models/GCF/DirectoryHeader.cs index a4585748..23558aea 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryHeader.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryHeader.cs @@ -76,4 +76,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryInfo1Entry.cs b/SabreTools.Serialization/Models/GCF/DirectoryInfo1Entry.cs index a5bb0e60..5ea71654 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryInfo1Entry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryInfo1Entry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Dummy0; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryInfo2Entry.cs b/SabreTools.Serialization/Models/GCF/DirectoryInfo2Entry.cs index 698330d6..050c1e78 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryInfo2Entry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryInfo2Entry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Dummy0; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryLocalEntry.cs b/SabreTools.Serialization/Models/GCF/DirectoryLocalEntry.cs index 4e298560..732b3ab8 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryLocalEntry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryLocalEntry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint DirectoryIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryMapEntry.cs b/SabreTools.Serialization/Models/GCF/DirectoryMapEntry.cs index 9a946f53..0bb5d8e4 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryMapEntry.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryMapEntry.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint FirstBlockIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/DirectoryMapHeader.cs b/SabreTools.Serialization/Models/GCF/DirectoryMapHeader.cs index 82deac0f..7ca2578a 100644 --- a/SabreTools.Serialization/Models/GCF/DirectoryMapHeader.cs +++ b/SabreTools.Serialization/Models/GCF/DirectoryMapHeader.cs @@ -19,4 +19,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Dummy1; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/Enums.cs b/SabreTools.Serialization/Models/GCF/Enums.cs index 9f71b1d0..4c1284bb 100644 --- a/SabreTools.Serialization/Models/GCF/Enums.cs +++ b/SabreTools.Serialization/Models/GCF/Enums.cs @@ -35,4 +35,4 @@ namespace SabreTools.Data.Models.GCF /// HL_GCF_FLAG_FILE = 0x00004000, } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/File.cs b/SabreTools.Serialization/Models/GCF/File.cs index 4f1e4332..6af3069a 100644 --- a/SabreTools.Serialization/Models/GCF/File.cs +++ b/SabreTools.Serialization/Models/GCF/File.cs @@ -11,108 +11,108 @@ namespace SabreTools.Data.Models.GCF /// /// Header data /// - public Header? Header { get; set; } + public Header Header { get; set; } /// /// Block entry header data /// - public BlockEntryHeader? BlockEntryHeader { get; set; } + public BlockEntryHeader BlockEntryHeader { get; set; } /// /// Block entries data /// - public BlockEntry[]? BlockEntries { get; set; } + public BlockEntry[] BlockEntries { get; set; } /// /// Fragmentation map header data /// - public FragmentationMapHeader? FragmentationMapHeader { get; set; } + public FragmentationMapHeader FragmentationMapHeader { get; set; } /// /// Fragmentation map data /// - public FragmentationMap[]? FragmentationMaps { get; set; } + public FragmentationMap[] FragmentationMaps { get; set; } /// /// Block entry map header data /// /// Part of version 5 but not version 6. - public BlockEntryMapHeader? BlockEntryMapHeader { get; set; } + public BlockEntryMapHeader BlockEntryMapHeader { get; set; } /// /// Block entry map data /// /// Part of version 5 but not version 6. - public BlockEntryMap[]? BlockEntryMaps { get; set; } + public BlockEntryMap[] BlockEntryMaps { get; set; } /// /// Directory header data /// - public DirectoryHeader? DirectoryHeader { get; set; } + public DirectoryHeader DirectoryHeader { get; set; } /// /// Directory entries data /// - public DirectoryEntry[]? DirectoryEntries { get; set; } + public DirectoryEntry[] DirectoryEntries { get; set; } /// /// Directory names data /// - public Dictionary? DirectoryNames { get; set; } + public Dictionary DirectoryNames { get; set; } /// /// Directory info 1 entries data /// - public DirectoryInfo1Entry[]? DirectoryInfo1Entries { get; set; } + public DirectoryInfo1Entry[] DirectoryInfo1Entries { get; set; } /// /// Directory info 2 entries data /// - public DirectoryInfo2Entry[]? DirectoryInfo2Entries { get; set; } + public DirectoryInfo2Entry[] DirectoryInfo2Entries { get; set; } /// /// Directory copy entries data /// - public DirectoryCopyEntry[]? DirectoryCopyEntries { get; set; } + public DirectoryCopyEntry[] DirectoryCopyEntries { get; set; } /// /// Directory local entries data /// - public DirectoryLocalEntry[]? DirectoryLocalEntries { get; set; } + public DirectoryLocalEntry[] DirectoryLocalEntries { get; set; } /// /// Directory map header data /// - public DirectoryMapHeader? DirectoryMapHeader { get; set; } + public DirectoryMapHeader DirectoryMapHeader { get; set; } /// /// Directory map entries data /// - public DirectoryMapEntry[]? DirectoryMapEntries { get; set; } + public DirectoryMapEntry[] DirectoryMapEntries { get; set; } /// /// Checksum header data /// - public ChecksumHeader? ChecksumHeader { get; set; } + public ChecksumHeader ChecksumHeader { get; set; } /// /// Checksum map header data /// - public ChecksumMapHeader? ChecksumMapHeader { get; set; } + public ChecksumMapHeader ChecksumMapHeader { get; set; } /// /// Checksum map entries data /// - public ChecksumMapEntry[]? ChecksumMapEntries { get; set; } + public ChecksumMapEntry[] ChecksumMapEntries { get; set; } /// /// Checksum entries data /// - public ChecksumEntry[]? ChecksumEntries { get; set; } + public ChecksumEntry[] ChecksumEntries { get; set; } /// /// Data block header data /// - public DataBlockHeader? DataBlockHeader { get; set; } + public DataBlockHeader DataBlockHeader { get; set; } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/FragmentationMap.cs b/SabreTools.Serialization/Models/GCF/FragmentationMap.cs index 656c486a..7363752f 100644 --- a/SabreTools.Serialization/Models/GCF/FragmentationMap.cs +++ b/SabreTools.Serialization/Models/GCF/FragmentationMap.cs @@ -11,4 +11,4 @@ namespace SabreTools.Data.Models.GCF /// public uint NextDataBlockIndex; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/FragmentationMapHeader.cs b/SabreTools.Serialization/Models/GCF/FragmentationMapHeader.cs index b32c5b0e..ed2db5d7 100644 --- a/SabreTools.Serialization/Models/GCF/FragmentationMapHeader.cs +++ b/SabreTools.Serialization/Models/GCF/FragmentationMapHeader.cs @@ -26,4 +26,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Checksum; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/GCF/Header.cs b/SabreTools.Serialization/Models/GCF/Header.cs index 4a5d4764..3de760af 100644 --- a/SabreTools.Serialization/Models/GCF/Header.cs +++ b/SabreTools.Serialization/Models/GCF/Header.cs @@ -61,4 +61,4 @@ namespace SabreTools.Data.Models.GCF /// public uint Dummy3; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Wrappers/GCF.Printing.cs b/SabreTools.Serialization/Wrappers/GCF.Printing.cs index 737a5ceb..92f70364 100644 --- a/SabreTools.Serialization/Wrappers/GCF.Printing.cs +++ b/SabreTools.Serialization/Wrappers/GCF.Printing.cs @@ -55,17 +55,10 @@ namespace SabreTools.Serialization.Wrappers Print(builder, Model.DataBlockHeader); } - 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.Dummy0, " Dummy 0"); builder.AppendLine(header.MajorVersion, " Major version"); builder.AppendLine(header.MinorVersion, " Minor version"); @@ -80,17 +73,10 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, BlockEntryHeader? header) + private static void Print(StringBuilder builder, BlockEntryHeader header) { builder.AppendLine(" Block Entry Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No block entry header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.BlockCount, " Block count"); builder.AppendLine(header.BlocksUsed, " Blocks used"); builder.AppendLine(header.Dummy0, " Dummy 0"); @@ -102,11 +88,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, BlockEntry[]? entries) + private static void Print(StringBuilder builder, BlockEntry[] entries) { builder.AppendLine(" Block Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No block entries"); builder.AppendLine(); @@ -130,17 +116,10 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, FragmentationMapHeader? header) + private static void Print(StringBuilder builder, FragmentationMapHeader header) { builder.AppendLine(" Fragmentation Map Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No fragmentation map header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.BlockCount, " Block count"); builder.AppendLine(header.FirstUnusedEntry, " First unused entry"); builder.AppendLine(header.Terminator, " Terminator"); @@ -148,11 +127,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, FragmentationMap[]? entries) + private static void Print(StringBuilder builder, FragmentationMap[] entries) { builder.AppendLine(" Fragmentation Maps Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No fragmentation maps"); builder.AppendLine(); @@ -170,17 +149,10 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, BlockEntryMapHeader? header) + private static void Print(StringBuilder builder, BlockEntryMapHeader header) { builder.AppendLine(" Block Entry Map Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No block entry map header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.BlockCount, " Block count"); builder.AppendLine(header.FirstBlockEntryIndex, " First block entry index"); builder.AppendLine(header.LastBlockEntryIndex, " Last block entry index"); @@ -189,11 +161,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, BlockEntryMap[]? entries) + private static void Print(StringBuilder builder, BlockEntryMap[] entries) { builder.AppendLine(" Block Entry Maps Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No block entry maps"); builder.AppendLine(); @@ -212,17 +184,10 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryHeader? header) + private static void Print(StringBuilder builder, DirectoryHeader header) { builder.AppendLine(" Directory Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No directory header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.Dummy0, " Dummy 0"); builder.AppendLine(header.CacheID, " Cache ID"); builder.AppendLine(header.LastVersionPlayed, " Last version played"); @@ -240,11 +205,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryEntry[]? entries, Dictionary? entryNames) + private static void Print(StringBuilder builder, DirectoryEntry[] entries, Dictionary entryNames) { builder.AppendLine(" Directory Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory entries"); builder.AppendLine(); @@ -269,11 +234,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryInfo1Entry[]? entries) + private static void Print(StringBuilder builder, DirectoryInfo1Entry[] entries) { builder.AppendLine(" Directory Info 1 Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory info 1 entries"); builder.AppendLine(); @@ -291,11 +256,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryInfo2Entry[]? entries) + private static void Print(StringBuilder builder, DirectoryInfo2Entry[] entries) { builder.AppendLine(" Directory Info 2 Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory info 2 entries"); builder.AppendLine(); @@ -313,11 +278,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryCopyEntry[]? entries) + private static void Print(StringBuilder builder, DirectoryCopyEntry[] entries) { builder.AppendLine(" Directory Copy Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory copy entries"); builder.AppendLine(); @@ -335,11 +300,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryLocalEntry[]? entries) + private static void Print(StringBuilder builder, DirectoryLocalEntry[] entries) { builder.AppendLine(" Directory Local Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory local entries"); builder.AppendLine(); @@ -357,27 +322,20 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryMapHeader? header) + private static void Print(StringBuilder builder, DirectoryMapHeader header) { builder.AppendLine(" Directory Map Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No directory map header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.Dummy0, " Dummy 0"); builder.AppendLine(header.Dummy1, " Dummy 1"); builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryMapEntry[]? entries) + private static void Print(StringBuilder builder, DirectoryMapEntry[] entries) { builder.AppendLine(" Directory Map Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No directory map entries"); builder.AppendLine(); @@ -395,33 +353,19 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, ChecksumHeader? header) + private static void Print(StringBuilder builder, ChecksumHeader header) { builder.AppendLine(" Checksum Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No checksum header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.Dummy0, " Dummy 0"); builder.AppendLine(header.ChecksumSize, " Checksum size"); builder.AppendLine(); } - private static void Print(StringBuilder builder, ChecksumMapHeader? header) + private static void Print(StringBuilder builder, ChecksumMapHeader header) { builder.AppendLine(" Checksum Map Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No checksum map header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.Dummy0, " Dummy 0"); builder.AppendLine(header.Dummy1, " Dummy 1"); builder.AppendLine(header.ItemCount, " Item count"); @@ -429,11 +373,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, ChecksumMapEntry[]? entries) + private static void Print(StringBuilder builder, ChecksumMapEntry[] entries) { builder.AppendLine(" Checksum Map Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No checksum map entries"); builder.AppendLine(); @@ -452,11 +396,11 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, ChecksumEntry[]? entries) + private static void Print(StringBuilder builder, ChecksumEntry[] entries) { builder.AppendLine(" Checksum Entries Information:"); builder.AppendLine(" -------------------------"); - if (entries == null || entries.Length == 0) + if (entries.Length == 0) { builder.AppendLine(" No checksum entries"); builder.AppendLine(); @@ -474,17 +418,10 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DataBlockHeader? header) + private static void Print(StringBuilder builder, DataBlockHeader header) { builder.AppendLine(" Data Block Header Information:"); builder.AppendLine(" -------------------------"); - if (header == null) - { - builder.AppendLine(" No data block header"); - builder.AppendLine(); - return; - } - builder.AppendLine(header.LastVersionPlayed, " Last version played"); builder.AppendLine(header.BlockCount, " Block count"); builder.AppendLine(header.BlockSize, " Block size"); diff --git a/SabreTools.Serialization/Wrappers/GCF.cs b/SabreTools.Serialization/Wrappers/GCF.cs index c688dd03..d0017b96 100644 --- a/SabreTools.Serialization/Wrappers/GCF.cs +++ b/SabreTools.Serialization/Wrappers/GCF.cs @@ -26,7 +26,7 @@ namespace SabreTools.Serialization.Wrappers return _files; // If we don't have a required property - if (Model.DirectoryEntries == null || Model.DirectoryMapEntries == null || Model.BlockEntries == null) + if (Model.DirectoryEntries == null || Model.DirectoryMapEntries == null) return null; // Otherwise, scan and build the files