helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moved more stuff to async

Browse source
This commit is contained in:
Anon 2026-04-04 16:45:13 +02:00
parent 3a20f2e235
commit 297d7dbc30
8 changed files with 389 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -93,11 +93,30 @@ namespace MinecraftClient.Protocol
/// <returns>TRUE if ping was successful</returns>
public static bool GetServerInfo(string serverIP, ushort serverPort, ref int protocolversion,
ref ForgeInfo? forgeInfo)
{
(bool success, int resolvedProtocolVersion, ForgeInfo? resolvedForgeInfo) =
GetServerInfoAsync(serverIP, serverPort, protocolversion).GetAwaiter().GetResult();
if (!success)
return false;
if (protocolversion != 0 && protocolversion != resolvedProtocolVersion)
ConsoleIO.WriteLineFormatted("§8" + Translations.error_version_different, acceptnewlines: true);
if (protocolversion == 0 && resolvedProtocolVersion <= 1)
ConsoleIO.WriteLineFormatted("§8" + Translations.error_no_version_report, acceptnewlines: true);
if (protocolversion == 0)
protocolversion = resolvedProtocolVersion;
forgeInfo = resolvedForgeInfo;
return true;
}
public static async Task<(bool Success, int ProtocolVersion, ForgeInfo? ForgeInfo)> GetServerInfoAsync(string serverIP, ushort serverPort, int protocolversion)
{
bool success = false;
int protocolversionTmp = 0;
ForgeInfo? forgeInfoTmp = null;
if (AutoTimeout.Perform(() =>
if (await AutoTimeout.PerformAsync(() =>
{
try
{
@ -120,19 +139,15 @@ namespace MinecraftClient.Protocol
? 10
: 30)))
{
if (protocolversion != 0 && protocolversion != protocolversionTmp)
ConsoleIO.WriteLineFormatted("§8" + Translations.error_version_different, acceptnewlines: true);
if (protocolversion == 0 && protocolversionTmp <= 1)
ConsoleIO.WriteLineFormatted("§8" + Translations.error_no_version_report, acceptnewlines: true);
if (protocolversion == 0)
protocolversion = protocolversionTmp;
forgeInfo = forgeInfoTmp;
return success;
return (success, protocolversion, forgeInfoTmp);
}
else
{
ConsoleIO.WriteLineFormatted("§8" + Translations.error_connection_timeout, acceptnewlines: true);
return false;
return (false, protocolversion, forgeInfoTmp);
}
}