[O] enforce type for SetEntryValue and some comment and type chore

MewoLab · Nov 25, 2024 · da36ef4 · da36ef4
1 parent e3b06b1
commit da36ef4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/AquaMai/AquaMai.Config.Interfaces/IConfig.cs b/AquaMai/AquaMai.Config.Interfaces/IConfig.cs
@@ -6,7 +6,7 @@ public interface IConfig
 {
     public interface IEntryState
     {
-        public bool IsDefault { get; set; }
+        public bool IsDefault { get; }
         public object DefaultValue { get; }
         public object Value { get; set; }
     }

diff --git a/AquaMai/AquaMai.Config/Config.cs b/AquaMai/AquaMai.Config/Config.cs
@@ -55,6 +55,7 @@ private void InitializeSection(ReflectionManager.Section section)
             {
                 throw new InvalidOperationException($"Null default value for entry {entry.Path} is not allowed.");
             }
+
             entries.Add(entry.Path, new EntryState()
             {
                 IsDefault = true,
@@ -75,6 +76,7 @@ public IConfig.ISectionState GetSectionState(Type type)
         {
             throw new ArgumentException($"Type {type.FullName} is not a config section.");
         }
+
         return sections[section.Path];
     }
 
@@ -91,8 +93,13 @@ public IConfig.IEntryState GetEntryState(IReflectionManager.IEntry entry)
 
     public void SetEntryValue(IReflectionManager.IEntry entry, object value)
     {
+        if (value.GetType() != entry.Field.FieldType)
+        {
+            throw new ArgumentException($"Value type {value.GetType().FullName} does not match entry type {entry.Field.FieldType.FullName}.");
+        }
+
         entry.Field.SetValue(null, value);
         entries[entry.Path].IsDefault = false;
         entries[entry.Path].Value = value;
     }
-}
+}
diff --git a/AquaMai/AquaMai.Mods/GameSettings/JudgeAdjust.cs b/AquaMai/AquaMai.Mods/GameSettings/JudgeAdjust.cs
@@ -24,7 +24,7 @@ public class JudgeAdjust
     [ConfigEntry(
         en: "Increase touch delay.",
         zh: "增加触摸延迟")]
-    private static readonly int touchDelay = 0;
+    private static readonly uint touchDelay = 0;
 
     [HarmonyPostfix]
     [HarmonyPatch(typeof(UserOption), "GetAdjustMSec")]
@@ -45,6 +45,6 @@ public static void GetJudgeTimingFrame(ref float __result)
     public static void NewTouchPanelRecv()
     {
         if (touchDelay <= 0) return;
-        Thread.Sleep(touchDelay);
+        Thread.Sleep((int)touchDelay);
     }
 }
diff --git a/AquaMai/AquaMai.Mods/GameSystem/DisableTimeout.cs b/AquaMai/AquaMai.Mods/GameSystem/DisableTimeout.cs
@@ -14,7 +14,7 @@ Disable timers (hidden and set to 65535 seconds).
         Not recommand to enable when SinglePlayer is off.
         """,
     zh: """
-        去除游戏中的倒计时（隐藏并设为 65535 秒）
+        去除并隐藏游戏中的倒计时
         没有开启单人模式时，不建议启用
         """)]
 public class DisableTimeout