The Everything Update (UI Overhaul + Bug Fixes)

README.md

@@ -1,4 +1,12 @@
 # ScoreSaber-Plugin
-Clone, and goodluck. The open source release of ScoreSaber was done hastily and quite a lot needs to be changed and plenty of "security through obscurity" practices covered by obfuscation can finally be removed, cleaning up the project. 
+ScoreSaber is Beat Saber's largest leaderboard system for custom songs, hosting 60 million scores across 170,000+ leaderboards, with more than 1 million users worldwide
 
-Everything here is licensed under MIT and we'll be accepting contributors immediately, so if you're looking to help us out, that'd be greatly appreciated, we're going to need it.
+![image](https://github.com/user-attachments/assets/f638f92b-d961-46e1-8277-d2628676128a)
+
+Scores can also be viewed on [the website](https://scoresaber.com)
+
+# Installation
+## Method 1
+- Install from your preferred mod manager
+## Method 2
+- Download from the [releases](https://github.com/ScoreSaber/scoresaber-plugin/releases/latest)

ScoreSaber/Core/AppInstaller.cs

@@ -1,4 +1,5 @@
 using ScoreSaber.Core.Daemons;
+using ScoreSaber.Core.Services;
 using System.Reflection;
 using Zenject;
 
@@ -7,8 +8,10 @@ internal class AppInstaller : Installer {
 
         public override void InstallBindings() {
             Plugin.Container = Container;
+            Container.Bind<PlayerService>().AsSingle();
 
             Container.Bind<ReplayService>().AsSingle().NonLazy();
+            Container.BindInterfacesAndSelfTo<ScoreSaberRichPresenceService>().AsSingle();
         }
     }
 }

ScoreSaber/Core/Data/Internal/Settings.cs

@@ -8,7 +8,7 @@ namespace ScoreSaber.Core.Data
 {
     internal class Settings
     {
-        private static int _currentVersion => 8;
+        private static int _currentVersion => 9;
 
         public bool hideReplayUI = false;
 
@@ -36,6 +36,11 @@ internal class Settings
         public bool leftHandedReplayUI { get; set; }
         public bool lockedReplayUIMode { get; set; }
         public List<SpectatorPoseRoot> spectatorPositions { get; set; }
+        public Vec2 replayUIPosition { get; set; }
+        public float replayUISize { get; set; }
+        public bool startReplayUIHidden { get; set; }
+        public bool hideWatermarkIfUsersReplay { get; set; }
+        public bool enableRichPresence { get; set; }
 
         internal static string dataPath => "UserData";
         internal static string configPath => dataPath + @"\ScoreSaber";
@@ -65,6 +70,11 @@ public void SetDefaults() {
             hasOpenedReplayUI = false;
             leftHandedReplayUI = false;
             lockedReplayUIMode = false;
+            replayUIPosition = new Vec2(new Vector2(0.12f, 0.14f));
+            replayUISize = 1.25f;
+            startReplayUIHidden = false;
+            hideWatermarkIfUsersReplay = false;
+            enableRichPresence = true;
             SetDefaultSpectatorPositions();
         }
 
@@ -113,6 +123,12 @@ internal static Settings LoadSettings() {
                     if(decoded.fileVersion < 8) {
                         decoded.replayCameraSmoothing = true;
                     }
+                    if (decoded.fileVersion < 9) {
+                        decoded.replayUIPosition = new Vec2(new Vector2(0.12f, 0.14f));
+                        decoded.replayUISize = 1.25f;
+                        decoded.startReplayUIHidden = false;
+                        decoded.enableRichPresence = true;
+                    }
                     SaveSettings(decoded);
                 }
                 return decoded;
@@ -136,6 +152,22 @@ internal static void SaveSettings(Settings settings) {
             }
         }
 
+        internal struct Vec2 {
+            [JsonProperty("x")]
+            internal float x { get; set; }
+            [JsonProperty("y")]
+            internal float y { get; set; }
+
+            internal Vec2(Vector2 position) {
+                x = position.x;
+                y = position.y;
+            }
+
+            internal Vector2 ToVector2() {
+                return new Vector2(x, y);
+            }
+        }
+
         internal struct SpectatorPoseRoot {
             [JsonProperty("name")]
             internal string name { get; set; }

ScoreSaber/Core/Data/Models/ScoreSaberTeam.cs

@@ -40,6 +40,7 @@ internal enum TeamType
         RT,
         NAT,
         QAT,
-        CAT
+        CAT,
+        CCT
     }
 }

ScoreSaber/Core/Data/Wrappers/LeaderboardMap.cs

@@ -22,5 +22,7 @@ internal LeaderboardMap(Leaderboard leaderboard, BeatmapLevel beatmapLevel, Beat
             }
             return leaderboardTableScoreData;
         }
+
+
     }
 }

ScoreSaber/Core/MainInstaller.cs

@@ -1,4 +1,5 @@
 using ScoreSaber.Core.Daemons;
+using ScoreSaber.Core.Data.Models;
 using ScoreSaber.Core.ReplaySystem;
 using ScoreSaber.Core.ReplaySystem.UI;
 using ScoreSaber.Core.Services;
@@ -11,6 +12,7 @@
 using ScoreSaber.UI.Main.Settings.ViewControllers;
 using ScoreSaber.UI.Main.ViewControllers;
 using ScoreSaber.UI.Multiplayer;
+using ScoreSaber.UI.PromoBanner;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -21,17 +23,26 @@ internal class MainInstaller : Installer {
 
         public override void InstallBindings() {
             Container.BindInstance(new object()).WithId("ScoreSaberUIBindings").AsCached();
+
+            Container.BindInterfacesAndSelfTo<MenuPresencePatches>().AsSingle();
+
+            Container.BindInterfacesAndSelfTo<PanelView>().FromNewComponentAsViewController().AsSingle();
+            Container.BindInterfacesAndSelfTo<ScoreSaberLeaderboardViewController>().FromNewComponentAsViewController().AsSingle();
+
+            Container.BindInterfacesTo<ScoreSaberLeaderboard>().AsSingle();
+
+            Container.Bind<TweeningService>().AsSingle();
+
             Container.Bind<ReplayLoader>().AsSingle().NonLazy();
             Container.BindInterfacesTo<ResultsViewReplayButtonController>().AsSingle();
 
             Container.Bind<GlobalLeaderboardService>().AsSingle();
             Container.Bind<LeaderboardService>().AsSingle();
-            Container.Bind<PlayerService>().AsSingle();
 
             Container.Bind<MaxScoreCache>().AsSingle();
 
 
-            Container.Bind<PanelView>().FromNewComponentAsViewController().AsSingle();
+
             Container.Bind<FAQViewController>().FromNewComponentAsViewController().AsSingle();
             Container.Bind<TeamViewController>().FromNewComponentAsViewController().AsSingle();
             Container.Bind<GlobalViewController>().FromNewComponentAsViewController().AsSingle();
@@ -54,8 +65,8 @@ public override void InstallBindings() {
             Container.Bind<CellClickingView>().FromMethodMultiple(context => clickingViews).AsSingle().WhenInjectedInto<ScoreSaberLeaderboardViewController>();
             clickingViews.ForEach(y => Container.QueueForInject(y));
 
-            Container.BindInterfacesAndSelfTo<ScoreSaberLeaderboardViewController>().AsSingle().NonLazy();
-            Container.BindInterfacesTo<LeaderboardPatches>().AsSingle();
+            Container.Bind<PromoBannerView>().FromNewComponentAsViewController().AsSingle();
+            Container.Bind<PromoBanner>().AsSingle().NonLazy();
 
 #if RELEASE
             Container.BindInterfacesAndSelfTo<UploadDaemon>().AsSingle().NonLazy();

ScoreSaber/Core/ReplaySystem/Accessors.cs

@@ -34,6 +34,7 @@ internal static class Accessors
         internal static readonly FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<GameNoteController>>.Accessor BurstSliderHeadNotePool = FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<GameNoteController>>.GetAccessor("_burstSliderHeadGameNotePoolContainer");
         internal static readonly FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<BurstSliderGameNoteController>>.Accessor BurstSliderNotePool = FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<BurstSliderGameNoteController>>.GetAccessor("_burstSliderGameNotePoolContainer");
         internal static readonly FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<GameNoteController>>.Accessor GameNotePool = FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<GameNoteController>>.GetAccessor("_basicGameNotePoolContainer");
+        internal static readonly FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<ObstacleController>>.Accessor ObstaclePool = FieldAccessor<BasicBeatmapObjectManager, MemoryPoolContainer<ObstacleController>>.GetAccessor("_obstaclePoolContainer");
         internal static readonly FieldAccessor<SaberSwingRatingCounter, LazyCopyHashSet<ISaberSwingRatingCounterDidChangeReceiver>>.Accessor ChangeReceivers = FieldAccessor<SaberSwingRatingCounter, LazyCopyHashSet<ISaberSwingRatingCounterDidChangeReceiver>>.GetAccessor("_didChangeReceivers");
 
         internal static readonly FieldAccessor<ScoreController, int>.Accessor MultipliedScore = FieldAccessor<ScoreController, int>.GetAccessor("_multipliedScore");

ScoreSaber/Core/ReplaySystem/Installers/ImberInstaller.cs

@@ -1,4 +1,5 @@
 using ScoreSaber.Core.ReplaySystem.UI;
+using ScoreSaber.Core.Services;
 using Zenject;
 
 namespace ScoreSaber.Core.ReplaySystem.Installers
@@ -9,11 +10,13 @@ public override void InstallBindings() {
 
             if (Plugin.ReplayState.IsPlaybackEnabled && !Plugin.ReplayState.IsLegacyReplay) {
                 Container.Bind<VRControllerAccessor>().AsSingle();
+                Container.Bind<TweeningService>().AsSingle();
                 Container.BindInterfacesTo<ImberManager>().AsSingle();
                 Container.BindInterfacesAndSelfTo<ImberScrubber>().AsSingle();
                 Container.BindInterfacesAndSelfTo<ImberSpecsReporter>().AsSingle();
                 Container.BindInterfacesAndSelfTo<ImberUIPositionController>().AsSingle();
                 Container.Bind<MainImberPanelView>().FromNewComponentAsViewController().AsSingle();
+                Container.BindInterfacesAndSelfTo<DesktopMainImberPanelView>().FromNewComponentAsViewController().AsSingle();
                 Container.Bind(typeof(ITickable), typeof(SpectateAreaController)).To<SpectateAreaController>().AsSingle();
             }
         }

ScoreSaber/Core/ReplaySystem/Installers/PlaybackInstaller.cs

@@ -33,7 +33,6 @@ public override void InstallBindings() {
                     if (_gameplayCoreSceneSetupData.playerSpecificSettings.automaticPlayerHeight)
                         Container.BindInterfacesTo<HeightPlayer>().AsSingle();
                     Container.BindInterfacesAndSelfTo<ReplayTimeSyncController>().AsSingle();
-                    Container.Bind<NonVRReplayUI>().FromNewComponentOnNewGameObject().AsSingle().NonLazy();
                     Container.Bind<IAffinity>().To<CancelScoreControllerBufferFinisher>().AsSingle();
                     Container.Bind<IAffinity>().To<CancelSaberCuttingPatch>().AsSingle();
                 } else {

ScoreSaber/Core/ReplaySystem/Legacy/LegacyReplayPlayer.cs

@@ -177,9 +177,9 @@ private void UpdatePlaybackScore(Z.Keyframe keyframe) {
 
                 int maxPossibleRawScore = LeaderboardUtils.OldMaxRawScoreForNumberOfNotes(cutOrMissedNotes);
 
-                _relativeScoreAndImmediateRankCounter?.InvokeMethod<object, RelativeScoreAndImmediateRankCounter>("UpdateRelativeScoreAndImmediateRank", keyframe.score, keyframe.score, maxPossibleRawScore, maxPossibleRawScore);
+                _relativeScoreAndImmediateRankCounter.UpdateRelativeScoreAndImmediateRank(keyframe.score, keyframe.score, maxPossibleRawScore, maxPossibleRawScore);
 
-                _scoreUIController?.InvokeMethod<object, ScoreUIController>("UpdateScore", keyframe.score, keyframe.score);
+                _scoreUIController.UpdateScore(keyframe.score, keyframe.score);
 
             }
 

ScoreSaber/Core/ReplaySystem/Playback/EnergyPlayer.cs

@@ -21,22 +21,23 @@ public EnergyPlayer(ReplayFile file, GameEnergyCounter gameEnergyCounter, DiCont
         }
 
         public void TimeUpdate(float newTime) {
+            if (_sortedEnergyEvents.Length == 0) {
+                UpdateEnergy(1.0f);
+                return;
+            }
 
             for (int c = 0; c < _sortedEnergyEvents.Length; c++) {
-                // TODO: this has potential to have problems if _sortedEnergyEvents[c].Time is within an epsilon of newTime, potentially applying energy changes twice or not at all
                 if (_sortedEnergyEvents[c].Time > newTime) {
-                    float energy = c != 0 ? _sortedEnergyEvents[c - 1].Energy : 0.5f;
+                    float energy = c != 0 ? _sortedEnergyEvents[c - 1].Energy : _sortedEnergyEvents[0].Energy;
                     UpdateEnergy(energy);
                     return;
                 }
             }
-            UpdateEnergy(0.5f);
-            var lastEvent = _sortedEnergyEvents.LastOrDefault();
-            if (newTime >= lastEvent.Time && lastEvent.Energy <= Mathf.Epsilon) {
-                UpdateEnergy(0f);
-            }
+
+            UpdateEnergy(_sortedEnergyEvents.Last().Energy);
         }
 
+
         private void UpdateEnergy(float energy) {
 
             bool isFailingEnergy = energy <= Mathf.Epsilon;
@@ -53,11 +54,11 @@ private void UpdateEnergy(float energy) {
                 _gameEnergyUIPanel.Init();
                 var director = Accessors.Director(ref _gameEnergyUIPanel);
                 director.Stop();
+                director.RebindPlayableGraphOutputs();
                 director.Evaluate();
                 Accessors.EnergyBar(ref _gameEnergyUIPanel).enabled = !isFailingEnergy;
             }
-
-            FieldAccessor<GameEnergyCounter, Action<float>>.Get(_gameEnergyCounter, "gameEnergyDidChangeEvent").Invoke(energy);
+            _gameEnergyUIPanel.RefreshEnergyUI(energy);
         }
     }
 }