From 043e95c7527eaca25675be75804211f3853c6263 Mon Sep 17 00:00:00 2001 From: Auros Nexus <41306347+Auros@users.noreply.github.com> Date: Wed, 22 Dec 2021 01:32:23 -0500 Subject: [PATCH] Fixed a hiccup with scoresaber score submission --- SiraUtil.Suite/Tests/SomeManager.cs | 2 +- .../Tests/SubmissionTest/DisableSubmission.cs | 10 ++++++++-- SiraUtil/Submissions/SubmissionCompletionInjector.cs | 11 +++-------- SiraUtil/Web/Implementations/UWRHttpService.cs | 3 +-- SiraUtil/manifest.json | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SiraUtil.Suite/Tests/SomeManager.cs b/SiraUtil.Suite/Tests/SomeManager.cs index ddd0ba6..ba4ce6e 100644 --- a/SiraUtil.Suite/Tests/SomeManager.cs +++ b/SiraUtil.Suite/Tests/SomeManager.cs @@ -5,7 +5,7 @@ namespace SiraUtil.Suite.Tests { - [Bind(Location.Menu)] + [Bind(Location.StandardPlayer)] public class SomeManager : ISomeManager, IInitializable { [Inject] diff --git a/SiraUtil.Suite/Tests/SubmissionTest/DisableSubmission.cs b/SiraUtil.Suite/Tests/SubmissionTest/DisableSubmission.cs index ff69b8c..f11cd68 100644 --- a/SiraUtil.Suite/Tests/SubmissionTest/DisableSubmission.cs +++ b/SiraUtil.Suite/Tests/SubmissionTest/DisableSubmission.cs @@ -1,14 +1,20 @@ -using SiraUtil.Submissions; +using SiraUtil.Attributes; +using SiraUtil.Logging; +using SiraUtil.Submissions; +using SiraUtil.Zenject; using Zenject; namespace SiraUtil.Suite.Tests.SubmissionTest { + [Bind(Location.StandardPlayer)] internal class DisableSubmission : IInitializable { + private readonly SiraLog _siraLog; private readonly Submission _submission; - public DisableSubmission(Submission submission) + public DisableSubmission(SiraLog siraLog, Submission submission) { + _siraLog = siraLog; _submission = submission; } diff --git a/SiraUtil/Submissions/SubmissionCompletionInjector.cs b/SiraUtil/Submissions/SubmissionCompletionInjector.cs index e05503a..3206f2d 100644 --- a/SiraUtil/Submissions/SubmissionCompletionInjector.cs +++ b/SiraUtil/Submissions/SubmissionCompletionInjector.cs @@ -1,10 +1,5 @@ -using IPA.Loader; -using IPA.Utilities; -using Mono.Cecil; +using IPA.Utilities; using SiraUtil.Affinity; -using System; -using System.Linq; -using System.Reflection; using Zenject; namespace SiraUtil.Submissions @@ -22,7 +17,7 @@ public SubmissionCompletionInjector(Submission submission, SubmissionDataContain _submissionDataContainer = submissionDataContainer; _inMission = missionGameplaySceneSetupData != null; _inStandard = standardGameplaySceneSetupData != null; - _submissionDataContainer.SSS(false); + _submissionDataContainer.SSS(true); } [AffinityPatch(typeof(PrepareLevelCompletionResults), nameof(PrepareLevelCompletionResults.FillLevelCompletionResults))] @@ -35,7 +30,7 @@ private void StandardResultsPrepared(ref LevelCompletionResults __result) { if (_inStandard) { - _submissionDataContainer.SSS(!_submission.Activated); + _submissionDataContainer.SSS(false); } else if (_inMission) { diff --git a/SiraUtil/Web/Implementations/UWRHttpService.cs b/SiraUtil/Web/Implementations/UWRHttpService.cs index f4bdce2..94136f5 100644 --- a/SiraUtil/Web/Implementations/UWRHttpService.cs +++ b/SiraUtil/Web/Implementations/UWRHttpService.cs @@ -1,5 +1,4 @@ -using IPA.Utilities; -using Newtonsoft.Json; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.IO; diff --git a/SiraUtil/manifest.json b/SiraUtil/manifest.json index 55b891f..e8f9532 100644 --- a/SiraUtil/manifest.json +++ b/SiraUtil/manifest.json @@ -3,7 +3,7 @@ "id": "SiraUtil", "name": "SiraUtil", "author": "Auros", - "version": "3.0.0", + "version": "3.0.1", "icon": "SiraUtil.Resources.logo.png", "description": "A powerful utility mod which expands the capabilities and provides more tools to Beat Saber modders.", "gameVersion": "1.19.0",