v1.8.8 release

LozenChen · Nov 28, 2023 · ecbe18b · ecbe18b
1 parent f983173
commit ecbe18b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 54 deletions.
diff --git a/Source/Entities/PauseUpdater.cs b/Source/Entities/PauseUpdater.cs
@@ -18,7 +18,14 @@ public PauseUpdateComponent() : base(true, false){
     [Initialize]
 
     public static void Initialize() {
-       levelPauseTags = (int)Tags.FrozenUpdate | (int)Tags.PauseUpdate | (int)Tags.TransitionUpdate;
+        try {
+            levelPauseTags = (int)Tags.FrozenUpdate | (int)Tags.PauseUpdate | (int)Tags.TransitionUpdate;
+        }
+        catch {
+            // idk, but there's such bug report 
+            levelPauseTags = 0;
+            Logger.Log(LogLevel.Info, "TAS Helper", "An error occurred when PauseUpdater initializes!");
+        }
     }
 
     [Load]

diff --git a/Source/TinySRT/ExtraSlActions.cs b/Source/TinySRT/ExtraSlActions.cs
@@ -1,6 +1,7 @@
 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;
 using Microsoft.Xna.Framework.Input;
 using Monocle;
@@ -30,6 +31,9 @@ public static void Load() {
         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());
         foreach (TH action in TH_Actions) {
             TH.Add(action);
@@ -230,3 +234,27 @@ public static SRT CreateSRT() {
         );
     }
 }
+
+internal static class GravityHelperSL {
+
+    public static bool Installed = false;
+
+    public static object PlayerGravityComponent;
+    public static TH Create() {
+        Installed = ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule")?.GetPropertyInfo("PlayerComponent") is not null;
+        TH.SlAction save = (_, _) => {
+            if (Installed) {
+                PlayerGravityComponent = ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule").GetPropertyValue<object>("PlayerComponent").TH_DeepCloneShared();
+            }
+        };
+        TH.SlAction load = (_, _) => {
+            if (Installed) {
+                ModUtils.GetType("GravityHelper", "Celeste.Mod.GravityHelper.GravityHelperModule").SetPropertyValue("PlayerComponent", PlayerGravityComponent);
+            }
+        };
+        Action clear = () => {
+            PlayerGravityComponent = null;
+        };
+        return new TH(save, load, clear, null, null);
+    }
+}
diff --git a/Source/TinySRT/SlExtensions.cs b/Source/TinySRT/SlExtensions.cs
@@ -59,56 +59,6 @@ public static void AddAction() {
     }
 }
 
-internal static class TH_StrawberryJamUtils {
-    public static float currentOldFreezeTimer;
-
-    public static float? savedOldFreezeTimer;
-
-    public static float? loadOldFreezeTimer;
-
-    public static readonly Lazy<MethodInfo> EngineUpdate = new Lazy<MethodInfo>(() => ModUtils.GetType("StrawberryJam2021", "Celeste.Mod.StrawberryJam2021.Entities.WonkyCassetteBlockController")?.GetMethodInfo("Engine_Update"));
-
-    public static bool hooked;
-
-    [Initialize]
-    public static void Initialize() {
-        EngineUpdate.Value?.IlHook((cursor, _) => {
-            int localIndex = 0;
-            if (cursor.TryGotoNext(MoveType.Before, (Instruction i) => i.MatchLdsfld<Engine>("FreezeTimer"), (Instruction i) => i.MatchStloc(out localIndex))) {
-                cursor.Index++;
-                cursor.Emit(OpCodes.Dup).Emit(OpCodes.Stsfld, typeof(TH_StrawberryJamUtils).GetFieldInfo(nameof(currentOldFreezeTimer)));
-                if (cursor.TryGotoNext(MoveType.After, (Instruction i) => i.MatchLdloc(localIndex))) {
-                    cursor.EmitDelegate<Func<float, float>>(RestoreOldFreezeTimer);
-                    hooked = true;
-                }
-            }
-        });
-    }
-
-    public static float RestoreOldFreezeTimer(float oldFreezeTimer) {
-        float? num = loadOldFreezeTimer;
-        if (num.HasValue) {
-            float valueOrDefault = num.GetValueOrDefault();
-            loadOldFreezeTimer = null;
-            return valueOrDefault;
-        }
-
-        return oldFreezeTimer;
-    }
-
-    public static void AddSupport() {
-        if (hooked) {
-            TH.SafeAdd(delegate {
-                savedOldFreezeTimer = currentOldFreezeTimer;
-            }, delegate {
-                loadOldFreezeTimer = savedOldFreezeTimer;
-            }, delegate {
-                savedOldFreezeTimer = null;
-            });
-        }
-    }
-}
-
 internal static class TH_FrostHelperUtils {
     public static readonly Lazy<Type> AttachedDataHelperType = new Lazy<Type>(() => ModUtils.GetType("FrostHelper", "FrostHelper.Helpers.AttachedDataHelper"));
 

diff --git a/Source/TinySRT/TH_SaveLoadAction.cs b/Source/TinySRT/TH_SaveLoadAction.cs
@@ -225,7 +225,6 @@ public static void InitActions() {
 
         SupportCommunalHelper();
         SupportBrokemiaHelper();
-        TH_StrawberryJamUtils.AddSupport();
         TH_FrostHelperUtils.SupportFrostHelper();
         SupportVivHelper();
 

diff --git a/Source/Utils/Extensions.cs b/Source/Utils/Extensions.cs
@@ -304,7 +304,7 @@ public static T GetPropertyValue<T>(this object obj, string name) {
         }
     }
 
-    public static T GetPropertyValue<T>(Type type, string name) {
+    public static T GetPropertyValue<T>(this Type type, string name) {
         object result = type.GetPropertyInfo(name)?.GetValue(null, null);
         if (result == null) {
             return default;

diff --git a/Source/Utils/ModUtils.cs b/Source/Utils/ModUtils.cs
@@ -49,6 +49,8 @@ public static Assembly GetAssembly(string modName) {
     public static bool IsaGrabBagInstalled = false;
 
     public static bool SpeedrunToolInstalled = false;
+
+    public static bool GravityHelperInstalled = false;
     public static bool UpsideDown => ExtendedVariantsUtils.UpsideDown;
     public static void InitializeAtFirst() {
         FrostHelperInstalled = IsInstalled("FrostHelper");
@@ -59,6 +61,7 @@ public static void InitializeAtFirst() {
         BrokemiaHelperInstalled = IsInstalled("BrokemiaHelper");
         IsaGrabBagInstalled = IsInstalled("IsaGrabBag");
         SpeedrunToolInstalled = IsInstalled("SpeedrunTool");
+        GravityHelperInstalled = IsInstalled("GravityHelper");
         // we actually also assume they are in enough late version
         // so all entities mentioned in corresponding hooks do exist
     }

diff --git a/everest.yaml b/everest.yaml
@@ -1,5 +1,5 @@
 - Name: TASHelper
-  Version: 1.8.7
+  Version: 1.8.8
   DLL: bin/Release/net4.5.2/TASHelper.dll
   Dependencies:
     - Name: Everest