1.20+

Configuration/Config.cs

@@ -17,7 +17,7 @@ internal class Config {
 		public virtual List<int> splits { get; set; } = new List<int>() { 115, 114, 110, 100, 0 };
 
 		public static IEnumerable<int> FilterSplitsList(IEnumerable<int> splits) {
-			var x = splits.Where(x => x <= ScoreModel.kMaxCutRawScore && x >= 0).Distinct().OrderByDescending(x => x);
+			var x = splits.Where(x => x <= 115 && x >= 0).Distinct().OrderByDescending(x => x);
 
 			if(!x.Any())
 				return new[] { 115 };

HitscoreCounter.cs

@@ -4,14 +4,17 @@
 using System.Runtime.CompilerServices;
 using TMPro;
 using UnityEngine;
+using Zenject;
 
 namespace HitscoreCounter {
-	public class HitscoreCounter : BasicCustomCounter, INoteEventHandler, ISaberSwingRatingCounterDidFinishReceiver {
+	public class HitscoreCounter : BasicCustomCounter {
 		TMP_Text[] hintLabels;
 		TMP_Text[] valueLabels;
 		int[] targets;
 		int[] values;
 
+		[Inject] ScoreController scoreController;
+
 		public override void CounterInit() {
 			var label = CanvasUtility.CreateTextFromSettings(Settings);
 			label.text = "Hitscores";
@@ -54,7 +57,7 @@ TMP_Text CreateLabel(TextAlignmentOptions align, Vector3 offset, float fontSize
 				}
 			}
 
-			var prevValue = ScoreModel.kMaxCutRawScore + 1;
+			var prevValue = 116;
 			for(var i = 0; i < countersCount; i++) {
 				if(!Config.Instance.verticalLayout)
 					hintLabels[i].fontStyle = FontStyles.Underline;
@@ -80,13 +83,16 @@ TMP_Text CreateLabel(TextAlignmentOptions align, Vector3 offset, float fontSize
 				prevValue = Config.Instance.splits[i];
 				targets[i] = Config.Instance.splits[i] - 1;
 			}
+
+			scoreController.scoringForNoteFinishedEvent += ScoreController_scoringForNoteFinishedEvent;
 		}
 
 		public override void CounterDestroy() {
 			hintLabels = null;
 			valueLabels = null;
 			targets = null;
 			values = null;
+			scoreController.scoringForNoteFinishedEvent -= ScoreController_scoringForNoteFinishedEvent;
 		}
 
 		void IncrementValueLabelForHitscore(int hitscore) {
@@ -98,26 +104,11 @@ void IncrementValueLabelForHitscore(int hitscore) {
 			}
 		}
 
-		private Dictionary<ISaberSwingRatingCounter, float> noteCutAccs = new Dictionary<ISaberSwingRatingCounter, float>();
-		public void OnNoteCut(NoteData data, NoteCutInfo info) {
-			if(!info.allIsOK || data.colorType == ColorType.None)
+		private void ScoreController_scoringForNoteFinishedEvent(ScoringElement scoringElement) {
+			if(!(scoringElement is GoodCutScoringElement goodCut && goodCut.noteData.scoringType == NoteData.ScoringType.Normal))
 				return;
 
-			noteCutAccs.Add(info.swingRatingCounter, info.cutDistanceToCenter);
-			info.swingRatingCounter.RegisterDidFinishReceiver(this);
-		}
-
-		public void OnNoteMiss(NoteData data) { }
-
-		public void HandleSaberSwingRatingCounterDidFinish(ISaberSwingRatingCounter saberSwingRatingCounter) {
-			if(!noteCutAccs.TryGetValue(saberSwingRatingCounter, out var nci))
-				return;
-
-			noteCutAccs.Remove(saberSwingRatingCounter);
-
-			ScoreModel.RawScoreWithoutMultiplier(saberSwingRatingCounter, nci, out int beforeCut, out int afterCut, out int cutDistance);
-
-			IncrementValueLabelForHitscore(beforeCut + afterCut + cutDistance);
+			IncrementValueLabelForHitscore(scoringElement.cutScore);
 		}
 	}
 }

HitscoreCounter.csproj

@@ -98,6 +98,12 @@
     <Reference Include="UnityEngine.VRModule">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.VRModule.dll</HintPath>
     </Reference>
+    <Reference Include="Zenject">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll</HintPath>
+    </Reference>
+    <Reference Include="Zenject-usage">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject-usage.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Images\icon.png" />

manifest.json

@@ -3,12 +3,12 @@
     "id": "HitscoreCounter",
     "name": "HitscoreCounter",
     "author": "Kinsi55",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Counter for Counters+ that counts the scores of your cuts grouped into configurable ranges",
-    "gameVersion": "1.18.3",
+    "gameVersion": "1.20.0",
     "dependsOn": {
         "BSIPA": "^4.0.5",
-        "Counters+": "^2.2.0"
+        "Counters+": "^2.2.7"
     },
     "features": {
         "CountersPlus.CustomCounter": {