Skip to content

Commit b8c9048

Browse files
committed
Update GrindCore to 0.6.5
1 parent 0b54350 commit b8c9048

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

SabreTools.Serialization/SabreTools.Serialization.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="GrindCore" Version="0.6.4" Condition="!$(TargetFramework.StartsWith(`net2`))" />
46+
<PackageReference Include="GrindCore" Version="0.6.5" />
4747
<PackageReference Include="GrindCore.SharpCompress" Version="0.41.3" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
4848
<PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
4949
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />

SabreTools.Serialization/Wrappers/GCF.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.IO;
3+
using SabreTools.Data.Models.GCF;
34

45
namespace SabreTools.Serialization.Wrappers
56
{
@@ -62,9 +63,9 @@ public FileInfo[]? Files
6263

6364
// If we have a directory, skip for now
6465
#if NET20 || NET35
65-
if ((directoryEntry.DirectoryFlags & Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE) == 0)
66+
if ((directoryEntry.DirectoryFlags & HL_GCF_FLAG.HL_GCF_FLAG_FILE) == 0)
6667
#else
67-
if (!directoryEntry.DirectoryFlags.HasFlag(Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE))
68+
if (!directoryEntry.DirectoryFlags.HasFlag(HL_GCF_FLAG.HL_GCF_FLAG_FILE))
6869
#endif
6970
continue;
7071

@@ -73,13 +74,14 @@ public FileInfo[]? Files
7374
{
7475
Size = directoryEntry.ItemSize,
7576
#if NET20 || NET35
76-
Encrypted = (directoryEntry.DirectoryFlags & Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED) != 0,
77+
Encrypted = (directoryEntry.DirectoryFlags & HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED) != 0,
7778
#else
78-
Encrypted = directoryEntry.DirectoryFlags.HasFlag(Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED),
79+
Encrypted = directoryEntry.DirectoryFlags.HasFlag(HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED),
7980
#endif
8081
};
82+
8183
var pathParts = new List<string> { Model.DirectoryNames[directoryEntry.NameOffset] ?? string.Empty };
82-
var blockEntries = new List<Data.Models.GCF.BlockEntry>();
84+
var blockEntries = new List<BlockEntry>();
8385

8486
// Traverse the parent tree
8587
uint index = directoryEntry.ParentIndex;
@@ -121,6 +123,7 @@ public FileInfo[]? Files
121123
tempPath = Path.Combine(tempPath, pathArray[j]);
122124
}
123125
}
126+
124127
fileInfo.Path = tempPath;
125128
#else
126129
fileInfo.Path = Path.Combine([.. pathParts]);
@@ -239,7 +242,7 @@ public sealed class FileInfo
239242
/// <summary>
240243
/// Array of block entries
241244
/// </summary>
242-
public Data.Models.GCF.BlockEntry[]? BlockEntries;
245+
public BlockEntry[] BlockEntries = [];
243246
}
244247

245248
#endregion

0 commit comments

Comments
 (0)