Merge remote-tracking branch 'upstream/master' into cleanup-and-nullable

neos-modding-group · Apr 8, 2022 · a9c33cc · a9c33cc
2 parents e4fd448 + 348aafb
commit a9c33cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+	"editor.formatOnSaveMode": "modifications",
+	"editor.insertSpaces": true,
+	"editor.tabSize": 4,
+	"csharp.format.enable": false
+}
diff --git a/NeosModLoader/ModConfiguration.cs b/NeosModLoader/ModConfiguration.cs
@@ -423,6 +423,7 @@ private bool AnyValuesSet()
 
         internal static ModConfiguration LoadConfigForMod(LoadedNeosMod mod)
         {
+            // intentional call to an obsolete method. This will need reorganizing in the next major version.
             ModConfigurationDefinition definition = mod.NeosMod.GetConfigurationDefinition();
             if (definition == null)
             {
@@ -500,11 +501,10 @@ public void Save(bool saveDefaultValues = false)
                 Logger.WarnInternal($"Config for {LoadedNeosMod.NeosMod.Name} will NOT be saved due to a safety check failing. This is probably due to you downgrading a mod.");
                 return;
             }
-            ModConfigurationDefinition definition = LoadedNeosMod.NeosMod.GetConfigurationDefinition();
 
             JObject json = new()
             {
-                [VERSION_JSON_KEY] = JToken.FromObject(definition.Version.ToString(), jsonSerializer)
+                [VERSION_JSON_KEY] = JToken.FromObject(Definition.Version.ToString(), jsonSerializer)
             };
 
             JObject valueMap = new();