SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-02-04 05:36:12 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Update GrindCore to 0.6.5

Browse Source
This commit is contained in:
Matt Nadareski
2025-12-02 19:35:20 -05:00
parent 0b54350d59
commit b8c9048ac6
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.Serialization/SabreTools.Serialization.csproj
View File

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

15
SabreTools.Serialization/Wrappers/GCF.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.IO;
using SabreTools.Data.Models.GCF;
namespace SabreTools.Serialization.Wrappers
{
@@ -62,9 +63,9 @@ namespace SabreTools.Serialization.Wrappers
// If we have a directory, skip for now
#if NET20 || NET35
if ((directoryEntry.DirectoryFlags & Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE) == 0)
if ((directoryEntry.DirectoryFlags & HL_GCF_FLAG.HL_GCF_FLAG_FILE) == 0)
#else
if (!directoryEntry.DirectoryFlags.HasFlag(Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE))
if (!directoryEntry.DirectoryFlags.HasFlag(HL_GCF_FLAG.HL_GCF_FLAG_FILE))
#endif
continue;
@@ -73,13 +74,14 @@ namespace SabreTools.Serialization.Wrappers
{
Size = directoryEntry.ItemSize,
#if NET20 || NET35
Encrypted = (directoryEntry.DirectoryFlags & Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED) != 0,
Encrypted = (directoryEntry.DirectoryFlags & HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED) != 0,
#else
Encrypted = directoryEntry.DirectoryFlags.HasFlag(Data.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED),
Encrypted = directoryEntry.DirectoryFlags.HasFlag(HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED),
#endif
};
var pathParts = new List<string> { Model.DirectoryNames[directoryEntry.NameOffset] ?? string.Empty };
var blockEntries = new List<Data.Models.GCF.BlockEntry>();
var blockEntries = new List<BlockEntry>();
// Traverse the parent tree
uint index = directoryEntry.ParentIndex;
@@ -121,6 +123,7 @@ namespace SabreTools.Serialization.Wrappers
tempPath = Path.Combine(tempPath, pathArray[j]);
}
}
fileInfo.Path = tempPath;
#else
fileInfo.Path = Path.Combine([.. pathParts]);
@@ -239,7 +242,7 @@ namespace SabreTools.Serialization.Wrappers
/// <summary>
/// Array of block entries
/// </summary>
public Data.Models.GCF.BlockEntry[]? BlockEntries;
public BlockEntry[] BlockEntries = [];
}
#endregion