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 #34 from erri120/patch-2

Browse Source 
Changed all modpack references to modlist
This commit is contained in:
Timothy Baldridge 2019-09-16 14:22:26 -06:00 committed by GitHub
commit 41e2efe810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -78,7 +78,7 @@ continuum).
5) Wabbajack will start by indexing all your downloaded archives. This will take some time on most machines as the application
has to performa `SHA-256` hash on every file in every archive. However the results of this operation are cached, so you'll only need
to do this once for every downloaded file.
6) Once completed, Wabbajack will collect the files required for the modpack install and begin running them through the compilation stack.
6) Once completed, Wabbajack will collect the files required for the modlist install and begin running them through the compilation stack.
7) If all goes well, you should see a new `<your profile name>.exe` file next to `Wabbajack.exe` that you just ran. This new `.exe` is the one
you want to hand out as a auto modlist installer.
@ -152,7 +152,7 @@ copyrighted material. Instead we copy instructions on how to modify the copyrigh
Look at the [`RECIPES.md`] file, we keep a knowledgebase of how to deal with given types of mods in that file.
**Why does each modpack install another copy of Mod Organizer 2?**
**Why does each modlist install another copy of Mod Organizer 2?**
Self-contained folders are a cleaner abstraction than dumping tons of modlists into the same set of folders. It's easy to uninstall a modlist (simply delete the folder),
and MO2 really isn't designed to support lots of disparate modlists. For example if two modlists both wanted a given texture mod, but different options they would

2
Wabbajack.Common/Consts.cs
View File

@ -9,7 +9,7 @@ namespace Wabbajack.Common
{
public static string GameFolderFilesDir = "Game Folder Files";
public static string LOOTFolderFilesDir = "LOOT Config Files";
public static string ModPackMagic = "Celebration!, Cheese for Everyone!";
public static string ModListMagic = "Celebration!, Cheese for Everyone!";
public static string BSACreationDir = "TEMP_BSA_FILES";
public static string MegaPrefix = "https://mega.nz/#!";

4
Wabbajack/Compiler.cs
View File

@ -462,7 +462,7 @@ namespace Wabbajack
}
else
{
Error("No way to handle archive {0} but it's required by the modpack", found.Name);
Error("No way to handle archive {0} but it's required by the modlist", found.Name);
return null;
}
@ -1127,7 +1127,7 @@ namespace Wabbajack
}
bw.Write(orig_pos);
bw.Write(Encoding.ASCII.GetBytes(Consts.ModPackMagic));
bw.Write(Encoding.ASCII.GetBytes(Consts.ModListMagic));
}
}

7
Wabbajack/Installer.cs
View File

@ -620,19 +620,20 @@ namespace Wabbajack
return HashArchive(e);
}
public static ModList CheckForModPack()
public static ModList CheckForModList()
{
Utils.Log("Looking for attached modlist");
using (var s = File.OpenRead(Assembly.GetExecutingAssembly().Location))
{
var magic_bytes = Encoding.ASCII.GetBytes(Consts.ModPackMagic);
var magic_bytes = Encoding.ASCII.GetBytes(Consts.ModListMagic);
s.Position = s.Length - magic_bytes.Length;
using (var br = new BinaryReader(s))
{
var bytes = br.ReadBytes(magic_bytes.Length);
var magic = Encoding.ASCII.GetString(bytes);
if (magic != Consts.ModPackMagic) return null;
if (magic != Consts.ModListMagic) return null;
s.Position = s.Length - magic_bytes.Length - 8;
var start_pos = br.ReadInt64();
s.Position = start_pos;

2
Wabbajack/MainWindow.xaml.cs
View File

@ -59,7 +59,7 @@ namespace Wabbajack
else
new Thread(() =>
{
var modlist = Installer.CheckForModPack();
var modlist = Installer.CheckForModList();
if (modlist == null)
Utils.Log("No Modlist found, running in Compiler mode.");
else