Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-10 06:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

make sure config is loaded

Browse source
This commit is contained in:
in0finite 2022-01-26 17:45:38 +01:00
parent 83251a8746
commit a6b8af5cb9
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/Editor/EditorLoader.cs
View file

@ -80,8 +80,6 @@ namespace SanAndreasUnity.Editor
return; return;
} }
Config.Load();
string selectedFolder = EditorUtility.OpenFolderPanel("Select GTA installation folder", Config.GamePath ?? "", ""); string selectedFolder = EditorUtility.OpenFolderPanel("Select GTA installation folder", Config.GamePath ?? "", "");
if (string.IsNullOrWhiteSpace(selectedFolder)) if (string.IsNullOrWhiteSpace(selectedFolder))
{ {

28
Assets/Scripts/Utilities/Config.cs
View file

@ -45,6 +45,8 @@ namespace SanAndreasUnity.Utilities
} }
private static bool _loaded = false;
private static JObject _root = new JObject (); private static JObject _root = new JObject ();
private static JObject _user = new JObject (); private static JObject _user = new JObject ();
@ -52,6 +54,11 @@ namespace SanAndreasUnity.Utilities
static Config()
{
Load();
}
private static TVal ConvertVal<TVal>(JToken val) private static TVal ConvertVal<TVal>(JToken val)
{ {
// note that if you pass string[] as type, it will fail on IL2CPP // note that if you pass string[] as type, it will fail on IL2CPP
@ -68,6 +75,8 @@ namespace SanAndreasUnity.Utilities
private static TVal Get<TVal>(string key) private static TVal Get<TVal>(string key)
{ {
Load();
var userVal = _user[key]; var userVal = _user[key];
if (userVal != null) if (userVal != null)
return ConvertVal<TVal>(userVal); return ConvertVal<TVal>(userVal);
@ -92,6 +101,8 @@ namespace SanAndreasUnity.Utilities
private static string GetSubstitution(string key) private static string GetSubstitution(string key)
{ {
Load();
if (_substitutions.ContainsKey(key)) return _substitutions[key]; if (_substitutions.ContainsKey(key)) return _substitutions[key];
string subs; string subs;
@ -112,16 +123,19 @@ namespace SanAndreasUnity.Utilities
private static string ReplaceSubstitutions(string value) private static string ReplaceSubstitutions(string value)
{ {
Load();
return _regex.Replace(value, x => GetSubstitution(x.Groups["key"].Value)); return _regex.Replace(value, x => GetSubstitution(x.Groups["key"].Value));
} }
public static string GetPath(string key) public static string GetPath(string key)
{ {
Load();
return ReplaceSubstitutions(GetString(key)); return ReplaceSubstitutions(GetString(key));
} }
public static string[] GetPaths(string key) public static string[] GetPaths(string key)
{ {
Load();
return Get<JArray>(key) return Get<JArray>(key)
.Select(x => ReplaceSubstitutions((string)x)) .Select(x => ReplaceSubstitutions((string)x))
.ToArray(); .ToArray();
@ -129,11 +143,17 @@ namespace SanAndreasUnity.Utilities
public static void SetString (string key, string value) public static void SetString (string key, string value)
{ {
Load();
_user [key] = value; _user [key] = value;
} }
public static void Load () private static void Load ()
{ {
if (_loaded)
return;
_loaded = true;
_root = new JObject (); _root = new JObject ();
_user = new JObject (); _user = new JObject ();
_substitutions.Clear (); _substitutions.Clear ();
@ -150,12 +170,14 @@ namespace SanAndreasUnity.Utilities
public static void SaveUserConfig () public static void SaveUserConfig ()
{ {
File.WriteAllText (UserConfigFilePath, _user.ToString (Newtonsoft.Json.Formatting.Indented)); Load();
File.WriteAllText (UserConfigFilePath, _user.ToString (Newtonsoft.Json.Formatting.Indented));
} }
public static void SaveUserConfigSafe () public static void SaveUserConfigSafe ()
{ {
F.RunExceptionSafe (() => SaveUserConfig ()); Load();
F.RunExceptionSafe (() => SaveUserConfig ());
} }
} }

2
Assets/Scripts/Utilities/ConfigManager.cs
View file

@ -7,7 +7,7 @@ namespace SanAndreasUnity.Utilities
{ {
void Awake() void Awake()
{ {
Config.Load(); //Config.Load();
} }
} }
} }