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 1.17 (#1630)

Browse source 
* fix caps

* implement 1.17 without terrain

* properly switch order of Tracking Position and Locked for 1.17

* Update MinecraftClient/Protocol/Handlers/PacketTypesIn.cs

Co-authored-by: ReinforceZwei <39955851+ReinforceZwei@users.noreply.github.com>

Co-authored-by: ReinforceZwei <39955851+ReinforceZwei@users.noreply.github.com>
This commit is contained in:
alex-huff 2021-06-11 08:45:33 -05:00 • committed by GitHub
parent 83e61f04b7
commit 8bd221c248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 229 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ namespace MinecraftClient.Protocol.Handlers
internal const int MC1162Version = 751;
internal const int MC1163Version = 753;
internal const int MC1165Version = 754;
internal const int MC117Version = 755;
private int compression_treshold = 0;
private bool autocomplete_received = false;
@ -299,6 +300,7 @@ namespace MinecraftClient.Protocol.Handlers
else
dataTypes.ReadNextString(packetData);
// TODO handle dimensions for 1.16+, needed for terrain handling
// TODO this data give min and max y which will be needed for chunk collumn handling
this.currentDimension = 0;
}
else if (protocolversion >= MC191Version)
@ -405,8 +407,10 @@ namespace MinecraftClient.Protocol.Handlers
// Teleport confirm packet
SendPacket(PacketTypesOut.TeleportConfirm, dataTypes.GetVarInt(teleportID));
}
if (protocolversion >= MC117Version) dataTypes.ReadNextBool(packetData);
break;
case PacketTypesIn.ChunkData:
case PacketTypesIn.ChunkData: //TODO implement for 1.17, bit mask is not limited to 0-15 anymore
if (handler.GetTerrainEnabled())
{
int chunkX = dataTypes.ReadNextInt(packetData);
@ -458,12 +462,16 @@ namespace MinecraftClient.Protocol.Handlers
case PacketTypesIn.MapData:
int mapid = dataTypes.ReadNextVarInt(packetData);
byte scale = dataTypes.ReadNextByte(packetData);
bool trackingposition = dataTypes.ReadNextBool(packetData);
bool trackingposition = protocolversion >= MC117Version ? false : dataTypes.ReadNextBool(packetData);
bool locked = false;
if (protocolversion >= MC114Version)
{
locked = dataTypes.ReadNextBool(packetData);
}
if (protocolversion >= MC117Version)
{
trackingposition = dataTypes.ReadNextBool(packetData);
}
int iconcount = dataTypes.ReadNextVarInt(packetData);
handler.OnMapData(mapid, scale, trackingposition, locked, iconcount);
break;
@ -841,6 +849,8 @@ namespace MinecraftClient.Protocol.Handlers
case PacketTypesIn.ResourcePackSend:
string url = dataTypes.ReadNextString(packetData);
string hash = dataTypes.ReadNextString(packetData);
bool forced = dataTypes.ReadNextBool(packetData);
String forcedMessage = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
// Some server plugins may send invalid resource packs to probe the client and we need to ignore them (issue #1056)
if (hash.Length != 40)
break;
@ -935,6 +945,12 @@ namespace MinecraftClient.Protocol.Handlers
handler.OnDestroyEntities(EntitiesList);
}
break;
case PacketTypesIn.DestroyEntity:
if (handler.GetEntityHandlingEnabled())
{
handler.OnDestroyEntities(new [] { dataTypes.ReadNextVarInt(packetData) });
}
break;
case PacketTypesIn.EntityPosition:
if (handler.GetEntityHandlingEnabled())
{
@ -969,7 +985,7 @@ namespace MinecraftClient.Protocol.Handlers
if (handler.GetEntityHandlingEnabled())
{
int EntityID = dataTypes.ReadNextVarInt(packetData);
int NumberOfProperties = dataTypes.ReadNextInt(packetData);
int NumberOfProperties = protocolversion >= MC117Version ? dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextInt(packetData);
Dictionary<string, Double> keys = new Dictionary<string, Double>();
for (int i = 0; i < NumberOfProperties; i++)
{
@ -1056,7 +1072,9 @@ namespace MinecraftClient.Protocol.Handlers
case PacketTypesIn.Explosion:
Location explosionLocation = new Location(dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData));
float explosionStrength = dataTypes.ReadNextFloat(packetData);
int explosionBlockCount = dataTypes.ReadNextInt(packetData);
int explosionBlockCount = protocolversion >= MC117Version
? dataTypes.ReadNextVarInt(packetData)
: dataTypes.ReadNextInt(packetData);
// Ignoring additional fields (records, pushback)
handler.OnExplosion(explosionLocation, explosionStrength, explosionBlockCount);
break;
@ -1565,6 +1583,8 @@ namespace MinecraftClient.Protocol.Handlers
else fields.Add(skinParts);
if (protocolversion >= MC19Version)
fields.AddRange(dataTypes.GetVarInt(mainHand));
if (protocolversion >= MC117Version)
fields.Add(1);
SendPacket(PacketTypesOut.ClientSettings, fields);
}
catch (SocketException) { }
@ -1850,14 +1870,11 @@ namespace MinecraftClient.Protocol.Handlers
packet.Add((byte)windowId);
packet.AddRange(dataTypes.GetShort((short)slotId));
packet.Add(button);
packet.AddRange(dataTypes.GetShort(actionNumber));
if (protocolversion < MC117Version) packet.AddRange(dataTypes.GetShort(actionNumber));
if (protocolversion >= MC19Version)
packet.AddRange(dataTypes.GetVarInt(mode));
else packet.Add(mode);
packet.AddRange(dataTypes.GetItemSlot(item, itemPalette));
SendPacket(PacketTypesOut.ClickWindow, packet);
return true;
}