Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-23 05:35:34 +08:00
Code Issues Projects Releases Wiki Activity

Update ArcPAC.cs

Browse Source
This commit is contained in:
Crsky 2024-09-15 02:11:39 +08:00 committed by GitHub
parent afd4d5f7fa
commit ba065f76af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ArcFormats/Nexas/ArcPAC.cs
View File

@ -32,7 +32,6 @@ using System.ComponentModel.Composition;
using GameRes.Compression;
using GameRes.Formats.Strings;
using GameRes.Utility;
using ZstdNet;
namespace GameRes.Formats.NeXAS
{
@ -43,7 +42,6 @@ namespace GameRes.Formats.NeXAS
Huffman,
Deflate,
DeflateOrNone,
None2,
Zstd,
ZstdOrNone,
@ -75,13 +73,13 @@ namespace GameRes.Formats.NeXAS
Settings = new[] { PacEncoding };
}
EncodingSetting PacEncoding = new EncodingSetting("NexasEncodingCP", "DefaultEncoding");
EncodingSetting PacEncoding = new EncodingSetting ("NexasEncodingCP", "DefaultEncoding");
public override ArcFile TryOpen (ArcView file)
{
if (!file.View.AsciiEqual (0, "PAC") || 'K' == file.View.ReadByte (3))
return null;
var reader = new IndexReader(file, PacEncoding.Get<Encoding>());
var reader = new IndexReader (file, PacEncoding.Get<Encoding>());
var dir = reader.Read();
if (null == dir)
return null;
@ -161,7 +159,7 @@ namespace GameRes.Formats.NeXAS
m_dir.Clear();
for (int i = 0; i < m_count; ++i)
{
var name = index.ReadCString(name_length, m_encoding);
var name = index.ReadCString (name_length, m_encoding);
if (string.IsNullOrWhiteSpace (name))
return false;
var entry = FormatCatalog.Instance.Create<PackedEntry> (name);
@ -170,7 +168,6 @@ namespace GameRes.Formats.NeXAS
entry.Size = index.ReadUInt32();
if (!entry.CheckPlacement (m_file.MaxOffset))
return false;
bool isPacked = false;
switch (m_pack_type)
{
@ -219,17 +216,15 @@ namespace GameRes.Formats.NeXAS
}
case Compression.Deflate:
case Compression.DeflateOrNone:
{
return new ZLibStream(input, CompressionMode.Decompress);
}
return new ZLibStream (input, CompressionMode.Decompress);
case Compression.Zstd:
case Compression.ZstdOrNone:
{
byte[] unpacked = ZstdDecompress(input, pent.UnpackedSize);
return new BinMemoryStream(unpacked, entry.Name);
var unpacked = ZstdDecompress (input, pent.UnpackedSize);
return new BinMemoryStream (unpacked, entry.Name);
}
default:
throw new NotImplementedException();
return input;
}
}
@ -240,13 +235,13 @@ namespace GameRes.Formats.NeXAS
return decoder.Unpack();
}
static private byte[] ZstdDecompress(Stream s, uint unpackedSize)
static private byte[] ZstdDecompress (Stream s, uint unpackedSize)
{
using(DecompressionStream zstdDecStream = new DecompressionStream(s))
using (var ds = new ZstdNet.DecompressionStream (s))
{
byte[] dest = new byte[unpackedSize];
zstdDecStream.Read(dest, 0, dest.Length);
return dest;
var dst = new byte[unpackedSize];
ds.Read (dst, 0, dst.Length);
return dst;
}
}
}