Change naming for @JKDev

Author: joukepouke

src/Managers/Config.cs

@@ -8,32 +8,32 @@ namespace PolyMod.Managers;
 /// </summary>
 public class Config<T> where T : class
 {
-    private T? _currentConfig;
-    private readonly string _modName;
-    private readonly ConfigTypes _configType;
+    private T? currentConfig;
+    private readonly string modName;
+    private readonly ConfigTypes configType;
     private static readonly string ExposedConfigPath = Path.Combine(Plugin.BASE_PATH, "mods.json");
-    private readonly string _perModConfigPath;
-    private T? _defaultConfig;
+    private readonly string perModConfigPath;
+    private T? defaultConfig;
     public Config(string modName, ConfigTypes configType)
     {
-        _modName = modName;
-        _configType = configType;
-        _perModConfigPath = Path.Combine(Plugin.MODS_PATH, $"{modName}.json");
+        this.modName = modName;
+        this.configType = configType;
+        perModConfigPath = Path.Combine(Plugin.MODS_PATH, $"{modName}.json");
         Load();
     }
 
     internal void Load() // can be called internally if config changes; gui config not implemented yet
     {
-        switch (_configType)
+        switch (configType)
         {
             case ConfigTypes.PerMod:
             {
-                if (!File.Exists(_perModConfigPath))
+                if (!File.Exists(perModConfigPath))
                 {
                     return;
                 }
-                var jsonText = File.ReadAllText(_perModConfigPath);
-                _currentConfig = JsonSerializer.Deserialize<T>(jsonText);
+                var jsonText = File.ReadAllText(perModConfigPath);
+                currentConfig = JsonSerializer.Deserialize<T>(jsonText);
                 break;
             }
             case ConfigTypes.Exposed:
@@ -43,7 +43,7 @@ public Config(string modName, ConfigTypes configType)
                     return;
                 }
                 var jsonText = File.ReadAllText(ExposedConfigPath);
-                _currentConfig = JsonNode.Parse(jsonText)![_modName]?.Deserialize<T>();
+                currentConfig = JsonNode.Parse(jsonText)![modName]?.Deserialize<T>();
                 break;
             }
             default:
@@ -55,9 +55,9 @@ public Config(string modName, ConfigTypes configType)
     /// </summary>
     public void SetDefaultConfig(T defaultValue)
     {
-        _defaultConfig = defaultValue;
-        if (_currentConfig is not null) return;
-        Write(_defaultConfig);
+        defaultConfig = defaultValue;
+        if (currentConfig is not null) return;
+        Write(defaultConfig);
         SaveChanges();
     }
 
@@ -66,45 +66,45 @@ public void SetDefaultConfig(T defaultValue)
     /// </summary>
     public void Write(T config)
     {
-        _currentConfig = config;
+        currentConfig = config;
     }
     /// <summary>
     /// Gets the config. Should only be called after setting a default.
     /// </summary>
     public T Get()
     {
-        return _currentConfig ?? throw new InvalidOperationException("Must set default before reading config.");
+        return currentConfig ?? throw new InvalidOperationException("Must set default before reading config.");
     }
     /// <summary>
-    /// edits the config. Should only be called after setting a default.
+    /// Edits the config. Should only be called after setting a default.
     /// </summary>
     /// <remarks>Call SaveChanges after editing</remarks>
     public void Edit(Action<T> editor)
     {
-        editor(_currentConfig ?? throw new InvalidOperationException("Must set default before reading config."));
+        editor(currentConfig ?? throw new InvalidOperationException("Must set default before reading config."));
     }
     /// <summary>
     /// Gets part of the config. Should only be called after setting a default
     /// </summary>
     public TResult Get<TResult>(Func<T, TResult> getter)
     {
-        return getter(_currentConfig ?? throw new InvalidOperationException("Must set default before reading config."));
+        return getter(currentConfig ?? throw new InvalidOperationException("Must set default before reading config."));
     }
     /// <summary>
     /// writes the config to disk
     /// </summary>
     public void SaveChanges()
     {
-        switch (_configType)
+        switch (configType)
         {
             case ConfigTypes.PerMod:
-                var perModJson = JsonSerializer.Serialize(_currentConfig, new JsonSerializerOptions { WriteIndented = true });
-                File.WriteAllText(_perModConfigPath, perModJson);
+                var perModJson = JsonSerializer.Serialize(currentConfig, new JsonSerializerOptions { WriteIndented = true });
+                File.WriteAllText(perModConfigPath, perModJson);
                 break;
             case ConfigTypes.Exposed:
                 var modsConfigText = File.ReadAllText(ExposedConfigPath);
                 var modsConfigJson = JsonNode.Parse(modsConfigText)!.AsObject();
-                modsConfigJson[_modName] = JsonSerializer.SerializeToNode(_currentConfig!);
+                modsConfigJson[modName] = JsonSerializer.SerializeToNode(currentConfig!);
                 File.WriteAllText(ExposedConfigPath, modsConfigJson.ToJsonString(new JsonSerializerOptions { WriteIndented = true }));
                 break;
             default:

src/Managers/GLDConfig.cs

@@ -9,14 +9,14 @@ public class GldConfigTemplate
 {
     private static readonly string ConfigPath = Path.Combine(Plugin.BASE_PATH, "mods.json");
 
-    private readonly string _templateText;
-    private JsonObject _currentConfig = new();
-    private string _modName;
+    private readonly string templateText;
+    private JsonObject currentConfig = new();
+    private string modName;
 
     public GldConfigTemplate(string templateText, string modName)
     {
-        _templateText = templateText;
-        _modName = modName;
+        this.templateText = templateText;
+        this.modName = modName;
         Load();
     }
     private void Load()
@@ -25,34 +25,34 @@ private void Load()
         {
             var json = File.ReadAllText(ConfigPath);
             if (JsonNode.Parse(json) is JsonObject modsConfig 
-                && modsConfig.TryGetPropertyValue(_modName, out var modConfigNode) 
+                && modsConfig.TryGetPropertyValue(modName, out var modConfigNode) 
                 && modConfigNode is JsonObject modConfig)
             {
-                _currentConfig = modConfig;
+                currentConfig = modConfig;
                 return;
             }
         }
-        _currentConfig = new JsonObject();
+        currentConfig = new JsonObject();
     }
 
     public string? Render()
     {
-        if (!_templateText.Contains("{{")) return _templateText;
-        var template = Template.Parse(_templateText);
+        if (!templateText.Contains("{{")) return templateText;
+        var template = Template.Parse(templateText);
         var context = new TemplateContext();
         var scriptObject = new ScriptObject();
 
         bool changedConfig = false;
         scriptObject.Import("config", 
             new Func<string, string, string>((key, defaultValue) =>
             {
-                if (_currentConfig.TryGetPropertyValue(key, out var token) && token != null)
+                if (currentConfig.TryGetPropertyValue(key, out var token) && token != null)
                 {
                     return token.ToString();
                 }
 
                 changedConfig = true;
-                _currentConfig[key] = defaultValue;
+                currentConfig[key] = defaultValue;
 
                 return defaultValue;
             })
@@ -88,7 +88,7 @@ public void SaveChanges()
             modsConfigJson = new JsonObject();
         }
 
-        modsConfigJson[_modName] = _currentConfig;
+        modsConfigJson[modName] = currentConfig;
         File.WriteAllText(ConfigPath, modsConfigJson.ToJsonString(new JsonSerializerOptions { WriteIndented = true }));
     }
 }