Merge pull request #80 from BUTR/dev

v1.4.8

.github/workflows/dotnet-format-daily.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code Formatting
-        uses: butr/actions-code-format-setup@v1.5
+        uses: butr/actions-code-format-setup@v1
         with:
           workspace: "src/Bannerlord.BLSE.sln"
           github-token: ${{ secrets.GITHUB_TOKEN }}

build/common.props

@@ -11,7 +11,7 @@
 
   <!--Development Variables-->
   <PropertyGroup>
-    <Version>1.4.7</Version>
+    <Version>1.4.8</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <BUTRSharedVersion>3.0.0.137</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>

changelog.txt

@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.4.8
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1,v1.2.2,v1.2.3
+* Better descriptions for certain misinstallation cases
+---------------------------------------------------------------------------------------------------
 Version: 1.4.7
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0
 * Fixed ReShade and Special K loading. At the moment they do not work together

src/Bannerlord.BLSE.Loaders.Standalone/GameConsistencyChecker.cs

@@ -8,7 +8,9 @@ internal static class GameConsistencyChecker
 {
     public static void Verify()
     {
-        var platform = new FileInfo(typeof(GameConsistencyChecker).Assembly.Location).Directory!.Name;
+        var assemblyFile = new FileInfo(typeof(GameConsistencyChecker).Assembly.Location);
+
+        var platform = assemblyFile.Directory!.Name;
         if (platform is not "Win64_Shipping_Client" and not "Gaming.Desktop.x64_Shipping_Client")
         {
             MessageBox.Show($"""
@@ -21,13 +23,15 @@ The BLSE containing folder is named '{platform}'
             Environment.Exit(1);
         }
 
-
         var twLibrary = new FileInfo("TaleWorlds.Library.dll");
         if (!twLibrary.Exists)
         {
             MessageBox.Show($"""
 Failed to find the necessary game files!
-Make sure BLSE is installed in '%GAME FOLDER%/bin/{platform}''
+Make sure BLSE is installed in '%GAME FOLDER%/bin/%PLATFORM%'
+Where %PLATFORM% is:
+* 'Win64_Shipping_Client' for Steam/GOG/Epic Games
+* 'Gaming.Desktop.x64_Shipping_Client' for Xbox Game Pass PC
 """, "Error from BLSE!", MessageBoxButtons.OK, MessageBoxIcon.Error);
             Environment.Exit(1);
         }

src/Bannerlord.BLSE.Shared/ModuleInitializer.cs

@@ -40,6 +40,8 @@ The Harmony module is missing!
 If the module was installed manually, make sure that the module in installed in 'Modules/Bannerlord.Harmony'!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -51,6 +53,8 @@ The Harmony module is corrupted!
 If the module was installed manually, try to do a clean reinstall!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -62,6 +66,8 @@ Failed to read '{ModuleInfoHelper.SubModuleFile}'!
 If the module was installed manually, try to do a clean reinstall!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -73,6 +79,8 @@ At least v2.2.2.x is required!
 If the module was installed manually, find and install the latest version!
 If Vortex is used, try to reinstall manually the latest version!
 If Steam is used, download the latest Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -84,6 +92,8 @@ The Harmony module is corrupted!
 If the module was installed manually, try to do a clean reinstall!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -95,6 +105,8 @@ The Harmony module is corrupted!
 If the module was installed manually, try to do a clean reinstall!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
                 Environment.Exit(1);
                 return null;
@@ -179,6 +191,8 @@ Wrong 0Harmony.dll version! At least v2.2.2.x is required!
 If the module was installed manually, try to do a clean reinstall!
 If Vortex is used, try to reinstall manually!
 If Steam is used, download the Harmony mod from NexusMods!
+Don't forget that on Steam you have the '/Modules' folder in the Game
+and the Steam Workshop folder that can conflict with each other!
 """, "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
             Environment.Exit(1);
             return null;

src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj

@@ -94,7 +94,7 @@
     <PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="StbSharp" Version="0.7.2.38" PrivateAssets="all" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageReference Include="Vanara.Core" Version="3.4.14" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
   <Target Name="SetLauncherExMetadata" BeforeTargets="BeforeCompile">