From 9f86f3466d36051782b862897508ac0545aae258 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Thu, 14 Nov 2019 23:43:58 -0600 Subject: [PATCH 1/4] Made GameMetaData Games dictionary readonly --- Wabbajack.Common/GameMetaData.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Wabbajack.Common/GameMetaData.cs b/Wabbajack.Common/GameMetaData.cs index 203d24a4..e865665f 100644 --- a/Wabbajack.Common/GameMetaData.cs +++ b/Wabbajack.Common/GameMetaData.cs @@ -71,8 +71,7 @@ namespace Wabbajack.Common return Games.Values.FirstOrDefault(g => g.NexusName == gameName.ToLower()); } - - public static Dictionary Games = new Dictionary + public static IReadOnlyDictionary Games = new Dictionary { /*{ Game.Morrowind, new GameMetaData() From deafaf5ebdcda487068bf61b7718e15089dbed1e Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Thu, 14 Nov 2019 23:45:02 -0600 Subject: [PATCH 2/4] Adjusted Game enum capitalization C# standard is camel case, and the other enum values were that way, too. KOTOR kept as is, as it's an acronym --- Wabbajack.Common/GameMetaData.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Wabbajack.Common/GameMetaData.cs b/Wabbajack.Common/GameMetaData.cs index e865665f..5440e722 100644 --- a/Wabbajack.Common/GameMetaData.cs +++ b/Wabbajack.Common/GameMetaData.cs @@ -22,9 +22,9 @@ namespace Wabbajack.Common Starbound, SWKOTOR, SWKOTOR2, - WITCHER, - WITCHER2, - WITCHER3 + Witcher, + Witcher2, + Witcher3 } public class GameMetaData @@ -241,30 +241,30 @@ namespace Wabbajack.Common } }, { - Game.WITCHER, new GameMetaData + Game.Witcher, new GameMetaData { SupportedModManager = ModManager.Vortex, - Game = Game.WITCHER, + Game = Game.Witcher, NexusName = "witcher", SteamIDs = new List{20900}, GOGIDs = new List{1207658924} } }, { - Game.WITCHER2, new GameMetaData + Game.Witcher2, new GameMetaData { SupportedModManager = ModManager.Vortex, - Game = Game.WITCHER2, + Game = Game.Witcher2, NexusName = "witcher2", SteamIDs = new List{20920}, GOGIDs = new List{1207658930} } }, { - Game.WITCHER3, new GameMetaData + Game.Witcher3, new GameMetaData { SupportedModManager = ModManager.Vortex, - Game = Game.WITCHER3, + Game = Game.Witcher3, NexusName = "witcher3", SteamIDs = new List{292030, 499450}, // normal and GotY GOGIDs = new List{1207664643, 1495134320, 1207664663, 1640424747} // normal, GotY and both in packages From 9580301a4f4ac740a6b8c4b854aa8d14638b785d Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Thu, 14 Nov 2019 23:47:31 -0600 Subject: [PATCH 3/4] Moved some trivial member instantiations to in-line No need to make every sub compiler create these --- Wabbajack.Lib/ACompiler.cs | 14 +++++++------- Wabbajack.Lib/Compiler.cs | 9 --------- Wabbajack.Lib/VortexCompiler.cs | 7 ------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/Wabbajack.Lib/ACompiler.cs b/Wabbajack.Lib/ACompiler.cs index 9c9c8561..279fe296 100644 --- a/Wabbajack.Lib/ACompiler.cs +++ b/Wabbajack.Lib/ACompiler.cs @@ -18,13 +18,13 @@ namespace Wabbajack.Lib public string ModListOutputFolder; public string ModListOutputFile; - public List SelectedArchives; - public List InstallDirectives; - public List AllFiles; - public ModList ModList; - public VirtualFileSystem VFS; - public List IndexedArchives; - public Dictionary> IndexedFiles; + public List SelectedArchives = new List(); + public List InstallDirectives = new List(); + public List AllFiles = new List(); + public ModList ModList = new ModList(); + public VirtualFileSystem VFS = VirtualFileSystem.VFS; + public List IndexedArchives = new List(); + public Dictionary> IndexedFiles = new Dictionary>(); public abstract void Info(string msg); public abstract void Status(string msg); diff --git a/Wabbajack.Lib/Compiler.cs b/Wabbajack.Lib/Compiler.cs index 3f395c63..1af2779e 100644 --- a/Wabbajack.Lib/Compiler.cs +++ b/Wabbajack.Lib/Compiler.cs @@ -50,15 +50,6 @@ namespace Wabbajack.Lib ModListOutputFolder = "output_folder"; ModListOutputFile = MO2Profile + ExtensionManager.Extension; - - SelectedArchives = new List(); - InstallDirectives = new List(); - AllFiles = new List(); - ModList = new ModList(); - - VFS = VirtualFileSystem.VFS; - IndexedArchives = new List(); - IndexedFiles = new Dictionary>(); } public dynamic MO2Ini { get; } diff --git a/Wabbajack.Lib/VortexCompiler.cs b/Wabbajack.Lib/VortexCompiler.cs index d650c3c2..80aa5789 100644 --- a/Wabbajack.Lib/VortexCompiler.cs +++ b/Wabbajack.Lib/VortexCompiler.cs @@ -55,13 +55,6 @@ namespace Wabbajack.Lib // TODO: add custom modlist name ModListOutputFile = $"VORTEX_TEST_MODLIST{ExtensionManager.Extension}"; - - VFS = VirtualFileSystem.VFS; - - SelectedArchives = new List(); - AllFiles = new List(); - IndexedArchives = new List(); - IndexedFiles = new Dictionary>(); } public override void Info(string msg) From 22d1f29a8d1c26015843fe3903f1c4931d374cfb Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Thu, 14 Nov 2019 23:49:00 -0600 Subject: [PATCH 4/4] Removed duplicate member --- Wabbajack.Lib/Compiler.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Wabbajack.Lib/Compiler.cs b/Wabbajack.Lib/Compiler.cs index 1af2779e..bb8d4214 100644 --- a/Wabbajack.Lib/Compiler.cs +++ b/Wabbajack.Lib/Compiler.cs @@ -53,7 +53,6 @@ namespace Wabbajack.Lib } public dynamic MO2Ini { get; } - public string GamePath { get; } public bool ShowReportWhenFinished { get; set; } = true;