From 61078e8402dc289cca0ace12933a688660d10b03 Mon Sep 17 00:00:00 2001 From: bibo38 Date: Fri, 2 Sep 2016 19:22:06 +0200 Subject: Added support for the Minecraft 1.10 protocol(#210) (#3348) * Added support for the Minecraft 1.10 protocol(#210) * Fixed the Clang compilation errors * Fixed wrong sound pitch value and fixed SendPlayerSpawn Metadata value. * Prefixed each enum item with the appropriate class name. --- src/Protocol/ProtocolRecognizer.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/Protocol/ProtocolRecognizer.cpp') diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 8b05ce768..ca0d05c51 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -9,6 +9,7 @@ #include "ProtocolRecognizer.h" #include "Protocol18x.h" #include "Protocol19x.h" +#include "Protocol110x.h" #include "Packetizer.h" #include "../ClientHandle.h" #include "../Root.h" @@ -47,11 +48,12 @@ AString cProtocolRecognizer::GetVersionTextFromInt(int a_ProtocolVersion) { switch (a_ProtocolVersion) { - case PROTO_VERSION_1_8_0: return "1.8"; - case PROTO_VERSION_1_9_0: return "1.9"; - case PROTO_VERSION_1_9_1: return "1.9.1"; - case PROTO_VERSION_1_9_2: return "1.9.2"; - case PROTO_VERSION_1_9_4: return "1.9.4"; + case PROTO_VERSION_1_8_0: return "1.8"; + case PROTO_VERSION_1_9_0: return "1.9"; + case PROTO_VERSION_1_9_1: return "1.9.1"; + case PROTO_VERSION_1_9_2: return "1.9.2"; + case PROTO_VERSION_1_9_4: return "1.9.4"; + case PROTO_VERSION_1_10_0: return "1.10"; } ASSERT(!"Unknown protocol version"); return Printf("Unknown protocol (%d)", a_ProtocolVersion); @@ -1047,6 +1049,11 @@ bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRema m_Protocol = new cProtocol194(m_Client, ServerAddress, ServerPort, NextState); return true; } + case PROTO_VERSION_1_10_0: + { + m_Protocol = new cProtocol1100(m_Client, ServerAddress, ServerPort, NextState); + return true; + } default: { LOGINFO("Client \"%s\" uses an unsupported protocol (lengthed, version %u (0x%x))", -- cgit v1.2.3