From 97ad19c093e8a6363c595f5e6f12a1b3308be852 Mon Sep 17 00:00:00 2001 From: ManlyMarco <39247311+ManlyMarco@users.noreply.github.com> Date: Sat, 16 May 2026 18:18:17 +0200 Subject: [PATCH] Update packages --- src/Directory.Build.props | 2 +- src/KKManager.Core/Data/Sardines/SardineModLoader.cs | 4 ++-- .../Data/Zipmods/SideloaderModLoader.cs | 4 ++-- src/KKManager.Core/KKManager.Core.csproj | 2 +- src/KKManager.SB3UGS/SB3UGS_Initializer.cs | 2 +- src/KKManager.Updater/KKManager.Updater.csproj | 2 +- src/KKManager.Updater/Sources/ZipUpdater.cs | 2 +- src/KKManager/ModpackTool/Data/ZipmodProcessor.cs | 11 +++++------ src/Tests/Tests.csproj | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0ec474a5..f4214e69 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -35,7 +35,7 @@ - + diff --git a/src/KKManager.Core/Data/Sardines/SardineModLoader.cs b/src/KKManager.Core/Data/Sardines/SardineModLoader.cs index 35dea5e0..dd8ede7f 100644 --- a/src/KKManager.Core/Data/Sardines/SardineModLoader.cs +++ b/src/KKManager.Core/Data/Sardines/SardineModLoader.cs @@ -145,7 +145,7 @@ public static SardineModInfo LoadFromFile(string filename) var version = name.Substring(versionSepIdx + 1); - using (var zf = ZipArchive.Open(location)) + using (var zf = ZipArchive.OpenArchive(location)) { // Without this reading crashes if any entry name has invalid characters // TODO not available in sharplib - zf.IgnoreDuplicateFiles = true; @@ -174,7 +174,7 @@ public static SardineModInfo LoadFromFile(string filename) { try { - using (var zf2 = ZipArchive.Open(location)) + using (var zf2 = ZipArchive.OpenArchive(location)) { var if2 = zf2.Entries.First(x => x.Key == imgName); using (var archiveStream = if2.OpenEntryStream()) diff --git a/src/KKManager.Core/Data/Zipmods/SideloaderModLoader.cs b/src/KKManager.Core/Data/Zipmods/SideloaderModLoader.cs index 043fa46a..64053112 100644 --- a/src/KKManager.Core/Data/Zipmods/SideloaderModLoader.cs +++ b/src/KKManager.Core/Data/Zipmods/SideloaderModLoader.cs @@ -136,7 +136,7 @@ public static SideloaderModInfo LoadFromFile(string filename) if (!IsValidZipmodExtension(location.Extension)) throw new ArgumentException($"The file {filename} has an invalid extension and can't be a zipmod", nameof(filename)); - using (var zf = ZipArchive.Open(location)) + using (var zf = ZipArchive.OpenArchive(location)) { // Without this reading crashes if any entry name has invalid characters // TODO not available in sharplib - zf.IgnoreDuplicateFiles = true; @@ -170,7 +170,7 @@ public static SideloaderModInfo LoadFromFile(string filename) { try { - using (var zf2 = ZipArchive.Open(location)) + using (var zf2 = ZipArchive.OpenArchive(location)) { var if2 = zf2.Entries.First(x => x.Key == imgName); using (var archiveStream = if2.OpenEntryStream()) diff --git a/src/KKManager.Core/KKManager.Core.csproj b/src/KKManager.Core/KKManager.Core.csproj index 125231cc..1f24b5eb 100644 --- a/src/KKManager.Core/KKManager.Core.csproj +++ b/src/KKManager.Core/KKManager.Core.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/KKManager.SB3UGS/SB3UGS_Initializer.cs b/src/KKManager.SB3UGS/SB3UGS_Initializer.cs index e242894b..3fb75e04 100644 --- a/src/KKManager.SB3UGS/SB3UGS_Initializer.cs +++ b/src/KKManager.SB3UGS/SB3UGS_Initializer.cs @@ -35,7 +35,7 @@ private static void Initialize() { Console.WriteLine("Found " + target.Name + " - attempting to extract"); - using (var extr = ArchiveFactory.Open(target)) + using (var extr = ArchiveFactory.OpenArchive(target)) { if (!extr.IsComplete) throw new IOException("Archive " + target.Name + " is not valid or is corrupted"); diff --git a/src/KKManager.Updater/KKManager.Updater.csproj b/src/KKManager.Updater/KKManager.Updater.csproj index eb51cd37..a2289dd4 100644 --- a/src/KKManager.Updater/KKManager.Updater.csproj +++ b/src/KKManager.Updater/KKManager.Updater.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/KKManager.Updater/Sources/ZipUpdater.cs b/src/KKManager.Updater/Sources/ZipUpdater.cs index 858d0a37..0089845c 100644 --- a/src/KKManager.Updater/Sources/ZipUpdater.cs +++ b/src/KKManager.Updater/Sources/ZipUpdater.cs @@ -16,7 +16,7 @@ public class ZipUpdater : UpdateSourceBase public ZipUpdater(FileInfo archive, int discoveryPriority, int downloadPriority = 101) : base(archive.Name, discoveryPriority, downloadPriority) { - _archive = ArchiveFactory.Open(archive); + _archive = ArchiveFactory.OpenArchive(archive); } public override void Dispose() { diff --git a/src/KKManager/ModpackTool/Data/ZipmodProcessor.cs b/src/KKManager/ModpackTool/Data/ZipmodProcessor.cs index 1ef6a95d..e61325b8 100644 --- a/src/KKManager/ModpackTool/Data/ZipmodProcessor.cs +++ b/src/KKManager/ModpackTool/Data/ZipmodProcessor.cs @@ -88,7 +88,7 @@ private static async Task ProcessingThread() } // ------ Extract zipmod to temp - using (var zf = ArchiveFactory.Open(zipmodEntry.FullPath.FullName)) + using (var zf = ArchiveFactory.OpenArchive(zipmodEntry.FullPath.FullName)) { zf.ExtractArchiveToDirectory(tempDir); } @@ -135,18 +135,17 @@ private static async Task ProcessingThread() manifestWorkCopy.Save(writer, SaveOptions.OmitDuplicateNamespaces); // ------ Recompress the archive - using (var zf = ZipArchive.Create()) + using (var zf = ZipArchive.CreateArchive()) using (var fs = File.Create(outPath)) { - zf.DeflateCompressionLevel = CompressionLevel.None; zf.AddAllFromDirectory(tempDir); - zf.SaveTo(fs, new ZipWriterOptions(CompressionType.Deflate) + zf.SaveTo(fs, new ZipWriterOptions(CompressionType.Deflate, CompressionLevel.None) { ArchiveComment = archiveComment, - ArchiveEncoding = new ArchiveEncoding(Encoding.UTF8, Encoding.UTF8), + ArchiveEncoding = new ArchiveEncoding { Default = Encoding.UTF8, Password = Encoding.UTF8 }, // Seems like there's soem funny business going on (getting zip version 63 instead of 20) and setting both of these again seems to fix it??? CompressionType = CompressionType.Deflate, - DeflateCompressionLevel = CompressionLevel.None, + CompressionLevel = (int)CompressionLevel.None, UseZip64 = false, LeaveStreamOpen = false }); diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index 0cd55f6a..fe6fe37b 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -8,7 +8,7 @@ - - + + \ No newline at end of file