Update for Beat Saber 1.19.0

BailOutMode/BailOutController.cs

@@ -237,7 +237,7 @@ private IEnumerator<WaitForSeconds> CheckLastStanding()
                         Logger.log?.Debug($"All other players failed, triggering level failed.");
                         if (MultiGameplayManager != null)
                         {
-                            MultiGameplayManager.HandleGameEnergyDidReach0();
+                            MultiGameplayManager.GetType().GetMethod("HandleGameEnergyDidReach0").Invoke(MultiGameplayManager, new object[] { });
                         }
                         else
                             Logger.log?.Warn($"Tried to fail level, but ILevelEndActions isn't a StandardLevelGameplayManager.");

BailOutMode/BailOutInstaller.cs

@@ -14,7 +14,7 @@ internal class BailOutInstaller : Installer
         public override void InstallBindings()
         {
             Logger.log?.Info("Injecting Dependencies");
-            Container.Bind<BailOutController>().FromNewComponentOnNewGameObject("BailOutController").AsSingle().NonLazy();
+            Container.Bind<BailOutController>().FromNewComponentOnNewGameObject().AsSingle().NonLazy();
         }
     }
 }

BailOutMode/BailOutMode.csproj

@@ -38,9 +38,9 @@
       <HintPath>$(BeatSaberDir)\Libs\0Harmony.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="BGNet">
-      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGNet.dll</HintPath>
+    <Reference Include="BGNetCore, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <Private>False</Private>
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGNetCore.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="BSML">
@@ -53,6 +53,11 @@
       <HintPath>$(BeatSaberDir)\Plugins\BS_Utils.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="DataModels, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="GameplayCore">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\GameplayCore.dll</HintPath>
       <Private>False</Private>

BailOutMode/Harmony_Patches/GameEnergyCounterProcessEnergyChange.cs

@@ -10,7 +10,7 @@
 
 namespace BailOutMode.Harmony_Patches
 {
-    [HarmonyPatch(typeof(GameEnergyCounter), nameof(GameEnergyCounter.ProcessEnergyChange),
+    [HarmonyPatch(typeof(GameEnergyCounter), "ProcessEnergyChange",
         new Type[] {
         typeof(float)})]
     class GameEnergyCounterProcessEnergyChange

BailOutMode/Harmony_Patches/HandleSongDidFinish.cs

@@ -10,7 +10,7 @@
 
 namespace BailOutMode.Harmony_Patches
 {
-    [HarmonyPatch(typeof(StandardLevelGameplayManager), nameof(StandardLevelGameplayManager.HandleSongDidFinish),
+    [HarmonyPatch(typeof(StandardLevelGameplayManager), "HandleSongDidFinish",
     new Type[] { })]
     internal class StandardLevelGameplayManagerHandleSongDidFinish
     {
@@ -24,7 +24,7 @@ static bool Prefix(StandardLevelGameplayManager __instance, ref StandardLevelGam
                 if (BailOutController.instance.numFails > 0)
                 {
                     Logger.log.Debug("Fail detected in BailOutController, forcing level failed");
-                    __instance.HandleGameEnergyDidReach0();
+                    __instance.GetType().GetMethod("HandleGameEnergyDidReach0").Invoke(__instance, new object[] {});
                     return false;
                 }
             }

BailOutMode/Harmony_Patches/MultiplayerHandleSongDidFinish.cs

@@ -10,7 +10,7 @@
 
 namespace BailOutMode.Harmony_Patches
 {
-    [HarmonyPatch(typeof(MultiplayerLocalActivePlayerGameplayManager), nameof(MultiplayerLocalActivePlayerGameplayManager.HandleSongDidFinish),
+    [HarmonyPatch(typeof(MultiplayerLocalActivePlayerGameplayManager), "HandleSongDidFinish",
     new Type[] { })]
     internal class MultiplayerLocalActivePlayerGameplayManagerHandleSongDidFinish
     {
@@ -24,7 +24,7 @@ static bool Prefix(MultiplayerLocalActivePlayerGameplayManager __instance)
                 if (BailOutController.instance.numFails > 0)
                 {
                     Logger.log.Debug("Fail detected in BailOutController, forcing level failed");
-                    __instance.HandleGameEnergyDidReach0();
+                    __instance.GetType().GetMethod("HandleGameEnergyDidReach0").Invoke(__instance, new object[] { });
                     return false;
                 }
             }

BailOutMode/Harmony_Patches/MultiplayerLocalActiveClient_ScoreControllerHandleScoreDidChange.cs

@@ -12,7 +12,7 @@ namespace BailOutMode.Harmony_Patches
     /// <summary>
     /// This patches ClassToPatch.MethodToPatch(Parameter1Type arg1, Parameter2Type arg2)
     /// </summary>
-    [HarmonyPatch(typeof(MultiplayerLocalActiveClient), nameof(MultiplayerLocalActiveClient.ScoreControllerHandleScoreDidChange),
+    [HarmonyPatch(typeof(MultiplayerLocalActiveClient), "HandleScoreDidChange",
         new Type[] { // List the Types of the method's parameters.
         typeof(int),
         typeof(int)})]
@@ -23,12 +23,12 @@ internal class MultiplayerLocalActiveClient_ScoreControllerHandleScoreDidChange
             Plugin.LevelStarted += OnLevelStarted;
         }
 
-        public static int lastRawScore { get; private set; } = -1;
+        public static int lastMultipliedScore { get; private set; } = -1;
         public static int lastModifiedScore { get; private set; } = -1;
 
         public static void ResetLastScores()
         {
-            lastRawScore = -1;
+            lastMultipliedScore = -1;
             lastModifiedScore = -1;
         }
 
@@ -37,11 +37,11 @@ private static void OnLevelStarted(object s, EventArgs _)
             ResetLastScores();
         }
 
-        static bool Prefix(ref int rawScore, ref int modifiedScore)
+        static bool Prefix(ref int multipliedScore, ref int modifiedScore)
         {
             if (BailOutController.instance.numFails > 0)
                 return false;
-            lastRawScore = rawScore;
+            lastMultipliedScore = multipliedScore;
             lastModifiedScore = modifiedScore;
             return true;
         }

BailOutMode/Harmony_Patches/ScoreController_Patches.cs

@@ -9,33 +9,33 @@
 /// </summary>
 namespace BailOutMode.Harmony_Patches
 {
-    [HarmonyPatch(typeof(ScoreController), nameof(ScoreController.prevFrameRawScore), MethodType.Getter)]
+    [HarmonyPatch(typeof(ScoreController), nameof(ScoreController.multipliedScore), MethodType.Getter)]
     public class ScoreController_prevFrameRawScore
     {
-        static bool Prefix(ref int ____prevFrameRawScore, ref int __result)
+        static bool Prefix(ref int ____multipliedScore, ref int __result)
         {
-            int lastRawScore = MultiplayerLocalActiveClient_ScoreControllerHandleScoreDidChange.lastRawScore;
-            if (BailOutController.instance.numFails > 0 && lastRawScore >= 0)
+            int lastMultipliedScore = MultiplayerLocalActiveClient_ScoreControllerHandleScoreDidChange.lastMultipliedScore;
+            if (BailOutController.instance.numFails > 0 && lastMultipliedScore >= 0)
             {
 #if DEBUG
-                Logger.log?.Debug($"Multiplayer Bailout detected. Overriding raw score '{____prevFrameRawScore}' with '{lastRawScore}'");
+                Logger.log?.Debug($"Multiplayer Bailout detected. Overriding multiplied score '{____multipliedScore}' with '{lastMultipliedScore}'");
 #endif
-                __result = lastRawScore;
+                __result = lastMultipliedScore;
                 return false;
             }
             return true;                
         }
     }
 
-    [HarmonyPatch(typeof(ScoreController), nameof(ScoreController.prevFrameModifiedScore), MethodType.Getter)]
+    [HarmonyPatch(typeof(ScoreController), nameof(ScoreController.modifiedScore), MethodType.Getter)]
     public class ScoreController_prevprevFrameModifiedScore
     {
-        static bool Prefix(ref int ____prevFrameRawScore, ref float ____gameplayModifiersScoreMultiplier, ref int __result)
+        static bool Prefix(ref int ____modifiedScore, ref float ____gameplayModifiersScoreMultiplier, ref int __result)
         {
             int lastModifiedScore = MultiplayerLocalActiveClient_ScoreControllerHandleScoreDidChange.lastModifiedScore;
             if (BailOutController.instance.numFails > 0 && lastModifiedScore >= 0)
             {
-                int modifiedScore = ScoreModel.GetModifiedScoreForGameplayModifiersScoreMultiplier(____prevFrameRawScore, ____gameplayModifiersScoreMultiplier);
+                int modifiedScore = ScoreModel.GetModifiedScoreForGameplayModifiersScoreMultiplier(____modifiedScore, ____gameplayModifiersScoreMultiplier);
 #if DEBUG
                 Logger.log?.Debug($"Multiplayer Bailout detected. Overriding modified score '{modifiedScore}' with '{lastModifiedScore}'");
 #endif

BailOutMode/Plugin.cs

@@ -35,18 +35,20 @@ public Plugin(IPA.Logging.Logger logger, Zenjector zenjector, PluginMetadata plu
             harmony = new Harmony("com.github.zingabopp.bailoutmode");
             PluginMetadata = pluginMetadata;
             Zenjector = zenjector;
-            zenjector.OnGame<BailOutInstaller>(false);
+            zenjector.Install<BailOutInstaller>(Location.GameCore);
             //BS_Utils.Utilities.BSEvents.lateMenuSceneLoadedFresh += MenuLoadedFresh;
         }
 
         [Init]
         public void InitWithConfig(Config conf)
         {
             Configuration.instance = conf.Generated<Configuration>();
-            SetGameplaySetupTab(Configuration.instance.EnableGameplayTab);
-            Logger.log.Debug("Config loaded"); 
-            BeatSaberMarkupLanguage.Settings.BSMLSettings.instance.AddSettingsMenu(PluginName, Resource_Settings_Path, Configuration.instance);
-
+            Logger.log.Debug("Config loaded");
+            BeatSaberMarkupLanguage.Util.MainMenuAwaiter.MainMenuInitializing += delegate
+            {
+                SetGameplaySetupTab(Configuration.instance.EnableGameplayTab);
+                BeatSaberMarkupLanguage.Settings.BSMLSettings.Instance.AddSettingsMenu(PluginName, Resource_Settings_Path, Configuration.instance);
+            };
         }
 
         [OnEnable]
@@ -76,7 +78,7 @@ public void OnDisable()
             }
             try
             {
-                harmony.UnpatchAll(harmony.Id);
+                harmony.UnpatchSelf();
             }
             catch (Exception ex)
             {
@@ -104,13 +106,13 @@ internal void SetGameplaySetupTab(bool enabled)
                 if (enabled)
                 {
                     Logger.log?.Debug($"Enabling GameplaySetup tab.");
-                    GameplaySetup.instance.AddTab(PluginName, Resource_GameplaySettings_Path, Configuration.instance);
+                    GameplaySetup.Instance.AddTab(PluginName, Resource_GameplaySettings_Path, Configuration.instance);
                     gameplayTabEnabled = true;
                 }
                 else
                 {
                     Logger.log?.Debug($"Disabling GameplaySetup tab.");
-                    GameplaySetup.instance.RemoveTab(PluginName);
+                    GameplaySetup.Instance.RemoveTab(PluginName);
                     gameplayTabEnabled = false;
                 }
             }

BailOutMode/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.3")]
+[assembly: AssemblyVersion("1.8.0")]

BailOutMode/manifest.json

@@ -4,13 +4,13 @@
   "author": "Zingabopp",
   "id": "bailoutmode",
   "description": "Allows you to continue playing songs without posting a score if you fail, but allows you to post scores if you don't.",
-  "version": "1.7.3",
-  "gameVersion": "1.13.4",
+  "version": "1.8.0",
+  "gameVersion": "1.40.3",
   "dependsOn": {
     "BSIPA": "^4.1.3",
     "BS Utils": "^1.6.2",
     "BeatSaberMarkupLanguage": "^1.4.1",
-    "SiraUtil": "^2.1.0"
+    "SiraUtil": "^3.0.0"
   },
   "links": {
     "project-source": "https://github.com/Zingabopp/BailOutMode",