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

Done receive message

Browse source
This commit is contained in:
ReinforceZwei 2023-01-10 20:43:54 +08:00
parent 657fc6117b
commit 08da49756f
2 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MinecraftClient/Protocol/Handlers/DataTypes.cs
View file

@ -240,6 +240,18 @@ namespace MinecraftClient.Protocol.Handlers
return ReadData(len, cache);
}
/// <summary>
/// Read a byte array with given length from a cache of bytes and remove it from the cache
/// </summary>
/// <param name="cache">Cache of bytes to read from</param>
/// <param name="length">Length of the bytes array</param>
/// <returns>The byte array</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
public byte[] ReadNextByteArray(Queue<byte> cache, int length)
{
return ReadData(length, cache);
}
/// <summary>
/// Reads a length-prefixed array of unsigned long integers and removes it from the cache
/// </summary>

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

@ -522,12 +522,14 @@ namespace MinecraftClient.Protocol.Handlers
}
else // 1.19.1 +
{
// 1.19.3+
if (protocolVersion >= MC_1_19_3_Version)
{
// Header section
Guid senderUUID = dataTypes.ReadNextUUID(packetData);
int index = dataTypes.ReadNextVarInt(packetData);
byte[]? messageSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData) : null;
// Signature is fixed size of 256 bytes
byte[]? messageSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData, 256) : null;
// Body
string message = dataTypes.ReadNextString(packetData);
@ -541,8 +543,8 @@ namespace MinecraftClient.Protocol.Handlers
for (int i = 0; i < totalPreviousMessages; i++)
{
int messageId = dataTypes.ReadNextVarInt(packetData);
if (messageId > 0)
previousMessageSignatures.Add(new Tuple<int, byte[]>(messageId, dataTypes.ReadNextByteArray(packetData)));
if (messageId == 0) // from botcraft implementation. Only read if id is 0. Byte array is fixed size of 256 bytes
previousMessageSignatures.Add(new Tuple<int, byte[]>(messageId, dataTypes.ReadNextByteArray(packetData, 256)));
}
// Other
@ -579,10 +581,13 @@ namespace MinecraftClient.Protocol.Handlers
}
}
// TODO
// TODO: Verify the message
ChatMessage chat = new(message, false, chatTypeId, senderUUID, unsignedChatContent, senderDisplayName, senderTeamName, timestamp, messageSignature, false);
handler.OnTextReceived(chat);
}
else
{
// 1.19.1 - 1.19.2
byte[]? precedingSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData) : null;
Guid senderUUID = dataTypes.ReadNextUUID(packetData);
byte[] headerSignature = dataTypes.ReadNextByteArray(packetData);
@ -2483,7 +2488,8 @@ namespace MinecraftClient.Protocol.Handlers
if (!isOnlineMode || playerKeyPair == null || !Config.Signature.LoginWithSecureProfile || !Config.Signature.SignChat)
{
fields.AddRange(dataTypes.GetLong(0)); // Salt: Long
fields.AddRange(dataTypes.GetVarInt(0)); // Signature Length: VarInt
if (protocolVersion < MC_1_19_3_Version)
fields.AddRange(dataTypes.GetVarInt(0)); // Signature Length: VarInt (1.19 - 1.19.2)
}
else
{
@ -2493,21 +2499,33 @@ namespace MinecraftClient.Protocol.Handlers
// Signature Length & Signature: (VarInt) and Byte Array
Guid uuid = handler.GetUserUuid();
byte[] sign = (protocolVersion >= MC_1_19_2_Version) ?
playerKeyPair.PrivateKey.SignMessage(message, uuid, timeNow, ref salt, acknowledgment!.lastSeen) :
playerKeyPair.PrivateKey.SignMessage(message, uuid, timeNow, ref salt);
byte[] sign;
if (protocolVersion < MC_1_19_2_Version) // 1.19.1 or lower
sign = playerKeyPair.PrivateKey.SignMessage(message, uuid, timeNow, ref salt);
else if (protocolVersion < MC_1_19_3_Version) // 1.19.2
sign = playerKeyPair.PrivateKey.SignMessage(message, uuid, timeNow, ref salt, acknowledgment!.lastSeen);
else // 1.19.3
sign = playerKeyPair.PrivateKey.SignMessage(message, uuid, timeNow, ref salt); // TODO?
if (protocolVersion < MC_1_19_3_Version)
fields.AddRange(dataTypes.GetVarInt(sign.Length));
else
fields.AddRange(dataTypes.GetBool(true));
fields.AddRange(sign);
}
// Signed Preview: Boolean
if (protocolVersion < MC_1_19_3_Version)
fields.AddRange(dataTypes.GetBool(false));
else
fields.AddRange(dataTypes.GetVarInt(1)); // message count
if (protocolVersion >= MC_1_19_2_Version)
{
// Message Acknowledgment
fields.AddRange(dataTypes.GetAcknowledgment(acknowledgment!, isOnlineMode && Config.Signature.LoginWithSecureProfile));
}
}
SendPacket(PacketTypesOut.ChatMessage, fields);
return true;