diff --git a/build/common.props b/build/common.props
index bcabda1..8565d62 100644
--- a/build/common.props
+++ b/build/common.props
@@ -10,8 +10,8 @@
- 1.2.4
- 2.10.1
+ 1.3.0
+ 2.2.2
3.0.0.135
5.0.198
3.2.0.77
diff --git a/changelog.txt b/changelog.txt
index 0c03747..d982b04 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2
+* Switched back to Lib.Harmony
+---------------------------------------------------------------------------------------------------
Version: 1.2.4
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2
* Unblock Bannerlord.Harmony automatically
diff --git a/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj b/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj
index 4be0bdf..b7d43dd 100644
--- a/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj
+++ b/src/Bannerlord.BLSE.Shared/Bannerlord.BLSE.Shared.csproj
@@ -8,7 +8,7 @@
library
Bannerlord.BLSE.Shared
- $(DefineConstants);HARMONYEXTENSIONS_HARMONYX
+ $(DefineConstants)
$(Configurations);
false
diff --git a/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs b/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs
index 2f3abab..bc794e9 100644
--- a/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs
+++ b/src/Bannerlord.BLSE.Shared/ModuleInitializer.cs
@@ -114,7 +114,7 @@ private static HarmonyDiscoveryResult TryResolveHarmonyAssembliesFile(AssemblyNa
if (harmonyModuleInfo is null)
return HarmonyDiscoveryResult.ModuleSubModuleCorrupted;
- if (new ApplicationVersionComparer().Compare(harmonyModuleInfo.Version, new ApplicationVersion(ApplicationVersionType.Release, 2, 10, 0, 0)) < 0)
+ if (new ApplicationVersionComparer().Compare(harmonyModuleInfo.Version, new ApplicationVersion(ApplicationVersionType.Release, 2, 2, 2, 0)) < 0)
return HarmonyDiscoveryResult.ModuleVersionWrong;
var harmonyBinFolder = Path.Combine(harmonyModuleFolder, "bin", configName);
@@ -210,7 +210,7 @@ Failed to read '{ModuleInfoHelper.SubModuleFile}'!
return null;
case HarmonyDiscoveryResult.ModuleVersionWrong:
MessageBoxDialog.Show(@"The Harmony module is wrong!
-At least v2.10.1.x is required!
+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!
@@ -252,10 +252,10 @@ At least v2.10.1.x is required!
return null;
var harmonyX = AssemblyDefinition.ReadAssembly(assemblyFile);
- if (harmonyX.Name.Version < new Version(2, 10, 1, 0))
+ if (harmonyX.Name.Version < new Version(2, 2, 2, 0))
{
MessageBoxDialog.Show(@"The Harmony module is corrupted!
-Wrong 0Harmony.dll version! At least v2.10.1.x is required!
+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!
diff --git a/src/Bannerlord.BLSE/Bannerlord.BLSE.csproj b/src/Bannerlord.BLSE/Bannerlord.BLSE.csproj
index 7fac1e9..a581aaa 100644
--- a/src/Bannerlord.BLSE/Bannerlord.BLSE.csproj
+++ b/src/Bannerlord.BLSE/Bannerlord.BLSE.csproj
@@ -10,7 +10,7 @@
enable
x64
- $(DefineConstants);HARMONYEXTENSIONS_HARMONYX
+ $(DefineConstants)
@@ -28,7 +28,7 @@
-
+
diff --git a/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj b/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj
index ad70afa..4fcf045 100644
--- a/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj
+++ b/src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj
@@ -22,7 +22,7 @@
v$(GameVersionFlat)
-->
- $(DefineConstants);$(GameVersionConstant);HARMONYEXTENSIONS_HARMONYX
+ $(DefineConstants);$(GameVersionConstant)
@@ -83,7 +83,7 @@
-
+
diff --git a/src/Bannerlord.LauncherEx/Manager.cs b/src/Bannerlord.LauncherEx/Manager.cs
index 61bcc14..065de2c 100644
--- a/src/Bannerlord.LauncherEx/Manager.cs
+++ b/src/Bannerlord.LauncherEx/Manager.cs
@@ -140,7 +140,7 @@ public static void Disable()
BrushFactoryManager.Clear();
WidgetFactoryManager.Clear();
BUTRLocalizationManager.Clear();
- _launcherHarmony.UnpatchSelf();
+ _launcherHarmony.UnpatchAll(_launcherHarmony.Id);
}
}
}
\ No newline at end of file