From 554aa358b57c998be1b49d5943f35d2dfa814dfb Mon Sep 17 00:00:00 2001 From: initsuj Date: Sun, 26 Jun 2016 14:27:04 -0700 Subject: [PATCH 1/2] Attempt to expand user and server aliases after accounts.txt and servers.txt file loaded. --- MinecraftClient/Settings.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index d72f6469..952daa4c 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -132,6 +132,8 @@ namespace MinecraftClient { try { + string serverIP = ""; + string login = ""; string[] Lines = File.ReadAllLines(settingsfile); ParseMode pMode = ParseMode.Default; foreach (string lineRAW in Lines) @@ -172,9 +174,9 @@ namespace MinecraftClient case ParseMode.Main: switch (argName.ToLower()) { - case "login": Login = argValue; break; + case "login": login = argValue; Login = argValue; break; case "password": Password = argValue; break; - case "serverip": SetServerIP(argValue); break; + case "serverip": serverIP = argValue; SetServerIP(argValue); break; case "singlecommand": SingleCommand = argValue; break; case "language": Language = argValue; break; case "consoletitle": ConsoleTitle = argValue; break; @@ -224,6 +226,9 @@ namespace MinecraftClient Accounts[account_data[0].ToLower()] = new KeyValuePair(account_data[1], account_data[2]); } + + //Try user value against aliases after load + Settings.SetAccount(login); } break; @@ -250,6 +255,9 @@ namespace MinecraftClient //Restore current server info ServerIP = server_host_temp; ServerPort = server_port_temp; + + //Try server value against aliases after load + SetServerIP(serverIP); } break; From aff1c04f2de5f5867e2f7eb9999a5b112ebd57cc Mon Sep 17 00:00:00 2001 From: initsuj Date: Sun, 26 Jun 2016 15:29:21 -0700 Subject: [PATCH 2/2] Removed unneeded temp login variable. Made server alias check conditional --- MinecraftClient/Settings.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index 952daa4c..6714ef5a 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -132,8 +132,7 @@ namespace MinecraftClient { try { - string serverIP = ""; - string login = ""; + string serverAlias = ""; string[] Lines = File.ReadAllLines(settingsfile); ParseMode pMode = ParseMode.Default; foreach (string lineRAW in Lines) @@ -174,9 +173,9 @@ namespace MinecraftClient case ParseMode.Main: switch (argName.ToLower()) { - case "login": login = argValue; Login = argValue; break; + case "login": Login = argValue; break; case "password": Password = argValue; break; - case "serverip": serverIP = argValue; SetServerIP(argValue); break; + case "serverip": if(!SetServerIP(argValue)) serverAlias = argValue; ; break; case "singlecommand": SingleCommand = argValue; break; case "language": Language = argValue; break; case "consoletitle": ConsoleTitle = argValue; break; @@ -228,7 +227,7 @@ namespace MinecraftClient } //Try user value against aliases after load - Settings.SetAccount(login); + Settings.SetAccount(Login); } break; @@ -257,7 +256,7 @@ namespace MinecraftClient ServerPort = server_port_temp; //Try server value against aliases after load - SetServerIP(serverIP); + SetServerIP(serverAlias); } break;