Merge pull request #48 from Auros/dev

SiraUtil 3.1.0

SiraUtil.Suite/Plugin.cs

@@ -47,8 +47,6 @@ public Plugin(IPALogger logger, Zenjector zenjector)
             {
                 //Container.RegisterRedecorator(new ConnectedPlayerNoteRegistration(Create));
             });
-
-            //zenjector.Install(Location.StandardPlayer | Location.CampaignPlayer, Container => Container.BindInterfacesTo<DisableSubmission>().AsSingle());
         }
 
         private GameNoteController Create2(GameNoteController before)

SiraUtil.Suite/Tests/SubmissionTest/DisableSubmission.cs

@@ -6,7 +6,7 @@
 
 namespace SiraUtil.Suite.Tests.SubmissionTest
 {
-    [Bind(Location.StandardPlayer)]
+    [Bind(Location.StandardPlayer | Location.MultiPlayer)]
     internal class DisableSubmission : IInitializable
     {
         private readonly SiraLog _siraLog;

SiraUtil/Installers/SiraMenuInstaller.cs

@@ -13,6 +13,7 @@ public override void InstallBindings()
 
             // Score Submission
             Container.Bind<SiraSubmissionViewController>().FromNewComponentAsViewController().AsSingle();
+            Container.BindInterfacesTo<MultiplayerDisplayer>().AsSingle();
             Container.BindInterfacesTo<StandardDisplayer>().AsSingle();
             Container.BindInterfacesTo<MissionDisplayer>().AsSingle();
         }

SiraUtil/Installers/SiraStandardCampaignInstaller.cs → SiraUtil/Installers/SiraStandardCampaignMultiplayerInstaller.cs

@@ -3,7 +3,7 @@
 
 namespace SiraUtil.Installers
 {
-    internal class SiraStandardCampaignInstaller : Installer
+    internal class SiraStandardCampaignMultiplayerInstaller : Installer
     {
         public override void InstallBindings()
         {

SiraUtil/Plugin.cs

@@ -40,7 +40,7 @@ public Plugin(Conf conf, IPALogger logger, PluginMetadata pluginMetadata)
             PluginInitInjector.AddInjector(typeof(Zenjector), ConstructZenjector);
 
             Zenjector zenjector = (ConstructZenjector(null!, null!, pluginMetadata) as Zenjector)!;
-            zenjector.Install<SiraStandardCampaignInstaller>(Location.StandardPlayer | Location.CampaignPlayer);
+            zenjector.Install<SiraStandardCampaignMultiplayerInstaller>(Location.StandardPlayer | Location.CampaignPlayer | Location.MultiPlayer);
             zenjector.Install<SiraInitializationInstaller>(Location.App, _zenjectManager, zenjector);
             zenjector.Install<FPFCInstaller>(Location.Menu | Location.Player | Location.Tutorial);
             zenjector.Install<SiraGameplayInstaller>(Location.Player | Location.Tutorial);

SiraUtil/Submissions/MultiplayerDisplayer.cs

@@ -0,0 +1,10 @@
+namespace SiraUtil.Submissions
+{
+    internal sealed class MultiplayerDisplayer : SubmissionDisplayer
+    {
+        public MultiplayerDisplayer(GameServerLobbyFlowCoordinator gameServerLobbyFlowCoordinator, MultiplayerResultsViewController multiplayerResultsViewController) : base(gameServerLobbyFlowCoordinator, multiplayerResultsViewController)
+        {
+
+        }
+    }
+}

SiraUtil/Submissions/SubmissionCompletionInjector.cs

@@ -8,27 +8,29 @@ internal class SubmissionCompletionInjector : IAffinity
     {
         private readonly bool _inMission;
         private readonly bool _inStandard;
+        private readonly bool _inMultiplayer;
         private readonly Submission _submission;
         private readonly SubmissionDataContainer _submissionDataContainer;
 
-        public SubmissionCompletionInjector(Submission submission, SubmissionDataContainer submissionDataContainer, [InjectOptional] MissionGameplaySceneSetupData missionGameplaySceneSetupData, [InjectOptional] StandardGameplaySceneSetupData standardGameplaySceneSetupData)
+        public SubmissionCompletionInjector(Submission submission, SubmissionDataContainer submissionDataContainer, [InjectOptional] MissionGameplaySceneSetupData missionGameplaySceneSetupData, [InjectOptional] StandardGameplaySceneSetupData standardGameplaySceneSetupData, [InjectOptional] MultiplayerLevelSceneSetupData multiplayerLevelSceneSetupData)
         {
             _submission = submission;
             _submissionDataContainer = submissionDataContainer;
             _inMission = missionGameplaySceneSetupData != null;
             _inStandard = standardGameplaySceneSetupData != null;
+            _inMultiplayer = multiplayerLevelSceneSetupData != null;
             _submissionDataContainer.SSS(true);
         }
 
         [AffinityPatch(typeof(PrepareLevelCompletionResults), nameof(PrepareLevelCompletionResults.FillLevelCompletionResults))]
         private void StandardResultsPrepared(ref LevelCompletionResults __result)
         {
-            if (!(_inStandard || _inMission))
+            if (!(_inStandard || _inMission || _inMultiplayer))
                 return;
 
             if (_submission.Activated)
             {
-                if (_inStandard)
+                if (_inStandard || _inMultiplayer)
                 {
                     _submissionDataContainer.SSS(false);
                 }

SiraUtil/Submissions/SubmissionPatches.cs

@@ -24,6 +24,23 @@ internal static void DynamicFinish(LevelCompletionResults levelCompletionResults
             }
         }
 
+
+        [HarmonyPatch(typeof(MultiplayerLevelCompletionResults), nameof(MultiplayerLevelCompletionResults.hasAnyResults), MethodType.Getter)]
+        internal class Multi
+        {
+            [HarmonyPrefix]
+            internal static bool DynamicFinish(MultiplayerLevelCompletionResults __instance, ref bool __result)
+            {
+                if (__instance.levelCompletionResults is SiraLevelCompletionResults siraLevelCompletionResults && !siraLevelCompletionResults.ShouldSubmitScores)
+                {
+                    __result = false;
+                    return false;
+                }
+                return true;
+            }
+        }
+
+
         internal static void ForcePracticeIfScoresDisabled(LevelCompletionResults levelCompletionResults, ref bool practice)
         {
             if (levelCompletionResults is SiraLevelCompletionResults siraLevelCompletionResults && !siraLevelCompletionResults.ShouldSubmitScores)

SiraUtil/Zenject/Location.cs

@@ -34,7 +34,7 @@ public enum Location
         CampaignPlayer = 8,
 
         /// <summary>
-        /// Installs your bindings onto the local multiplayer player. The current backing installer is <see cref="MultiplayerLocalPlayerInstaller" />
+        /// Installs your bindings onto the local active multi player. Think of this as when the local user is actively playing the song. The current backing installer is <see cref="MultiplayerLocalActivePlayerInstaller" />
         /// </summary>
         MultiPlayer = 16,
 
@@ -70,6 +70,16 @@ public enum Location
         /// <summary>
         /// Installs your bindings onto every connected player in multiplayer. The current backing installer is <see cref="MultiplayerConnectedPlayerInstaller" />
         /// </summary>
-        ConnectedPlayer = 256
+        ConnectedPlayer = 256,
+
+        /// <summary>
+        /// Installs your bindings onto the local active player in multiplayer. This is the current local player, no matter if they're spectating or not. The current backing installer is <see cref="MultiplayerLocalPlayerInstaller" />
+        /// </summary>
+        AlwaysMultiPlayer = 512,
+
+        /// <summary>
+        /// Installs your bindings onto the local inactive player in multiplayer. Think of this as when the local user is spectating in multiplayer. The current backing installer is <see cref="MultiplayerLocalInactivePlayerInstaller" />
+        /// </summary>
+        InactiveMultiPlayer = 1024,
     }
 }

SiraUtil/Zenject/Zenjector.cs

@@ -130,6 +130,10 @@ private IEnumerable<Type> InstallerForLocation(Location location)
                 installerTypes.Add(typeof(MultiplayerCoreInstaller));
             if (location.HasFlag(Location.ConnectedPlayer))
                 installerTypes.Add(typeof(MultiplayerConnectedPlayerInstaller));
+            if (location.HasFlag(Location.AlwaysMultiPlayer))
+                installerTypes.Add(typeof(MultiplayerLocalPlayerInstaller));
+            if (location.HasFlag(Location.InactiveMultiPlayer))
+                installerTypes.Add(typeof(MultiplayerLocalInactivePlayerInstaller));
             return installerTypes;
         }
 

SiraUtil/manifest.json

@@ -3,10 +3,10 @@
   "id": "SiraUtil",
   "name": "SiraUtil",
   "author": "Auros",
-  "version": "3.0.6",
+  "version": "3.1.0",
   "icon": "SiraUtil.Resources.logo.png",
   "description": "A powerful utility mod which expands the capabilities and provides more tools to Beat Saber modders.",
-  "gameVersion": "1.21.0",
+  "gameVersion": "1.22.1",
   "dependsOn": {
     "BSIPA": "^4.2.1"
   },