Updated for 1.3.0

HitScoreVisualizer/Config.cs

@@ -382,7 +382,7 @@ public static void resetToDefault()
             instance = DEFAULT_CONFIG;
         }
 
-        public static void judge(FlyingScoreEffect scoreEffect, NoteCutInfo noteCutInfo, SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, int score, int before, int after, int accuracy)
+        public static void judge(FlyingScoreEffect scoreEffect, int score, int before, int after, int accuracy)
         {
             // as of 0.13, the TextMeshPro is private; use reflection to grab it out of a private field
             TextMeshPro text = scoreEffect.getPrivateField<TextMeshPro>("_text");

HitScoreVisualizer/Harmony Patches/FlyingScoreEffectHandleSaberSwingRatingCounterDidChangeEvent.cs

@@ -0,0 +1,26 @@
+using Harmony;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace HitScoreVisualizer.Harmony_Patches
+{
+    [HarmonyPatch(typeof(FlyingScoreEffect), "HandleSaberSwingRatingCounterDidChangeEvent",
+        new Type[] { typeof(SaberSwingRatingCounter), typeof(float) })]
+    class FlyingScoreEffectHandleSaberSwingRatingCounterDidChangeEvent
+    {
+        static bool Prefix(SaberSwingRatingCounter saberSwingRatingCounter, FlyingScoreEffect __instance, NoteCutInfo ____noteCutInfo)
+        {
+            if (Config.instance.doIntermediateUpdates)
+            {
+                ScoreController.RawScoreWithoutMultiplier(____noteCutInfo, out int before, out int after, out int accuracy);
+                int total = before + after + accuracy;
+                Config.judge(__instance, total, before, after, accuracy);
+            }
+            return false;
+        }
+    }
+}

HitScoreVisualizer/Harmony Patches/FlyingScoreEffectInitAndPresent.cs

@@ -16,8 +16,7 @@ namespace HitScoreVisualizer.Harmony_Patches
             typeof(int),
             typeof(float),
             typeof(Vector3),
-            typeof(Color),
-            typeof(SaberAfterCutSwingRatingCounter)})]
+            typeof(Color)})]
     class FlyingScoreEffectInitAndPresent
     {
         public static FlyingScoreEffect currentEffect = null;
@@ -39,6 +38,7 @@ static void Prefix(ref Vector3 targetPos, FlyingScoreEffect __instance)
                 // Save the existing effect to clear if a new one spawns
                 currentEffect = __instance;
                 // In case it despawns before the next note is hit, don't try to clear it
+                currentEffect.didFinishEvent -= handleEffectDidFinish; // Just in case
                 currentEffect.didFinishEvent += handleEffectDidFinish;
             }
         }
@@ -49,21 +49,25 @@ static void handleEffectDidFinish(FlyingObjectEffect effect)
             if (currentEffect == effect) currentEffect = null;
         }
 
-        static void Postfix(SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo noteCutInfo)
+        static void Postfix(FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo noteCutInfo)
         {
-            void judge(SaberAfterCutSwingRatingCounter counter)
+            void judge(SaberSwingRatingCounter counter)
             {
-                ScoreController.RawScoreWithoutMultiplier(noteCutInfo, counter, out int before_plus_acc, out int after, out int accuracy);
-                int total = before_plus_acc + after;
-                Config.judge(__instance, noteCutInfo, counter, total, before_plus_acc - accuracy, after, accuracy);
+                ScoreController.RawScoreWithoutMultiplier(noteCutInfo, out int before, out int after, out int accuracy);
+                int total = before + after + accuracy;
+                Config.judge(__instance, total, before, after, accuracy);
 
                 // If the counter is finished, remove our event from it
                 counter.didFinishEvent -= judge;
             }
 
             // Apply judgments a total of twice - once when the effect is created, once when it finishes.
-            judge(saberAfterCutSwingRatingCounter);
-            saberAfterCutSwingRatingCounter.didFinishEvent += judge;
+            judge(noteCutInfo.swingRatingCounter);
+            if (!Config.instance.doIntermediateUpdates) // Don't need a judge on didFinishEvent if doIntermediateUpdates is on
+            {
+                noteCutInfo.swingRatingCounter.didFinishEvent -= judge; // Just in case
+                noteCutInfo.swingRatingCounter.didFinishEvent += judge;
+            }
         }
     }
 }

HitScoreVisualizer/HitScoreVisualizer.csproj

@@ -43,9 +43,6 @@
     <Reference Include="Assembly-CSharp-firstpass">
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="IllusionPlugin">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\IllusionPlugin.dll</HintPath>
-    </Reference>
     <Reference Include="IPA.Loader, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
@@ -74,7 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Config.cs" />
-    <Compile Include="Harmony Patches\FlyingScoreEffectHandleSaberAfterCutSwingRatingCounterDidChangeEvent.cs" />
+    <Compile Include="Harmony Patches\FlyingScoreEffectHandleSaberSwingRatingCounterDidChangeEvent.cs" />
     <Compile Include="Harmony Patches\FlyingScoreEffectInitAndPresent.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

HitScoreVisualizer/Plugin.cs

@@ -1,5 +1,5 @@
 using Harmony;
-using IllusionPlugin;
+using IPA.Old;
 using System;
 using System.Reflection;
 using UnityEngine.SceneManagement;