Handle GamepadControl API differences

Author: chripa85

src/kc-accessibility/ScreenReaderAccessibilityBehaviour.Helpers.cs

@@ -10,6 +10,8 @@
 public partial class ScreenReaderAccessibilityBehaviour
 {
 	private static readonly FieldInfo GameUiCursorModeField = typeof(GameUI).GetField("currCursorMode", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+	private static readonly FieldInfo GamepadControlIsControllerActiveField = typeof(GamepadControl).GetField("isControllerActive", BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
+	private static readonly FieldInfo GamepadControlControllerUpdateField = typeof(GamepadControl).GetField("controllerUpdate", BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
 	private const int SettingsSaveIndex = -2;
 
 	private sealed class GameplayTileElement
@@ -262,6 +264,31 @@ private bool HasActiveAccessibleGameplayPanel()
 		return IsIslandInfoPanelVisible(GameUI.inst);
 	}
 
+	private void PrimeGamepadControlForKeyboardNavigation()
+	{
+		GamepadControl control = GamepadControl.inst;
+		if (control == null)
+		{
+			return;
+		}
+
+		if (GamepadControlIsControllerActiveField != null)
+		{
+			GamepadControlIsControllerActiveField.SetValue(
+				GamepadControlIsControllerActiveField.IsStatic ? null : (object)control,
+				true);
+		}
+
+		if (GamepadControlControllerUpdateField != null)
+		{
+			Delegate controllerUpdate = GamepadControlControllerUpdateField.GetValue(
+				GamepadControlControllerUpdateField.IsStatic ? null : (object)control) as Delegate;
+			controllerUpdate?.DynamicInvoke(true);
+		}
+
+		control.PrepForGamepad();
+	}
+
 	private static bool IsIslandInfoPanelVisible(GameUI gameUi)
 	{
 		return gameUi != null

src/kc-accessibility/ScreenReaderAccessibilityBehaviour.cs

@@ -340,12 +340,7 @@ private void EnsureKeyboardNavigationEnabled()
 		try
 		{
 			suppressedHoverAnnouncements++;
-			GamepadControl.inst.isControllerActive = true;
-			if (GamepadControl.inst.controllerUpdate != null)
-			{
-				GamepadControl.inst.controllerUpdate(true);
-			}
-			GamepadControl.inst.PrepForGamepad();
+			PrimeGamepadControlForKeyboardNavigation();
 			log("Enabled keyboard-driven accessibility navigation.");
 		}
 		catch (Exception ex)

src/kc-accessibility/ScreenReaderLoadMod.cs

@@ -5,7 +5,7 @@
 public class ScreenReaderLoadMod
 {
 	private const string InitialAnnouncement = "Kingdoms and Castles loaded.";
-	private const string BuildStamp = "0.2.4";
+	private const string BuildStamp = "0.2.5";
 
 	private static KCModHelper helper;
 

src/kc-accessibility/info.json

@@ -2,5 +2,5 @@
   "Name": "kc-accessibility",
   "Author": "chris",
   "Description": "Adds screen-reader accessibility support for menus and gameplay.",
-  "ModVersion": "0.2.4"
+  "ModVersion": "0.2.5"
 }