Merge pull request #4 from Luxusio/develop

Release 1.2.1
Luxusio · Jun 21, 2021 · 4854a9e · 4854a9e
2 parents 0c9a2f3 + e5c8176
commit 4854a9e
Show file tree

Hide file tree

Showing 9 changed files with 1,225 additions and 148 deletions.
diff --git a/Info.json b/Info.json
@@ -2,7 +2,7 @@
   "Id": "NoStopMod",
   "DisplayName": "NoStopMod",
   "Author": "Luxus",
-  "Version": "1.1.0",
+  "Version": "1.2.1",
   "ManagerVersion": "0.23.4.0",
   "AssemblyName": "NoStopMod.dll",
   "EntryMethod": "NoStopMod.NoStopMod.Load"

diff --git a/InputFixer/InputFixerManager.cs b/InputFixer/InputFixerManager.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using UnityEngine;
 using UnityModManagerNet;
+using NoStopMod.InputFixer.SyncFixer;
 
 namespace NoStopMod.InputFixer
 {
@@ -15,11 +16,9 @@ class InputFixerManager
 
         private static Thread thread;
         public static Queue<Tuple<long, List<KeyCode>>> keyQueue = new Queue<Tuple<long, List<KeyCode>>>();
+
 
-        public static long currTick;
-        public static long prevTick;
-
-        public static long offsetTick;
+        //public static long offsetTick;
         public static long currPressTick;
 
         public static bool jumpToOtherClass = false;
@@ -36,13 +35,11 @@ public static void Init()
 
             settings = new InputFixerSettings();
             Settings.settings.Add(settings);
-
-            prevTick = DateTime.Now.Ticks;
-            currTick = prevTick;
 
             mask = Enumerable.Repeat(false, 1024).ToArray();
 
             HitIgnoreManager.Init();
+            SyncFixerManager.Init();
         }
 
         private static void OnGUI(UnityModManager.ModEntry modEntry)
@@ -67,7 +64,6 @@ private static void UpdateEnableAsync(bool value)
         public static void Start()
         {
             Stop();
-            adjustOffsetTick();
             if (settings.enableAsync) {
                 thread = new Thread(Run);
                 thread.Start();
@@ -106,10 +102,11 @@ private static bool GetKeyDown(int idx)
 
         private static void Run()
         {
-            long prevTick = DateTime.Now.Ticks;
-            while (true)
+            long prevTick, currTick;
+            prevTick = DateTime.Now.Ticks;
+            while (settings.enableAsync)
             {
-                long currTick = DateTime.Now.Ticks;
+                currTick = DateTime.Now.Ticks;
                 if (currTick > prevTick)
                 {
                     prevTick = currTick;
@@ -160,28 +157,13 @@ public static double getSongPosition(scrConductor __instance, long nowTick)
         {
             if (!GCS.d_oldConductor && !GCS.d_webglConductor)
             {
-                return ((nowTick / 10000000.0 - scrConductor.calibration_i) * __instance.song.pitch) - __instance.addoffset;
+                return ((nowTick / 10000000.0 - SyncFixerManager.newScrConductor.dspTimeSong - scrConductor.calibration_i) * __instance.song.pitch) - __instance.addoffset;
             }
             else
             {
                 return (__instance.song.time - scrConductor.calibration_i) - __instance.addoffset / __instance.song.pitch;
             }
         }
-
-        public static void adjustOffsetTick()
-        {
-            if (scrConductor.instance != null)
-            {
-                long prevOffset = offsetTick;
-                InputFixerManager.jumpToOtherClass = true;
-                scrConductor.instance.Start();
-            }
-        }
-
-        public static void adjustOffsetTick(scrConductor __instance, double ___dspTimeSong)
-        {
-            offsetTick = currTick - (long)((__instance.dspTime - ___dspTimeSong) * 10000000);
-        }
-
+
     }
 }
diff --git a/InputFixer/InputFixerPatches.cs b/InputFixer/InputFixerPatches.cs
@@ -1,6 +1,7 @@
 using DG.Tweening;
 using HarmonyLib;
 using NoStopMod.InputFixer.HitIgnore;
+using NoStopMod.InputFixer.SyncFixer;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,49 +11,25 @@ namespace NoStopMod.InputFixer
 {
     public static class AsyncInputPatches
     {
-
-        //public static string s(double d, int to = 6)
-        //{
-        //    try
-        //    {
-        //        return ("" + d).Substring(0, to);
-        //    }
-        //    catch
-        //    {
-        //        return "" + d;
-        //    }
-        //}
 
         [HarmonyPatch(typeof(scrController), "Awake")]
         private static class scrController_Awake_Patch
         {
             public static void Postfix(scrController __instance)
             {
-                InputFixerManager.jumpToOtherClass = true;
-                __instance.conductor.Start();
                 InputFixerManager.Start();
             }
         }
 
         [HarmonyPatch(typeof(scrConductor), "Update")]
         private static class scrConductor_Update_Patch_Time
         {
-            public static void Prefix(scrConductor __instance)
-            {
-                InputFixerManager.prevTick = InputFixerManager.currTick;
-                InputFixerManager.currTick = DateTime.Now.Ticks;
-            }
-
-            public static void Postfix(scrConductor __instance, double ___dspTimeSong)
+            public static void Postfix(scrConductor __instance)
             {
-                if (AudioListener.pause)
-                {
-                    InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                }
 
                 if (!InputFixerManager.settings.enableAsync)
                 {
-                    InputFixerManager.UpdateKeyQueue(InputFixerManager.currTick);
+                    InputFixerManager.UpdateKeyQueue(NoStopMod.CurrFrameTick());
                 }
 
                 while (InputFixerManager.keyQueue.Any())
@@ -71,7 +48,7 @@ public static void Postfix(scrConductor __instance, double ___dspTimeSong)
                         if (++count > 4) break;
                     }
 
-                    InputFixerManager.currPressTick = tick - InputFixerManager.offsetTick;
+                    InputFixerManager.currPressTick = tick - SyncFixerManager.newScrConductor.offsetTick;
                     controller.keyBufferCount += count;
                     while (controller.keyBufferCount > 0)
                     {
@@ -112,7 +89,7 @@ public static bool Prefix(scrPlanet __instance, ref double ___snappedLastAngle)
 
                 if (!GCS.d_stationary)
                 {
-                    long nowTick = InputFixerManager.currTick - InputFixerManager.offsetTick;
+                    long nowTick = NoStopMod.CurrFrameTick() - SyncFixerManager.newScrConductor.offsetTick;
                     __instance.angle = InputFixerManager.getAngle(__instance, ___snappedLastAngle, nowTick);
 
                     if (__instance.shouldPrint)
@@ -157,72 +134,7 @@ public static bool Prefix(scrPlanet __instance, ref double ___snappedLastAngle)
                 return false;
             }
         }
-
-        [HarmonyPatch(typeof(scrController), "OnMusicScheduled")]
-        private static class scrController_Rewind_Patch
-        {
-            public static void Postfix(scrController __instance)
-            {
-                InputFixerManager.jumpToOtherClass = true;
-                __instance.conductor.Start();
-            }
-        }
-
-        [HarmonyPatch(typeof(scrConductor), "Start")]
-        private static class scrConductor_Start_Patch
-        {
-            public static bool Prefix(scrConductor __instance, double ___dspTimeSong)
-            {
-                if (InputFixerManager.jumpToOtherClass)
-                {
-                    InputFixerManager.jumpToOtherClass = false;
-                    InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                    return false;
-                }
-                return true;
-            }
-        }
-
-        [HarmonyPatch(typeof(scrConductor), "Rewind")]
-        private static class scrConductor_Rewind_Patch
-        {
-            public static void Postfix(scrConductor __instance, double ___dspTimeSong)
-            {
-                InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                //NoStopMod.mod.Logger.Log("Rewind");
-            }
-        }
-
-        [HarmonyPatch(typeof(scrConductor), "StartMusicCo")]
-        private static class scrConductor_StartMusicCo_Patch
-        {
-            public static void Prefix(scrConductor __instance, double ___dspTimeSong)
-            {
-                InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                //NoStopMod.mod.Logger.Log("StartMusicCo");
-            }
-        }
-
-        [HarmonyPatch(typeof(scrConductor), "ScrubMusicToTile")]
-        private static class scrConductor_ScrubMusicToTile_Patch
-        {
-            public static void Postfix(scrConductor __instance, double ___dspTimeSong)
-            {
-                InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                //NoStopMod.mod.Logger.Log("ScrubMusicToTile");
-            }
-        }
-
-        [HarmonyPatch(typeof(scrConductor), "DesyncFix")]
-        private static class scrConductor_DesyncFix_Patch
-        {
-            public static void Postfix(scrConductor __instance, double ___dspTimeSong)
-            {
-                InputFixerManager.adjustOffsetTick(__instance, ___dspTimeSong);
-                //NoStopMod.mod.Logger.Log("DesyncFix");
-            }
-        }
-
-
+
+
     }
 }
diff --git a/InputFixer/InputFixerSettings.cs b/InputFixer/InputFixerSettings.cs
@@ -17,7 +17,6 @@ public void Load(ref JSONNode json)
             enableAsync = node["enableAsync"].AsBool;
             enableKeyLimit = node["enableKeyLimit"].AsBool;
             JSONArray array = node["LimitKeys"].AsArray;
-
         }
 
         public void Save(ref JSONNode json)

diff --git a/InputFixer/SyncFixer/SyncFixerManager.cs b/InputFixer/SyncFixer/SyncFixerManager.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NoStopMod.InputFixer.SyncFixer
+{
+    class SyncFixerManager
+    {
+
+        public static newScrConductor newScrConductor;
+
+        public static void Init()
+        {
+            newScrConductor = new newScrConductor();
+            if (newScrConductor.instance != null) newScrConductor.FixOffsetTick();
+        }
+
+    }
+}