diff --git a/src/Core/Config/InternalConfigHandler.cs b/src/Core/Config/InternalConfigHandler.cs index e3ebdf0..e73e1ae 100644 --- a/src/Core/Config/InternalConfigHandler.cs +++ b/src/Core/Config/InternalConfigHandler.cs @@ -87,9 +87,6 @@ namespace UnityExplorer.Core.Config foreach (var entry in ConfigManager.InternalConfigs) sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString()); - if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder)) - Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder); - File.WriteAllText(INI_PATH, data.ToString()); } diff --git a/src/Core/Reflection/Il2CppReflection.cs b/src/Core/Reflection/Il2CppReflection.cs index 3b9b809..cedb948 100644 --- a/src/Core/Reflection/Il2CppReflection.cs +++ b/src/Core/Reflection/Il2CppReflection.cs @@ -462,7 +462,7 @@ namespace UnityExplorer #if ML Path.Combine("MelonLoader", "Managed") #elif BIE - Path.Combine("BepInEx", "unhollowed") + Path.Combine(BepInEx.Paths.BepInExRootPath, "unhollowed") #else Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Modules") #endif diff --git a/src/Loader/BIE/ExplorerBepInPlugin.cs b/src/Loader/BIE/ExplorerBepInPlugin.cs index 93ce63d..cdd1103 100644 --- a/src/Loader/BIE/ExplorerBepInPlugin.cs +++ b/src/Loader/BIE/ExplorerBepInPlugin.cs @@ -46,7 +46,6 @@ namespace UnityExplorer private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID); public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME); - public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME); public Action OnLogMessage => LogSource.LogMessage; public Action OnLogWarning => LogSource.LogWarning; diff --git a/src/Loader/IExplorerLoader.cs b/src/Loader/IExplorerLoader.cs index ac7520b..9aa8ea6 100644 --- a/src/Loader/IExplorerLoader.cs +++ b/src/Loader/IExplorerLoader.cs @@ -10,7 +10,6 @@ namespace UnityExplorer { string ExplorerFolder { get; } - string ConfigFolder { get; } ConfigHandler ConfigHandler { get; } Action OnLogMessage { get; } diff --git a/src/Loader/ML/ExplorerMelonMod.cs b/src/Loader/ML/ExplorerMelonMod.cs index 75be012..25df105 100644 --- a/src/Loader/ML/ExplorerMelonMod.cs +++ b/src/Loader/ML/ExplorerMelonMod.cs @@ -27,7 +27,6 @@ namespace UnityExplorer public static ExplorerMelonMod Instance; public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME); - public string ConfigFolder => ExplorerFolder; public ConfigHandler ConfigHandler => _configHandler; public MelonLoaderConfigHandler _configHandler; diff --git a/src/Loader/STANDALONE/ExplorerStandalone.cs b/src/Loader/STANDALONE/ExplorerStandalone.cs index 27a3387..fb29c67 100644 --- a/src/Loader/STANDALONE/ExplorerStandalone.cs +++ b/src/Loader/STANDALONE/ExplorerStandalone.cs @@ -76,8 +76,6 @@ namespace UnityExplorer } private static string s_explorerFolder; - public string ConfigFolder => ExplorerFolder; - Action IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); }; Action IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); }; Action IExplorerLoader.OnLogError => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); }; diff --git a/src/Loader/STANDALONE/StandaloneConfigHandler.cs b/src/Loader/STANDALONE/StandaloneConfigHandler.cs index e96a480..f8d4615 100644 --- a/src/Loader/STANDALONE/StandaloneConfigHandler.cs +++ b/src/Loader/STANDALONE/StandaloneConfigHandler.cs @@ -13,11 +13,11 @@ namespace UnityExplorer.Loader.STANDALONE public class StandaloneConfigHandler : ConfigHandler { internal static IniDataParser _parser; - internal static string INI_PATH; + internal static string CONFIG_PATH; public override void Init() { - INI_PATH = Path.Combine(ExplorerCore.Loader.ConfigFolder, "config.ini"); + CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini"); _parser = new IniDataParser(); _parser.Configuration.CommentString = "#"; } @@ -49,10 +49,10 @@ namespace UnityExplorer.Loader.STANDALONE { try { - if (!File.Exists(INI_PATH)) + if (!File.Exists(CONFIG_PATH)) return false; - string ini = File.ReadAllText(INI_PATH); + string ini = File.ReadAllText(CONFIG_PATH); var data = _parser.Parse(ini); @@ -97,10 +97,10 @@ namespace UnityExplorer.Loader.STANDALONE foreach (var entry in ConfigManager.ConfigElements) sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString()); - if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder)) - Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder); + if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder)) + Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder); - File.WriteAllText(INI_PATH, data.ToString()); + File.WriteAllText(CONFIG_PATH, data.ToString()); } } }