From bdcf3e5aa28ba90c24c3bf311f5cbb872593911f Mon Sep 17 00:00:00 2001 From: ReinforceZwei <39955851+ReinforceZwei@users.noreply.github.com> Date: Fri, 10 Dec 2021 22:15:00 +0800 Subject: [PATCH] Update version to 1.18.1 (#1845) --- MinecraftClient/Program.cs | 2 +- MinecraftClient/Protocol/Handlers/PacketType18Handler.cs | 2 +- MinecraftClient/Protocol/Handlers/Protocol18.cs | 6 +++--- MinecraftClient/Protocol/ProtocolHandler.cs | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 2451ac53..cbeec26d 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -32,7 +32,7 @@ namespace MinecraftClient public const string Version = MCHighestVersion; public const string MCLowestVersion = "1.4.6"; - public const string MCHighestVersion = "1.18"; + public const string MCHighestVersion = "1.18.1"; public static readonly string BuildInfo = null; private static Thread offlinePrompt = null; diff --git a/MinecraftClient/Protocol/Handlers/PacketType18Handler.cs b/MinecraftClient/Protocol/Handlers/PacketType18Handler.cs index d9d51b53..bc675720 100644 --- a/MinecraftClient/Protocol/Handlers/PacketType18Handler.cs +++ b/MinecraftClient/Protocol/Handlers/PacketType18Handler.cs @@ -51,7 +51,7 @@ namespace MinecraftClient.Protocol.Handlers public PacketTypePalette GetTypeHandler(int protocol) { PacketTypePalette p; - if (protocol > Protocol18Handler.MC118Version) + if (protocol > Protocol18Handler.MC1181Version) throw new NotImplementedException(Translations.Get("exception.palette.packet")); if (protocol <= Protocol18Handler.MC18Version) p = new PacketPalette17(); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 21c25224..8ead50ae 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -52,7 +52,7 @@ namespace MinecraftClient.Protocol.Handlers internal const int MC1165Version = 754; internal const int MC117Version = 755; internal const int MC1171Version = 756; - internal const int MC118Version = 757; + internal const int MC1181Version = 757; private int compression_treshold = 0; private bool autocomplete_received = false; @@ -326,7 +326,7 @@ namespace MinecraftClient.Protocol.Handlers dataTypes.ReadNextString(packetData); // Level Type - 1.15 and below if (protocolversion >= MC114Version) dataTypes.ReadNextVarInt(packetData); // View distance - 1.14 and above - if (protocolversion >= MC118Version) + if (protocolversion >= MC1181Version) dataTypes.ReadNextVarInt(packetData); // Simulation Distance - 1.18 and above if (protocolversion >= MC18Version) dataTypes.ReadNextBool(packetData); // Reduced debug info - 1.8 and above @@ -1613,7 +1613,7 @@ namespace MinecraftClient.Protocol.Handlers fields.AddRange(dataTypes.GetVarInt(mainHand)); if (protocolversion >= MC117Version) fields.Add(0); // Enables text filtering. Always false - if (protocolversion >= MC118Version) + if (protocolversion >= MC1181Version) fields.Add(1); // 1.18 and above - Allow server listings SendPacket(PacketTypesOut.ClientSettings, fields); } diff --git a/MinecraftClient/Protocol/ProtocolHandler.cs b/MinecraftClient/Protocol/ProtocolHandler.cs index 572832ec..830960ff 100644 --- a/MinecraftClient/Protocol/ProtocolHandler.cs +++ b/MinecraftClient/Protocol/ProtocolHandler.cs @@ -251,6 +251,7 @@ namespace MinecraftClient.Protocol case "1.17.1": return 756; case "1.18": + case "1.18.1": return 757; default: return 0; @@ -315,7 +316,7 @@ namespace MinecraftClient.Protocol case 754: return "1.16.5"; case 755: return "1.17"; case 756: return "1.17.1"; - case 757: return "1.18"; + case 757: return "1.18.1"; default: return "0.0"; } }