添加mods存在同Id模组的检测

Author: Hakoyu

App.xaml

@@ -4,7 +4,7 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:I18n="clr-namespace:StarsectorTools.Langs"
   xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
-  StartupUri="Views/MainWindow/MainWindow.xaml">
+  StartupUri="Views/Main/MainWindow.xaml">
   <Application.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
@@ -55,6 +55,7 @@
                   <Grid>
                     <pu:StateControl
                       HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
                       CurrentState="{Binding MessageBoxIcon}"
                       FontFamily="/Panuon.WPF.UI;component/Resources/Fonts/#PanuonIcon"
                       FontSize="64"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # StarsectorToolsChangeLog
 
+## 0.8.7.2
+
+添加mods存在同Id模组的检测
+
 ## 0.8.7.1
 
 修复获取游戏版本失败时会判断游戏路径设置错误的问题

Langs/Pages/ModManager/ModManagerPageI18nRes.Designer.cs

@@ -571,4 +571,16 @@ Submit the issue with its ID and the category it should be in</value>
   <data name="LastUpdateTime" xml:space="preserve">
     <value>Last update time</value>
   </data>
+  <data name="ModIsContainsMessage" xml:space="preserve">
+    <value>The same mod exists
+The game will only load the first mod with this Id in the correct order by folder name and ignore the following mod with the same Id
+Please check your mod, and remove any extra mod with the same ID
+First load location: {0}
+Reload location: {1}</value>
+  </data>
+  <data name="ModIsContains" xml:space="preserve">
+    <value>The same mod exists
+First load location: {0}
+Reload location: {1}</value>
+  </data>
 </root>

Langs/Pages/ModManager/ModManagerPageI18nRes.en-US.resx

@@ -571,4 +571,16 @@
   <data name="LastUpdateTime" xml:space="preserve">
     <value>最后更新时间</value>
   </data>
+  <data name="ModIsContainsMessage" xml:space="preserve">
+    <value>存在相同的模组
+游戏只会加载按文件夹名称正序的首个为此Id的模组并忽视后面的同Id模组
+请检查你的模组, 并删除多余的同Id模组
+首次载入位置: {0}
+再次载入位置: {1}</value>
+  </data>
+  <data name="ModIsContains" xml:space="preserve">
+    <value>存在相同的模组
+首次载入位置: {0}
+再次载入位置: {1}</value>
+  </data>
 </root>

Langs/Pages/ModManager/ModManagerPageI18nRes.resx

@@ -301,15 +301,15 @@ is string baseNamespace
     private static string GetDataTimeMessage()
     {
         string dateTime = GetDataTime();
-        if (!string.IsNullOrWhiteSpace(dateTime))
+        if (string.IsNullOrWhiteSpace(dateTime) is false)
             dateTime += " ";
         return dateTime;
     }
 
     private static string GetThreadIdMessage()
     {
         string threadId = GetThreadId();
-        if (!string.IsNullOrWhiteSpace(threadId))
+        if (string.IsNullOrWhiteSpace(threadId) is false)
             threadId = $":{threadId}";
         return threadId;
     }

Libs/HKW/Libs/Logger.cs

@@ -99,7 +99,7 @@ internal enum WindowCompositionAttribute
     /// <summary>
     /// 设置高斯模糊
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="argb">背景颜色(ARGB)</param>
     public static void SetBlurBehind(Window window, uint argb)
     {
@@ -109,7 +109,7 @@ public static void SetBlurBehind(Window window, uint argb)
     /// <summary>
     /// 设置高斯模糊
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="color">背景颜色</param>
     public static void SetBlurBehind(Window window, Color color)
     {
@@ -119,7 +119,7 @@ public static void SetBlurBehind(Window window, Color color)
     /// <summary>
     /// 设置亚克力模糊
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="argb">背景颜色(ARGB)</param>
     public static void SetAcrylicBlurBehind(Window window, uint argb)
     {
@@ -129,7 +129,7 @@ public static void SetAcrylicBlurBehind(Window window, uint argb)
     /// <summary>
     /// 设置亚克力模糊
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="color">背景颜色</param>
     public static void SetAcrylicBlurBehind(Window window, Color color)
     {
@@ -139,7 +139,7 @@ public static void SetAcrylicBlurBehind(Window window, Color color)
     /// <summary>
     /// 设置窗口强调类型
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="state">强调状态</param>
     /// <param name="argb">背景颜色(ARGB)</param>
     public static void SetWindowAccent(Window window, AccentState state, uint argb)
@@ -150,7 +150,7 @@ public static void SetWindowAccent(Window window, AccentState state, uint argb)
     /// <summary>
     /// 设置窗口强调类型
     /// </summary>
-    /// <param name="window">主窗口(MainWindow)</param>
+    /// <param name="window">主窗口(Main)</param>
     /// <param name="state">强调状态</param>
     /// <param name="color">背景颜色</param>
     public static void SetWindowAccent(Window window, AccentState state, Color color)

Libs/HKW/WPF/WindowAccent.cs

@@ -14,7 +14,7 @@
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
 using SharpCompress.Common;
-using StarsectorTools.ViewModels.MainWindow;
+using StarsectorTools.ViewModels.Main;
 using I18n = StarsectorTools.Langs.Libs.UtilsI18nRes;
 
 namespace StarsectorTools.Libs.Utils;

Libs/Utils/Utils.cs

@@ -25,8 +25,8 @@
     <NeutralLanguage>zh-CN</NeutralLanguage>
     <Title>$(AssemblyName)</Title>
     <Authors>HKW</Authors>
-    <FileVersion>0.8.7.1</FileVersion>
-    <AssemblyVersion>0.8.7.1</AssemblyVersion>
+    <FileVersion>0.8.7.2</FileVersion>
+    <AssemblyVersion>0.8.7.2</AssemblyVersion>
     <Copyright>Copyright ©2022-2023 HKW</Copyright>
     <RepositoryType>https://github.com/Hakoyu/StarsectorTools</RepositoryType>
     <IncludeSymbols>False</IncludeSymbols>

StarsectorTools.csproj

@@ -9,7 +9,7 @@
 using StarsectorTools.Libs.Utils;
 using I18nRes = StarsectorTools.Langs.Pages.GameSettings.GameSettingsPageI18nRes;
 
-namespace StarsectorTools.ViewModels.GameSettingsPage;
+namespace StarsectorTools.ViewModels.GameSettings;
 
 internal partial class GameSettingsPageViewModel
 {
@@ -34,7 +34,7 @@ private void GetGameKey()
         if (key != null)
         {
             var serialKey = key.GetValue("serial") as string;
-            if (!string.IsNullOrWhiteSpace(serialKey))
+            if (string.IsNullOrWhiteSpace(serialKey) is false)
             {
                 _realGameKey = serialKey.Replace("/", "");
                 GameKey = _hideGameKey = new string('*', 23);