Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit 0d10f94

Browse files
committed
Use Paths.BepInExRootPath, and cleanup dirs
1 parent 91671bf commit 0d10f94

File tree

7 files changed

+8
-16
lines changed

7 files changed

+8
-16
lines changed

src/Core/Config/InternalConfigHandler.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ public override void SaveConfig()
8787
foreach (var entry in ConfigManager.InternalConfigs)
8888
sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
8989

90-
if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
91-
Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
92-
9390
File.WriteAllText(INI_PATH, data.ToString());
9491
}
9592

src/Core/Reflection/Il2CppReflection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ internal override void Internal_FindSingleton(string[] possibleNames, Type type,
462462
#if ML
463463
Path.Combine("MelonLoader", "Managed")
464464
#elif BIE
465-
Path.Combine("BepInEx", "unhollowed")
465+
Path.Combine(BepInEx.Paths.BepInExRootPath, "unhollowed")
466466
#else
467467
Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Modules")
468468
#endif

src/Loader/BIE/ExplorerBepInPlugin.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public ManualLogSource LogSource
4646
private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
4747

4848
public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
49-
public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);
5049

5150
public Action<object> OnLogMessage => LogSource.LogMessage;
5251
public Action<object> OnLogWarning => LogSource.LogWarning;

src/Loader/IExplorerLoader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public interface IExplorerLoader
1010
{
1111
string ExplorerFolder { get; }
1212

13-
string ConfigFolder { get; }
1413
ConfigHandler ConfigHandler { get; }
1514

1615
Action<object> OnLogMessage { get; }

src/Loader/ML/ExplorerMelonMod.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class ExplorerMelonMod : MelonMod, IExplorerLoader
2727
public static ExplorerMelonMod Instance;
2828

2929
public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
30-
public string ConfigFolder => ExplorerFolder;
3130

3231
public ConfigHandler ConfigHandler => _configHandler;
3332
public MelonLoaderConfigHandler _configHandler;

src/Loader/STANDALONE/ExplorerStandalone.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ public string ExplorerFolder
7676
}
7777
private static string s_explorerFolder;
7878

79-
public string ConfigFolder => ExplorerFolder;
80-
8179
Action<object> IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); };
8280
Action<object> IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); };
8381
Action<object> IExplorerLoader.OnLogError => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); };

src/Loader/STANDALONE/StandaloneConfigHandler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace UnityExplorer.Loader.STANDALONE
1313
public class StandaloneConfigHandler : ConfigHandler
1414
{
1515
internal static IniDataParser _parser;
16-
internal static string INI_PATH;
16+
internal static string CONFIG_PATH;
1717

1818
public override void Init()
1919
{
20-
INI_PATH = Path.Combine(ExplorerCore.Loader.ConfigFolder, "config.ini");
20+
CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini");
2121
_parser = new IniDataParser();
2222
_parser.Configuration.CommentString = "#";
2323
}
@@ -49,10 +49,10 @@ public bool TryLoadConfig()
4949
{
5050
try
5151
{
52-
if (!File.Exists(INI_PATH))
52+
if (!File.Exists(CONFIG_PATH))
5353
return false;
5454

55-
string ini = File.ReadAllText(INI_PATH);
55+
string ini = File.ReadAllText(CONFIG_PATH);
5656

5757
var data = _parser.Parse(ini);
5858

@@ -97,10 +97,10 @@ public override void SaveConfig()
9797
foreach (var entry in ConfigManager.ConfigElements)
9898
sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());
9999

100-
if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
101-
Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
100+
if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder))
101+
Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder);
102102

103-
File.WriteAllText(INI_PATH, data.ToString());
103+
File.WriteAllText(CONFIG_PATH, data.ToString());
104104
}
105105
}
106106
}

0 commit comments

Comments
 (0)