Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -493,4 +493,4 @@ fabric.properties
# *.ipr

### Custom ###
ShinRyuModManager-Linux/Properties/launchSettings.json
ShinRyuModManager-CE/Properties/launchSettings.json
6 changes: 5 additions & 1 deletion ShinRyuModManager-CE/ModLoadOrder/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace ShinRyuModManager.ModLoadOrder;

public static class Generator {
public static async Task<MLO> GenerateModeLoadOrder(List<string> mods, bool looseFilesEnabled, bool cpkRepackingEnabled) {
var modIndices = new List<int> { 0 };
List<int> modIndices = [0];
var files = new OrderedSet<string>();
var modsWithFoldersNotFound = new Dictionary<string, List<string>>(); // Dict of Mod, ListOfFolders
var parDictionary = new Dictionary<string, List<string>>(); // Dict of PathToPar, ListOfMods
Expand Down Expand Up @@ -82,6 +82,10 @@ public static async Task<MLO> GenerateModeLoadOrder(List<string> mods, bool loos
var subPathName = new DirectoryInfo(subPath).Name;

if (!(GamePath.DirectoryExistsInData(subPathName) || GamePath.FileExistsInData($"{subPathName}.par"))) {
// While "stream" isn't a folder in Y0 or Kiwami, it shouldn't warn the user as it's used in place of bgm.cpk
if (GamePath.CurrentGame is Game.Yakuza0 or Game.YakuzaKiwami && subPathName == "stream")
continue;

foldersNotFound.Add(subPathName);
}
}
Expand Down
10 changes: 7 additions & 3 deletions ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,13 @@ public void AddFiles(string path, string check) {
// Add files in current directory
var files = Directory.GetFiles(path).Where(f => !f.EndsWith(Constants.VORTEX_MANAGED_FILE)).Select(GamePath.GetDataPathFrom);

foreach (var p in files) {
Files.Add(p);
Log.Verbose("Adding file: {file}", p);
foreach (var file in files) {
// No need to add the meta file
if (file.EndsWith("mod-meta.yaml"))
continue;

Files.Add(file);
Log.Verbose("Adding file: {file}", file);
}

var isParlessMod = GetType() == typeof(ParlessMod);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ShinRyuModManager-CE": {
"commandName": "Project",
"commandLineArgs": "",
"workingDirectory": "/mnt/nvme-storage/SteamLibrary/steamapps/common/Yakuza 5/main/"
"workingDirectory": "" // Path to folder containing exe
}
}
}