helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store server IP and server port in distinct vars

Browse source 
- Change "replaceVars" to "expandVars" (more explicit)
- Store server IP and server port in distinct vars in Settings class
- Add setServerIP setter in Settings which automatically split a
host:port string
- Add %serverip% variable which use the new ServerPort setting
- Fix "text%incompletevarnameatstringend" strings
This commit is contained in:
ORelio 2014-06-13 16:50:55 +02:00
parent 068b87a11a
commit 283074bb63
5 changed files with 74 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MinecraftClient/Program.cs
View file

@ -59,7 +59,7 @@ namespace MinecraftClient
Settings.Password = args[1];
if (args.Length >= 3)
{
Settings.ServerIP = args[2];
Settings.setServerIP(args[2]);
//Single command?
if (args.Length >= 4)
@ -73,7 +73,7 @@ namespace MinecraftClient
if (Settings.ConsoleTitle != "")
{
Settings.Username = "New Window";
Console.Title = Settings.replaceVars(Settings.ConsoleTitle);
Console.Title = Settings.expandVars(Settings.ConsoleTitle);
}
//Asking the user to type in missing data such as Username and Password
@ -127,14 +127,14 @@ namespace MinecraftClient
{
if (Settings.ConsoleTitle != "")
{
Console.Title = Settings.replaceVars(Settings.ConsoleTitle);
Console.Title = Settings.expandVars(Settings.ConsoleTitle);
}
Console.WriteLine("Success. (session ID: " + sessionID + ')');
if (Settings.ServerIP == "")
{
Console.Write("Server IP : ");
Settings.ServerIP = Console.ReadLine();
Settings.setServerIP(Console.ReadLine());
}
//Get server version
@ -147,9 +147,9 @@ namespace MinecraftClient
//Start the main TCP client
if (Settings.SingleCommand != "")
{
Client = new McTcpClient(Settings.Username, UUID, sessionID, Settings.ServerIP, protocolversion, Settings.SingleCommand);
Client = new McTcpClient(Settings.Username, UUID, sessionID, Settings.ServerIP, Settings.ServerPort, protocolversion, Settings.SingleCommand);
}
else Client = new McTcpClient(Settings.Username, UUID, sessionID, protocolversion, Settings.ServerIP);
else Client = new McTcpClient(Settings.Username, UUID, sessionID, protocolversion, Settings.ServerIP, Settings.ServerPort);
}
catch (NotSupportedException)
{