Null config value fix

NeosModLoader/AssemblyLoader.cs

@@ -64,14 +64,17 @@ internal static class AssemblyLoader
             return assembly;
         }
 
-        internal static AssemblyFile[] LoadAssembliesFromDir(string dirName) {
+        internal static AssemblyFile[] LoadAssembliesFromDir(string dirName)
+        {
             List<AssemblyFile> assemblyFiles = new();
-            if (GetAssemblyPathsFromDir(dirName) is string[] assemblyPaths) {
+            if (GetAssemblyPathsFromDir(dirName) is string[] assemblyPaths)
+            {
                 foreach (string assemblyFilepath in assemblyPaths)
                 {
                     try
                     {
-                        if (LoadAssembly(assemblyFilepath) is Assembly assembly) {
+                        if (LoadAssembly(assemblyFilepath) is Assembly assembly)
+                        {
                             assemblyFiles.Add(new AssemblyFile(assemblyFilepath, assembly));
                         }
                     }

NeosModLoader/ModConfigurationKey.cs

@@ -124,13 +124,23 @@ public ModConfigurationKey(string name, string description = null, Func<T> compu
         private readonly Func<T> ComputeDefault;
         private readonly Predicate<T> IsValueValid;
 
+        /// <summary>
+        /// Get the type of this key's value
+        /// </summary>
+        /// <returns>the type of this key's value</returns>
         public override Type ValueType() => typeof(T);
 
+        /// <summary>
+        /// Checks if a value is valid for this configuration item
+        /// </summary>
+        /// <param name="value">value to check</param>
+        /// <returns>true if the value is valid</returns>
         public override bool Validate(object value)
         {
-            if (value is T castValue)
+            // specifically allow nulls for class types
+            if (value is T || (value is null && !typeof(T).IsValueType))
             {
-                return ValidateTyped(castValue);
+                return ValidateTyped((T)value);
             }
             else
             {

NeosModLoader/ModLoader.cs

@@ -41,9 +41,12 @@ internal static void LoadMods()
 
             // generate list of assemblies to load
             AssemblyFile[] modsToLoad;
-            if (AssemblyLoader.LoadAssembliesFromDir("nml_mods") is AssemblyFile[] arr) {
+            if (AssemblyLoader.LoadAssembliesFromDir("nml_mods") is AssemblyFile[] arr)
+            {
                 modsToLoad = arr;
-            } else {
+            }
+            else
+            {
                 return;
             }
 

NeosModLoader/SplashChanger.cs

@@ -11,13 +11,19 @@ internal static class SplashChanger
         private static bool failed = false;
 
         private static MethodInfo? _updatePhase = null;
-        private static MethodInfo? UpdatePhase {
-            get {
-                if (_updatePhase is null) {
-                    try {
+        private static MethodInfo? UpdatePhase
+        {
+            get
+            {
+                if (_updatePhase is null)
+                {
+                    try
+                    {
                         _updatePhase = typeof(Engine)
                             .GetMethod("UpdateInitPhase", BindingFlags.NonPublic | BindingFlags.Instance);
-                    } catch (Exception ex) {
+                    }
+                    catch (Exception ex)
+                    {
                         if (!failed)
                         {
                             Logger.WarnInternal("UpdatePhase not found: " + ex.ToString());
@@ -29,13 +35,19 @@ private static MethodInfo? UpdatePhase {
             }
         }
         private static MethodInfo? _updateSubPhase = null;
-        private static MethodInfo? UpdateSubPhase {
-            get {
-                if (_updateSubPhase is null) {
-                    try {
+        private static MethodInfo? UpdateSubPhase
+        {
+            get
+            {
+                if (_updateSubPhase is null)
+                {
+                    try
+                    {
                         _updateSubPhase = typeof(Engine)
                             .GetMethod("UpdateInitPhase", BindingFlags.NonPublic | BindingFlags.Instance);
-                    } catch (Exception ex) {
+                    }
+                    catch (Exception ex)
+                    {
                         if (!failed)
                         {
                             Logger.WarnInternal("UpdateSubPhase not found: " + ex.ToString());