From 67c602b32f67862215a69e4adbd2c2f8dd5230b8 Mon Sep 17 00:00:00 2001
From: Sinai <49360850+sinai-dev@users.noreply.github.com>
Date: Wed, 19 Jan 2022 18:20:26 +1100
Subject: [PATCH] Use Tomlet for Standalone config, fix ML double reference

---
 .../Standalone/StandaloneConfigHandler.cs     | 31 +++++++------------
 src/UnityExplorer.csproj                      | 11 ++++---
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/Loader/Standalone/StandaloneConfigHandler.cs b/src/Loader/Standalone/StandaloneConfigHandler.cs
index 22df2f5..c533e03 100644
--- a/src/Loader/Standalone/StandaloneConfigHandler.cs
+++ b/src/Loader/Standalone/StandaloneConfigHandler.cs
@@ -4,22 +4,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.Config;
-using IniParser.Parser;
 using System.IO;
 using UnityEngine;
+using Tomlet;
+using Tomlet.Models;
 
 namespace UnityExplorer.Loader.STANDALONE
 {
     public class StandaloneConfigHandler : ConfigHandler
     {
-        internal static IniDataParser _parser;
         internal static string CONFIG_PATH;
 
         public override void Init()
         {
-            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini");
-            _parser = new IniDataParser();
-            _parser.Configuration.CommentString = "#";
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.cfg");
         }
 
         public override void LoadConfig()
@@ -52,14 +50,11 @@ namespace UnityExplorer.Loader.STANDALONE
                 if (!File.Exists(CONFIG_PATH))
                     return false;
 
-                string ini = File.ReadAllText(CONFIG_PATH);
-
-                var data = _parser.Parse(ini);
-
-                foreach (var config in data.Sections["Config"])
+                var document = TomlParser.ParseFile(CONFIG_PATH);
+                foreach (var key in document.Keys)
                 {
-                    if (ConfigManager.ConfigElements.TryGetValue(config.KeyName, out IConfigElement configElement))
-                        configElement.BoxedValue = StringToConfigValue(config.Value, configElement.ElementType);
+                    var config = ConfigManager.ConfigElements[key];
+                    config.BoxedValue = StringToConfigValue(document.GetValue(key).StringValue, config.ElementType);
                 }
 
                 return true;
@@ -89,18 +84,14 @@ namespace UnityExplorer.Loader.STANDALONE
 
         public override void SaveConfig()
         {
-            var data = new IniParser.Model.IniData();
-
-            data.Sections.AddSection("Config");
-            var sec = data.Sections["Config"];
-
-            foreach (var entry in ConfigManager.ConfigElements)
-                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
+            var document = TomlDocument.CreateEmpty();
+            foreach (var config in ConfigManager.ConfigElements)
+                document.Put(config.Key, config.Value.BoxedValue.ToString());
 
             if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder))
                 Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder);
 
-            File.WriteAllText(CONFIG_PATH, data.ToString());
+            File.WriteAllText(CONFIG_PATH, document.SerializedValue);
         }
     }
 }
diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj
index ed6055a..ec393cc 100644
--- a/src/UnityExplorer.csproj
+++ b/src/UnityExplorer.csproj
@@ -106,11 +106,14 @@
       <HintPath>..\lib\mcs-unity\mcs\bin\Release\mcs.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Tomlet, Version=3.1.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Samboy063.Tomlet.3.1.3\lib\net35\Tomlet.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
+    <!-- Non-MelonLoader (it includes Tomlet) -->
+    <ItemGroup Condition="'$(IsMelonLoader)'=='false'">
+        <Reference Include="Tomlet, Version=3.1.3.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>packages\Samboy063.Tomlet.3.1.3\lib\net35\Tomlet.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
   <!-- MelonLoader refs -->
   <ItemGroup Condition="'$(IsMelonLoader)'=='true'">
     <Reference Include="MelonLoader">