From 19fe842be980579957d6dc5b32114726ff49bced Mon Sep 17 00:00:00 2001
From: EnderdracheLP <enderdrachelp@elp.quest>
Date: Sat, 20 Dec 2025 22:54:01 +0100
Subject: [PATCH] Initial working update for 1.42.0

---
 MultiplayerCore/Installers/MpAppInstaller.cs  |   9 +-
 MultiplayerCore/Installers/MpMenuInstaller.cs |  17 ++-
 MultiplayerCore/MultiplayerCore.csproj        |  21 ++-
 .../Networking/MpPacketSerializer.cs          |  20 +--
 .../Objects/CustomPlayerSessionProvider.cs    | 135 ++++++++++++++++++
 .../Objects/MpEntitlementChecker.cs           |   4 +-
 MultiplayerCore/Objects/MpLevelLoader.cs      |   8 +-
 .../Patchers/NetworkConfigPatcher.cs          |  57 ++++++--
 .../Patches/GraphAPIClientPatch.cs            |  16 ++-
 MultiplayerCore/Patches/LoggingPatch.cs       |   2 +-
 .../Patches/MainSystemBinderPatch.cs          |  46 +++++-
 .../Patches/NoLevelSpectatorPatch.cs          |   2 +-
 ...latformAuthenticationTokenProviderPatch.cs |   2 +-
 MultiplayerCore/Players/MpPlayerManager.cs    |  52 +++++--
 MultiplayerCore/UI/MpLoadingIndicator.cs      |   4 +-
 MultiplayerCore/UI/MpPerPlayerUI.cs           |   4 +-
 MultiplayerCore/manifest.json                 |   2 +-
 17 files changed, 341 insertions(+), 60 deletions(-)
 create mode 100644 MultiplayerCore/Objects/CustomPlayerSessionProvider.cs

diff --git a/MultiplayerCore/Installers/MpAppInstaller.cs b/MultiplayerCore/Installers/MpAppInstaller.cs
index 1176b6b..2bc9046 100644
--- a/MultiplayerCore/Installers/MpAppInstaller.cs
+++ b/MultiplayerCore/Installers/MpAppInstaller.cs
@@ -1,4 +1,5 @@
 using BeatSaverSharp;
+using BGNet.Core.GameLift;
 using MultiplayerCore.Beatmaps.Providers;
 using MultiplayerCore.Networking;
 using MultiplayerCore.NodePoseSyncState;
@@ -7,6 +8,7 @@
 using MultiplayerCore.Players;
 using MultiplayerCore.Repositories;
 using SiraUtil.Zenject;
+using System;
 using Zenject;
 
 namespace MultiplayerCore.Installers
@@ -31,11 +33,16 @@ public override void InstallBindings()
             Container.Bind<MpLevelDownloader>().ToSelf().AsSingle();
             Container.Bind<MpBeatmapLevelProvider>().ToSelf().AsSingle();
             Container.BindInterfacesAndSelfTo<CustomLevelsPatcher>().AsSingle();
-            Container.BindInterfacesAndSelfTo<NetworkConfigPatcher>().AsSingle();
+			Container.BindInterfacesAndSelfTo<NetworkConfigPatcher>().AsSingle();
 			Container.BindInterfacesAndSelfTo<ModeSelectionPatcher>().AsSingle();
             Container.BindInterfacesAndSelfTo<PlayerCountPatcher>().AsSingle();
             Container.Bind<BGNetDebugLogger>().ToSelf().AsSingle();
             Container.BindInterfacesAndSelfTo<MpStatusRepository>().AsSingle();
+
+            if (Container.HasBinding<IGameLiftPlayerSessionProvider>())
+            {
+                Plugin.Logger.Trace("IGameLiftPlayerSessionProvider found in AppInstaller");
+            }
         }
     }
 }
diff --git a/MultiplayerCore/Installers/MpMenuInstaller.cs b/MultiplayerCore/Installers/MpMenuInstaller.cs
index 833502a..62fccdb 100644
--- a/MultiplayerCore/Installers/MpMenuInstaller.cs
+++ b/MultiplayerCore/Installers/MpMenuInstaller.cs
@@ -1,4 +1,6 @@
-using MultiplayerCore.Patchers;
+using BGNet.Core.GameLift;
+using MultiplayerCore.Objects;
+using MultiplayerCore.Patchers;
 using MultiplayerCore.UI;
 using Zenject;
 
@@ -15,8 +17,17 @@ public override void InstallBindings()
             Container.BindInterfacesAndSelfTo<GameServerPlayerTableCellPatcher>().AsSingle();
             Container.BindInterfacesAndSelfTo<BeatmapSelectionViewPatcher>().AsSingle();
 
-            // Inject sira stuff that didn't get injected on appinit
-            Container.Inject(Container.Resolve<NetworkPlayerEntitlementChecker>());
+			if (Container.HasBinding<IGameLiftPlayerSessionProvider>())
+			{
+				Plugin.Logger.Trace("IGameLiftPlayerSessionProvider found in MenuInstaller");
+			}
+
+			//Container.Rebind<IGameLiftPlayerSessionProvider>()
+	  //          .To<CustomPlayerSessionProvider>()
+	  //          .AsSingle();
+
+			// Inject sira stuff that didn't get injected on appinit
+			Container.Inject(Container.Resolve<NetworkPlayerEntitlementChecker>());
         }
 
 	}
diff --git a/MultiplayerCore/MultiplayerCore.csproj b/MultiplayerCore/MultiplayerCore.csproj
index ccafce3..9e99cba 100644
--- a/MultiplayerCore/MultiplayerCore.csproj
+++ b/MultiplayerCore/MultiplayerCore.csproj
@@ -46,7 +46,17 @@
     <None Remove="UI\RequirementsUI.bsml" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="netstandard"/>
+    <Reference Include="BeatSaber.Multiplayer.Core" Publicize="true">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.Multiplayer.Core.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="BGLib.AppFlow" Publicize="true">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="netstandard" />
     <Reference Include="Microsoft.CSharp">
       <!--<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Microsoft.CSharp.dll</HintPath>
       <Private>False</Private>
@@ -57,6 +67,11 @@
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>-->
     </Reference>
+    <Reference Include="OculusStudios.Platform.Core" Publicize="true">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\OculusStudios.Platform.Core.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="System">
       <!--<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\System.dll</HintPath>
       <Private>False</Private>
@@ -118,12 +133,12 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="BGNet">
+    <Reference Include="BGNet" Publicize="true">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Ignorance.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="BGNetCore">
+    <Reference Include="BGNetCore" Publicize="true">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGNetCore.dll</HintPath>
     </Reference>
     <Reference Include="BGNetLogging">
diff --git a/MultiplayerCore/Networking/MpPacketSerializer.cs b/MultiplayerCore/Networking/MpPacketSerializer.cs
index 1bf65b6..8b827e6 100644
--- a/MultiplayerCore/Networking/MpPacketSerializer.cs
+++ b/MultiplayerCore/Networking/MpPacketSerializer.cs
@@ -8,29 +8,29 @@
 
 namespace MultiplayerCore.Networking
 {
-    public class MpPacketSerializer : INetworkPacketSubSerializer<IConnectedPlayer>, IInitializable, IDisposable
+    public class MpPacketSerializer : INetworkPacketSubSerializer<IBeatSaberConnectedPlayer>, IInitializable, IDisposable
     {
         private const int ID = 100;
 
-        private Dictionary<string, Action<NetDataReader, int, IConnectedPlayer>> packetHandlers = new();
+        private Dictionary<string, Action<NetDataReader, int, IBeatSaberConnectedPlayer>> packetHandlers = new();
         private List<Type> registeredTypes = new();
 
-        private readonly MultiplayerSessionManager _sessionManager;
+        private readonly BeatSaberMultiplayerSessionManager _sessionManager;
         private readonly SiraLog _logger;
 
         internal MpPacketSerializer(
-            IMultiplayerSessionManager sessionManager, 
+            IBeatSaberMultiplayerSessionManager sessionManager, 
             SiraLog logger)
         {
-            _sessionManager = (sessionManager as MultiplayerSessionManager)!;
+            _sessionManager = (sessionManager as BeatSaberMultiplayerSessionManager)!;
             _logger = logger;
         }
 
         public void Initialize()
-            => _sessionManager.RegisterSerializer((MultiplayerSessionManager.MessageType)ID, this);
+            => _sessionManager.RegisterSerializer((NetworkMessageType)ID, this);
 
         public void Dispose()
-            => _sessionManager.UnregisterSerializer((MultiplayerSessionManager.MessageType)ID, this);
+            => _sessionManager.UnregisterSerializer((NetworkMessageType)ID, this);
 
         /// <summary>
         /// Method the base game uses to serialize an <see cref="INetSerializable"/>.
@@ -54,14 +54,14 @@ public void Serialize(NetDataWriter writer, INetSerializable packet)
         /// <param name="reader">The buffer to read from</param>
         /// <param name="length">Length of the packet</param>
         /// <param name="data">The sender of the packet</param>
-        public void Deserialize(NetDataReader reader, int length, IConnectedPlayer data)
+        public void Deserialize(NetDataReader reader, int length, IBeatSaberConnectedPlayer data)
         {
             int prevPosition = reader.Position;
             string packetId = reader.GetString();
             length -= reader.Position - prevPosition;
             prevPosition = reader.Position;
 
-            Action<NetDataReader, int, IConnectedPlayer> action;
+            Action<NetDataReader, int, IBeatSaberConnectedPlayer> action;
             if (packetHandlers.TryGetValue(packetId, out action) && action != null)
             {
                 try
@@ -141,7 +141,7 @@ public void RegisterType<TPacket>()
                 return packet!;
             };
 
-            packetHandlers[packetId] = delegate (NetDataReader reader, int size, IConnectedPlayer player)
+            packetHandlers[packetId] = delegate (NetDataReader reader, int size, IBeatSaberConnectedPlayer player)
             {
                 callback(deserialize(reader, size), player);
             };
diff --git a/MultiplayerCore/Objects/CustomPlayerSessionProvider.cs b/MultiplayerCore/Objects/CustomPlayerSessionProvider.cs
new file mode 100644
index 0000000..5ca597d
--- /dev/null
+++ b/MultiplayerCore/Objects/CustomPlayerSessionProvider.cs
@@ -0,0 +1,135 @@
+using BGNet.Core.GameLift;
+using IPA.Utilities;
+using MultiplayerCore.Patchers;
+using SiraUtil.Logging;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace MultiplayerCore.Objects
+{
+	public class CustomPlayerSessionProvider : GameLiftPlayerSessionProvider, IGameLiftPlayerSessionProvider
+	{
+		internal NetworkConfigPatcher? _customNetconfig;
+		private readonly SiraLog _logger;
+		public CustomPlayerSessionProvider(INetworkConfig networkConfig, IMultiplayerStatusModel multiplayerStatusModel/*, NetworkConfigPatcher customNetconfig*/, SiraLog logger) : base(networkConfig, multiplayerStatusModel)
+		{
+			//_customNetconfig = customNetconfig;
+			_logger = logger;
+		}
+
+		public new async Task<PlayerSessionInfo> GetGameLiftPlayerSessionInfo(IAuthenticationTokenProvider authenticationTokenProvider, string userId, BeatmapLevelSelectionMask beatmapLevelSelectionMask, GameplayServerConfiguration gameplayServerConfiguration, string secret, string code, CancellationToken cancellationToken)
+		{
+			Stopwatch stopwatch = new Stopwatch();
+			stopwatch.Start();
+			string ticketId = null;
+			string placementId = null;
+			string graphAPIAccessToken = _networkConfig.graphAccessToken;
+			AuthenticationToken.PlatformType? userPlatform = null;
+			AuthenticationToken? singleUsePlatformAuthToken = null;
+			XPlatformAccessTokenData xPlatformAccessToken = await GetXPlatformAccessToken(authenticationTokenProvider, cancellationToken);
+			if (xPlatformAccessToken.IsValid())
+			{
+				userPlatform = authenticationTokenProvider.GetTokenPlatform(xPlatformAccessToken.platformEnvironment);
+				graphAPIAccessToken = xPlatformAccessToken.token;
+			}
+
+			try
+			{
+				int numAttempts = 0;
+				while (stopwatch.ElapsedMilliseconds < 120000 && !cancellationToken.IsCancellationRequested)
+				{
+					if (!xPlatformAccessToken.IsValid() || (_customNetconfig != null && _customNetconfig.IsOverridingApi))
+					{
+						singleUsePlatformAuthToken = await authenticationTokenProvider.GetAuthenticationToken();
+						userPlatform = singleUsePlatformAuthToken.Value.platform;
+					}
+
+					GetMultiplayerInstanceResponse getMatchmakingInstanceResponse;
+					try
+					{
+						numAttempts++;
+						getMatchmakingInstanceResponse = await _graphAPIClient.Post<GetMultiplayerInstanceRequest, GetMultiplayerInstanceResponse>("beat_saber_get_multiplayer_instance", graphAPIAccessToken, new GetMultiplayerInstanceRequest(Application.version, _networkConfig.serviceEnvironment, userId, beatmapLevelSelectionMask, gameplayServerConfiguration, userPlatform.Value, singleUsePlatformAuthToken?.userId, singleUsePlatformAuthToken?.sessionToken, secret, code, GetAverageLatencies(), ticketId, placementId, _networkConfig.customLocation), default(GraphAPIClient.PostOptions), cancellationToken);
+					}
+					catch (ConnectionFailedException ex) when (numAttempts <= 1 && ex.reason == ConnectionFailedReason.AuthenticationFailed)
+					{
+						xPlatformAccessToken = await GetXPlatformAccessToken(authenticationTokenProvider, cancellationToken, skipCache: true);
+						if (xPlatformAccessToken.IsValid())
+						{
+							userPlatform = authenticationTokenProvider.GetTokenPlatform(xPlatformAccessToken.platformEnvironment);
+							graphAPIAccessToken = xPlatformAccessToken.token;
+						}
+
+						continue;
+					}
+
+					if (getMatchmakingInstanceResponse.errorCode != 0 && getMatchmakingInstanceResponse.errorCode != MultiplayerPlacementErrorCode.RequestTimeout)
+					{
+						throw new ConnectionFailedException(getMatchmakingInstanceResponse.errorCode.ToConnectionFailedReason());
+					}
+
+					if (getMatchmakingInstanceResponse.playerSessionInfo != null && !string.IsNullOrEmpty(getMatchmakingInstanceResponse.playerSessionInfo.gameSessionId) && !string.IsNullOrEmpty(getMatchmakingInstanceResponse.playerSessionInfo.playerSessionId))
+					{
+						return getMatchmakingInstanceResponse.playerSessionInfo;
+					}
+
+					if (string.IsNullOrEmpty(getMatchmakingInstanceResponse.ticketId) && string.IsNullOrEmpty(getMatchmakingInstanceResponse.placementId))
+					{
+						throw new ConnectionFailedException(ConnectionFailedReason.Timeout);
+					}
+
+					ticketId = getMatchmakingInstanceResponse.ticketId;
+					placementId = getMatchmakingInstanceResponse.placementId;
+					if (getMatchmakingInstanceResponse.pollIntervalMs > 0)
+					{
+						await Task.Delay(getMatchmakingInstanceResponse.pollIntervalMs, cancellationToken);
+					}
+				}
+			}
+			catch (TaskCanceledException)
+			{
+			}
+
+			if (!cancellationToken.IsCancellationRequested)
+			{
+				throw new ConnectionFailedException(ConnectionFailedReason.FailedToFindMatch);
+			}
+
+			if (!string.IsNullOrEmpty(ticketId) || !string.IsNullOrEmpty(placementId))
+			{
+				if (!xPlatformAccessToken.IsValid())
+				{
+					singleUsePlatformAuthToken = await authenticationTokenProvider.GetAuthenticationToken();
+					userPlatform = singleUsePlatformAuthToken.Value.platform;
+				}
+
+				try
+				{
+					CancellationToken token = new CancellationTokenSource(TimeSpan.FromSeconds(5.0)).Token;
+					await _graphAPIClient.Post<GetMultiplayerInstanceRequest, GetMultiplayerInstanceResponse>("beat_saber_multiplayer_cancel_matchmaking_ticket", graphAPIAccessToken, new GetMultiplayerInstanceRequest(Application.version, _networkConfig.serviceEnvironment, userId, beatmapLevelSelectionMask, gameplayServerConfiguration, userPlatform.Value, singleUsePlatformAuthToken?.userId, singleUsePlatformAuthToken?.sessionToken, secret, code, GetAverageLatencies(), ticketId, placementId), default(GraphAPIClient.PostOptions), token);
+				}
+				catch
+				{
+				}
+			}
+
+			throw new TaskCanceledException("Cancelled Request");
+		}
+
+
+		internal void UpdateServer()
+		{
+			GameLiftPlayerSessionProvider instance = this as GameLiftPlayerSessionProvider;
+			instance.SetField(nameof(_graphAPIClient), new GraphAPIClient(_networkConfig.graphUrl, _networkConfig.graphAccessToken));
+			GetMultiplayerStatusData();
+		}
+
+
+	}
+}
diff --git a/MultiplayerCore/Objects/MpEntitlementChecker.cs b/MultiplayerCore/Objects/MpEntitlementChecker.cs
index 5cff035..e2dda16 100644
--- a/MultiplayerCore/Objects/MpEntitlementChecker.cs
+++ b/MultiplayerCore/Objects/MpEntitlementChecker.cs
@@ -18,13 +18,13 @@ public class MpEntitlementChecker : NetworkPlayerEntitlementChecker
         private ConcurrentDictionary<string, ConcurrentDictionary<string, EntitlementsStatus>> _entitlementsDictionary = new();
         private ConcurrentDictionary<string, ConcurrentDictionary<string, TaskCompletionSource<EntitlementsStatus>>> _tcsDictionary = new();
 
-        private IMultiplayerSessionManager _sessionManager = null!;
+        private IBeatSaberMultiplayerSessionManager _sessionManager = null!;
         private BeatSaver _beatsaver = null!;
         private IPALogger _logger = null!;
 
         [Inject]
         internal void Inject(
-            IMultiplayerSessionManager sessionManager)
+            IBeatSaberMultiplayerSessionManager sessionManager)
         {
             _sessionManager = sessionManager;
             _beatsaver = Plugin._beatsaver;
diff --git a/MultiplayerCore/Objects/MpLevelLoader.cs b/MultiplayerCore/Objects/MpLevelLoader.cs
index 8013c31..32c943e 100644
--- a/MultiplayerCore/Objects/MpLevelLoader.cs
+++ b/MultiplayerCore/Objects/MpLevelLoader.cs
@@ -14,14 +14,14 @@ public class MpLevelLoader : MultiplayerLevelLoader, IProgress<double>
 
         public ILevelGameplaySetupData? CurrentLoadingData => _gameplaySetupData;
 
-        internal readonly IMultiplayerSessionManager _sessionManager;
+        internal readonly IBeatSaberMultiplayerSessionManager _sessionManager;
 		internal readonly MpLevelDownloader _levelDownloader;
 		internal readonly MpEntitlementChecker _entitlementChecker;
 		internal readonly IMenuRpcManager _rpcManager;
 		internal readonly SiraLog _logger;
 
         internal MpLevelLoader(
-            IMultiplayerSessionManager sessionManager,
+            IBeatSaberMultiplayerSessionManager sessionManager,
             MpLevelDownloader levelDownloader,
             NetworkPlayerEntitlementChecker entitlementChecker,
             IMenuRpcManager rpcManager,
@@ -108,7 +108,7 @@ private async Task<LoadBeatmapLevelDataResult> DownloadBeatmapLevelAsync(string
                 // If the download fails we go into spectator
                 _rpcManager.SetIsEntitledToLevel(levelId, EntitlementsStatus.NotOwned);
                 _beatmapLevelData = null;
-                return LoadBeatmapLevelDataResult.Error;
+                return LoadBeatmapLevelDataResult.BeatmapLevelDataNotFound;
             }
 
             // Reload custom level set
@@ -120,7 +120,7 @@ private async Task<LoadBeatmapLevelDataResult> DownloadBeatmapLevelAsync(string
             
 			// Load level data
 			var method = AccessTools.Method(_beatmapLevelsModel.GetType(), nameof(_beatmapLevelsModel.LoadBeatmapLevelDataAsync));
-			LoadBeatmapLevelDataResult loadResult = LoadBeatmapLevelDataResult.Error;
+			LoadBeatmapLevelDataResult loadResult = LoadBeatmapLevelDataResult.BeatmapLevelDataNotFound;
 			if (method != null)
 			{
 				if (method.GetParameters().Length > 2)
diff --git a/MultiplayerCore/Patchers/NetworkConfigPatcher.cs b/MultiplayerCore/Patchers/NetworkConfigPatcher.cs
index 701ae04..a30e026 100644
--- a/MultiplayerCore/Patchers/NetworkConfigPatcher.cs
+++ b/MultiplayerCore/Patchers/NetworkConfigPatcher.cs
@@ -1,6 +1,10 @@
-using IgnoranceCore;
+using BGNet.Core.GameLift;
+using IgnoranceCore;
+using MultiplayerCore.Objects;
 using SiraUtil.Affinity;
 using SiraUtil.Logging;
+using System;
+using Zenject;
 
 // ReSharper disable RedundantAssignment
 // ReSharper disable MemberCanBePrivate.Global
@@ -28,11 +32,19 @@ public class NetworkConfigPatcher : IAffinity
 
         private readonly SiraLog _logger;
 
-        internal NetworkConfigPatcher(
-            SiraLog logger)
+        internal IGameLiftPlayerSessionProvider _sessionProvider;
+
+
+		internal NetworkConfigPatcher(
+			IGameLiftPlayerSessionProvider sessionProvider,
+			SiraLog logger)
         {
+            _sessionProvider = sessionProvider;
             _logger = logger;
-        }
+			var cSessionProvider = (_sessionProvider as CustomPlayerSessionProvider);
+            if (cSessionProvider != null) cSessionProvider._customNetconfig = this;
+
+		}
 
         /// <summary>
         /// Override official servers with a custom API server.
@@ -50,6 +62,14 @@ public void UseCustomApiServer(string graphUrl, string? statusUrl, int? maxParty
             MaxPartySize = maxPartySize;
             QuickPlaySetupUrl = quickPlaySetupUrl;
             DisableSsl = disableSsl;
+
+            if (_sessionProvider is CustomPlayerSessionProvider customPlayerSessionProvider)
+            {
+                customPlayerSessionProvider.UpdateServer();
+            } else
+            {
+                _logger.Error("Could not get instance of CustomPlayerSessionProvider");
+            }
         }
 
         /// <summary>
@@ -64,7 +84,16 @@ public void UseOfficialServer()
             MaxPartySize = null;
             QuickPlaySetupUrl = null;
             DisableSsl = false;
-        }
+
+			if (_sessionProvider is CustomPlayerSessionProvider customPlayerSessionProvider)
+			{
+				customPlayerSessionProvider.UpdateServer();
+			}
+			else
+			{
+				_logger.Error("Could not get instance of CustomPlayerSessionProvider");
+			}
+		}
 
         [AffinityPatch(typeof(NetworkConfigSO), nameof(NetworkConfigSO.graphUrl), AffinityMethodType.Getter)]
         private void GetGraphUrl(ref string __result)
@@ -153,18 +182,22 @@ private void PrefixSetActiveNetworkPlayerModelType(
             activeNetworkPlayerModelType = UnifiedNetworkPlayerModel.ActiveNetworkPlayerModelType.GameLift;
         }
 
-        [AffinityPrefix]
-        [AffinityPatch(typeof(ClientCertificateValidator), "ValidateCertificateChainInternal")]
-        private bool ValidateCertificateChain()
-        {
-            return !IsOverridingApi;
-        }
+
+        // Don't think this method is used, but still setting this to be safe
+        //[AffinityPrefix]
+        //[AffinityPatch(typeof(ICertificateValidator), "ValidateCertificateChain")]
+        //private bool ValidateCertificateChain()
+        //{
+        //    return !IsOverridingApi;
+        //}
         
         [AffinityPrefix]
         [AffinityPatch(typeof(IgnoranceClient), "Start")]
         private void PrefixIgnoranceClientStart(IgnoranceClient __instance)
         {
-            if (DisableSsl)
+            __instance.ValidateCertificate = !IsOverridingApi;
+
+			if (DisableSsl)
                 __instance.UseSsl = false;
             if (IsOverridingApi)
                 __instance.ValidateCertificate = false;
diff --git a/MultiplayerCore/Patches/GraphAPIClientPatch.cs b/MultiplayerCore/Patches/GraphAPIClientPatch.cs
index 7997b60..bfb7547 100644
--- a/MultiplayerCore/Patches/GraphAPIClientPatch.cs
+++ b/MultiplayerCore/Patches/GraphAPIClientPatch.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using BGNet.Core.GameLift;
 using HarmonyLib;
+using IPA.Utilities;
 
 namespace MultiplayerCore.Patches
 {
@@ -24,6 +25,15 @@ internal class GraphAPIClientPatch
 
 		// TODO: If this ever breaks, just patch the GraphAPIClient ctor and replace HttpClient _client with a custom HttpClient that has a logging handler
 
+		//[HarmonyPostfix]
+		//[HarmonyPatch(typeof(GraphAPIClientPatch), ".ctor")]
+		//static void ctor(GraphAPIClient __instance)
+		//{
+		//	__instance.SetField(nameof(GraphAPIClient._client), _client);
+		//}
+
+
+		// Old Patch
 		private static readonly MethodInfo _sendAsyncAttacher =
 			SymbolExtensions.GetMethodInfo(() => SendAsync(null!, 0, CancellationToken.None));
 
@@ -32,7 +42,7 @@ internal class GraphAPIClientPatch
 
 		private static MethodBase TargetMethod()
 		{
-			return AccessTools.FirstInner(typeof(GraphAPIClient), t => t.Name.StartsWith("<Post>d__5`1"))
+			return AccessTools.FirstInner(typeof(GraphAPIClient), t => t.Name.StartsWith("<Post>d__6`1"))
 				?.MakeGenericType(typeof(GetMultiplayerInstanceResponse))
 				.GetMethod("MoveNext", BindingFlags.NonPublic | BindingFlags.Instance)!;
 		}
@@ -52,6 +62,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 						Plugin.Logger.Trace("Found SendAsync call");
 						var newCode = new CodeInstruction(OpCodes.Callvirt, _sendAsyncAttacher);
 						codes[i] = newCode;
+						break;
 					}
 				}
 			}
@@ -64,6 +75,9 @@ private static Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
 			CancellationToken cancellationToken)
 		{
 			Plugin.Logger.Debug("SendAsync MasterServer Request called");
+#if DEBUG
+			Plugin.Logger.Trace($"URI: '{request.RequestUri.ToString()}'");
+#endif
 			var result = _client.SendAsync(request, completionOption, cancellationToken);
 
 			result.ContinueWith(async task =>
diff --git a/MultiplayerCore/Patches/LoggingPatch.cs b/MultiplayerCore/Patches/LoggingPatch.cs
index 39aad82..6af5ebf 100644
--- a/MultiplayerCore/Patches/LoggingPatch.cs
+++ b/MultiplayerCore/Patches/LoggingPatch.cs
@@ -10,7 +10,7 @@ namespace MultiplayerCore.Patches
     internal class LoggingPatch
     {
         [HarmonyTranspiler]
-        [HarmonyPatch(typeof(ConnectedPlayerManager), "HandleNetworkReceive")]
+        [HarmonyPatch(typeof(ConnectedPlayerManager<IBeatSaberConnectedPlayer, BeatSaberConnectedPlayer, BeatSaberPlayerIdentityPacketData>), "HandleNetworkReceive")]
         private static IEnumerable<CodeInstruction> PacketErrorLogger(IEnumerable<CodeInstruction> instructions, ILGenerator gen)
         {
             LocalBuilder localException = gen.DeclareLocal(typeof(Exception));
diff --git a/MultiplayerCore/Patches/MainSystemBinderPatch.cs b/MultiplayerCore/Patches/MainSystemBinderPatch.cs
index 96a5720..ea73d0b 100644
--- a/MultiplayerCore/Patches/MainSystemBinderPatch.cs
+++ b/MultiplayerCore/Patches/MainSystemBinderPatch.cs
@@ -1,4 +1,5 @@
-using HarmonyLib;
+using BGNet.Core.GameLift;
+using HarmonyLib;
 using MultiplayerCore.Objects;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,20 +17,46 @@ internal class MainSystemBinderPatch
         private static readonly MethodInfo _entitlementCheckerAttacher = SymbolExtensions.GetMethodInfo(() => EntitlementCheckerAttacher(null!, null!));
         private static readonly FieldInfo _entitlementCheckerPrefab = typeof(MainSystemInit).GetField("_networkPlayerEntitlementCheckerPrefab", BindingFlags.NonPublic | BindingFlags.Instance);
 
-        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+
+		private static readonly MethodInfo _bindTypes = typeof(DiContainer).GetMethod(nameof(DiContainer.Bind), new[] { typeof(System.Type[]) });
+		private static readonly MethodInfo _toSessionProvider = typeof(ConcreteBinderNonGeneric).GetMethods()
+	        .First(m => m.Name == "To" && m.IsGenericMethodDefinition).MakeGenericMethod(new[] { typeof(GameLiftPlayerSessionProvider) });
+		private static readonly MethodInfo _sessionProviderAttacher = SymbolExtensions.GetMethodInfo(() => PlayerSessionProviderAttacher(null!));
+
+		static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             var codes = instructions.ToList();
             for (int i = 0; i < codes.Count; i++)
             {
-                if (codes[i].opcode == OpCodes.Ldfld && codes[i].OperandIs(_entitlementCheckerPrefab))
+				Plugin.Logger.Trace($"Instruction at index {i}: {codes[i].opcode}");
+				if (codes[i].opcode == OpCodes.Ldfld && codes[i].OperandIs(_entitlementCheckerPrefab))
                 {
-                    if (codes[i + 1].opcode == OpCodes.Callvirt && codes[i + 1].Calls(_rootMethod))
+					Plugin.Logger.Trace($"Ldfld: {codes[i].operand}");
+					if (codes[i + 1].opcode == OpCodes.Callvirt && codes[i + 1].Calls(_rootMethod))
                     {
+						Plugin.Logger.Trace($"Callvirt method: {codes[i + 1].operand}");
+						Plugin.Logger.Trace("Patched EntitlementChecker prefab");
                         CodeInstruction newCode = new CodeInstruction(OpCodes.Callvirt, _entitlementCheckerAttacher);
                         codes[i + 1] = newCode;
                     }
-                }
-            }
+                } else if ((i + 2) < codes.Count && codes[i].opcode == OpCodes.Stelem_Ref)
+                {
+                    if (codes[i + 1].opcode == OpCodes.Callvirt && codes[i + 1].Calls(_bindTypes))
+                    {
+						Plugin.Logger.Trace($"Callvirt 1 method: {codes[i + 1].operand}");
+						if (codes[i + 2].opcode == OpCodes.Callvirt && codes[i + 2].Calls(_toSessionProvider))
+						{
+							Plugin.Logger.Trace($"Callvirt 2 method: {codes[i + 2].operand}");
+							Plugin.Logger.Trace("Patched IGameLiftPlayerSessionProvider");
+							CodeInstruction replaceCode = new CodeInstruction(OpCodes.Callvirt, _sessionProviderAttacher);
+							codes[i + 2] = replaceCode;
+						}
+					}
+				} else if (codes[i].opcode == OpCodes.Callvirt)
+                {
+					Plugin.Logger.Trace($"Callvirt method: {codes[i].operand}");
+				}
+			}
 
             return codes.AsEnumerable();
         }
@@ -38,5 +65,10 @@ private static ScopeConcreteIdArgConditionCopyNonLazyBinder EntitlementCheckerAt
         {
             return contract.To<MpEntitlementChecker>().FromNewComponentOnRoot();
         }
-    }
+
+        private static FromBinderGeneric<CustomPlayerSessionProvider> PlayerSessionProviderAttacher(ConcreteBinderGeneric<GameLiftPlayerSessionProvider> contract)
+        {
+           return contract.To<CustomPlayerSessionProvider>();
+        }
+	}
 }
diff --git a/MultiplayerCore/Patches/NoLevelSpectatorPatch.cs b/MultiplayerCore/Patches/NoLevelSpectatorPatch.cs
index eee9bf8..3e065e7 100644
--- a/MultiplayerCore/Patches/NoLevelSpectatorPatch.cs
+++ b/MultiplayerCore/Patches/NoLevelSpectatorPatch.cs
@@ -62,7 +62,7 @@ internal static bool LobbyGameStateController_StartMultiplayerLevel(LobbyGameSta
 
 					__instance._menuTransitionsHelper.StartMultiplayerLevel("Multiplayer", gameplaySetupData.beatmapKey, beatmapLevel, beatmapLevelData,
 						__instance._playerDataModel.playerData.colorSchemesSettings.GetOverrideColorScheme(), gameplaySetupData.gameplayModifiers,
-						__instance._playerDataModel.playerData.playerSpecificSettings, null, Localization.Get("BUTTON_MENU"), false,
+						__instance._playerDataModel.playerData.playerSpecificSettings, __instance._environmentsListModel, null, Localization.Get("BUTTON_MENU"), false,
 						beforeSceneSwitchCallback,
 						__instance.HandleMultiplayerLevelDidFinish,
 						__instance.HandleMultiplayerLevelDidDisconnect
diff --git a/MultiplayerCore/Patches/PlatformAuthenticationTokenProviderPatch.cs b/MultiplayerCore/Patches/PlatformAuthenticationTokenProviderPatch.cs
index 3222590..62d8e35 100644
--- a/MultiplayerCore/Patches/PlatformAuthenticationTokenProviderPatch.cs
+++ b/MultiplayerCore/Patches/PlatformAuthenticationTokenProviderPatch.cs
@@ -23,7 +23,7 @@ private static void GetAuthenticationToken(PlatformAuthenticationTokenProvider _
 				{
 					Plugin.Logger.Error("An error occurred while attempting to get the auth token: " + task.Exception);
 					Plugin.Logger.Warn("Failed to get auth token, returning custom authentication token!");
-					return new AuthenticationToken(__instance.platform, __instance.hashedUserId, __instance.userName, DummyAuth);
+					return new AuthenticationToken(__instance.GetTokenPlatform(PlatformEnvironment.Production), __instance.hashedUserId, __instance.userName, DummyAuth);
 				}
 				Plugin.Logger.Debug("Successfully got auth token!");
 				return result;
diff --git a/MultiplayerCore/Players/MpPlayerManager.cs b/MultiplayerCore/Players/MpPlayerManager.cs
index 69a95bd..cbd7229 100644
--- a/MultiplayerCore/Players/MpPlayerManager.cs
+++ b/MultiplayerCore/Players/MpPlayerManager.cs
@@ -1,4 +1,5 @@
 using MultiplayerCore.Networking;
+using OculusStudios.Platform.Core;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -17,29 +18,62 @@ public class MpPlayerManager : IInitializable, IDisposable
         private ConcurrentDictionary<string, MpPlayerData> _playerData = new();
 
         private readonly MpPacketSerializer _packetSerializer;
-        private readonly IMultiplayerSessionManager _sessionManager;
-        private readonly IPlatformUserModel _platformUserModel;
+        private readonly IBeatSaberMultiplayerSessionManager _sessionManager;
+        private readonly IPlatform _platform;
 
         internal MpPlayerManager(
             MpPacketSerializer packetSerializer,
-            IMultiplayerSessionManager sessionManager,
-            IPlatformUserModel platformUserModel)
+			IBeatSaberMultiplayerSessionManager sessionManager,
+            IPlatform platform)
         {
             _packetSerializer = packetSerializer;
             _sessionManager = sessionManager;
-            _platformUserModel = platformUserModel;
+            _platform = platform;
         }
 
-        public async void Initialize()
+        public void Initialize()
         {
             _sessionManager.SetLocalPlayerState("modded", true);
             _packetSerializer.RegisterCallback<MpPlayerData>(HandlePlayerData);
-            //_sessionManager.playerConnectedEvent += HandlePlayerConnected;
+			//_sessionManager.playerConnectedEvent += HandlePlayerConnected;
 
-            _localPlayerInfo = await _platformUserModel.GetUserInfo(CancellationToken.None);
+            InitUserInfo();
         }
 
-        public void Dispose()
+        public void InitUserInfo()
+        {
+			string key = _platform.key;
+			UserInfo.Platform platform;
+			if (!(key == "steam"))
+			{
+				if (!(key == "oculus"))
+				{
+					if (!(key == "oculus-mock"))
+					{
+						if (!(key == "mock"))
+						{
+							throw new NotImplementedException();
+						}
+						platform = UserInfo.Platform.Test;
+					}
+					else
+					{
+						platform = UserInfo.Platform.Oculus;
+					}
+				}
+				else
+				{
+					platform = UserInfo.Platform.Oculus;
+				}
+			}
+			else
+			{
+				platform = UserInfo.Platform.Steam;
+			}
+			_localPlayerInfo = new UserInfo(platform, _platform.user.userId.ToString(), _platform.user.displayName);
+		}
+
+		public void Dispose()
         {
             _packetSerializer.UnregisterCallback<MpPlayerData>();
         }
diff --git a/MultiplayerCore/UI/MpLoadingIndicator.cs b/MultiplayerCore/UI/MpLoadingIndicator.cs
index f6b7027..4ee673d 100644
--- a/MultiplayerCore/UI/MpLoadingIndicator.cs
+++ b/MultiplayerCore/UI/MpLoadingIndicator.cs
@@ -14,7 +14,7 @@ internal class MpLoadingIndicator : NotifiableBase, IInitializable, IDisposable,
     {
         public const string ResourcePath = "MultiplayerCore.UI.LoadingIndicator.bsml";
 
-        private readonly IMultiplayerSessionManager _sessionManager;
+        private readonly IBeatSaberMultiplayerSessionManager _sessionManager;
         private readonly ILobbyGameStateController _gameStateController;
         private readonly ILobbyPlayersDataModel _playersDataModel;
         private readonly MpEntitlementChecker _entitlementChecker;
@@ -25,7 +25,7 @@ internal class MpLoadingIndicator : NotifiableBase, IInitializable, IDisposable,
         private bool _isDownloading;
 
         internal MpLoadingIndicator(
-            IMultiplayerSessionManager sessionManager,
+            IBeatSaberMultiplayerSessionManager sessionManager,
             ILobbyGameStateController gameStateController,
             ILobbyPlayersDataModel playersDataModel,
             NetworkPlayerEntitlementChecker entitlementChecker,
diff --git a/MultiplayerCore/UI/MpPerPlayerUI.cs b/MultiplayerCore/UI/MpPerPlayerUI.cs
index 603f130..125d50b 100644
--- a/MultiplayerCore/UI/MpPerPlayerUI.cs
+++ b/MultiplayerCore/UI/MpPerPlayerUI.cs
@@ -27,7 +27,7 @@ internal class MpPerPlayerUI : IInitializable, IDisposable
 		public static string PerPlayerTogglesResourcePath => "MultiplayerCore.UI.MpPerPlayerToggles.bsml";
 		private readonly GameServerLobbyFlowCoordinator _gameServerLobbyFlowCoordinator;
 		private readonly LobbySetupViewController _lobbyViewController;
-		private readonly IMultiplayerSessionManager _multiplayerSessionManager;
+		private readonly IBeatSaberMultiplayerSessionManager _multiplayerSessionManager;
 		private readonly ILobbyGameStateController _gameStateController;
 		private readonly BeatmapLevelsModel _beatmapLevelsModel;
 		private readonly MpPacketSerializer _packetSerializer;
@@ -45,7 +45,7 @@ internal class MpPerPlayerUI : IInitializable, IDisposable
 		public MpPerPlayerUI(
 			GameServerLobbyFlowCoordinator gameServerLobbyFlowCoordinator, 
 			BeatmapLevelsModel beatmapLevelsModel, 
-			IMultiplayerSessionManager sessionManager, 
+			IBeatSaberMultiplayerSessionManager sessionManager, 
 			MpBeatmapLevelProvider beatmapLevelProvider, 
 			MpPacketSerializer packetSerializer,
 			MpStatusRepository statusRepository,
diff --git a/MultiplayerCore/manifest.json b/MultiplayerCore/manifest.json
index 529ad34..1278d46 100644
--- a/MultiplayerCore/manifest.json
+++ b/MultiplayerCore/manifest.json
@@ -5,7 +5,7 @@
   "author": "Goobwabber",
   "version": "1.6.3",
   "description": "Adds custom songs to Beat Saber Multiplayer.",
-  "gameVersion": "1.40.0",
+  "gameVersion": "1.42.0",
   "dependsOn": {
     "BSIPA": "^4.3.3",
     "SongCore": "^3.15.2",