diff --git a/MinecraftClient/ChatParser.cs b/MinecraftClient/ChatParser.cs index 6b285704..74ae9618 100644 --- a/MinecraftClient/ChatParser.cs +++ b/MinecraftClient/ChatParser.cs @@ -95,10 +95,13 @@ namespace MinecraftClient TranslationRules["commands.message.display.incoming"] = "§7%s whispers to you: %s"; TranslationRules["commands.message.display.outgoing"] = "§7You whisper to %s: %s"; - //Use translations from Minecraft assets if a copy of the game is installed? - if (!System.IO.File.Exists(Settings.TranslationsFile) + //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 && 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; } //Load an external dictionnary of translation rules if (System.IO.File.Exists(Settings.TranslationsFile)) @@ -123,7 +126,7 @@ namespace MinecraftClient else //No external dictionnary found. { Console.ForegroundColor = ConsoleColor.DarkGray; - ConsoleIO.WriteLine("MC 1.6+ warning: Translations file not found: \"" + Settings.TranslationsFile + "\"" + ConsoleIO.WriteLine("Translations file not found: \"" + Settings.TranslationsFile + "\"" + "\nYou can pick a translation file from .minecraft\\assets\\lang\\" + "\nSome messages won't be properly printed without this file."); Console.ForegroundColor = ConsoleColor.Gray; diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index e3b76c3c..f6a3284c 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -23,7 +23,8 @@ namespace MinecraftClient public static string SingleCommand = ""; //Other Settings - public static string TranslationsFile_FromMCDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\.minecraft\assets\lang\en_US.lang"; + public static string TranslationsFile_FromMCDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\.minecraft\assets\virtual\legacy\lang\en_US.lang"; + public static string TranslationsFile_FromMCDir_Alt = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\.minecraft\assets\virtual\legacy\lang\en_GB.lang"; public static string TranslationsFile = "translations.lang"; public static string Bots_OwnersFile = "bot-owners.txt";