ModLibSettingsProvider might be null

Removed core deps as they are not needed Introduced OptionalDependedModules that might be implemented later?
Aragas · Apr 26, 2020 · c1a148d · c1a148d
1 parent dd0e45e
commit c1a148d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/MBOptionScreen/Settings/SettingsDatabase.cs b/MBOptionScreen/Settings/SettingsDatabase.cs
@@ -5,22 +5,22 @@ namespace MBOptionScreen.Settings
 {
     internal static class SettingsDatabase
     {
-        internal static IModLibSettingsProvider ModLibSettingsProvider { get; set; } = default!;
+        internal static IModLibSettingsProvider? ModLibSettingsProvider { get; set; }
         internal static IMBOptionScreenSettingsProvider MBOptionScreenSettingsProvider { get; set; } = default!;
 
         public static List<ModSettingsDefinition> CreateModSettingsDefinitions
         {
             get
             {
                 return MBOptionScreenSettingsProvider.CreateModSettingsDefinitions
-                    .Concat(ModLibSettingsProvider.CreateModSettingsDefinitions)
+                    .Concat(ModLibSettingsProvider?.CreateModSettingsDefinitions ?? new List<ModSettingsDefinition>())
                     .ToList();
             }
         }
 
         public static bool RegisterSettings(SettingsBase settings)
         {
-            if (settings is ModLibSettingsWrapper modLibSettings)
+            if (settings is ModLibSettingsWrapper modLibSettings && ModLibSettingsProvider != null)
                 return ModLibSettingsProvider.RegisterSettings(modLibSettings);
 
             return MBOptionScreenSettingsProvider.RegisterSettings(settings);
@@ -29,20 +29,20 @@ public static bool RegisterSettings(SettingsBase settings)
         public static SettingsBase? GetSettings(string id)
         {
             return MBOptionScreenSettingsProvider.GetSettings(id)
-                ?? ModLibSettingsProvider.GetSettings(id);
+                ?? ModLibSettingsProvider?.GetSettings(id);
         }
 
         public static void SaveSettings(SettingsBase settings)
         {
-            if (settings is ModLibSettingsWrapper modLibSettings)
+            if (settings is ModLibSettingsWrapper modLibSettings && ModLibSettingsProvider != null)
                 ModLibSettingsProvider.SaveSettings(modLibSettings);
 
             MBOptionScreenSettingsProvider.SaveSettings(settings);
         }
 
         public static bool OverrideSettings(SettingsBase settings)
         {
-            if (settings is ModLibSettingsWrapper modLibSettings)
+            if (settings is ModLibSettingsWrapper modLibSettings && ModLibSettingsProvider != null)
                 return ModLibSettingsProvider.OverrideSettings(modLibSettings);
 
             return MBOptionScreenSettingsProvider.OverrideSettings(settings);
@@ -51,7 +51,7 @@ public static bool OverrideSettings(SettingsBase settings)
         public static SettingsBase ResetSettings(string id)
         {
             return MBOptionScreenSettingsProvider.ResetSettings(id)
-                ?? ModLibSettingsProvider.ResetSettings(id);
+                ?? ModLibSettingsProvider?.ResetSettings(id);
         }
     }
 }
diff --git a/MBOptionScreen/_Data/SubModule.xml b/MBOptionScreen/_Data/SubModule.xml
@@ -6,14 +6,12 @@
 	<DefaultModule value="false"/>
 	<SingleplayerModule value="true"/>
 	<MultiplayerModule value="false"/>
-  	<Official value="false"/>
+	<Official value="false"/>
 	<DependedModules>
-		<DependedModule Id="Native"/>
-		<DependedModule Id="SandBoxCore"/>
-		<DependedModule Id="Sandbox"/>
-		<DependedModule Id="CustomBattle"/>
-		<DependedModule Id="StoryMode"/>
 	</DependedModules>
+	<OptionalDependedModules>
+		<OptionalDependedModule Id="ModLib"/>
+	</OptionalDependedModules>
 	<SubModules>
 		<SubModule>
 			<Name value="Bannerlord.MBOptionScreen"/>