From d919a097e30c0ff5650ab6705794e8b44307c85a Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Sun, 18 Oct 2020 07:00:55 -0600 Subject: [PATCH] VFSCacheName into ACompiler --- Wabbajack.Lib/ACompiler.cs | 7 ++++--- Wabbajack.Lib/MO2Compiler.cs | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Wabbajack.Lib/ACompiler.cs b/Wabbajack.Lib/ACompiler.cs index af4fd54c..a9559aad 100644 --- a/Wabbajack.Lib/ACompiler.cs +++ b/Wabbajack.Lib/ACompiler.cs @@ -25,7 +25,10 @@ namespace Wabbajack.Lib public bool ModlistIsNSFW; protected Version? WabbajackVersion; - public abstract AbsolutePath VFSCacheName { get; } + public AbsolutePath VFSCacheName => + Consts.LocalAppDataPath.Combine( + $"vfs_compile_cache-2-{Path.Combine((string)SourcePath ?? "Unknown", "ModOrganizer.exe").StringSha256Hex()}.bin"); + //protected string VFSCacheName => Path.Combine(Consts.LocalAppDataPath, $"vfs_compile_cache.bin"); /// /// A stream of tuples of ("Update Title", 0.25) which represent the name of the current task @@ -34,8 +37,6 @@ namespace Wabbajack.Lib public IObservable<(string, float)> ProgressUpdates => _progressUpdates; protected readonly Subject<(string, float)> _progressUpdates = new Subject<(string, float)>(); - public abstract ModManager ModManager { get; } - public abstract AbsolutePath GamePath { get; } public AbsolutePath SourcePath { get;} diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs index c5665e15..e4e0a891 100644 --- a/Wabbajack.Lib/MO2Compiler.cs +++ b/Wabbajack.Lib/MO2Compiler.cs @@ -33,8 +33,6 @@ namespace Wabbajack.Lib public string MO2Profile { get; } - public override ModManager ModManager => ModManager.MO2; - public override AbsolutePath GamePath { get; } public GameMetaData CompilingGame { get; } @@ -45,10 +43,6 @@ namespace Wabbajack.Lib public override AbsolutePath ModListOutputFile { get; } - public override AbsolutePath VFSCacheName => - Consts.LocalAppDataPath.Combine( - $"vfs_compile_cache-2-{Path.Combine((string)SourcePath ?? "Unknown", "ModOrganizer.exe").StringSha256Hex()}.bin"); - public dynamic MO2Ini { get; } public AbsolutePath MO2ProfileDir => SourcePath.Combine("profiles", MO2Profile);