From 42fcb4e1e3f3101f650cd341aaf7a165d37c319b Mon Sep 17 00:00:00 2001 From: Benjamin Date: Sun, 2 Nov 2025 08:54:13 -0600 Subject: [PATCH] Minor updates - Updated `.gitignore` to ignore `launchSettings.json`, adding an example file in its place - Fixed list declaration to prevent odd debugger behavior - Prevent `mod-meta.yml` from being added to MLO - Prevent "Folder not found" warning when using the "stream" folder in Y0 and YK --- .gitignore | 2 +- ShinRyuModManager-CE/ModLoadOrder/Generator.cs | 6 +++++- ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs | 10 +++++++--- ...launchSettings.json => launchSettings.example.json} | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) rename ShinRyuModManager-CE/Properties/{launchSettings.json => launchSettings.example.json} (67%) diff --git a/.gitignore b/.gitignore index 00278f3..33ec363 100644 --- a/.gitignore +++ b/.gitignore @@ -493,4 +493,4 @@ fabric.properties # *.ipr ### Custom ### -ShinRyuModManager-Linux/Properties/launchSettings.json +ShinRyuModManager-CE/Properties/launchSettings.json diff --git a/ShinRyuModManager-CE/ModLoadOrder/Generator.cs b/ShinRyuModManager-CE/ModLoadOrder/Generator.cs index 60c9670..0388078 100644 --- a/ShinRyuModManager-CE/ModLoadOrder/Generator.cs +++ b/ShinRyuModManager-CE/ModLoadOrder/Generator.cs @@ -7,7 +7,7 @@ namespace ShinRyuModManager.ModLoadOrder; public static class Generator { public static async Task GenerateModeLoadOrder(List mods, bool looseFilesEnabled, bool cpkRepackingEnabled) { - var modIndices = new List { 0 }; + List modIndices = [0]; var files = new OrderedSet(); var modsWithFoldersNotFound = new Dictionary>(); // Dict of Mod, ListOfFolders var parDictionary = new Dictionary>(); // Dict of PathToPar, ListOfMods @@ -82,6 +82,10 @@ public static async Task GenerateModeLoadOrder(List 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); } } diff --git a/ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs b/ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs index bbb6feb..9aaf029 100644 --- a/ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs +++ b/ShinRyuModManager-CE/ModLoadOrder/Mods/Mod.cs @@ -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); diff --git a/ShinRyuModManager-CE/Properties/launchSettings.json b/ShinRyuModManager-CE/Properties/launchSettings.example.json similarity index 67% rename from ShinRyuModManager-CE/Properties/launchSettings.json rename to ShinRyuModManager-CE/Properties/launchSettings.example.json index 43543bd..0435f61 100644 --- a/ShinRyuModManager-CE/Properties/launchSettings.json +++ b/ShinRyuModManager-CE/Properties/launchSettings.example.json @@ -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 } } }