-SaveValue configs now save to a dedicated folder

-PMLSettings GUI now has DBM toggle -DBM is now handled with a SaveValue config.
PULSAR-Modders · Nov 14, 2022 · f954269 · f954269
1 parent 34b34b3
commit f954269
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/PulsarModLoader/Chat/Commands/DebugModeCommand.cs b/PulsarModLoader/Chat/Commands/DebugModeCommand.cs
@@ -5,8 +5,6 @@ namespace PulsarModLoader.Chat.Commands
 {
     class DebugModeCommand : ChatCommand
     {
-        public static bool DebugMode = false;
-
         public override string[] CommandAliases()
         {
             return new string[] { "debugmode", "dbm" };
@@ -20,15 +18,12 @@ public override string Description()
         public override void Execute(string arguments)
         {
             //Toggle DebugMode value
-            DebugMode = !DebugMode;
-
-            //Write new DebugMode value to settings xml file
-            PLXMLOptionsIO.Instance.CurrentOptions.SetStringValue("PMLDebugMode", DebugMode.ToString());
+            PMLConfig.DebugMode.Value = !PMLConfig.DebugMode.Value;
 
             //notify player of new DebugMode value
-            Messaging.Notification($"PMLDebugMode is now {DebugMode}");
+            Messaging.Notification($"PMLDebugMode is now {PMLConfig.DebugMode}");
 
-            if (!DebugMode)
+            if (!PMLConfig.DebugMode)
                 PLInGameUI.Instance.CurrentVersionLabel.text = PulsarModLoader.Patches.GameVersion.Version;
         }
 

diff --git a/PulsarModLoader/CustomGUI/PMLSettings.cs b/PulsarModLoader/CustomGUI/PMLSettings.cs
@@ -13,6 +13,16 @@ class PMLSettings : ModSettingsMenu
         public override string Name() => "PulsarModLoader";
         public override void Draw()
         {
+            if (Button("Debug Mode: " + (PMLConfig.DebugMode ? "Enabled" : "Disabled")))
+            {
+                PMLConfig.DebugMode.Value = !PMLConfig.DebugMode.Value;
+
+                if (!PMLConfig.DebugMode)
+                {
+                    PLInGameUI.Instance.CurrentVersionLabel.text = PulsarModLoader.Patches.GameVersion.Version;
+                }
+            }
+
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
             BeginHorizontal();
             {

diff --git a/PulsarModLoader/PMLConfig.cs b/PulsarModLoader/PMLConfig.cs
@@ -1,9 +1,4 @@
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using UnityEngine;
-using Valve.Newtonsoft.Json;
-using Valve.Newtonsoft.Json.Converters;
+using UnityEngine;
 
 namespace PulsarModLoader
 {
@@ -12,6 +7,8 @@ public static class PMLConfig
         public static SaveValue<UnityEngine.TextAnchor> ModInfoTextAnchor =
 	        new SaveValue<TextAnchor>("ModInfoTextAnchor", TextAnchor.UpperLeft);
 
+        public static SaveValue<bool> DebugMode = new SaveValue<bool>("DebugMode", false);
+
         public static void SetDefault()
         {
 	        ModInfoTextAnchor.Value = TextAnchor.UpperLeft;

diff --git a/PulsarModLoader/Patches/DebugReadout.cs b/PulsarModLoader/Patches/DebugReadout.cs
@@ -10,7 +10,7 @@ class DebugReadout
     {
         static void Postfix(PLInGameUI __instance)
         {
-            if (DebugModeCommand.DebugMode && PLServer.Instance != null && PLEncounterManager.Instance != null && PLNetworkManager.Instance != null && GameVersion.Version != string.Empty)
+            if (PMLConfig.DebugMode && PLServer.Instance != null && PLEncounterManager.Instance != null && PLNetworkManager.Instance != null && GameVersion.Version != string.Empty)
             {
                 Vector3 pos;
                 if (PLNetworkManager.Instance.LocalPlayer != null)

diff --git a/PulsarModLoader/Patches/PLGlobalStart.cs b/PulsarModLoader/Patches/PLGlobalStart.cs
@@ -1,6 +1,5 @@
 using HarmonyLib;
 using System.IO;
-using System.Reflection;
 using UnityEngine;
 
 namespace PulsarModLoader.Patches
@@ -14,23 +13,19 @@ static void Prefix()
         {
             if (!modsLoaded)
             {
-                //DebugModeSetting
-                if (bool.TryParse(PLXMLOptionsIO.Instance.CurrentOptions.GetStringValue("PMLDebugMode"), out bool result))
-                {
-                    Chat.Commands.DebugModeCommand.DebugMode = result;
-                }
-
-                //PML Config
-                //string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "/PulsarModLoaderConfig.json";
-                //if (!File.Exists(path)) PMLConfig.CreateDefaultConfig(path, true);
-                //else PMLConfig.CreateConfigFromFile(path);
-
                 //Modmanager GUI Init.
                 new GameObject("ModManager", typeof(CustomGUI.GUIMain)) { hideFlags = HideFlags.HideAndDontSave };
 
                 //SaveDataManager Init()
                 new SaveData.SaveDataManager();
 
+                //Create ModConfigs Directory for SaveValue class
+                string ModConfigDir = SaveValueManager.GetConfigFolder();
+                if (!Directory.Exists(ModConfigDir))
+                {
+                    Directory.CreateDirectory(ModConfigDir);
+                }
+
                 //ModLoading
                 string modsDir = Path.Combine(Directory.GetCurrentDirectory(), "Mods");
                 ModManager.Instance.LoadModsDirectory(modsDir);

diff --git a/PulsarModLoader/SaveData/SaveDataManager.cs b/PulsarModLoader/SaveData/SaveDataManager.cs
@@ -117,6 +117,7 @@ public void LoadDatas(BinaryReader reader, bool ldarg3)
             for (int i = 0; i < count; i++)
             {
                 //SaveDataHeader
+                Logger.Info($"{reader.BaseStream.Position}");
                 string harmonyIdent = reader.ReadString(); //HarmonyIdentifier
                 string SavDatIdent = reader.ReadString();  //SaveDataIdentifier
                 uint VersionID = reader.ReadUInt32();      //VersionID

diff --git a/PulsarModLoader/SaveValue.cs b/PulsarModLoader/SaveValue.cs
@@ -1,17 +1,19 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using HarmonyLib;
-using PulsarModLoader.Utilities;
 using Valve.Newtonsoft.Json;
-using Valve.Newtonsoft.Json.Converters;
 
 namespace PulsarModLoader
 {
-	internal class SaveValueManager
+    internal class SaveValueManager
 	{
+		public static string GetConfigFolder()
+		{
+			return Path.Combine(Directory.GetCurrentDirectory(), "ModConfigs");
+		}
+
 		private static JsonSerializerSettings serializerSettings;
 		static SaveValueManager()
 		{
@@ -55,7 +57,7 @@ internal static T GetValueFor<T>(string id, Assembly mod, T @default)
 		private static string GetConfigFile(Assembly mod)
 		{
 			if (ModToConfigFile.ContainsKey(mod)) return ModToConfigFile[mod];
-			string newFile = mod.Location.Replace(".dll", ".json");
+			string newFile = Path.Combine(GetConfigFolder(), mod.GetName().Name + ".json");
 			ModToConfigFile.Add(mod, newFile);
 			if (!ModToCacheValues.ContainsKey(mod) && File.Exists(newFile))
 				ModToCacheValues.Add(mod, JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(newFile)));

diff --git a/PulsarModLoader/Utilities/ExceptionWarningPatch.cs b/PulsarModLoader/Utilities/ExceptionWarningPatch.cs
@@ -18,7 +18,7 @@ private static void OnUnityLog(string line, string stackTrace, LogType type)
             {
                 string id = String.Format("{0:X}", DateTime.UtcNow.GetHashCode()).Substring(0, 7).ToUpper();
                 string msg = $"<color='#{ColorUtility.ToHtmlStringRGB(Color.red)}'>Exception!</color> {id}";
-                if (DebugModeCommand.DebugMode)
+                if (PMLConfig.DebugMode)
                 {
                     Messaging.Notification(msg);
                 }

diff --git a/PulsarModLoader/Utilities/Logger.cs b/PulsarModLoader/Utilities/Logger.cs
@@ -31,7 +31,7 @@ public static void Info(string message)
             }
 
             string line;
-            if (Chat.Commands.DebugModeCommand.DebugMode)
+            if (PMLConfig.DebugMode)
             {
                 MethodBase invoker = new System.Diagnostics.StackTrace().GetFrame(1).GetMethod();
                 string type = invoker.DeclaringType.ToString();

diff --git a/PulsarModLoader/Utilities/Messaging.cs b/PulsarModLoader/Utilities/Messaging.cs
@@ -208,7 +208,7 @@ internal static void AntiNullReferenceException(string args)
 
             Logger.Info($"NullReferenceException! Target -> {targetMethod.Name}({args}); Caller -> {who?.ReflectedType?.FullName}.{who?.Name}({who?.GetParameters()?.ToStringFull()});");
 
-            if (Chat.Commands.DebugModeCommand.DebugMode)
+            if (PMLConfig.DebugMode)
                 Messaging.Notification("NullReferenceException! Check the logs!");
         }