helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for MC 1.10.0

Browse source 
See #159
This commit is contained in:
ORelio 2016-06-09 21:10:45 +02:00
parent c6c0c0e3a7
commit d3a54e8caf
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -13,13 +13,14 @@ using MinecraftClient.Mapping;
namespace MinecraftClient.Protocol.Handlers namespace MinecraftClient.Protocol.Handlers
{ {
/// <summary> /// <summary>
/// Implementation for Minecraft 1.7.X, 1.8.X, 1.9.X Protocols /// Implementation for Minecraft 1.7.X, 1.8.X, 1.9.X, 1.10.X Protocols
/// </summary> /// </summary>
class Protocol18Handler : IMinecraftCom class Protocol18Handler : IMinecraftCom
{ {
private const int MC18Version = 47; private const int MC18Version = 47;
private const int MC19Version = 107; private const int MC19Version = 107;
private const int MC110Version = 210;
private int compression_treshold = 0; private int compression_treshold = 0;
private bool autocomplete_received = false; private bool autocomplete_received = false;
@ -555,8 +556,12 @@ namespace MinecraftClient.Protocol.Handlers
string url = readNextString(packetData); string url = readNextString(packetData);
string hash = readNextString(packetData); string hash = readNextString(packetData);
//Send back "accepted" and "successfully loaded" responses for plugins making use of resource pack mandatory //Send back "accepted" and "successfully loaded" responses for plugins making use of resource pack mandatory
SendPacket(protocolversion >= MC19Version ? 0x16 : 0x19, concatBytes(getVarInt(hash.Length), Encoding.UTF8.GetBytes(hash), getVarInt(3))); byte[] responseHeader = new byte[0];
SendPacket(protocolversion >= MC19Version ? 0x16 : 0x19, concatBytes(getVarInt(hash.Length), Encoding.UTF8.GetBytes(hash), getVarInt(0))); if (protocolversion < MC110Version) //MC 1.10 does not include resource pack hash in responses
responseHeader = concatBytes(getVarInt(hash.Length), Encoding.UTF8.GetBytes(hash));
int packResponsePid = protocolversion >= MC19Version ? 0x16 : 0x19; //ID changed in 1.9
SendPacket(packResponsePid, concatBytes(responseHeader, getVarInt(3))); //Accepted pack
SendPacket(packResponsePid, concatBytes(responseHeader, getVarInt(0))); //Successfully loaded
break; break;
default: default:
return false; //Ignored packet return false; //Ignored packet

4
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -71,7 +71,7 @@ namespace MinecraftClient.Protocol
int[] supportedVersions_Protocol16 = { 51, 60, 61, 72, 73, 74, 78 }; int[] supportedVersions_Protocol16 = { 51, 60, 61, 72, 73, 74, 78 };
if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1) if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1)
return new Protocol16Handler(Client, ProtocolVersion, Handler); return new Protocol16Handler(Client, ProtocolVersion, Handler);
int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110 }; int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210 };
if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1) if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1)
return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo); return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
throw new NotSupportedException("The protocol version no." + ProtocolVersion + " is not supported."); throw new NotSupportedException("The protocol version no." + ProtocolVersion + " is not supported.");
@ -134,6 +134,8 @@ namespace MinecraftClient.Protocol
case "1.9.3": case "1.9.3":
case "1.9.4": case "1.9.4":
return 110; return 110;
case "1.10.0":
return 210;
default: default:
return 0; return 0;
} }