diff --git a/AquaMai/App.config b/AquaMai/App.config index 8984ce3c..6b90b201 100644 --- a/AquaMai/App.config +++ b/AquaMai/App.config @@ -5,6 +5,10 @@ + + + + \ No newline at end of file diff --git a/AquaMai/AquaMai.csproj b/AquaMai/AquaMai.csproj index 4d1d320b..70752762 100644 --- a/AquaMai/AquaMai.csproj +++ b/AquaMai/AquaMai.csproj @@ -60,6 +60,9 @@ Libs\System.Xml.dll + + Libs\Tomlet.dll + Libs\Unity.Analytics.DataPrivacy.dll @@ -258,9 +261,6 @@ Libs\UnityEngine.XRModule.dll - - packages\YamlDotNet.15.1.1\lib\net47\YamlDotNet.dll - @@ -271,10 +271,9 @@ - - + diff --git a/AquaMai/AquaMai.toml b/AquaMai/AquaMai.toml new file mode 100644 index 00000000..294a9cea --- /dev/null +++ b/AquaMai/AquaMai.toml @@ -0,0 +1,8 @@ + +# =================================== +# UX: User Experience Improvements +[UX] +# Skip the warning screen and logo shown after the POST sequence +SkipWarningScreen=true +# Single player: Show 1P only, at the center of the screen +SinglePlayer=true diff --git a/AquaMai/AquaMai.yaml b/AquaMai/AquaMai.yaml deleted file mode 100644 index 8ec7bc6a..00000000 --- a/AquaMai/AquaMai.yaml +++ /dev/null @@ -1,8 +0,0 @@ - -# =================================== -# UX: User Experience Improvements -UX: - # Skip the warning screen and logo shown after the POST sequence - SkipWarningScreen: true - # Single player: Show 1P only, at the center of the screen - SinglePlayer: true diff --git a/AquaMai/Libs/Tomlet.dll b/AquaMai/Libs/Tomlet.dll new file mode 100644 index 00000000..0f941446 Binary files /dev/null and b/AquaMai/Libs/Tomlet.dll differ diff --git a/AquaMai/Main.cs b/AquaMai/Main.cs index c3615675..e7e62e9a 100644 --- a/AquaMai/Main.cs +++ b/AquaMai/Main.cs @@ -1,5 +1,6 @@ using AquaMai.UX; using MelonLoader; +using Tomlet; namespace AquaMai { @@ -21,9 +22,15 @@ namespace AquaMai { MelonLogger.Msg("Loading mod settings..."); - // Read AquaMai.yaml to load settings - var yaml = new YamlDotNet.Serialization.Deserializer(); - AppConfig = yaml.Deserialize(System.IO.File.ReadAllText("AquaMai.yaml")); + // Check if AquaMai.toml exists + if (!System.IO.File.Exists("AquaMai.toml")) + { + MelonLogger.Error("AquaMai.toml not found! Please create it."); + return; + } + + // Read AquaMai.toml to load settings + AppConfig = TomletMain.To(System.IO.File.ReadAllText("AquaMai.toml")); if (AppConfig.UX.SkipWarningScreen) { diff --git a/AquaMai/packages.config b/AquaMai/packages.config deleted file mode 100644 index c35aaf88..00000000 --- a/AquaMai/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file