Fix for 1.34.2

TrickSaber/GlobalTrickManager.cs

@@ -120,7 +120,7 @@ public void OnTrickEndRequested(TrickAction trickAction)
                 if (_config.SlowmoDuringThrow && !_isMultiplayer &&
                     !IsTrickInState(trickAction, TrickState.Started) && _slowmoApplied)
                 {
-                    if(_applySlowmoCoroutine!=null)SharedCoroutineStarter.instance.StopCoroutine(_applySlowmoCoroutine);
+                    if(_applySlowmoCoroutine!=null) SharedCoroutineStarter.instance.StopCoroutine(_applySlowmoCoroutine);
                     _endSlowmoCoroutine = SharedCoroutineStarter.instance.StartCoroutine(EndSlowmoSmooth());
                     _slowmoApplied = false;
                 }

TrickSaber/InputHandling/InputManager.cs

@@ -24,7 +24,7 @@ private InputManager(PluginConfig config, SiraLog logger)
             _trickInputHandler = new TrickInputHandler();
         }
 
-        public void Init(SaberType type, VRControllersInputManager vrControllersInputManager)
+        public void Init(SaberType type)
         {
             OVRInput.Controller oculusController;
             XRNode node;

TrickSaber/Plugin.cs

@@ -4,14 +4,14 @@
 using SiraUtil.Zenject;
 using TrickSaber.Configuration;
 using TrickSaber.Installers;
+using Zenject;
 using IPALogger = IPA.Logging.Logger;
 
 namespace TrickSaber
 {
     [Plugin(RuntimeOptions.DynamicInit)]
     public class Plugin
     {
-
         [Init]
         public Plugin(IPALogger logger, Config conf, Zenjector zenjector)
         {

TrickSaber/SaberTrickManager.cs

@@ -79,7 +79,7 @@ public async void Init(GlobalTrickManager globalTrickManager)
 
             _movementController.Init(_vrController, this);
 
-            _inputManager.Init(_saber.saberType, _vrController.GetField<VRControllersInputManager, VRController>("_vrControllersInputManager"));
+            _inputManager.Init(_saber.saberType);
             _inputManager.TrickActivated += OnTrickActivated;
             _inputManager.TrickDeactivated += OnTrickDeactivated;
 

TrickSaber/SharedCoroutineStarter.cs

@@ -0,0 +1,58 @@
+using UnityEngine;
+
+namespace TrickSaber
+{
+    // Mostly a copy-paste of PersistentSingleton<T> from game version < 1.31.0.
+    internal class SharedCoroutineStarter : MonoBehaviour
+    {
+        private static SharedCoroutineStarter? _instance;
+        private static object _lock = new object();
+        private static bool _applicationIsQuitting;
+
+        public static SharedCoroutineStarter? instance
+        {
+            get
+            {
+                if (_applicationIsQuitting)
+                {
+                    Debug.LogWarning("[Singleton] Instance '" + nameof(SharedCoroutineStarter) + "' already destroyed on application quit. Won't create again - returning null.");
+                    return null;
+                }
+
+                lock (_lock)
+                {
+                    if (_instance == null)
+                    {
+                        _instance = FindObjectOfType<SharedCoroutineStarter>();
+
+                        if (FindObjectsOfType<SharedCoroutineStarter>().Length > 1)
+                        {
+                            Debug.LogError("[Singleton] Something went really wrong - there should never be more than 1 singleton! Reopening the scene might fix it.");
+                            return _instance;
+                        }
+
+                        if (_instance == null)
+                        {
+                            GameObject obj = new GameObject();
+                            _instance = obj.AddComponent<SharedCoroutineStarter>();
+                            obj.name = nameof(SharedCoroutineStarter);
+                            DontDestroyOnLoad(obj);
+                        }
+                    }
+
+                    return _instance;
+                }
+            }
+        }
+
+        protected void OnEnable()
+        {
+            DontDestroyOnLoad(this);
+        }
+
+        protected virtual void OnDestroy()
+        {
+            _applicationIsQuitting = true;
+        }
+    }
+}

TrickSaber/TrickSaber.csproj

@@ -50,6 +50,9 @@
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="BGLib.UnityExtension">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll</HintPath>
+    </Reference>
     <Reference Include="BSML">
       <HintPath>$(BeatSaberDir)\Plugins\BSML.dll</HintPath>
       <Private>False</Private>

TrickSaber/UI/SettingsUI.cs

@@ -28,7 +28,7 @@ private void ShowFlow()
 
         public void Dispose()
         {
-            if (MenuButtons.IsSingletonAvailable && BSMLParser.IsSingletonAvailable)
+            if (MenuButtons.instance != null && BSMLParser.instance != null)
             {
                 MenuButtons.instance.UnregisterButton(_menuButton);
             }