zontreck/ForgeCore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try 2 to fix the config loading

Browse source
This commit is contained in:
Zontreck 2020-06-20 09:11:51 -07:00
parent 6dbc838b11
commit f07fdec676
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assembly/ASMInfo.cs
View file

@ -6,7 +6,7 @@ using System.Reflection;
[assembly: AssemblyCompany("ZNI")]
[assembly: AssemblyAlgorithmId(System.Configuration.Assemblies.AssemblyHashAlgorithm.MD5)]
[assembly: AssemblyCopyright("© 2020 Tara Piccari")]
[assembly: AssemblyFileVersion("5.1.964")]
[assembly: AssemblyFileVersion("5.1.965")]
[assembly: AssemblyDescription("Second Life Bot - BotCore5")]
@ -15,7 +15,7 @@ namespace Bot.Assemble
public class ASMInfo
{
public static string BotName = "ZBotCore";
public static string BotVer = "5.1.964";
public static string BotVer = "5.1.965";
public static string GitPassword
{
get

21
Program.cs
View file

@ -21,7 +21,6 @@ namespace Bot
public static Logger Log;
public static string BotVer = ASMInfo.BotVer;
public static string BotStr = ASMInfo.BotName; // internal identifier for linden
public static MainConfiguration conf;
public static string Flavor = "Bot"; // inworld identification - must be customized
public static SerialManager SM = new SerialManager();
public static string DefaultProgram = ""; // no default.
@ -56,8 +55,8 @@ namespace Bot
ZHash.Instance.NewKey();
ZHash.Instance.Key = "Test";
Console.WriteLine("ZHash (Test): " + ZHash.Instance.Key);
conf = MainConfiguration.Instance;
conf.Load();
MainConfiguration.Instance.Load();
MainConfiguration conf = MainConfiguration.Instance;
//MasterObjectCaches = ObjectCaches.Instance;
@ -66,14 +65,14 @@ namespace Bot
// Check if this is activation command
if (args[0] == "-a")
{
conf.ActivationCode = args[1];
conf.Save();
MainConfiguration.Instance.ActivationCode = args[1];
MainConfiguration.Instance.Save();
return;
}
else if (args[0] == "-m")
{
conf.MainProgramDLL = args[1];
conf.Save();
MainConfiguration.Instance.MainProgramDLL = args[1];
MainConfiguration.Instance.Save();
return;
}
}
@ -81,10 +80,10 @@ namespace Bot
{
if (args[0] == "-l")
{
conf.first = args[1];
conf.last = args[2];
conf.password = args[3];
conf.Save();
MainConfiguration.Instance.first = args[1];
MainConfiguration.Instance.last = args[2];
MainConfiguration.Instance.password = args[3];
MainConfiguration.Instance.Save();
return;
}
}