diff --git a/build/common.props b/build/common.props index 4b47fe7..21ac841 100644 --- a/build/common.props +++ b/build/common.props @@ -11,7 +11,7 @@ - 1.4.11 + 1.4.12 2.2.2 3.0.0.137 5.0.209 @@ -50,7 +50,7 @@ - + diff --git a/changelog.txt b/changelog.txt index 16ef010..b7151d0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,7 @@ --------------------------------------------------------------------------------------------------- Version: 1.4.12 -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.1.6,v1.2.6 +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.1.6,v1.2.9 +* Adapted to v1.2.9. Thanks to jzebedee! * Added Ukrainian and Japanese localization --------------------------------------------------------------------------------------------------- Version: 1.4.11 diff --git a/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs b/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs index c7dfe35..8265083 100644 --- a/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs +++ b/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs @@ -44,7 +44,7 @@ private static void ExceptionInterceptorFeatureOnException(Exception exception) fs.SetLength(0); using var writer = new StreamWriter(fs); writer.Write($@"BLSE Exception: -Version: {typeof(Program).Assembly.GetName().Version} +Version: {typeof(LauncherExceptionHandler).Assembly.GetName().Version} {GetRecursiveException(exception)}"); } diff --git a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs index 1d67776..701cb99 100644 --- a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs +++ b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs @@ -10,7 +10,7 @@ namespace Bannerlord.LauncherEx { - internal partial class BUTRLauncherManagerHandler + partial class BUTRLauncherManagerHandler { public override SaveMetadata[] GetSaveFiles() => MBSaveLoad.GetSaveFiles().Where(x => x.MetaData is not null).Select(x => { diff --git a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs index 8de1a02..45c2bab 100644 --- a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs +++ b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs @@ -7,7 +7,7 @@ namespace Bannerlord.LauncherEx { - internal partial class BUTRLauncherManagerHandler + partial class BUTRLauncherManagerHandler { public void SetGameParametersLoadOrder(IEnumerable modules) => SaveLoadOrder(GetFromViewModel(modules)); @@ -23,10 +23,7 @@ internal partial class BUTRLauncherManagerHandler public Task ShowWarning(string title, string contentPrimary, string contentSecondary) { var tcs = new TaskCompletionSource(); - base.ShowWarning(title, contentPrimary, contentSecondary, result => - { - tcs.SetResult(result); - }); + base.ShowWarning(title, contentPrimary, contentSecondary, tcs.SetResult); return tcs.Task; } diff --git a/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs b/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs index a709c14..8ba2cdf 100644 --- a/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs +++ b/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs @@ -8,9 +8,8 @@ namespace Bannerlord.LauncherEx.Helpers { internal static class ConfigReader { - private static readonly string BOMMarkUtf8 = - Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); - + private static readonly string BOMMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); + public static readonly string GameConfigPath = Path.Combine($@"{Environment.GetFolderPath(Environment.SpecialFolder.Personal)}", "Mount and Blade II Bannerlord", "Configs", "BannerlordConfig.txt"); public static readonly string EngineConfigPath = diff --git a/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs b/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs index 05773f6..55b9601 100644 --- a/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs +++ b/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs @@ -12,7 +12,6 @@ using System.Linq; using TaleWorlds.Library; -using TaleWorlds.MountAndBlade; namespace Bannerlord.LauncherEx.Helpers { @@ -28,7 +27,7 @@ public static bool IsInstalledInMainAndExternalModuleDirectory(ModuleInfoExtende public static bool IsObfuscated(ModuleInfoExtendedWithPath moduleInfoExtended) { static bool CanBeLoaded(SubModuleInfoExtended x) => - ModuleInfoHelper.CheckIfSubModuleCanBeLoaded(x, ApplicationPlatform.CurrentPlatform, ApplicationPlatform.CurrentRuntimeLibrary, DedicatedServerType.None, false); + ModuleInfoHelper.CheckIfSubModuleCanBeLoaded(x, ApplicationPlatform.CurrentPlatform, ApplicationPlatform.CurrentRuntimeLibrary, TaleWorlds.MountAndBlade.DedicatedServerType.None, false); foreach (var subModule in moduleInfoExtended.SubModules.Where(CanBeLoaded)) {