Fix for BS 1.21

Kevga · Mar 31, 2022 · 2dfac53 · 2dfac53
1 parent 51aa26b
commit 2dfac53
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/BeatSaberCinema/Resources/configs.json b/BeatSaberCinema/Resources/configs.json
diff --git a/BeatSaberCinema/Screen/CustomBloomPrePass.cs b/BeatSaberCinema/Screen/CustomBloomPrePass.cs
@@ -7,7 +7,7 @@
 
 namespace BeatSaberCinema
 {
-	internal class CustomBloomPrePass : MonoBehaviour, CameraRenderCallbacksManager.ICameraRenderCallbacks
+	internal class CustomBloomPrePass : MonoBehaviour
 	{
 		//Most cameras have their own BloomPrePass, so save one for each camera and use that when rendering the bloom for the camera
 		private readonly Dictionary<Camera, BloomPrePass?> _bloomPrePassDict = new Dictionary<Camera, BloomPrePass?>();
@@ -248,18 +248,18 @@ public void OnMenuSceneLoaded(ScenesTransitionSetupDataSO scenesTransitionSetupD
 			UpdateMesh();
 		}
 
-		private void OnWillRenderObject() {
-			CameraRenderCallbacksManager.RegisterForCameraCallbacks(Camera.current, this);
+		public void OnEnable()
+		{
+			Camera.onPreRender = (Camera.CameraCallback)Delegate.Combine(Camera.onPreRender, new Camera.CameraCallback(OnCameraPreRender));
 		}
 
 		public void OnDisable()
 		{
-			CameraRenderCallbacksManager.UnregisterFromCameraCallbacks(this);
+			Camera.onPreRender = (Camera.CameraCallback)Delegate.Remove(Camera.onPreRender, new Camera.CameraCallback(OnCameraPreRender))!;
 		}
 
 		private void OnDestroy()
 		{
-			CameraRenderCallbacksManager.UnregisterFromCameraCallbacks(this);
 			BSEvents.menuSceneLoaded -= UpdateMesh;
 			BSEvents.gameSceneLoaded -= UpdateMesh;
 			BSEvents.lateMenuSceneLoadedFresh -= OnMenuSceneLoaded;

diff --git a/BeatSaberCinema/manifest.json b/BeatSaberCinema/manifest.json
@@ -4,8 +4,8 @@
 	"name": "Cinema",
 	"description": "Sync up videos to play in the background of your beatmaps",
 	"author": "Dakari",
-	"gameVersion": "1.20.0",
-	"version": "1.4.18",
+	"gameVersion": "1.21.0",
+	"version": "1.4.19",
 	"dependsOn": {
 		"BSIPA": "^4.2.1",
 		"BeatSaberMarkupLanguage": "^1.6.0",

diff --git a/Resources/bundled-configs.txt b/Resources/bundled-configs.txt
@@ -30,6 +30,7 @@ Franky Nuts - Lose Control (ft. Danyka Nadeau) [pkdan]
 Gekidan Hitotose - Curtain Call!!!!! [ETAN]
 Giga - BRING IT ON [CoolingCloset]
 Ho-kago Tea Time - Utauyo Miracle [Todokete]
+Hoshimachi Suisei - Stellar Stellar [Joetastic, Joshabi & oddloop]
 HyunA - Bubble Pop! [noxn]
 Imagine Dragons - Warriors (2020 ReMap) [Stumi]
 JVNA - Catch Me [nitronik.exe]

diff --git a/Resources/cinema.bplist b/Resources/cinema.bplist