Merge pull request #34 from rithik-b/patch-1

Fix for broken songcore
Goobwabber · Jan 16, 2023 · 74c6e95 · 74c6e95
2 parents b67b331 + b465ef9
commit 74c6e95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/MultiplayerCore/UI/MpColorsUI.cs b/MultiplayerCore/UI/MpColorsUI.cs
@@ -18,7 +18,7 @@ internal class MpColorsUI : NotifiableBase
 
         public event Action dismissedEvent = null!;
 
-        private BoostedColorSchemeView boostedColorSchemeView = null!;
+        private ColorSchemeView colorSchemeView = null!;
         private readonly Color voidColor = new Color(0.5f, 0.5f, 0.5f, 0.25f);
 
         private readonly LobbySetupViewController _lobbySetupViewController;
@@ -70,9 +70,6 @@ private void Parse()
         private void PostParse()
         {
             ColorSchemeView colorSchemeView = GameObject.Instantiate(Resources.FindObjectsOfTypeAll<ColorSchemeView>().First(), selectedColorTransform);
-            boostedColorSchemeView = IPA.Utilities.ReflectionUtil.CopyComponent<BoostedColorSchemeView>(colorSchemeView, colorSchemeView.gameObject);
-            GameObject.DestroyImmediate(colorSchemeView);
-            boostedColorSchemeView.Setup();
             _modalPosition = _modal.transform.localPosition;
             _modal.blockerClickedEvent += Dismiss;
         }
@@ -90,7 +87,7 @@ private void SetColors(DifficultyColors colors)
             Color envRightBoost = colors._envColorRightBoost == null ? voidColor : SongCore.Utilities.Utils.ColorFromMapColor(colors._envColorRightBoost);
             Color obstacle = colors._obstacleColor == null ? voidColor : SongCore.Utilities.Utils.ColorFromMapColor(colors._obstacleColor);
 
-            boostedColorSchemeView.SetColors(saberLeft, saberRight, envLeft, envRight, envLeftBoost, envRightBoost, obstacle);
+            colorSchemeView.SetColors(saberLeft, saberRight, envLeft, envRight, envLeftBoost, envRightBoost, obstacle);
         }
     }
 }
diff --git a/MultiplayerCore/manifest.json b/MultiplayerCore/manifest.json
@@ -3,12 +3,12 @@
   "id": "MultiplayerCore",
   "name": "MultiplayerCore",
   "author": "Goobwabber",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Adds custom songs to Beat Saber Multiplayer.",
-  "gameVersion": "1.21.0",
+  "gameVersion": "1.25.0",
   "dependsOn": {
     "BSIPA": "^4.1.4",
-    "SongCore": "^3.9.3",
+    "SongCore": "^3.9.7",
     "BeatSaverSharp": "^3.0.1",
     "SiraUtil": "^3.0.0",
     "BeatSaberMarkupLanguage": "^1.6.3"