Skip to content

Merging changes from Indev for 1.7.1 release #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ORelio merged 22 commits into from
Jan 28, 2014
Merged

Merging changes from Indev for 1.7.1 release #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bca2a41
Support text pasting with Ctrl+V
ORelio Jan 11, 2014
7e8b750
Fix for chat translation rules
ORelio Jan 11, 2014
adba897
Fix for text coloration
ORelio Jan 11, 2014
afff1ef
Fix for respawning + /respawn command
ORelio Jan 12, 2014
baaf37f
Scripting bot : automatically find script file
ORelio Jan 12, 2014
f6de2e4
Removed "You are dead" ingame message
ORelio Jan 12, 2014
c826dd3
Automatically download en_GB.lang from Mojang
ORelio Jan 13, 2014
19c3fb9
Removed a check before reading data from server
ORelio Jan 13, 2014
bf87374
Show username in title
v1RuX Jan 16, 2014
3185b2d
Merge pull request #29 from v1RuX/Indev
ORelio Jan 16, 2014
b49850e
Default console title + add username after login
ORelio Jan 16, 2014
fa6aa10
Fixed username added several times with autorelog
ORelio Jan 16, 2014
ed30790
Add AntiAFK command setting (see pull request #18)
ORelio Jan 17, 2014
a627842
Username in window title using %username%
ORelio Jan 17, 2014
c6e4404
Use Minecraft 1.7.4's en_GB object from assets
ORelio Jan 17, 2014
07ef031
Allow to use both INI files and command-line args
ORelio Jan 17, 2014
7f65a5d
Change for vanilla whisper detection
ORelio Jan 18, 2014
6e6fa6a
Fix text encoding for GUI (BasicIO) mode
ORelio Jan 21, 2014
420c93a
Input GUI fix :D
Aragas Jan 21, 2014
31e9a8e
Merge pull request #31 from Aragas/Indev
ORelio Jan 21, 2014
d086347
Little optimization from dogwatch
ORelio Jan 22, 2014
86908c3
Change version number for 1.7.1 release
ORelio Jan 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions MinecraftClient/Bots.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ protected static bool isPrivateMessage(string text, ref string message, ref stri
try
{
//Detect vanilla /tell messages
//Someone whispers message
//Someone whispers to you: message
if (tmp.Length > 2 && tmp[1] == "whispers")
{
message = text.Substring(tmp[0].Length + 10);
message = text.Substring(tmp[0].Length + 18);
sender = tmp[0];
return isValidName(sender);
}
Expand Down Expand Up @@ -264,7 +264,7 @@ public override void GetText(string text)
}

/// <summary>
/// This bot sends a /ping command every 60 seconds in order to stay non-afk.
/// This bot sends a command every 60 seconds in order to stay non-afk.
/// </summary>

public class AntiAFK : ChatBot
Expand All @@ -289,7 +289,7 @@ public override void Update()
count++;
if (count == timeping)
{
SendText("/ping");
SendText(Settings.AntiAFK_Command);
count = 0;
}
}
Expand Down Expand Up @@ -875,14 +875,33 @@ public Scripting(string filename)

public override void Initialize()
{
// Loads the given file from the startup parameters
if (System.IO.File.Exists(file))
//Load the given file from the startup parameters
//Automatically look in subfolders and try to add ".txt" file extension
string[] files = new string[]
{
lines = System.IO.File.ReadAllLines(file); // Load the given bot text file (containing commands)
file,
file + ".txt",
"scripts\\" + file,
"scripts\\" + file + ".txt",
"config\\" + file,
"config\\" + file + ".txt",
};

bool file_found = false;

foreach (string possible_file in files)
{
if (System.IO.File.Exists(possible_file))
{
lines = System.IO.File.ReadAllLines(possible_file);
file_found = true;
break;
}
}
else

if (!file_found)
{
LogToConsole("File not found: " + file);
LogToConsole("File not found: '" + file + "'");
UnloadBot(); //No need to keep the bot active
}
}
Expand All @@ -898,9 +917,9 @@ public override void Update()
nextline++; //Move the cursor so that the next time the following line will be interpreted
sleepticks = sleepticks_interval; //Used to delay next command sending and prevent from beign kicked for spamming

if (instruction_line.Length > 0)
if (instruction_line.Length > 1)
{
if (!instruction_line.StartsWith("//") && !instruction_line.StartsWith("#"))
if (instruction_line[0] != '#' && instruction_line[0] != '/' && instruction_line[1] != '/')
{
string instruction_name = instruction_line.Split(' ')[0];
switch (instruction_name.ToLower())
Expand Down
85 changes: 64 additions & 21 deletions MinecraftClient/ChatParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static string ParseText(string json)
{
int cursorpos = 0;
JSONData jsonData = String2Data(json, ref cursorpos);
return JSONData2String(jsonData);
return JSONData2String(jsonData, "");
}

/// <summary>
Expand Down Expand Up @@ -96,14 +96,37 @@ private static void InitRules()
TranslationRules["commands.message.display.outgoing"] = "§7You whisper to %s: %s";

//Use translations from Minecraft assets if translation file is not found but a copy of the game is installed?
if (!System.IO.File.Exists(Settings.TranslationsFile) //Try en_US.lang
if (!System.IO.File.Exists(Settings.TranslationsFile) //Try en_GB.lang
&& System.IO.File.Exists(Settings.TranslationsFile_FromMCDir))
{ Settings.TranslationsFile = Settings.TranslationsFile_FromMCDir; }
if (!System.IO.File.Exists(Settings.TranslationsFile) //Still not found? try en_GB.lang
&& System.IO.File.Exists(Settings.TranslationsFile_FromMCDir_Alt))
{ Settings.TranslationsFile = Settings.TranslationsFile_FromMCDir_Alt; }
{
Settings.TranslationsFile = Settings.TranslationsFile_FromMCDir;
Console.ForegroundColor = ConsoleColor.DarkGray;
ConsoleIO.WriteLine("Using en_GB.lang from your Minecraft directory.");
Console.ForegroundColor = ConsoleColor.Gray;
}

//Still not found? try downloading en_GB from Mojang's servers?
if (!System.IO.File.Exists(Settings.TranslationsFile))
{
Console.ForegroundColor = ConsoleColor.DarkGray;
ConsoleIO.WriteLine("Downloading en_GB.lang from Mojang's servers...");
try
{
string assets_index = downloadString(Settings.TranslationsFile_Website_Index);
string[] tmp = assets_index.Split(new string[] { "lang/en_GB.lang" }, StringSplitOptions.None);
tmp = tmp[1].Split(new string[] { "hash\": \"" }, StringSplitOptions.None);
string hash = tmp[1].Split('"')[0]; //Translations file identifier on Mojang's servers
System.IO.File.WriteAllText(Settings.TranslationsFile, downloadString(Settings.TranslationsFile_Website_Download + '/' + hash.Substring(0, 2) + '/' + hash));
ConsoleIO.WriteLine("Done. File saved as \"" + Settings.TranslationsFile + '"');
}
catch
{
ConsoleIO.WriteLine("Failed to download the file.");
}
Console.ForegroundColor = ConsoleColor.Gray;
}

//Load an external dictionnary of translation rules
//Load the external dictionnary of translation rules or display an error message
if (System.IO.File.Exists(Settings.TranslationsFile))
{
string[] translations = System.IO.File.ReadAllLines(Settings.TranslationsFile);
Expand Down Expand Up @@ -281,54 +304,56 @@ private static JSONData String2Data(string toparse, ref int cursorpos)
/// Use a JSON Object to build the corresponding string
/// </summary>
/// <param name="data">JSON object to convert</param>
/// <param name="colorcode">Allow parent color code to affect child elements (set to "" for function init)</param>
/// <returns>returns the Minecraft-formatted string</returns>

private static string JSONData2String(JSONData data)
private static string JSONData2String(JSONData data, string colorcode)
{
string extra_result = "";
string colorcode = "";
switch (data.Type)
{
case JSONData.DataType.Object:
if (data.Properties.ContainsKey("color"))
{
colorcode = color2tag(JSONData2String(data.Properties["color"], ""));
}
if (data.Properties.ContainsKey("extra"))
{
JSONData[] extras = data.Properties["extra"].DataArray.ToArray();
foreach (JSONData item in extras)
extra_result = extra_result + JSONData2String(item) + "§r";
}
if (data.Properties.ContainsKey("color"))
{
colorcode = color2tag(JSONData2String(data.Properties["color"]));
extra_result = extra_result + JSONData2String(item, colorcode) + "§r";
}
if (data.Properties.ContainsKey("text"))
{
return extra_result + colorcode + JSONData2String(data.Properties["text"]) + colorcode;
return colorcode + JSONData2String(data.Properties["text"], colorcode) + extra_result;
}
else if (data.Properties.ContainsKey("translate"))
{
List<string> using_data = new List<string>();
if (data.Properties.ContainsKey("using"))
if (data.Properties.ContainsKey("using") && !data.Properties.ContainsKey("with"))
data.Properties["with"] = data.Properties["using"];
if (data.Properties.ContainsKey("with"))
{
JSONData[] array = data.Properties["using"].DataArray.ToArray();
JSONData[] array = data.Properties["with"].DataArray.ToArray();
for (int i = 0; i < array.Length; i++)
{
using_data.Add(JSONData2String(array[i]));
using_data.Add(JSONData2String(array[i], colorcode));
}
}
return extra_result + colorcode + TranslateString(JSONData2String(data.Properties["translate"]), using_data) + colorcode;
return colorcode + TranslateString(JSONData2String(data.Properties["translate"], ""), using_data) + extra_result;
}
else return extra_result;

case JSONData.DataType.Array:
string result = "";
foreach (JSONData item in data.DataArray)
{
result += JSONData2String(item);
result += JSONData2String(item, colorcode);
}
return result;

case JSONData.DataType.String:
return data.StringValue;
return colorcode + data.StringValue;
}

return "";
Expand All @@ -341,5 +366,23 @@ private static string JSONData2String(JSONData data)
/// <returns>True if hexadecimal</returns>

private static bool isHex(char c) { return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f')); }

/// <summary>
/// Do a HTTP request to get a webpage or text data from a server file
/// </summary>
/// <param name="url">URL of resource</param>
/// <returns>Returns resource data if success, otherwise a WebException is raised</returns>

private static string downloadString(string url)
{
System.Net.HttpWebRequest myRequest = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url);
myRequest.Method = "GET";
System.Net.WebResponse myResponse = myRequest.GetResponse();
System.IO.StreamReader sr = new System.IO.StreamReader(myResponse.GetResponseStream(), System.Text.Encoding.UTF8);
string result = sr.ReadToEnd();
sr.Close();
myResponse.Close();
return result;
}
}
}
Loading