helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow to use both INI files and command-line args

Browse source 
- MinecraftClient.ini or the specified INI file is loaded anyway
- Command-line arguments overrides the INI file settings
- INI file is added in front of the command-line args
- eg. MinecraftClient.exe my.ini Login Password IP
This commit is contained in:
ORelio 2014-01-17 20:58:42 +01:00
parent c6e44041d2
commit 07ef031bb9
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MinecraftClient/Program.cs
View file

@ -32,13 +32,24 @@ namespace MinecraftClient
args = args.Where(o => !Object.ReferenceEquals(o, args[args.Length - 1])).ToArray(); args = args.Where(o => !Object.ReferenceEquals(o, args[args.Length - 1])).ToArray();
} }
//Processing Command-line arguments or Config File //Process ini configuration file
if (args.Length >= 1 && System.IO.File.Exists(args[0]) && System.IO.Path.GetExtension(args[0]).ToLower() == ".ini")
if (args.Length == 1 && System.IO.File.Exists(args[0]))
{ {
Settings.LoadSettings(args[0]); Settings.LoadSettings(args[0]);
//remove ini configuration file from arguments array
List<string> args_tmp = args.ToList<string>();
args_tmp.RemoveAt(0);
args = args_tmp.ToArray();
} }
else if (args.Length >= 1) else if (System.IO.File.Exists("MinecraftClient.ini"))
{
Settings.LoadSettings("MinecraftClient.ini");
}
else Settings.WriteDefaultSettings("MinecraftClient.ini");
//Other command-line arguments
if (args.Length >= 1)
{ {
Settings.Login = args[0]; Settings.Login = args[0];
if (args.Length >= 2) if (args.Length >= 2)
@ -141,11 +152,6 @@ namespace MinecraftClient
} }
} }
} }
else if (System.IO.File.Exists("MinecraftClient.ini"))
{
Settings.LoadSettings("MinecraftClient.ini");
}
else Settings.WriteDefaultSettings("MinecraftClient.ini");
if (Settings.ConsoleTitle != "") if (Settings.ConsoleTitle != "")
{ {