Merge pull request #373 from BUTR/v2.8.16

v2.8.16
BUTR · Feb 15, 2024 · 65b1579 · 65b1579
2 parents 6c2dd06 + de9df74
commit 65b1579
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/build/common.props b/build/common.props
@@ -4,7 +4,7 @@
   <!--Development Variables-->
   <PropertyGroup>
     <!--Module Version-->
-    <Version>2.8.15</Version>
+    <Version>2.8.16</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.8.16
+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.x
+* Fixed an issue with the new JsonSerializer overload
+---------------------------------------------------------------------------------------------------
 Version: 2.8.15
 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.4
 * Fixed an issue with the new JsonSerializer overload

diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs
@@ -53,7 +53,7 @@ public override IReadOnlyList<HotKeyBase> Build()
 
 #if v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115
             TWHotKeyManager.RegisterInitialContexts(new[] { hotKeyCategoryContainer }, true);
-#elif v120 || v121 || v122 || v123 || v124
+#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129
             TWHotKeyManager.RegisterInitialContexts(TWHotKeyManager.GetAllCategories().ToList().Concat(new[] { hotKeyCategoryContainer }), true);
 #else
 #error DEFINE

diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs
@@ -58,10 +58,10 @@ private static void OnApplicationTick(float dt)
                 var hotKey = HotKeyManagerImplementation.GlobalHotKeyStorage[i];
                 if (!hotKey.ShouldExecute() || hotKey.GameKey is null) continue;
 
-                if (hotKey.GameKey.KeyboardKey?.InputKey.IsDown() == true || hotKey.GameKey.ControllerKey?.InputKey.IsDown() == true)
-                    hotKey.IsDownInternal();
                 if (hotKey.GameKey.KeyboardKey?.InputKey.IsPressed() == true || hotKey.GameKey.ControllerKey?.InputKey.IsPressed() == true)
                     hotKey.OnPressedInternal();
+                if (hotKey.GameKey.KeyboardKey?.InputKey.IsDown() == true || hotKey.GameKey.ControllerKey?.InputKey.IsDown() == true)
+                    hotKey.IsDownInternal();
                 if (hotKey.GameKey.KeyboardKey?.InputKey.IsReleased() == true || hotKey.GameKey.ControllerKey?.InputKey.IsReleased() == true)
                     hotKey.OnReleasedInternal();
             }

diff --git a/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectExtensionDataStore.cs b/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectExtensionDataStore.cs
@@ -108,7 +108,7 @@ private sealed record DataKey([field: SaveableField(0)] MBGUID ObjectId, [field:
 
 #if v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115
         private sealed class SavedTypeDefiner : SaveableCampaignBehaviorTypeDefiner
-#elif v120 || v121 || v122 || v123 || v124
+#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129
         private sealed class SavedTypeDefiner : SaveableTypeDefiner
 #else
 #error DEFINE

diff --git a/supported-game-versions.txt b/supported-game-versions.txt
@@ -1,3 +1,8 @@
+v1.2.9
+v1.2.8
+v1.2.7
+v1.2.6
+v1.2.5
 v1.2.4
 v1.1.6
 v1.1.5
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+    v1.2.9
+    v1.2.8
+    v1.2.7
+    v1.2.6
+    v1.2.5
     v1.2.4
     v1.1.6
     v1.1.5
@@ Expand Down @@