diff --git a/MinecraftClient/Bots.cs b/MinecraftClient/Bots.cs
index ca3b34c75d..1f4694f54d 100644
--- a/MinecraftClient/Bots.cs
+++ b/MinecraftClient/Bots.cs
@@ -289,7 +289,7 @@ public override void Update()
count++;
if (count == timeping)
{
- SendText("/ping");
+ SendText(Settings.AntiAFK_Text);
count = 0;
}
}
diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj
index aba910f0ae..bb53a035b2 100644
--- a/MinecraftClient/MinecraftClient.csproj
+++ b/MinecraftClient/MinecraftClient.csproj
@@ -13,8 +13,9 @@
v4.0
Client
512
+ false
publish\
- true
+ false
Disk
false
Foreground
@@ -23,10 +24,11 @@
false
false
true
- 0
+ true
+ 1
1.0.0.%2a
- false
false
+ true
true
@@ -59,6 +61,24 @@
MinecraftClient.Program
+
+ A031397043FB37471161CDFFE0D48E014EF30582
+
+
+ MinecraftClient_TemporaryKey.pfx
+
+
+ false
+
+
+
+ LocalIntranet
+
+
+
+
+ true
+
False
diff --git a/MinecraftClient/MinecraftClient.csproj.user b/MinecraftClient/MinecraftClient.csproj.user
index c0a75d71c8..c9158862ff 100644
--- a/MinecraftClient/MinecraftClient.csproj.user
+++ b/MinecraftClient/MinecraftClient.csproj.user
@@ -4,7 +4,7 @@
TestBot - localhost
- publish\
+ publish\|C:\Users\Robert\Desktop\
diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs
index 29fa2482d6..c5cafe65a7 100644
--- a/MinecraftClient/Program.cs
+++ b/MinecraftClient/Program.cs
@@ -244,12 +244,15 @@ private static void InitializeClient()
{
Console.WriteLine("Cannot connect to the server : This version is not supported !");
ReadLineReconnect();
+ Console.WriteLine("Waiting " + Settings.Retry_Delay + " seconds before reconnecting...");
+ System.Threading.Thread.Sleep(Settings.Retry_Delay * 1000); Restart();
}
}
else
{
Console.WriteLine("Failed to ping this IP.");
- ReadLineReconnect();
+ Console.WriteLine("Waiting " + Settings.Retry_Delay + " seconds before reconnecting...");
+ System.Threading.Thread.Sleep(Settings.Retry_Delay * 1000); Restart();
}
}
else
@@ -266,7 +269,9 @@ private static void InitializeClient()
case MinecraftCom.LoginResult.Error: Console.WriteLine("Network error."); break;
}
while (Console.KeyAvailable) { Console.ReadKey(false); }
- if (Settings.SingleCommand == "") { ReadLineReconnect(); }
+ if (Settings.SingleCommand == "") { Console.WriteLine("Waiting " + Settings.Retry_Delay + " seconds before reconnecting..."); }
+ {System.Threading.Thread.Sleep(Settings.Retry_Delay * 1000); Restart();
+ }
}
}
diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index e3b76c3cb7..06f148904b 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -26,10 +26,12 @@ public static class Settings
public static string TranslationsFile_FromMCDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\.minecraft\assets\lang\en_US.lang";
public static string TranslationsFile = "translations.lang";
public static string Bots_OwnersFile = "bot-owners.txt";
+ public static int Retry_Delay = 10;
//AntiAFK Settings
public static bool AntiAFK_Enabled = false;
public static int AntiAFK_Delay = 600;
+ public static string AntiAFK_Text = "/ping";
//Hangman Settings
public static bool Hangman_Enabled = false;
@@ -116,6 +118,7 @@ public static void LoadSettings(string settingsfile)
case "login": Login = argValue; break;
case "password": Password = argValue; break;
case "serverip": ServerIP = argValue; break;
+ case "retry_delay": Retry_Delay = str2int(argValue); break;
case "singlecommand": SingleCommand = argValue; break;
case "translationsfile": TranslationsFile = argValue; break;
case "botownersfile": Bots_OwnersFile = argValue; break;
@@ -137,6 +140,7 @@ public static void LoadSettings(string settingsfile)
{
case "enabled": AntiAFK_Enabled = str2bool(argValue); break;
case "delay": AntiAFK_Delay = str2int(argValue); break;
+ case "text": AntiAFK_Text = argValue; break;
}
break;
@@ -194,7 +198,7 @@ public static void LoadSettings(string settingsfile)
public static void WriteDefaultSettings(string settingsfile)
{
- System.IO.File.WriteAllText(settingsfile, "#Minecraft Console Client v" + Program.Version + "\r\n#Startup Config File\r\n\r\n[Main]\r\n\r\n#General settings\r\n#leave blank = prompt user on startup\r\n#Use \"-\" as password for offline mode\r\n\r\nlogin=\r\npassword=\r\nserverip=\r\n\r\n#Advanced settings\r\n\r\ntranslationsfile=translations.lang\r\nbotownersfile=bot-owners.txt\r\nconsoletitle=Minecraft Console Client\r\n\r\n#Bot Settings\r\n\r\n[Alerts]\r\nenabled=false\r\nalertsfile=alerts.txt\r\nexcludesfile=alerts-exclude.txt\r\n\r\n[AntiAFK]\r\nenabled=false\r\ndelay=600 #10 = 1s\r\n\r\n[AutoRelog]\r\nenabled=false\r\ndelay=10\r\nretries=3 #-1 = unlimited\r\nkickmessagesfile=kickmessages.txt\r\n\r\n[ChatLog]\r\nenabled=false\r\ntimestamps=true\r\nfilter=messages\r\nlogfile=chatlog.txt\r\n\r\n[Hangman]\r\nenabled=false\r\nenglish=true\r\nwordsfile=hangman-en.txt\r\nfichiermots=hangman-fr.txt\r\n\r\n[Scripting]\r\nenabled=false\r\nscriptfile=testscript.txt\r\n", Encoding.UTF8);
+ System.IO.File.WriteAllText(settingsfile, "#Minecraft Console Client v" + Program.Version + "\r\n#Startup Config File\r\n\r\n[Main]\r\n\r\n#General settings\r\n#leave blank = prompt user on startup\r\n#Use \"-\" as password for offline mode\r\n\r\nlogin=\r\npassword=\r\nserverip=\r\n\r\n#Advanced settings\r\n\r\ntranslationsfile=translations.lang\r\nbotownersfile=bot-owners.txt\r\nconsoletitle=Minecraft Console Client\r\nRetry_Delay=10 #Time to wait after login failure to retry in seconds\r\n\r\n#Bot Settings\r\n\r\n[Alerts]\r\nenabled=false\r\nalertsfile=alerts.txt\r\nexcludesfile=alerts-exclude.txt\r\n\r\n[AntiAFK]\r\nenabled=false\r\ndelay=600 #10 = 1s\r\ntext=/ping\r\n\r\n[AutoRelog]\r\nenabled=false\r\ndelay=10\r\nretries=3 #-1 = unlimited\r\nkickmessagesfile=kickmessages.txt\r\n\r\n[ChatLog]\r\nenabled=false\r\ntimestamps=true\r\nfilter=messages\r\nlogfile=chatlog.txt\r\n\r\n[Hangman]\r\nenabled=false\r\nenglish=true\r\nwordsfile=hangman-en.txt\r\nfichiermots=hangman-fr.txt\r\n\r\n[Scripting]\r\nenabled=false\r\nscriptfile=testscript.txt\r\n", Encoding.UTF8);
}
public static int str2int(string str) { try { return Convert.ToInt32(str); } catch { return 0; } }