release, feat: 更新1.1.2，添加对newest/targetVersion文件夹的支持

Author: pkuyo

RandomBuff/BuffPlugin.cs

@@ -60,7 +60,7 @@ internal partial class BuffPlugin : BaseUnityPlugin
 
         public const string ModId = "randombuff";
 
-        public const string ModVersion = "1.1.1";
+        public const string ModVersion = "1.1.2";
 
         public static string CacheFolder { get; private set; }
 
@@ -74,6 +74,8 @@ internal partial class BuffPlugin : BaseUnityPlugin
         private static bool isLoaded = false;
         private static bool canAccessLog = true;
 
+        public static string GameVersion;
+
 #if TESTVERSION
         internal static bool DevEnabled => true;
         private FStage devVersion;
@@ -87,7 +89,10 @@ public void OnEnable()
             LogInstance = this.Logger;
             Instance = this;
 
-
+            var replace = File.ReadAllLines("doorstop_config.ini").First(i => 
+                i.Contains("enabledVersionPath=")).Replace("enabledVersionPath=","");
+            GameVersion = File.ReadAllText(replace);
+            
             try
             {
                 On.RainWorld.OnModsInit += RainWorld_OnModsInit;
@@ -143,9 +148,8 @@ private void OnModsInit()
                     HookILCursor();
 
                     basePath = ModManager.ActiveMods.First(i => i.id == ModId).basePath;
-                    Log($"Version: {ModVersion}, Current save version: {saveVersion}, {DateTime.Now}");
-
-
+                    Log($"Version: {ModVersion},Game Version:{GameVersion}," +
+                        $" Current save version: {saveVersion}, {DateTime.Now}");
 
                     CheckBuffPluginVersion();
 
@@ -361,8 +365,8 @@ private void CheckBuffPluginVersion()
                 }
 
                 foreach (var mod in ModManager.ActiveMods.Where(i =>
-                             Directory.Exists(Path.Combine(i.basePath, "buffplugins")) ||
-                             Directory.Exists(Path.Combine(i.basePath, "buffassets"))))
+                             Directory.Exists(Path.Combine(i.BestMatchedPath("buffplugins"), "buffplugins")) ||
+                             Directory.Exists(Path.Combine(i.BestMatchedPath("buffassets"), "buffassets"))))
                 {
                     if (lastVersion.TryGetValue(mod.id, out var version))
                     {
@@ -397,8 +401,8 @@ private void CheckBuffPluginVersion()
                 foreach (var all in Directory.GetFiles(CacheFolder, $"*"))
                     File.Delete(all);
                 File.WriteAllLines(Path.Combine(SaveFolder, "BuffPluginVersion.txt"), ModManager.ActiveMods.Where(i =>
-                        Directory.Exists(Path.Combine(i.basePath, "buffplugins")) ||
-                        Directory.Exists(Path.Combine(i.basePath, "buffassets")))
+                        Directory.Exists(Path.Combine(i.BestMatchedPath("buffplugins"), "buffplugins")) ||
+                        Directory.Exists(Path.Combine(i.BestMatchedPath("buffassets"), "buffassets")))
                     .Select(i => $"{i.id}|{i.version}")
                     .ToArray());
             }

RandomBuff/Core/BuffMenu/BuffGameMenu.cs

@@ -172,6 +172,13 @@ void OnDataLoaded()
                     BuffOptionInterface.Instance.DisableNotifyDialog.Value = true;
                     BuffOptionInterface.SaveConfig();
                 }
+
+                if (BuffPlugin.GameVersion != "v1.9.15b" && !BuffOptionInterface.Instance.HasShownWarning.Value)
+                {
+                    testNotification.NewInfoNotification(BuffResourceString.Get("Notification_WatcherVersionWarning_Title"),BuffResourceString.Get("Notification_WatcherVersionWarning_Info"));
+                    BuffOptionInterface.Instance.HasShownWarning.Value = true;
+                    BuffOptionInterface.SaveConfig();
+                }
                 if((BuffConfigManager.IsItemLocked(QuestUnlockedType.Cosmetic, "Crown") || BuffPlugin.DevEnabled) && BuffOptionInterface.Instance.ShowUnlockWawaFuncNotification.Value)
                 {
                     testNotification.NewInfoNotification(BuffResourceString.Get("Notification_UnlockWawa_Title"), BuffResourceString.Get("Notification_UnlockWawa_Info"));

RandomBuff/Core/Entry/BuffRegister.cs

@@ -485,9 +485,10 @@ internal static void InitAllBuffPlugins()
 
             foreach (var mod in ModManager.ActiveMods)
             {
-                string path = mod.path + Path.DirectorySeparatorChar + "buffplugins";
-                if (!Directory.Exists(path))
+                string path = Path.Combine(mod.BestMatchedPath("buffplugins"), "buffplugins");
+                if(!Directory.Exists(path))
                     continue;
+                
                 BuffPlugin.Log($"Find correct path in {mod.id} to load plugins");
                 DirectoryInfo info = new DirectoryInfo(path);
 
@@ -840,8 +841,8 @@ private static AssemblyDefinition BuildCachePlugin(ModManager.Mod mod,string fil
         {
             hasPdb = File.Exists(filePath.Replace(".dll", ".pdb"));
             var resolver = new DefaultAssemblyResolver();
-            resolver.AddSearchDirectory(ModManager.ActiveMods.First(i => i.id == BuffPlugin.ModId).path + "/plugins");
-            resolver.AddSearchDirectory(ModManager.ActiveMods.First(i => i.id == BuffPlugin.ModId).path + "/buffplugins");
+            resolver.AddSearchDirectory(ModManager.ActiveMods.First(i => i.id == BuffPlugin.ModId).BestMatchedPath("plugins") + "/plugins");
+            resolver.AddSearchDirectory(ModManager.ActiveMods.First(i => i.id == BuffPlugin.ModId).BestMatchedPath("buffplugins") + "/buffplugins");
 
             foreach (var modPath in ModManager.ActiveMods.Where(i => mod.requirements.Contains(i.id)
                                                                      && i.requirements.Contains(BuffPlugin.ModId)))

RandomBuff/Core/Hooks/CoreHooks.cs

@@ -21,6 +21,7 @@
 using RandomBuff.Core.SaveData;
 using RandomBuff.Core.StaticsScreen;
 using RandomBuff.Credit;
+using RandomBuff.Render.UI.Notification;
 using RandomBuffUtils;
 using RWCustom;
 using UnityEngine;

RandomBuff/Core/Option/BuffOptionInterface.cs

@@ -57,6 +57,7 @@ public BuffOptionInterface()
             DisableCardPocketConflict = config.Bind(nameof(DisableCardPocketConflict), false);
             EnableDevChat = config.Bind(nameof(EnableDevChat), false);
             ShowUnlockWawaFuncNotification = config.Bind(nameof(ShowUnlockWawaFuncNotification), true);
+            HasShownWarning = config.Bind(nameof(HasShownWarning), false);
             Instance = this;
 
         }
@@ -329,6 +330,8 @@ private void AppendItems(OpTab tab, ref float yIndex, params UIelement[] element
         public Configurable<bool> ShowExceptionLog { get; private set; }
 
         public Configurable<bool> CheatAllCards { get; private set; }
+        
+        public Configurable<bool> HasShownWarning { get; private set; }
         public Configurable<bool> CheatAllCosmetics { get; private set; }
 
         public Configurable<bool> EnableExpeditionModExtend { get; private set; }

RandomBuff/Core/SaveData/BuffStaticDataManager.cs

@@ -186,7 +186,7 @@ internal static void InitBuffPluginInfo()
             Futile.atlasManager.LoadImage("buffassets/illustrations/default_thumbnail");
             foreach (var mod in ModManager.ActiveMods)
             {
-                string root = Path.Combine(mod.basePath, "buffinfos");
+                string root = Path.Combine(mod.BestMatchedPath("buffinfos"), "buffinfos");
                 if (!Directory.Exists(root))
                     continue;
                 foreach (var dir in new DirectoryInfo(root).GetDirectories())
@@ -225,7 +225,7 @@ internal static void InitBuffPluginInfo()
 
         private static IEnumerable<string> GetPluginFolder(ModManager.Mod mod, string folderName)
         {
-            string root = Path.Combine(mod.basePath, "buffinfos");
+            string root = Path.Combine(mod.BestMatchedPath("buffinfos"), "buffinfos");
             if (!Directory.Exists(root))
                 yield break;
 
@@ -239,9 +239,10 @@ private static IEnumerable<string> GetPluginFolder(ModManager.Mod mod, string fo
         }
         private static IEnumerable<(string, string)> GetPluginFolderWithId(ModManager.Mod mod, string folderName)
         {
-            string root = Path.Combine(mod.basePath, "buffinfos");
+            string root = Path.Combine(mod.BestMatchedPath("buffinfos"),"buffinfos");
             if (!Directory.Exists(root))
                 yield break;
+            
 
             foreach (var dir in new DirectoryInfo(root).GetDirectories())
             {
@@ -306,7 +307,7 @@ internal static void InitBuffStaticData()
                         new CustomAttributeArgument(assembly.MainModule.TypeSystem.Boolean, true)));
 
                     PluginStaticDataTable.Add(pluginId, new());
-                    LoadInDirectory(new DirectoryInfo(path), new DirectoryInfo(mod.path).FullName, pluginId);
+                    LoadInDirectory(new DirectoryInfo(path), new DirectoryInfo(mod.BestMatchedPath("buffinfo")).FullName, pluginId);
 
                     if (CreateStaticDataCache(assembly.MainModule, mod.id, pluginId))
                         assembly.Write(Path.Combine(BuffPlugin.CacheFolder, $"{mod.id}_{pluginId}_dataCache.dll"));

RandomBuff/Helper.cs

@@ -10,6 +10,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -26,6 +27,32 @@ namespace RandomBuff
     /// </summary>
     public static class Helper
     {
+
+        public static string BestMatchedPath(this ModManager.Mod mod)
+        {
+            if (mod.hasTargetedVersionFolder)
+                return mod.TargetedPath;
+            else if (mod.hasNewestFolder)
+                return mod.NewestPath;
+            return mod.path;
+        }
+        
+        public static string BestMatchedPath(this ModManager.Mod mod, string withCheck)
+        {
+            if (mod.hasTargetedVersionFolder && Directory.Exists(Path.Combine(mod.TargetedPath,withCheck)))
+                return mod.TargetedPath;
+            else if (mod.hasNewestFolder && Directory.Exists(Path.Combine(mod.NewestPath,withCheck)))
+                return mod.NewestPath;
+            return mod.path;
+        }
+        public static IEnumerable<string> SortedPaths(this ModManager.Mod mod)
+        {
+            if (mod.hasTargetedVersionFolder)
+                yield return mod.TargetedPath;
+            if (mod.hasNewestFolder)
+                yield return mod.NewestPath;
+            yield return mod.path;
+        }
         /// <summary>
         /// 按键跟踪简化类
         /// </summary>

buffassets/resourceStrings.txt

@@ -56,6 +56,8 @@ Notification_MissionReward_Unique|Unlock exclusive mission
 Notification_CosmeticReward|Unlock cosmetic
 Notification_CardReward|Unlock card
 Notification_FreePickReward|Unlock free pick count
+Notification_WatcherVersionWarning_Title|Unstable Version Warning:
+Notification_WatcherVersionWarning_Info|Random Buff may be unstable in the new version and could cause exceptions or game crashes. <LINE>If an exception occurs, please keep an eye on the exception notifications (if enabled) and files below:<LINE>exceptionLog.txt (locate at root path of rainworld)<LINE>buffcore.txt (locate at Rain World\RainWorld_Data\StreamingAssets)
 Notification_TooManyMods_Title|Mod amount warning:
 Notification_TooManyMods_Info|It seems you have enabled too many mods, be aware that this may cause more exception or crash.<LINE>If an exception occurs, please keep an eye on the exception notifications (if enabled) and files below:<LINE>exceptionLog.txt (locate at root path of rainworld)<LINE>buffcore.txt (locate at Rain World\RainWorld_Data\StreamingAssets)
 Notification_UnlockWawa_Title|Hiden function unlocked:

buffassets/resourceStrings_Chinese.txt

@@ -57,6 +57,8 @@ Notification_MissionReward_Unique|解锁专属使命
 Notification_CosmeticReward|解锁装饰品
 Notification_CardReward|解锁卡牌
 Notification_FreePickReward|解锁自由抽卡数
+Notification_WatcherVersionWarning_Title|版本不稳定警告:
+Notification_WatcherVersionWarning_Info|新版本下卡牌mod暂时还不稳定，可能会有异常或或导致游戏崩溃。<LINE>如果出现异常，请留意 报错提示（如有启用）和 以下文件：<LINE>exceptionLog.txt（位于 雨世界根目录）<LINE>buffcore.txt（位于 Rain World\RainWorld_Data\StreamingAssets）
 Notification_TooManyMods_Title|启用mod数量警告:
 Notification_TooManyMods_Info|看起来你启用了很多的mod，请注意这有可能会造成更多的异常或游戏崩溃。<LINE>如果出现异常，请留意 报错提示（如有启用）和 以下文件：<LINE>exceptionLog.txt（位于 雨世界根目录）<LINE>buffcore.txt（位于 Rain World\RainWorld_Data\StreamingAssets）
 Notification_UnlockWawa_Title|隐藏功能解锁: