Updated for SPT 3.9.0

lgtm
Co-authored-by: Nympfonic <arys.steam@gmail.com>
Co-committed-by: Nympfonic <arys.steam@gmail.com>

.gitignore

@@ -3,6 +3,7 @@ project/References/EFT_Managed/*
 
 # Allow these files, despite the rules above
 !project/References/EFT_Managed/.keep
+!project/References/SPT/.keep
 
 # ---> VisualStudio
 ## Ignore Visual Studio temporary files, build results, and

project/Terkoiz.Freecam/FallDamagePatch.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using EFT.HealthSystem;
 using HarmonyLib;
 
@@ -11,7 +11,7 @@ namespace Terkoiz.Freecam
         
         protected override MethodBase GetTargetMethod()
         {
-            return AccessTools.Method(typeof(ActiveHealthController), "HandleFall");
+            return AccessTools.Method(typeof(ActiveHealthController), nameof(ActiveHealthController.HandleFall));
         }
 
         [PatchPrefix]

project/Terkoiz.Freecam/Freecam.cs

@@ -6,7 +6,7 @@ namespace Terkoiz.Freecam
     /// <summary>
     /// A simple free camera to be added to a Unity game object.
     /// 
-    /// Full credit to Ashley Davis on GitHub for the inital code:
+    /// Full credit to Ashley Davis on GitHub for the initial code:
     /// https://gist.github.com/ashleydavis/f025c03a9221bc840a2b
     /// 
     /// </summary>

project/Terkoiz.Freecam/FreecamController.cs

@@ -13,7 +13,7 @@ namespace Terkoiz.Freecam
         private GameObject _mainCamera;
         private Freecam _freeCamScript;
 
-        private BattleUIScreen _playerUi;
+        private EftBattleUIScreen _playerUi;
         private bool _uiHidden;
 
         private GamePlayerOwner _gamePlayerOwner;
@@ -24,14 +24,22 @@ namespace Terkoiz.Freecam
         [UsedImplicitly]
         public void Start()
         {
-            // Find Main Camera
+            // Get Main Camera
-            _mainCamera = GameObject.Find("FPS Camera");
+            _mainCamera = GetLocalPlayerFromWorld().GetComponent<PlayerCameraController>().Camera.gameObject;
             if (_mainCamera == null)
             {
                 FreecamPlugin.Logger.LogError("Failed to locate main camera");
                 return;
             }
 
+            // Get Player UI
+            _playerUi = Singleton<CommonUI>.Instance.EftBattleUIScreen;
+            if (_playerUi == null)
+            {
+                FreecamPlugin.Logger.LogError("Failed to locate player UI");
+                return;
+            }
+
             // Add Freecam script to main camera in scene
             _freeCamScript = _mainCamera.AddComponent<Freecam>();
             if (_freeCamScript == null)
@@ -124,18 +132,6 @@ namespace Terkoiz.Freecam
             if (GetLocalPlayerFromWorld() == null)
                 return;
 
-            // If we don't have the UI Component cached, go look for it in the scene
-            if (_playerUi == null)
-            {
-                _playerUi = GameObject.Find("BattleUIScreen").GetComponent<BattleUIScreen>();
-
-                if (_playerUi == null)
-                {
-                    FreecamPlugin.Logger.LogError("Failed to locate player UI");
-                    return;
-                }
-            }
-
             _playerUi.gameObject.SetActive(_uiHidden);
             _uiHidden = !_uiHidden;
         }
@@ -240,7 +236,6 @@ namespace Terkoiz.Freecam
         {
             // Destroy FreeCamScript before FreeCamController if exists
             Destroy(_freeCamScript);
-            Destroy(this);
         }
     }
 }

project/Terkoiz.Freecam/FreecamPatch.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using Comfort.Common;
 using EFT;
 using HarmonyLib;
@@ -10,19 +10,19 @@ namespace Terkoiz.Freecam
     {
         protected override MethodBase GetTargetMethod()
         {
-            return AccessTools.Method(typeof(GameWorld), "OnGameStarted");
+            return AccessTools.Method(typeof(GameWorld), nameof(GameWorld.OnGameStarted));
         }
 
         [PatchPostfix]
         public static void PatchPostFix()
         {
-            var gameworld = Singleton<GameWorld>.Instance;
+            var gameWorld = Singleton<GameWorld>.Instance;
             
-            if (gameworld == null)
+            if (gameWorld == null)
                 return;
 
-            // Add FreeCamController to GameWorld GameObject
+            // Add FreecamController to GameWorld GameObject
-            gameworld.gameObject.AddComponent<FreecamController>();
+            gameWorld.gameObject.AddComponent<FreecamController>();
         }
     }
 }

project/Terkoiz.Freecam/FreecamPlugin.cs

@@ -7,7 +7,7 @@ using KeyboardShortcut = BepInEx.Configuration.KeyboardShortcut;
 
 namespace Terkoiz.Freecam
 {
-    [BepInPlugin("com.terkoiz.freecam", "Terkoiz.Freecam", "1.4.1")]
+    [BepInPlugin("com.terkoiz.freecam", "Terkoiz.Freecam", "1.4.4")]
     public class FreecamPlugin : BaseUnityPlugin
     {
         internal new static ManualLogSource Logger { get; private set; }

project/Terkoiz.Freecam/Terkoiz.Freecam.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net471</TargetFramework>
-    <Version>1.4.1</Version>
+    <Version>1.4.4</Version>
     <Authors>Terkoiz, Kobrakon, CWX</Authors>
     <RepositoryUrl>https://dev.sp-tarkov.com/Terkoiz/Freecam</RepositoryUrl>
     <PackageLicenseExpression>NCSA</PackageLicenseExpression>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <Reference Include="Aki.Reflection">
-      <HintPath>..\References\EFT_Managed\Aki.Reflection.dll</HintPath>
+      <HintPath>..\References\SPT\spt-reflection.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">