Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from erri120/omod-update

Browse Source 
OMOD Update
This commit is contained in:
Timothy Baldridge 2019-10-03 16:31:51 -06:00 committed by GitHub
commit dd490a00a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "OMOD-Extractor"]
path = OMOD-Extractor
url = https://github.com/erri120/OMOD-Extractor
[submodule "OMOD-Framework"]
path = OMOD-Framework
url = https://github.com/erri120/OMOD-Framework.git

1
OMOD-Extractor

@ -1 +0,0 @@
Subproject commit a3eb3584527e4363a02607d38e91c646316b1cea

1
OMOD-Framework Submodule

@ -0,0 +1 @@
Subproject commit 91009782d5bfe909558bde9a946bbf3c9844faec

10
Wabbajack.Common/FileExtractor.cs
View File

@ -5,6 +5,7 @@ using System.Reflection;
using Alphaleonis.Win32.Filesystem;
using Compression.BSA;
using ICSharpCode.SharpZipLib.GZip;
using OMODFramework;
namespace Wabbajack.Common
{
@ -53,11 +54,10 @@ namespace Wabbajack.Common
private static void ExtractAllWithOMOD(string source, string dest)
{
Utils.Log($"Extracting {Path.GetFileName(source)}");
OMODExtractorDLL.OMOD omod = new OMODExtractorDLL.OMOD(source, dest+"//", "temp");
omod.SaveConfig();
omod.SaveFile("script");
omod.SaveFile("readme");
omod.ExtractData();
Framework f = new Framework();
f.SetTempDirectory(dest);
OMOD omod = new OMOD(source, ref f);
omod.ExtractDataFiles();
omod.ExtractPlugins();
}

6
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -107,9 +107,9 @@
<Project>{ff5d892f-8ff4-44fc-8f7f-cd58f307ad1b}</Project>
<Name>Compression.BSA</Name>
</ProjectReference>
<ProjectReference Include="..\OMOD-Extractor\OMODExtractorDLL\OMODExtractorDLL.csproj">
<Project>{eb003d18-dffb-49c7-b054-fb375345ae26}</Project>
<Name>OMODExtractorDLL</Name>
<ProjectReference Include="..\OMOD-Framework\OMOD-Framework\OMOD-Framework.csproj">
<Project>{1b2576a1-0208-485f-8e79-38551e4593b4}</Project>
<Name>OMOD-Framework</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>

26
Wabbajack.sln
View File

@ -30,7 +30,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabbajack.WebAutomation.Tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wabbajack.Test", "Wabbajack.Test\Wabbajack.Test.csproj", "{A47FFF32-782B-4D9F-8704-C98FB32FA8CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OMODExtractorDLL", "OMOD-Extractor\OMODExtractorDLL\OMODExtractorDLL.csproj", "{EB003D18-DFFB-49C7-B054-FB375345AE26}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OMOD-Framework", "OMOD-Framework\OMOD-Framework\OMOD-Framework.csproj", "{1B2576A1-0208-485F-8E79-38551E4593B4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -150,18 +150,18 @@ Global
{A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|Any CPU.Build.0 = Release|Any CPU
{A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|x64.ActiveCfg = Release|Any CPU
{A47FFF32-782B-4D9F-8704-C98FB32FA8CC}.Release|x64.Build.0 = Release|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug (no commandargs)|Any CPU.ActiveCfg = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug (no commandargs)|Any CPU.Build.0 = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug (no commandargs)|x64.ActiveCfg = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug (no commandargs)|x64.Build.0 = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Debug|x64.Build.0 = Debug|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Release|Any CPU.Build.0 = Release|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Release|x64.ActiveCfg = Release|Any CPU
{EB003D18-DFFB-49C7-B054-FB375345AE26}.Release|x64.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|Any CPU.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|Any CPU.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|x64.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug (no commandargs)|x64.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|Any CPU.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|x64.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Debug|x64.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Release|Any CPU.Build.0 = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Release|x64.ActiveCfg = Release|Any CPU
{1B2576A1-0208-485F-8E79-38551E4593B4}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE