fixes

rushiiMachine · Mar 27, 2024 · fa4976c · fa4976c
1 parent afb58d0
commit fa4976c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 13 deletions.
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PatchAddPerformanceToUi.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PatchAddPerformanceToUi.cs
@@ -40,8 +40,8 @@ private static void After(
         var performanceSprite = ((ConstructorInfo)pSpriteText.Constructor.Reference).Invoke(
         [
             /* text: */ "0000.0",
-            /* fontName: */ "", // TODO: use correct value
-            /* spacingOverlap: */ 0f, // TODO: use correct value
+            /* fontName: */ "Assets/score/score",
+            /* spacingOverlap: */ 10f,
             /* fieldType: */ alignRight ? Fields.TopRight : Fields.TopLeft,
             /* origin: */ alignRight ? Origins.TopRight : Origins.TopLeft,
             /* clock: */ Clocks.Game,

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PatchTrackOnScoreHit.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PatchTrackOnScoreHit.cs
@@ -28,7 +28,6 @@ private static void After(
         [HarmonyArgument(0)] int increaseScoreType,
         [HarmonyArgument(2)] bool increaseCombo)
     {
-        Console.WriteLine(increaseScoreType);
         if (!PerformanceCalculator.IsInitialized)
         {
             Console.WriteLine("OnIncreaseScoreHit called before performance calculator initialized!");

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs
@@ -54,7 +54,7 @@ private static void ResetCalculatorSync()
         if (beatmapPath == null) return;
 
         Calculator = new OsuPerformance(beatmapPath, (uint)mods);
-        Calculator.OnNewCalculation += Console.WriteLine;
+        Calculator.OnNewCalculation += PerformanceDisplay.UpdatePerformanceCounter;
 
         Debug.WriteLine("Initialized performance calculator!");
     }

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Reflection;
+using HarmonyLib;
 using Osu.Stubs;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
@@ -39,4 +41,26 @@ public static void UpdatePerformanceCounter(double pp)
             Console.WriteLine($"Failed to set performance counter sprite text: {e}");
         }
     }
-}
+}
+
+// [HarmonyPatch]
+// public class fhjks
+// {
+//     static fhjks()
+//     {
+//         Console.WriteLine("sinit");
+//     }
+//     
+//     [HarmonyTargetMethod]
+//     private static MethodBase fjhsdf() => pSpriteText.Constructor.Reference;
+//
+//     [HarmonyPrefix]
+//     private static void before(
+//         [HarmonyArgument(0)] string text,
+//         [HarmonyArgument(1)] string abc,
+//         [HarmonyArgument(2)] float abcd
+//     )
+//     {
+//         Console.WriteLine($"{text} {abc} {abcd}");
+//     }
+// }
diff --git a/Osu.Stubs/Ruleset.cs b/Osu.Stubs/Ruleset.cs
@@ -123,7 +123,7 @@ public static class Ruleset
     public static readonly LazyField<object?> ScoreDisplay = new(
         "Ruleset#ScoreDisplay",
         () => RuntimeType.GetRuntimeFields()
-            .Single(field => field.FieldType == ScoreDisplay.Reference)
+            .Single(field => field.FieldType == Stubs.ScoreDisplay.RuntimeType)
     );
 
     [UsedImplicitly]

diff --git a/Osu.Stubs/ScoreDisplay.cs b/Osu.Stubs/ScoreDisplay.cs
@@ -78,10 +78,10 @@ public class ScoreDisplay
     [UsedImplicitly]
     public static readonly LazyField<object> SpriteManager = new(
         "ScoreDisplay#spriteManager",
-        () => RuntimeTime.GetDeclaredFields()
-            .Single(field => field.FieldType == SpriteManager.Reference)
+        () => RuntimeType.GetDeclaredFields()
+            .Single(field => field.FieldType == Stubs.SpriteManager.RuntimeType)
     );
 
     [UsedImplicitly]
-    public static Type RuntimeTime => Constructor.Reference.DeclaringType!;
+    public static Type RuntimeType => Constructor.Reference.DeclaringType!;
 }
diff --git a/Osu.Stubs/SpriteManager.cs b/Osu.Stubs/SpriteManager.cs
@@ -34,5 +34,5 @@ public class SpriteManager
     );
 
     [UsedImplicitly]
-    public static Type RuntimeTime => Add.Reference.DeclaringType!;
+    public static Type RuntimeType => Add.Reference.DeclaringType!;
 }
diff --git a/Osu.Stubs/pText.cs b/Osu.Stubs/pText.cs
@@ -26,7 +26,7 @@ public class pText
             Ldarg_0,
             Ldfld,
             Ldarg_1,
-            Callvirt,
+            Call,
             Brfalse_S,
             Ret,
             Ldarg_0,
@@ -37,7 +37,6 @@ public class pText
             Stfld,
             Ret,
         },
-        false,
-        true
+        entireMethod: true
     );
 }