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

Login Start, Encryption Reqest, Merchant Offers, Set Experience packets implemented.

Browse source
This commit is contained in:
Milutinke 2022-12-21 12:03:39 +01:00
parent 7a9bc7bd1d
commit d81a67762e
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -728,11 +728,17 @@ namespace MinecraftClient.Protocol.Handlers
{ {
Item inputItem1 = ReadNextItemSlot(cache, itemPalette)!; Item inputItem1 = ReadNextItemSlot(cache, itemPalette)!;
Item outputItem = ReadNextItemSlot(cache, itemPalette)!; Item outputItem = ReadNextItemSlot(cache, itemPalette)!;
Item? inputItem2 = null; Item? inputItem2 = null;
if (ReadNextBool(cache)) //check if villager has second item
{ if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
inputItem2 = ReadNextItemSlot(cache, itemPalette); inputItem2 = ReadNextItemSlot(cache, itemPalette);
else
{
if (ReadNextBool(cache)) //check if villager has second item
inputItem2 = ReadNextItemSlot(cache, itemPalette);
} }
bool tradeDisabled = ReadNextBool(cache); bool tradeDisabled = ReadNextBool(cache);
int numberOfTradeUses = ReadNextInt(cache); int numberOfTradeUses = ReadNextInt(cache);
int maximumNumberOfTradeUses = ReadNextInt(cache); int maximumNumberOfTradeUses = ReadNextInt(cache);

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

@ -1712,8 +1712,19 @@ namespace MinecraftClient.Protocol.Handlers
break; break;
case PacketTypesIn.SetExperience: case PacketTypesIn.SetExperience:
float experiencebar = dataTypes.ReadNextFloat(packetData); float experiencebar = dataTypes.ReadNextFloat(packetData);
int level = dataTypes.ReadNextVarInt(packetData); int totalexperience, level;
int totalexperience = dataTypes.ReadNextVarInt(packetData);
if (protocolVersion >= MC_1_19_3_Version)
{
totalexperience = dataTypes.ReadNextVarInt(packetData);
level = dataTypes.ReadNextVarInt(packetData);
}
else
{
level = dataTypes.ReadNextVarInt(packetData);
totalexperience = dataTypes.ReadNextVarInt(packetData);
}
handler.OnSetExperience(experiencebar, level, totalexperience); handler.OnSetExperience(experiencebar, level, totalexperience);
break; break;
case PacketTypesIn.Explosion: case PacketTypesIn.Explosion:
@ -1911,7 +1922,9 @@ namespace MinecraftClient.Protocol.Handlers
List<byte> fullLoginPacket = new(); List<byte> fullLoginPacket = new();
fullLoginPacket.AddRange(dataTypes.GetString(handler.GetUsername())); // Username fullLoginPacket.AddRange(dataTypes.GetString(handler.GetUsername())); // Username
if (protocolVersion >= MC_1_19_Version)
// 1.19 - 1.19.2
if (protocolVersion >= MC_1_19_Version && protocolVersion < MC_1_19_3_Version)
{ {
if (playerKeyPair == null) if (playerKeyPair == null)
fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data
@ -1929,6 +1942,7 @@ namespace MinecraftClient.Protocol.Handlers
if (protocolVersion >= MC_1_19_2_Version) if (protocolVersion >= MC_1_19_2_Version)
{ {
Guid uuid = handler.GetUserUuid(); Guid uuid = handler.GetUserUuid();
if (uuid == Guid.Empty) if (uuid == Guid.Empty)
fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has UUID fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has UUID
else else
@ -1937,6 +1951,7 @@ namespace MinecraftClient.Protocol.Handlers
fullLoginPacket.AddRange(dataTypes.GetUUID(uuid)); // UUID fullLoginPacket.AddRange(dataTypes.GetUUID(uuid)); // UUID
} }
} }
SendPacket(0x00, fullLoginPacket); SendPacket(0x00, fullLoginPacket);
while (true) while (true)
@ -2018,7 +2033,9 @@ namespace MinecraftClient.Protocol.Handlers
// Encryption Response packet // Encryption Response packet
List<byte> encryptionResponse = new(); List<byte> encryptionResponse = new();
encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret
if (protocolVersion >= Protocol18Handler.MC_1_19_Version)
// 1.19 - 1.19.2
if (protocolVersion >= MC_1_19_Version && protocolVersion < MC_1_19_3_Version)
{ {
if (playerKeyPair == null) if (playerKeyPair == null)
{ {
@ -2039,6 +2056,7 @@ namespace MinecraftClient.Protocol.Handlers
{ {
encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token
} }
SendPacket(0x01, encryptionResponse); SendPacket(0x01, encryptionResponse);
//Start client-side encryption //Start client-side encryption