mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Server list file support
Works the same way as account list feature Idea from TNT-UP
This commit is contained in:
ORelio
parent
608eb8059c
commit
f88fcea59b
3 changed files with 59 additions and 6 deletions
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
public class Connect : Command
|
||||
{
|
||||
public override string CMDName { get { return "connect"; } }
|
||||
public override string CMDDesc { get { return "connect <serverip> [account]: connect to the specified server."; } }
|
||||
public override string CMDDesc { get { return "connect <server> [account]: connect to the specified server."; } }
|
||||
|
||||
public override string Run(McTcpClient handler, string command)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ namespace MinecraftClient
|
|||
//Custom app variables and Minecraft accounts
|
||||
private static Dictionary<string, string> AppVars = new Dictionary<string, string>();
|
||||
private static Dictionary<string, KeyValuePair<string, string>> Accounts = new Dictionary<string, KeyValuePair<string, string>>();
|
||||
private static Dictionary<string, KeyValuePair<string, short>> Servers = new Dictionary<string, KeyValuePair<string, short>>();
|
||||
|
||||
private enum ParseMode { Default, Main, AppVars, Proxy, AntiAFK, Hangman, Alerts, ChatLog, AutoRelog, ScriptScheduler, RemoteControl };
|
||||
|
||||
|
|
@ -145,11 +146,13 @@ namespace MinecraftClient
|
|||
case "timestamps": chatTimeStamps = str2bool(argValue); break;
|
||||
case "exitonfailure": exitOnFailure = str2bool(argValue); break;
|
||||
case "mcversion": ServerVersion = argValue; break;
|
||||
|
||||
case "botowners":
|
||||
Bots_Owners.Clear();
|
||||
foreach (string name in argValue.ToLower().Replace(" ", "").Split(','))
|
||||
Bots_Owners.Add(name);
|
||||
break;
|
||||
|
||||
case "internalcmdchar":
|
||||
switch (argValue.ToLower())
|
||||
{
|
||||
|
|
@ -158,7 +161,8 @@ namespace MinecraftClient
|
|||
case "backslash": internalCmdChar = '\\'; break;
|
||||
}
|
||||
break;
|
||||
case "accountsfile":
|
||||
|
||||
case "accountlist":
|
||||
if (File.Exists(argValue))
|
||||
{
|
||||
foreach (string account_line in File.ReadAllLines(argValue))
|
||||
|
|
@ -171,6 +175,31 @@ namespace MinecraftClient
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case "serverlist":
|
||||
if (File.Exists(argValue))
|
||||
{
|
||||
//Backup current server info
|
||||
string server_host_temp = ServerIP;
|
||||
short server_port_temp = ServerPort;
|
||||
|
||||
foreach (string server_line in File.ReadAllLines(argValue))
|
||||
{
|
||||
//Each line contains server data: 'Alias,Host:Port'
|
||||
string[] server_data = server_line.Split('#')[0].Trim().Split(',');
|
||||
if (server_data.Length == 2
|
||||
&& server_data[0] != "localhost"
|
||||
&& !server_data[0].Contains('.')
|
||||
&& setServerIP(server_data[1]))
|
||||
Servers[server_data[0].ToLower()]
|
||||
= new KeyValuePair<string, short>(ServerIP, ServerPort);
|
||||
}
|
||||
|
||||
//Restore current server info
|
||||
ServerIP = server_host_temp;
|
||||
ServerPort = server_port_temp;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -296,7 +325,8 @@ namespace MinecraftClient
|
|||
+ "consoletitle=%username% - Minecraft Console Client\r\n"
|
||||
+ "internalcmdchar=slash #use 'none', 'slash' or 'backslash'\r\n"
|
||||
+ "mcversion=auto #use 'auto' or '1.X.X' values\r\n"
|
||||
+ "accountsfile=accounts.txt\r\n"
|
||||
+ "accountlist=accounts.txt\r\n"
|
||||
+ "serverlist=servers.txt\r\n"
|
||||
+ "exitonfailure=false\r\n"
|
||||
+ "timestamps=false\r\n"
|
||||
+ "\r\n"
|
||||
|
|
@ -373,13 +403,13 @@ namespace MinecraftClient
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Parse a "serverip:port" couple and store the values in ServerIP and ServerPort variables
|
||||
/// Load server information in ServerIP and ServerPort variables from a "serverip:port" couple or server alias
|
||||
/// </summary>
|
||||
/// <returns>True if the server IP was valid and loaded, false otherwise</returns>
|
||||
|
||||
public static bool setServerIP(string serverIP)
|
||||
public static bool setServerIP(string server)
|
||||
{
|
||||
string[] sip = serverIP.Split(':');
|
||||
string[] sip = server.Split(':');
|
||||
string host = sip[0];
|
||||
short port = 25565;
|
||||
|
||||
|
|
@ -398,6 +428,11 @@ namespace MinecraftClient
|
|||
ServerPort = port;
|
||||
return true;
|
||||
}
|
||||
else if (Servers.ContainsKey(server))
|
||||
{
|
||||
ServerIP = Servers[server].Key;
|
||||
ServerPort = Servers[server].Value;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
18
MinecraftClient/config/sample-servers.txt
Normal file
18
MinecraftClient/config/sample-servers.txt
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Minecraft Console Client
|
||||
# Server list file
|
||||
|
||||
# Put server data as comma separated values
|
||||
# Values are: Alias,ServerIP:Port
|
||||
# Aliases cannot contains dots or spaces
|
||||
# The name "localhost" cannot be used as an alias
|
||||
# It allows an easier and faster server switching
|
||||
# with short aliases instead of full server IP
|
||||
# It also adds a bit of privacy for remote control
|
||||
|
||||
# Usage examples:
|
||||
# /tell <mybot> connect Server1
|
||||
# /connect Server2
|
||||
|
||||
Server1,localhost
|
||||
Server2,mc.awesomeserver.com:25567
|
||||
Server3,192.168.1.27:1348 # Example of LAN server
|
||||
Loading…
Add table
Add a link
Reference in a new issue