First test

TournamentAssistant/Behaviors/SharedCoroutineStarter.cs

@@ -0,0 +1,63 @@
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+/**
+ * Taken with love from Zingabopp's BeatSaberPlaylistsLib
+ */
+
+namespace TournamentAssistant.Behaviors
+{
+    // 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;
+        }
+    }
+}

TournamentAssistant/ILRepack.targets

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <Target Name="ILRepacker" AfterTargets="Build">
         <ItemGroup>
-            <InputAssemblies Include="$(OutputPath)$(AssemblyName).dll" />
+			<InputAssemblies Include="$(OutputPath)$(AssemblyName).dll" />
             <InputAssemblies Include="$(OutputPath)TournamentAssistantShared.dll" />
             <InputAssemblies Include="$(OutputPath)protobuf-net.dll" />
             <InputAssemblies Include="$(OutputPath)protobuf-net.Core.dll" />

TournamentAssistant/Interop/CustomNotesInterop.cs

@@ -4,12 +4,13 @@ static class CustomNotesInterop
     {
         public static void EnableHMDOnly()
         {
-            CustomNotes.Utilities.LayerUtils.EnableHMDOnly();
+            // Disabled until CustomNotes updates for 1.34.2
+            // CustomNotes.Utilities.LayerUtils.EnableHMDOnly();
         }
 
         public static void DisableHMDOnly()
         {
-            CustomNotes.Utilities.LayerUtils.DisableHMDOnly();
+            // CustomNotes.Utilities.LayerUtils.DisableHMDOnly();
         }
     }
 }

TournamentAssistant/Plugin.cs

@@ -15,6 +15,7 @@
 using TournamentAssistantShared;
 using TournamentAssistantShared.Models;
 using TournamentAssistantShared.SimpleJSON;
+using TournamentAssistantShared.Utilities;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Config = TournamentAssistantShared.Config;
@@ -175,7 +176,7 @@ private static void InitScoreSaber()
 
         private void CreateMenuButton()
         {
-            MenuButtons.instance.RegisterButton(menuButton);
+            MenuButtons.Instance.RegisterButton(menuButton);
         }
 
         private void MenuButtonPressed()
@@ -184,7 +185,7 @@ private void MenuButtonPressed()
             _tournamentSelectionCoordinator = BeatSaberUI.CreateFlowCoordinator<TournamentSelectionCoordinator>();
             _tournamentSelectionCoordinator.DidFinishEvent += tournamentSelectionCoordinator_DidFinishEvent;
 
-            _mainFlowCoordinator.PresentFlowCoordinatorOrAskForTutorial(_tournamentSelectionCoordinator);
+            _mainFlowCoordinator.InvokeMethod("PresentFlowCoordinatorOrAskForTutorial", _tournamentSelectionCoordinator);
         }
 
         private void tournamentSelectionCoordinator_DidFinishEvent()
@@ -197,9 +198,9 @@ private void tournamentSelectionCoordinator_DidFinishEvent()
 
         public void Dispose()
         {
-            if (MenuButtons.IsSingletonAvailable && MenuButtons.instance)
+            if (MenuButtons.Instance != null)
             {
-                MenuButtons.instance.UnregisterButton(menuButton);
+                MenuButtons.Instance.UnregisterButton(menuButton);
             }
         }
     }

TournamentAssistant/PluginClient.cs

@@ -21,10 +21,11 @@ public class PluginClient(string endpoint, int port) : TAClient(endpoint, port)
         public string CurrentMatch { get; set; }
 
         public event Func<IBeatmapLevel, Task> LoadedSong;
-        public event Func<IPreviewBeatmapLevel, BeatmapCharacteristicSO, BeatmapDifficulty, GameplayModifiers, PlayerSpecificSettings, OverrideEnvironmentSettings, ColorScheme, bool, bool, bool, bool, Task> PlaySong;
+        public event Func<BeatmapLevel, BeatmapKey, GameplayModifiers, PlayerSpecificSettings, OverrideEnvironmentSettings, ColorScheme, bool, bool, bool, bool, Task> PlaySong;
 
         protected override async Task Client_PacketReceived(Packet packet)
         {
+
             await base.Client_PacketReceived(packet);
 
             if (packet.packetCase == Packet.packetOneofCase.Command)
@@ -90,7 +91,8 @@ await UnityMainThreadTaskScheduler.Factory.StartNew(() =>
                                 : EnvironmentEffectsFilterPreset.AllEffects,
                             playSong.GameplayParameters.PlayerSettings.Options.HasFlag(PlayerOptions.StaticLights)
                                 ? EnvironmentEffectsFilterPreset.NoEffects
-                                : EnvironmentEffectsFilterPreset.AllEffects
+                                : EnvironmentEffectsFilterPreset.AllEffects,
+                            0.7f
                         );
                     }