Merge remote-tracking branch 'upstream/master' into logging-fixes

# Conflicts:
#	NeosModLoader/Util.cs

Author: zkxs

NeosModLoader/ModConfiguration.cs

@@ -519,7 +519,7 @@ private bool AnyValuesSet()
 
 
 		/// <summary>
-		/// Persist this configuration to disk. This method is not called automatically.
+		/// Asynchronously persist this configuration to disk.
 		/// </summary>
 		/// <param name="saveDefaultValues">If true, default values will also be persisted</param>
 		/// <param name="immediate">Skip the debouncing and save immediately</param>
@@ -583,8 +583,11 @@ internal void Save(bool saveDefaultValues = false, bool immediate = false)
 			}
 		}
 
-		// performs the actual, synchronous save
-		private void SaveInternal(bool saveDefaultValues)
+		/// <summary>
+		/// performs the actual, synchronous save
+		/// </summary>
+		/// <param name="saveDefaultValues">If true, default values will also be persisted</param>
+		private void SaveInternal(bool saveDefaultValues = false)
 		{
 			Stopwatch stopwatch = Stopwatch.StartNew();
 			JObject json = new()
@@ -680,7 +683,8 @@ private static void ShutdownHook()
 				{
 					try
 					{
-						config!.Save();
+						// synchronously save the config
+						config!.SaveInternal();
 					}
 					catch (Exception e)
 					{

NeosModLoader/Util.cs

@@ -118,6 +118,7 @@ private static bool CheckType(Type type, Predicate<Type> predicate)
 			{
 				return false;
 			}
+
 			try
 			{
 				string _name = type.Name;
@@ -127,19 +128,6 @@ private static bool CheckType(Type type, Predicate<Type> predicate)
 				Logger.DebugFuncInternal(() => $"Could not read the name for a type: {e}");
 				return false;
 			}
-			try
-			{
-				if (type.TypeInitializer == null)
-				{
-					Logger.DebugFuncInternal(() => $"No TypeInitializer for type \"{type}\"");
-					return false;
-				}
-			}
-			catch (Exception e)
-			{
-				Logger.DebugFuncInternal(() => $"Could not read TypeInitializer for type \"{type}\": {e}");
-				return false;
-			}
 
 			try
 			{