The Everything Update (UI Overhaul + Bug Fixes)

ScoreSaber/Core/AffinityPatches/MenuPresencePatches.cs

@@ -0,0 +1,119 @@
+using HarmonyLib;
+using ScoreSaber.Core.Services;
+using SiraUtil.Affinity;
+using SiraUtil.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Zenject;
+
+namespace ScoreSaber.Core.AffinityPatches {
+    public class MenuPresencePatches : IAffinity {
+
+        [Inject] private readonly ScoreSaberRichPresenceService _richPresenceService = null;
+        [Inject] private readonly SiraLog _log = null;
+
+        [AffinityPatch(typeof(SinglePlayerLevelSelectionFlowCoordinator), "HandleStandardLevelDidFinish")]
+        [AffinityPostfix]
+        public void HandleStopStandardLevelPostfix() {
+            var jsonObject = new SceneChangeEvent() {
+                Timestamp = _richPresenceService.TimeRightNow,
+                Scene = Scene.menu
+            };
+
+            _richPresenceService.SendUserProfileChannel("scene_change", jsonObject);
+            _log.Notice("Sent scene change event to rich presence service");
+        }
+
+        [AffinityPatch(typeof(SinglePlayerLevelSelectionFlowCoordinator), nameof(SinglePlayerLevelSelectionFlowCoordinator.StartLevel))]
+        [AffinityPostfix]
+        public void HandleStartLevelPostfix(SinglePlayerLevelSelectionFlowCoordinator __instance, Action beforeSceneSwitchCallback, bool practice) {
+
+            string hash = string.Empty;
+
+            if (!__instance.selectedBeatmapLevel.hasPrecalculatedData) {
+                hash = "#" + __instance.selectedBeatmapLevel.levelID;
+            } else {
+                hash = __instance.selectedBeatmapLevel.levelID.Split('_')[2];
+            }
+
+            bool isPractice = practice;
+            Services.GameMode gameMode = Services.GameMode.solo;
+
+            if (isPractice) {
+                gameMode = Services.GameMode.practice;
+
+                // this is to privatise the practice mode song, as it would be exposed in the rich presence, still not shown in UI though.
+                var songeventSilly = new SongStartEvent(_richPresenceService.TimeRightNow, gameMode,
+                                    "HYPER SONIC MEGA DEATH **** CORE",
+                                    string.Empty,
+                                    "oce v...",
+                                    "echelon#6295",
+                                    "Standard",
+                                    "A297DECDFB0B3FE6F14F0BEF788AEBAC978E825E",
+                                    (int)2000000000,
+                                    ((1 + 1 - 1) * 0) + 1, // those who know 💀💀💀 🥭🥭🥭
+                                    0,
+                                    1);
+
+                _richPresenceService.SendUserProfileChannel("start_song", songeventSilly);
+                return;
+            }
+
+            GameplayModifiers gameplayModifiers = __instance.gameplayModifiers;
+            int startTime = 0;
+            if (__instance.isInPracticeView) {
+                startTime = (int)__instance._practiceViewController._practiceSettings.startSongTime;
+            }
+
+            var songevent = new SongStartEvent(_richPresenceService.TimeRightNow, gameMode,
+                                                __instance.selectedBeatmapLevel.songName,
+                                                __instance.selectedBeatmapLevel.songSubName,
+                                                Data.Models.ScoreSaberUploadData.FriendlyLevelAuthorName(__instance.selectedBeatmapLevel.allMappers, __instance.selectedBeatmapLevel.allLighters),
+                                                __instance.selectedBeatmapLevel.songAuthorName,
+                                                __instance.selectedBeatmapKey.beatmapCharacteristic.SerializedName(),
+                                                hash,
+                                                (int)__instance.selectedBeatmapLevel.songDuration,
+                                                ((int)__instance.selectedBeatmapKey.difficulty * 2) + 1,
+                                                startTime,
+                                                gameplayModifiers.songSpeedMul);
+
+            _richPresenceService.SendUserProfileChannel("start_song", songevent);
+        }
+
+        [AffinityPatch(typeof(MultiplayerLevelSelectionFlowCoordinator), nameof(MultiplayerLevelSelectionFlowCoordinator.HandleLobbyGameStateControllerGameStarted))]
+        [AffinityPostfix]
+        public void HandleMultiplayerGameStartPostfix(MultiplayerLevelSelectionFlowCoordinator __instance, ILevelGameplaySetupData levelGameplaySetupData) {
+
+            string hash = string.Empty;
+
+            if (!levelGameplaySetupData.beatmapKey.levelId.StartsWith("custom_level_")) {
+                hash = "#" + __instance.selectedBeatmapLevel.levelID;
+            } else {
+                hash = __instance.selectedBeatmapLevel.levelID.Split('_')[2];
+            }
+
+            // i dont like this, but i have to do it
+            BeatmapLevel beatmapLevel = SongCore.Loader.GetLevelByHash(levelGameplaySetupData.beatmapKey.levelId);
+
+            GameplayModifiers gameplayModifiers = levelGameplaySetupData.gameplayModifiers;
+            int startTime = 0;
+
+            var songevent = new SongStartEvent(_richPresenceService.TimeRightNow, GameMode.multiplayer,
+                                                beatmapLevel.songName,
+                                                beatmapLevel.songSubName,
+                                                beatmapLevel.allMappers.Join().ToString(),
+                                                beatmapLevel.songAuthorName,
+                                                levelGameplaySetupData.beatmapKey.beatmapCharacteristic.SerializedName(),
+                                                hash,
+                                                (int)beatmapLevel.songDuration,
+                                                ((int)levelGameplaySetupData.beatmapKey.difficulty * 2) + 1,
+                                                startTime,
+                                                gameplayModifiers.songSpeedMul);
+
+            _richPresenceService.SendUserProfileChannel("start_song", songevent);
+        }
+    }
+}

ScoreSaber/Core/Data/Internal/Settings.cs

@@ -128,6 +128,7 @@ internal static Settings LoadSettings() {
                         decoded.replayUISize = 1.25f;
                         decoded.startReplayUIHidden = false;
                         decoded.enableRichPresence = true;
+                        decoded.hideWatermarkIfUsersReplay = false;
                     }
                     SaveSettings(decoded);
                 }

ScoreSaber/Core/Data/Models/LeaderboardUploadData.cs

@@ -64,7 +64,7 @@ internal static ScoreSaberUploadData Create(BeatmapLevel beatmapLevel, BeatmapKe
             data.songName = beatmapLevel.songName;
             data.songSubName = beatmapLevel.songSubName;
             data.songAuthorName = beatmapLevel.songAuthorName;
-            data.levelAuthorName = friendlyLevelAuthorName(beatmapLevel.allMappers, beatmapLevel.allLighters);
+            data.levelAuthorName = FriendlyLevelAuthorName(beatmapLevel.allMappers, beatmapLevel.allLighters);
             data.bpm = Convert.ToInt32(beatmapLevel.beatsPerMinute);
 
             data.playerName = playerInfo.playerName;
@@ -84,7 +84,7 @@ internal static ScoreSaberUploadData Create(BeatmapLevel beatmapLevel, BeatmapKe
             return data;
         }
 
-        static string friendlyLevelAuthorName(string[] mappers, string[] lighters) {
+        public static string FriendlyLevelAuthorName(string[] mappers, string[] lighters) {
             List<string> mappersAndLighters = new List<string>();
             mappersAndLighters.AddRange(mappers);
             mappersAndLighters.AddRange(lighters);

ScoreSaber/Core/Data/Models/ScoreSaberTeam.cs

@@ -8,7 +8,7 @@ namespace ScoreSaber.Core.Data.Models
     internal class ScoreSaberTeam
     {
         [JsonProperty("TeamMembers")]
-        public Dictionary<TeamType, List<TeamMember>> TeamMembers { get; set; }
+        public Dictionary<string, List<TeamMember>> TeamMembers { get; set; }
     }
 
     internal class TeamMember
@@ -28,19 +28,4 @@ internal class TeamMember
         [JsonProperty("YouTube")]
         internal string YouTube { get; set; }
     }
-
-    [JsonConverter(typeof(StringEnumConverter))]
-    internal enum TeamType
-    {
-        Backend,
-        Frontend,
-        Mod,
-        PPv3,
-        Admin,
-        RT,
-        NAT,
-        QAT,
-        CAT,
-        CCT
-    }
 }

ScoreSaber/Core/MainInstaller.cs

@@ -1,4 +1,5 @@
-using ScoreSaber.Core.Daemons;
+using ScoreSaber.Core.AffinityPatches;
+using ScoreSaber.Core.Daemons;
 using ScoreSaber.Core.Data.Models;
 using ScoreSaber.Core.ReplaySystem;
 using ScoreSaber.Core.ReplaySystem.UI;
@@ -15,7 +16,6 @@
 using ScoreSaber.UI.PromoBanner;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Zenject;
 
 namespace ScoreSaber.Core {

ScoreSaber/Core/ReplaySystem/HarmonyPatches/ImmediateRankReinitializer.cs

@@ -10,8 +10,8 @@ internal static bool Prefix(RelativeScoreAndImmediateRankCounter __instance, int
 
             if (Plugin.ReplayState.IsPlaybackEnabled && !Plugin.ReplayState.IsLegacyReplay) {
                 if (score == 0 && maxPossibleScore == 0) {
-                    Accessors.RelativeScore(ref __instance, 1f);
-                    Accessors.ImmediateRank(ref __instance, RankModel.Rank.SS);
+                    __instance.relativeScore = 1f;
+                    __instance.immediateRank = RankModel.Rank.SS;
                     ___relativeScoreOrImmediateRankDidChangeEvent.Invoke();
                     return false;
                 }