bugfix: predictor makes gravity helper not working

Author: LozenChen

Source/Entities/PauseUpdater.cs

@@ -9,8 +9,8 @@ public static class PauseUpdater {
     private static int levelPauseTags;
 
     [Tracked]
-    public class PauseUpdateComponent :Component{ 
-        public PauseUpdateComponent() : base(true, false){
+    public class PauseUpdateComponent : Component {
+        public PauseUpdateComponent() : base(true, false) {
 
         }
     }
@@ -23,6 +23,7 @@ public static void Initialize() {
         }
         catch {
             // idk, but there's such bug report 
+            // https://discord.com/channels/403698615446536203/1175568290303725669
             levelPauseTags = 0;
             Logger.Log(LogLevel.Info, "TAS Helper", "An error occurred when PauseUpdater initializes!");
         }

Source/Gameplay/ActualCollideHitboxDelegatee.cs

@@ -13,7 +13,7 @@ internal static class ActualCollideHitboxDelegatee {
 
     [Initialize]
     private static void Initiailize() {
-        
+
         typeof(ActualEntityCollideHitbox).GetMethod("SaveActualCollidable", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static).HookAfter<Entity>(
             e => {
                 if (TasHelperSettings.Enabled && SpinnerCalculateHelper.HazardType(e) != null) {
@@ -25,7 +25,7 @@ private static void Initiailize() {
         typeof(ActualEntityCollideHitbox).GetMethod("Clear", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static).HookAfter(() => {
             LastCollidables.Clear();
         });
-        
+
         typeof(ActualEntityCollideHitbox).GetMethod("LoadActualCollidePosition", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static).IlHook(il => {
             ILCursor cursor = new(il);
             Instruction start = cursor.Next;

Source/TinySRT/ExtraSlActions.cs

@@ -1,5 +1,4 @@
 using Celeste.Mod.SpeedrunTool.SaveLoad;
-using Celeste.Mod.TASHelper.Entities;
 using Celeste.Mod.TASHelper.Module.Menu;
 using Celeste.Mod.TASHelper.Utils;
 using Microsoft.Xna.Framework;
@@ -26,21 +25,23 @@ public static class ExtraSlActions {
     public static List<SRT> SRT_Actions = new();
 
     // we want to ensure these actions are added lastly
+
     [Initialize]
-    public static void Load() {
+    public static void LoadSRT() {
+        SRT_Actions.Add(TasHelperSL.CreateSRT());
+        foreach (SRT action in SRT_Actions) {
+            SRT.Add(action);
+        }
+    }
+
+    public static void LoadTH() {
         TH_Actions.Add(TasModSL.Create());
         // tas mod already adds to SRT itself
         TH_Actions.Add(TasHelperSL.Create());
-
-        //TH_Actions.Add(GravityHelperSL.Create());
-
-        SRT_Actions.Add(TasHelperSL.CreateSRT());
+        TH_Actions.Add(GravityHelperSL.Create());
         foreach (TH action in TH_Actions) {
             TH.Add(action);
         }
-        foreach (SRT action in SRT_Actions) {
-            SRT.Add(action);
-        }
     }
 
     [Unload]
@@ -140,7 +141,6 @@ public static TH Create() {
 
 internal static class TasHelperSL {
 
-
     private static float DashTime;
     private static bool Frozen;
     private static int TransitionFrames;
@@ -157,7 +157,6 @@ internal static class TasHelperSL {
     private static Dictionary<Entity, bool> TH_LastCollidables = new();
     public static TH Create() {
         TH.SlAction save = (_, _) => {
-
             DashTime = GameInfo.DashTime;
             Frozen = GameInfo.Frozen;
             TransitionFrames = GameInfo.TransitionFrames;
@@ -169,7 +168,6 @@ public static TH Create() {
             TH_LastCollidables = ActualEntityCollideHitbox.LastColldables.TH_DeepCloneShared();
         };
         TH.SlAction load = (_, _) => {
-
             GameInfo.DashTime = DashTime;
             GameInfo.Frozen = Frozen;
             GameInfo.TransitionFrames = TransitionFrames;
@@ -201,14 +199,12 @@ public static TH Create() {
 
     public static SRT CreateSRT() {
         SRT.SlAction save = (_, _) => {
-
             SRT_freezeTimerBeforeUpdateBeforePredictLoops = Predictor.Core.FreezeTimerBeforeUpdate;
             SRT_CachedNodes = Gameplay.MovingEntityTrack.CachedNodes.DeepCloneShared();
             SRT_CachedStartEnd = Gameplay.MovingEntityTrack.CachedStartEnd.DeepCloneShared();
             SRT_CachedCircle = Gameplay.MovingEntityTrack.CachedCircle.DeepCloneShared();
         };
         SRT.SlAction load = (_, _) => {
-
             Predictor.Core.FreezeTimerBeforeUpdate = SRT_freezeTimerBeforeUpdateBeforePredictLoops;
             Gameplay.MovingEntityTrack.CachedNodes = SRT_CachedNodes.DeepCloneShared();
             Gameplay.MovingEntityTrack.CachedStartEnd = SRT_CachedStartEnd.DeepCloneShared();
@@ -240,6 +236,8 @@ internal static class GravityHelperSL {
     public static bool Installed = false;
 
     public static object PlayerGravityComponent;
+    // dont know why, this become null after SL, so I have to manually clone it
+    // while the original SRT doesn't have this issue
     public static TH Create() {
         Installed = ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule")?.GetPropertyInfo("PlayerComponent") is not null;
         TH.SlAction save = (_, _) => {
@@ -249,7 +247,7 @@ public static TH Create() {
         };
         TH.SlAction load = (_, _) => {
             if (Installed) {
-                ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule").SetPropertyValue("PlayerComponent", PlayerGravityComponent);
+                ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule").SetPropertyValue("PlayerComponent", PlayerGravityComponent.TH_DeepCloneShared());
             }
         };
         Action clear = () => {

Source/TinySRT/SlExtensions.cs

@@ -5,9 +5,7 @@
 using FMOD.Studio;
 using Force.DeepCloner;
 using Force.DeepCloner.Helpers;
-using Mono.Cecil.Cil;
 using Monocle;
-using MonoMod.Cil;
 using System.Collections.Concurrent;
 using System.Reflection;
 using System.Runtime.CompilerServices;

Source/TinySRT/TH_SaveLoadAction.cs

@@ -228,6 +228,8 @@ public static void InitActions() {
         TH_FrostHelperUtils.SupportFrostHelper();
         SupportVivHelper();
 
+        ExtraSlActions.LoadTH();
+
         // 放最后，确保收集了所有克隆的 VirtualAssets 与 EventInstance
         ReloadVirtualAssets();
         ReleaseEventInstances();

everest.yaml

@@ -1,5 +1,5 @@
 - Name: TASHelper
-  Version: 1.8.8
+  Version: 1.8.9
   DLL: bin/Release/net4.5.2/TASHelper.dll
   Dependencies:
     - Name: Everest