v3.27.11

support latest max helping hand

Author: LozenChen

SpeedrunTool/Source/DebugTool/TestCommand.cs

@@ -0,0 +1,12 @@
+#if DEBUG
+
+
+namespace Celeste.Mod.SpeedrunTool.DebugTool;
+internal static class TestCommand {
+
+    [Command("test", "SpeedrunTool debug test")]
+    public static void Test() {
+
+    }
+}
+#endif

SpeedrunTool/Source/Extensions/LoggerExtensions.cs

@@ -37,7 +37,8 @@ public static void DebugLog(this object message, LogLevel logLevel = LogLevel.In
 
             try {
                 Engine.Commands?.Log($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}] [{Tag}] {logLevel}: {message}", color);
-            } catch (Exception) {
+            }
+            catch (Exception) {
                 // ignored
             }
         }

SpeedrunTool/Source/SaveLoad/Implements/DeepClonerUtils.cs

@@ -237,13 +237,14 @@ private static void Config() {
                 // Clone dynData.Data
                 if (type is { IsClass: true } objType && !DynDataUtils.IgnoreObjects.ContainsKey(sourceObj)) {
                     bool cloned = false;
-
+
+                    // 对其类型及其逐层展开的根类型 T 检验 DynData<T> 里是否涉及到这个对象
                     do {
                         if (DynDataUtils.NotExistDynData(objType, out object dataMap)) {
                             continue;
                         }
 
-                        object[] parameters = { sourceObj, null };
+                        object[] parameters = [sourceObj, null];
                         if (false == (bool)dataMap.InvokeMethod("TryGetValue", parameters)) {
                             continue;
                         }
@@ -262,7 +263,8 @@ private static void Config() {
                     }
                 }
 
-                // Clone DynamicData
+                // Clone DynamicData
+                // 注意这个和 DynData 不是同一个东西
                 if (DynamicData._DataMap.TryGetValue(sourceObj, out DynamicData._Data_ value) && value.Data.Count > 0) {
                     DynamicData._DataMap.Add(clonedObj, value.DeepClone(deepCloneState));
                 }

SpeedrunTool/Source/SaveLoad/Implements/DynDataUtils.cs

@@ -6,9 +6,9 @@ namespace Celeste.Mod.SpeedrunTool.SaveLoad;
 
 internal static class DynDataUtils {
     // DynData
-    private static readonly Dictionary<Type, object> CachedDataMaps = new();
-    public static ConditionalWeakTable<object, object> IgnoreObjects = new();
-    private static readonly HashSet<Type> IgnoreTypes = new();
+    private static readonly Dictionary<Type, object> CachedDataMaps = [];
+    public static ConditionalWeakTable<object, object> IgnoreObjects = [];
+    private static readonly HashSet<Type> IgnoreTypes = [];
 
     private static readonly Lazy<int> EmptyTableEntriesLength =
         new(() => new ConditionalWeakTable<object, object>().GetFieldValue<Array>("_entries").Length);
@@ -19,7 +19,7 @@ internal static class DynDataUtils {
     private static Func<object, bool> checkEmpty;
 
     public static void ClearCached() {
-        IgnoreObjects = new ConditionalWeakTable<object, object>();
+        IgnoreObjects = [];
         IgnoreTypes.Clear();
     }
 
@@ -29,7 +29,7 @@ public static bool NotExistDynData(Type type, out object dataMap) {
             return true;
         }
 
-        dataMap = GetDataMap(type);
+        dataMap = GetDataMap(type);
         if (CheckEmpty(dataMap)) {
             IgnoreTypes.Add(type);
             return true;
@@ -43,16 +43,16 @@ private static bool CheckEmpty(object weakTable) {
         if (checkEmpty == null) {
             if (Type.GetType("Mono.Runtime") != null) {
                 // Mono
-                checkEmpty = o => o.GetFieldValue<int>("size") == 0;
+                checkEmpty = static o => o.GetFieldValue<int>("size") == 0;
             }
             else if (weakTable.GetType().GetFieldInfo("_entries") != null) {
                 // .net framework
-                checkEmpty = o => o.GetFieldValue<Array>("_entries").Length == EmptyTableEntriesLength.Value &&
+                checkEmpty = static o => o.GetFieldValue<Array>("_entries").Length == EmptyTableEntriesLength.Value &&
                              o.GetFieldValue<int>("_freeList") == EmptyTableFreeList.Value;
             }
             else {
                 // .net7
-                checkEmpty = o => o.GetFieldValue("_container") is { } container && container.GetFieldValue<Array>("_entries").Length == EmptyContainerEntriesLength.Value &&
+                checkEmpty = static o => o.GetFieldValue("_container") is { } container && container.GetFieldValue<Array>("_entries").Length == EmptyContainerEntriesLength.Value &&
                                   container.GetFieldValue<int>("_firstFreeEntry") == EmptyContainerFirstFreeEntry.Value;
             }
         }

SpeedrunTool/Source/SaveLoad/SaveLoadAction.cs

@@ -384,7 +384,7 @@ public static void InitSlots() {
 #if DEBUG
     internal static void LogSavedValues(Level level) {
         System.Text.StringBuilder sb = new();
-        
+
         foreach (SaveLoadAction slAction in SharedActions) {
             sb.Append($"\n======  {slAction.ActionDescription}  ======\n");
             int count = 1;

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/ThirdParty.cs

@@ -20,7 +20,7 @@ private static void ComplexModsSupport() {
     }
 
 
-   private static class EasyMods {
+    private static class EasyMods {
 
         internal static void Support() {
             CommunalHelperSupport();
@@ -46,9 +46,8 @@ private static void CrystallineHelperSupport() {
             SaveLoadAction.CloneModTypeFields("CrystallineHelper", "vitmod.TriggerTrigger", "collidedEntities");
         }
         private static void MaxHelpingHandSupport() {
-
-            SaveLoadAction.CloneModTypeFields("MaxHelpingHand", "Celeste.Mod.MaxHelpingHand.Effects.BlackholeCustomColors", "colorsMild");
-
+            SaveLoadAction.CloneModTypeFields("MaxHelpingHand", "Celeste.Mod.MaxHelpingHand.Effects.BlackholeCustomColors", "colorsMildOverride");
+            SaveLoadAction.CloneModTypeFields("MaxHelpingHand", "Celeste.Mod.MaxHelpingHand.Entities.MovingFlagTouchSwitch", "flagMapping");
         }
         private static void VivHelperSupport() {
             if (ModUtils.GetAssembly("VivHelper") is not { }) {

SpeedrunTool/everest.yaml

@@ -1,5 +1,5 @@
 - Name: SpeedrunTool
-  Version: 3.27.10
+  Version: 3.27.11
   DLL: SpeedrunTool.dll
   Dependencies:
     - Name: Everest