diff --git a/Compression.BSA.Test/BSATests.cs b/Compression.BSA.Test/BSATests.cs index 92d1aa63..b7d21aa6 100644 --- a/Compression.BSA.Test/BSATests.cs +++ b/Compression.BSA.Test/BSATests.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Newtonsoft.Json; using Wabbajack.Common; +using Wabbajack.Compression.BSA; using Wabbajack.Lib.Downloaders; using Wabbajack.Lib.NexusApi; using Wabbajack.VirtualFileSystem; diff --git a/Compression.BSA.Test/Compression.BSA.Test.csproj b/Compression.BSA.Test/Compression.BSA.Test.csproj index 1797506d..3b3f1ad9 100644 --- a/Compression.BSA.Test/Compression.BSA.Test.csproj +++ b/Compression.BSA.Test/Compression.BSA.Test.csproj @@ -19,9 +19,9 @@ - + diff --git a/Wabbajack.CLI/Verbs/BSADump.cs b/Wabbajack.CLI/Verbs/BSADump.cs index 0c1c55ca..59c1e7ff 100644 --- a/Wabbajack.CLI/Verbs/BSADump.cs +++ b/Wabbajack.CLI/Verbs/BSADump.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using CommandLine; -using Compression.BSA; +using Wabbajack.Compression.BSA; using Wabbajack.Common; namespace Wabbajack.CLI.Verbs diff --git a/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf b/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf new file mode 100644 index 00000000..9d9245fc Binary files /dev/null and b/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf differ diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index 247751cb..e7298fce 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -6,7 +6,7 @@ win10-x64 enable true - 3.0 + 2.1.0.0 Wabbajack Common Lib Wabbajack Team 2020 @@ -14,7 +14,7 @@ https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt https://www.wabbajack.org/favicon.ico https://github.com/wabbajack-tools/wabbajack - 3.0 + 2.1.0.0 Wabbajack.Common.xml diff --git a/Compression.BSA/BA2Builder.cs b/Wabbajack.Compression.BSA/BA2Builder.cs similarity index 99% rename from Compression.BSA/BA2Builder.cs rename to Wabbajack.Compression.BSA/BA2Builder.cs index c182bd7c..234fc6d6 100644 --- a/Compression.BSA/BA2Builder.cs +++ b/Wabbajack.Compression.BSA/BA2Builder.cs @@ -9,7 +9,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression; using ICSharpCode.SharpZipLib.Zip.Compression.Streams; using Wabbajack.Common; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { interface IFileBuilder { diff --git a/Compression.BSA/BA2Reader.cs b/Wabbajack.Compression.BSA/BA2Reader.cs similarity index 99% rename from Compression.BSA/BA2Reader.cs rename to Wabbajack.Compression.BSA/BA2Reader.cs index b5d20ed9..fd0ce5d1 100644 --- a/Compression.BSA/BA2Reader.cs +++ b/Wabbajack.Compression.BSA/BA2Reader.cs @@ -9,7 +9,7 @@ using Wabbajack.Common; using Wabbajack.Common.Serialization.Json; using File = Alphaleonis.Win32.Filesystem.File; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public enum EntryType { diff --git a/Compression.BSA/BSABuilder.cs b/Wabbajack.Compression.BSA/BSABuilder.cs similarity index 99% rename from Compression.BSA/BSABuilder.cs rename to Wabbajack.Compression.BSA/BSABuilder.cs index dbc5dc56..7bd71e5b 100644 --- a/Compression.BSA/BSABuilder.cs +++ b/Wabbajack.Compression.BSA/BSABuilder.cs @@ -11,7 +11,7 @@ using Wabbajack.Common; using File = Alphaleonis.Win32.Filesystem.File; using Path = Alphaleonis.Win32.Filesystem.Path; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public class BSABuilder : IBSABuilder { diff --git a/Compression.BSA/BSADispatch.cs b/Wabbajack.Compression.BSA/BSADispatch.cs similarity index 97% rename from Compression.BSA/BSADispatch.cs rename to Wabbajack.Compression.BSA/BSADispatch.cs index fec3073c..0e8cd684 100644 --- a/Compression.BSA/BSADispatch.cs +++ b/Wabbajack.Compression.BSA/BSADispatch.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; using Wabbajack.Common; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public static class BSADispatch { diff --git a/Compression.BSA/BSAReader.cs b/Wabbajack.Compression.BSA/BSAReader.cs similarity index 99% rename from Compression.BSA/BSAReader.cs rename to Wabbajack.Compression.BSA/BSAReader.cs index 6858c4a8..8770edd0 100644 --- a/Compression.BSA/BSAReader.cs +++ b/Wabbajack.Compression.BSA/BSAReader.cs @@ -9,7 +9,7 @@ using Wabbajack.Common; using Wabbajack.Common.Serialization.Json; using File = Alphaleonis.Win32.Filesystem.File; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public enum VersionType : uint { diff --git a/Compression.BSA/DDS.cs b/Wabbajack.Compression.BSA/DDS.cs similarity index 99% rename from Compression.BSA/DDS.cs rename to Wabbajack.Compression.BSA/DDS.cs index 01ca931e..309af7d2 100644 --- a/Compression.BSA/DDS.cs +++ b/Wabbajack.Compression.BSA/DDS.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { /* * Copied from https://raw.githubusercontent.com/AlexxEG/BSA_Browser/master/Sharp.BSA.BA2/BA2Util/DDS.cs diff --git a/Compression.BSA/IBSAReader.cs b/Wabbajack.Compression.BSA/IBSAReader.cs similarity index 97% rename from Compression.BSA/IBSAReader.cs rename to Wabbajack.Compression.BSA/IBSAReader.cs index 46f6ca4b..cb731931 100644 --- a/Compression.BSA/IBSAReader.cs +++ b/Wabbajack.Compression.BSA/IBSAReader.cs @@ -4,7 +4,7 @@ using System.IO; using System.Threading.Tasks; using Wabbajack.Common; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public interface IBSAReader { diff --git a/Compression.BSA/Readme.md b/Wabbajack.Compression.BSA/Readme.md similarity index 100% rename from Compression.BSA/Readme.md rename to Wabbajack.Compression.BSA/Readme.md diff --git a/Compression.BSA/TES3Builder.cs b/Wabbajack.Compression.BSA/TES3Builder.cs similarity index 98% rename from Compression.BSA/TES3Builder.cs rename to Wabbajack.Compression.BSA/TES3Builder.cs index 78a42178..c7f39a98 100644 --- a/Compression.BSA/TES3Builder.cs +++ b/Wabbajack.Compression.BSA/TES3Builder.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Wabbajack.Common; using File = Alphaleonis.Win32.Filesystem.File; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public class TES3Builder : IBSABuilder { diff --git a/Compression.BSA/TES3Reader.cs b/Wabbajack.Compression.BSA/TES3Reader.cs similarity index 99% rename from Compression.BSA/TES3Reader.cs rename to Wabbajack.Compression.BSA/TES3Reader.cs index 45ffecdc..6d4939c6 100644 --- a/Compression.BSA/TES3Reader.cs +++ b/Wabbajack.Compression.BSA/TES3Reader.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Wabbajack.Common; using Wabbajack.Common.Serialization.Json; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { public class TES3Reader : IBSAReader { diff --git a/Compression.BSA/Utils.cs b/Wabbajack.Compression.BSA/Utils.cs similarity index 99% rename from Compression.BSA/Utils.cs rename to Wabbajack.Compression.BSA/Utils.cs index 32893261..e266fe2b 100644 --- a/Compression.BSA/Utils.cs +++ b/Wabbajack.Compression.BSA/Utils.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Wabbajack.Common; using Path = Alphaleonis.Win32.Filesystem.Path; -namespace Compression.BSA +namespace Wabbajack.Compression.BSA { internal static class Utils { diff --git a/Compression.BSA/Compression.BSA.csproj b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj similarity index 67% rename from Compression.BSA/Compression.BSA.csproj rename to Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj index cf206971..e8bfd06d 100644 --- a/Compression.BSA/Compression.BSA.csproj +++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj @@ -5,11 +5,15 @@ true x64 win10-x64 - 3.0 + 2.1.0.0 true + https://github.com/wabbajack-tools/wabbajack + https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt + https://www.wabbajack.org/favicon.ico + https://github.com/wabbajack-tools/wabbajack - Compression.BSA.xml + Wabbajack.Compression.BSA.xml diff --git a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml new file mode 100644 index 00000000..df9cd0af --- /dev/null +++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml @@ -0,0 +1,56 @@ + + + + Wabbajack.Compression.BSA + + + + + The files defined by the archive + + + + + The path of the file inside the archive + + + + + The uncompressed file size + + + + + Get the metadata for the file. + + + + + Copies this entry to the given stream. 100% thread safe, the .bsa will be opened multiple times + in order to maintain thread-safe access. + + + + + + Returns bytes for a \0 terminated string + + + + + + + Returns bytes for unterminated string with a count at the start + + + + + + + Returns bytes for a \0 terminated string prefixed by a length + + + + + + diff --git a/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs b/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs index daa6abc9..52fc3759 100644 --- a/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs +++ b/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Alphaleonis.Win32.Filesystem; -using Compression.BSA; +using Wabbajack.Compression.BSA; using Newtonsoft.Json; using Wabbajack.Common; using Wabbajack.Common.StatusFeed.Errors; diff --git a/Wabbajack.Lib/Data.cs b/Wabbajack.Lib/Data.cs index cc0cab5e..8eea94a4 100644 --- a/Wabbajack.Lib/Data.cs +++ b/Wabbajack.Lib/Data.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Compression.BSA; +using Wabbajack.Compression.BSA; using Newtonsoft.Json; using Wabbajack.Common; using Wabbajack.Common.Serialization.Json; diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs index 2cbfb1ea..891acd7e 100644 --- a/Wabbajack.Lib/MO2Compiler.cs +++ b/Wabbajack.Lib/MO2Compiler.cs @@ -1,4 +1,4 @@ -using Compression.BSA; +using Wabbajack.Compression.BSA; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj index 067f9f91..612006de 100644 --- a/Wabbajack.Lib/Wabbajack.Lib.csproj +++ b/Wabbajack.Lib/Wabbajack.Lib.csproj @@ -72,8 +72,8 @@ - + diff --git a/Wabbajack.Test/SanityTests.cs b/Wabbajack.Test/SanityTests.cs index a4fa2a78..a332b176 100644 --- a/Wabbajack.Test/SanityTests.cs +++ b/Wabbajack.Test/SanityTests.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Compression.BSA; +using Wabbajack.Compression.BSA; using Wabbajack.Common; using Wabbajack.Lib; using Wabbajack.Lib.CompilationSteps.CompilationErrors; diff --git a/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs b/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs index 694a5a2a..055983ec 100644 --- a/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs +++ b/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using Compression.BSA; +using Wabbajack.Compression.BSA; using Wabbajack.Common; namespace Wabbajack.VirtualFileSystem diff --git a/Wabbajack.VirtualFileSystem/FileExtractor.cs b/Wabbajack.VirtualFileSystem/FileExtractor.cs index 41bc64bd..5f53c6b4 100644 --- a/Wabbajack.VirtualFileSystem/FileExtractor.cs +++ b/Wabbajack.VirtualFileSystem/FileExtractor.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; using Alphaleonis.Win32.Filesystem; -using Compression.BSA; +using Wabbajack.Compression.BSA; using OMODFramework; using Wabbajack.Common.StatusFeed; using Wabbajack.Common.StatusFeed.Errors; diff --git a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj index 8fe0e7fc..146fa16b 100644 --- a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj +++ b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj @@ -9,8 +9,8 @@ Wabbajack.VirtualFileSystem.xml - + diff --git a/Wabbajack.sln b/Wabbajack.sln index 745caef4..16757883 100644 --- a/Wabbajack.sln +++ b/Wabbajack.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Common", "Wabbajack.Common\Wabbajack.Common.csproj", "{B3F3FB6E-B9EB-4F49-9875-D78578BC7AE5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compression.BSA", "Compression.BSA\Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Compression.BSA", "Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EDEF6CC-2F5C-439B-BEAF-9D03895099F1}" ProjectSection(SolutionItems) = preProject diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index bde3bcf8..6266da13 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -80,9 +80,9 @@ - +