Update

BUTR · Jul 5, 2023 · 4d75a08 · 4d75a08
1 parent 734b65a
commit 4d75a08
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 27 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -2,7 +2,7 @@
 Version: 1.4.0
 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
 * Added a global exception handler with integration support and settings
-* Added a temporary Watchdog disabler ofr v1.2.0
+* Added a temporary Watchdog disabler for v1.2.0
 ---------------------------------------------------------------------------------------------------
 Version: 1.3.10
 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

diff --git a/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj b/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj
@@ -30,7 +30,7 @@
 
  <PackageReference Include="Bannerlord.BUTR.Shared" Version="$(BUTRSharedVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
  <!-- We need our own implementation of Bannerlord.ModuleManager.Source so won't load it from Bannerlord.LauncherEx that is dynamically resolved -->
- <PackageReference Include="Bannerlord.ModuleManager" PrivateAssets="all" Version="$(BUTRModuleManagerVersion)" />
+ <PackageReference Include="Bannerlord.ModuleManager.Source" PrivateAssets="all" Version="$(BUTRModuleManagerVersion)" />
  <PackageReference Include="Harmony.Extensions" Version="$(HarmonyExtensionsVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
  <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
 
@@ -49,14 +49,6 @@
  <ProjectReference Include="..\Bannerlord.LauncherEx\Bannerlord.LauncherEx.csproj" Private="false" IncludeAssets="compile" PrivateAssets="all" />
  </ItemGroup>
 
- <Target Name="ChangeAliasesOfNugetRefs" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
- <ItemGroup>
- <ReferencePath Condition="'%(FileName)' == 'Bannerlord.ModuleManager'">
- <Aliases>ModuleManager</Aliases>
- </ReferencePath>
- </ItemGroup>
- </Target>
-
  <Target Name="PostBuildFramework" AfterTargets="CopyFilesToOutputDirectory" Condition="Exists($(GameFolder))">
  <ItemGroup>
  <FilesDebug Include="Bannerlord.LauncherEx.dll" />

diff --git a/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs b/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs
@@ -1,9 +1,7 @@
-extern alias ModuleManager;
-
+
 using Bannerlord.BLSE.Shared.Utils;
 using Bannerlord.BUTR.Shared.Helpers;
-
-using ModuleManager::Bannerlord.ModuleManager;
+using Bannerlord.ModuleManager;
 
 using System;
 using System.IO;

diff --git a/src/Bannerlord.BLSE.Shared/Standalone.cs b/src/Bannerlord.BLSE.Shared/Standalone.cs
@@ -1,18 +1,15 @@
-extern alias ModuleManager;
-
-using Bannerlord.BLSE.Features.AssemblyResolver;
+using Bannerlord.BLSE.Features.AssemblyResolver;
 using Bannerlord.BLSE.Features.Commands;
 using Bannerlord.BLSE.Features.ContinueSaveFile;
 using Bannerlord.BLSE.Features.ExceptionInterceptor;
 using Bannerlord.BLSE.Features.Interceptor;
 using Bannerlord.BLSE.Features.Xbox;
 using Bannerlord.BLSE.Shared.Utils;
 using Bannerlord.BUTR.Shared.Helpers;
+using Bannerlord.ModuleManager;
 
 using HarmonyLib;
 
-using ModuleManager::Bannerlord.ModuleManager;
-
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;

diff --git a/src/Bannerlord.BLSE.Shared/Utils/HarmonyFinder.cs b/src/Bannerlord.BLSE.Shared/Utils/HarmonyFinder.cs
@@ -1,10 +1,8 @@
-extern alias ModuleManager;
-
-using System.IO;
+using System.IO;
 using System.Reflection;
 
 #if SHARED
-using ModuleManager::Bannerlord.ModuleManager;
+using Bannerlord.ModuleManager;
 #endif
 
 namespace Bannerlord.BLSE.Shared.Utils;

diff --git a/src/Bannerlord.BLSE.Shared/Utils/WatchdogHandler.cs b/src/Bannerlord.BLSE.Shared/Utils/WatchdogHandler.cs
@@ -9,8 +9,8 @@ namespace Bannerlord.BLSE.Shared.Utils
  internal static unsafe class WatchdogHandler
  {
  private static readonly string WatchdogLibraryName = "TaleWorlds.Native.dll";
- private static readonly byte[] WatchdogOriginal = "Watchdog.exe"u8.ToArray();
- private static readonly byte[] WatchdogReplacement = "Wetchdog.exe"u8.ToArray();
+ private static readonly byte[] WatchdogOriginal = @"Watchdog\Watchdog.exe"u8.ToArray();
+ private static readonly byte[] WatchdogReplacement = @"Wetchdog\Watchdog.exe"u8.ToArray();
 
  // Disable Watchdog by renaming it, thus performing a soft delete in it's eyes
  public static void DisableTWWatchdog()
@@ -39,8 +39,8 @@ public static void DisableTWWatchdog()
  WatchdogReplacement.CopyTo(watchdogLocationSpan);
  PInvoke.VirtualProtect(watchdogLocationPtr, (nuint) watchdogLocationSpan.Length, old, out _);
 
- searchSpanOffset = idx;
- searchSpan = searchSpan.Slice(searchSpanOffset);
+ searchSpanOffset += idx + 1;
+ searchSpan = searchSpan.Slice(idx + 1);
  }
  }
  }