diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index fcade4a7..6d89f219 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -314,7 +314,7 @@ namespace MinecraftClient client.ReceiveBufferSize = 1024 * 1024; client.ReceiveTimeout = Config.Main.Advanced.TcpTimeout * 1000; // Default: 30 seconds handler = Protocol.ProtocolHandler.GetProtocolHandler(client, protocolversion, forgeInfo, this); - if (forgeInfo is not null) + if (forgeInfo is not null && forgeInfo.Version == FMLVersion.FML) ChatParser.LoadForgeModTranslations(forgeInfo.Mods.Select(static mod => mod.ModID)); Log.Info(Translations.mcc_version_supported); diff --git a/MinecraftClient/Protocol/Message/ChatParser.cs b/MinecraftClient/Protocol/Message/ChatParser.cs index 71091c8a..e6da1e08 100644 --- a/MinecraftClient/Protocol/Message/ChatParser.cs +++ b/MinecraftClient/Protocol/Message/ChatParser.cs @@ -511,8 +511,7 @@ namespace MinecraftClient.Protocol.Message foreach (string modDirectory in GetForgeModTranslationDirectories()) { - foreach (string modJarPath in Directory.EnumerateFiles(modDirectory, "*.jar") - .OrderBy(static path => path, StringComparer.OrdinalIgnoreCase)) + foreach (string modJarPath in Directory.EnumerateFiles(modDirectory, "*.jar")) { try { @@ -1005,7 +1004,8 @@ namespace MinecraftClient.Protocol.Message private static string ComputeFileSha256(string filePath) { using FileStream stream = File.OpenRead(filePath); - return Convert.ToHexString(SHA256.HashData(stream)).ToLowerInvariant(); + using SHA256 sha256 = SHA256.Create(); + return Convert.ToHexString(sha256.ComputeHash(stream)).ToLowerInvariant(); } private static bool TryLoadCachedForgeModTranslations(string cacheFilePath, string sourceHash,