Merge pull request #169 from initsuj/Indev

Extend aliases for use in MinecraftClient.ini file. Contribution by Inisuj.
This commit is contained in:
ORelio 2016-06-27 12:04:46 +02:00 committed by GitHub
commit b83985c9fa

View file

@ -132,6 +132,7 @@ namespace MinecraftClient
{ {
try try
{ {
string serverAlias = "";
string[] Lines = File.ReadAllLines(settingsfile); string[] Lines = File.ReadAllLines(settingsfile);
ParseMode pMode = ParseMode.Default; ParseMode pMode = ParseMode.Default;
foreach (string lineRAW in Lines) foreach (string lineRAW in Lines)
@ -174,7 +175,7 @@ namespace MinecraftClient
{ {
case "login": Login = argValue; break; case "login": Login = argValue; break;
case "password": Password = argValue; break; case "password": Password = argValue; break;
case "serverip": SetServerIP(argValue); break; case "serverip": if(!SetServerIP(argValue)) serverAlias = argValue; ; break;
case "singlecommand": SingleCommand = argValue; break; case "singlecommand": SingleCommand = argValue; break;
case "language": Language = argValue; break; case "language": Language = argValue; break;
case "consoletitle": ConsoleTitle = argValue; break; case "consoletitle": ConsoleTitle = argValue; break;
@ -224,6 +225,9 @@ namespace MinecraftClient
Accounts[account_data[0].ToLower()] Accounts[account_data[0].ToLower()]
= new KeyValuePair<string, string>(account_data[1], account_data[2]); = new KeyValuePair<string, string>(account_data[1], account_data[2]);
} }
//Try user value against aliases after load
Settings.SetAccount(Login);
} }
break; break;
@ -250,6 +254,9 @@ namespace MinecraftClient
//Restore current server info //Restore current server info
ServerIP = server_host_temp; ServerIP = server_host_temp;
ServerPort = server_port_temp; ServerPort = server_port_temp;
//Try server value against aliases after load
SetServerIP(serverAlias);
} }
break; break;