helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bugfix: Protocol gap fixes (Entity Effect Duration, Villager Trading on 1.20.6+, Enchanting effected)

Browse source 
bugfix: Protocol gap fixes (Entity Effect Duration, Villager Trading on 1.20.6+, Enchanting effected)
This commit is contained in:
Anon 2026-06-12 01:14:28 +02:00 • committed by GitHub
commit 37cf19c175
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 64 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1396,12 +1396,14 @@ namespace MinecraftClient.Protocol.Handlers
/// <returns>The item that was read or NULL for an empty slot</returns>
public VillagerTrade ReadNextTrade(Queue<byte> cache, ItemPalette itemPalette)
{
Item inputItem1 = ReadNextItemSlot(cache, itemPalette)!;
Item inputItem1 = ReadNextTradeCost(cache, itemPalette)!;
Item outputItem = ReadNextItemSlot(cache, itemPalette)!;
Item? inputItem2 = null;
if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
if (protocolversion >= Protocol18Handler.MC_1_20_6_Version)
inputItem2 = ReadNextOptionalTradeCost(cache, itemPalette);
else if (protocolversion >= Protocol18Handler.MC_1_19_3_Version)
inputItem2 = ReadNextItemSlot(cache, itemPalette);
else
{
@ -1420,6 +1422,40 @@ namespace MinecraftClient.Protocol.Handlers
maximumNumberOfTradeUses, xp, specialPrice, priceMultiplier, demand);
}
private Item? ReadNextTradeCost(Queue<byte> cache, ItemPalette itemPalette)
{
if (protocolversion < Protocol18Handler.MC_1_20_6_Version)
return ReadNextItemSlot(cache, itemPalette);
var itemId = ReadNextVarInt(cache);
var itemCount = ReadNextVarInt(cache);
var item = new Item(itemPalette.FromId(itemId), itemCount, null);
var componentCount = ReadNextVarInt(cache);
if (componentCount > 0)
{
var structuredComponentHandler = new StructuredComponentsHandler(protocolversion, this, itemPalette);
var components = new List<StructuredComponent>(componentCount);
for (var i = 0; i < componentCount; i++)
{
var componentTypeId = ReadNextVarInt(cache);
components.Add(structuredComponentHandler.Parse(componentTypeId, cache));
}
item.Components = components;
}
return item;
}
private Item? ReadNextOptionalTradeCost(Queue<byte> cache, ItemPalette itemPalette)
{
if (!ReadNextBool(cache))
return null;
return ReadNextTradeCost(cache, itemPalette);
}
public string ReadNextChat(Queue<byte> cache)
{
if (protocolversion >= Protocol18Handler.MC_1_20_4_Version)

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

@ -2104,12 +2104,9 @@ namespace MinecraftClient.Protocol.Handlers
break;
case PacketTypesIn.ChangeGameState:
if (protocolVersion >= MC_1_15_2_Version)
{
var reason = dataTypes.ReadNextByte(packetData);
var state = dataTypes.ReadNextFloat(packetData);
handler.OnGameEvent(reason, state);
}
var reason = dataTypes.ReadNextByte(packetData);
var state = dataTypes.ReadNextFloat(packetData);
handler.OnGameEvent(reason, state);
break;
case PacketTypesIn.PlayerInfo:
@ -2338,6 +2335,11 @@ namespace MinecraftClient.Protocol.Handlers
}
break;
case PacketTypesIn.PlayerListHeaderAndFooter:
handler.OnTabListHeaderAndFooter(
dataTypes.ReadNextChat(packetData),
dataTypes.ReadNextChat(packetData));
break;
case PacketTypesIn.TabComplete:
var oldTransactionId = autocomplete_transaction_id;
if (protocolVersion >= MC_1_13_Version)
@ -2605,7 +2607,9 @@ namespace MinecraftClient.Protocol.Handlers
if (Enum.IsDefined(typeof(Effects), effectId))
{
var effect = (Effects)effectId;
var amplifier = dataTypes.ReadNextByte(packetData);
var amplifier = protocolVersion >= MC_1_20_6_Version
? dataTypes.ReadNextVarInt(packetData)
: dataTypes.ReadNextByte(packetData);
var duration = dataTypes.ReadNextVarInt(packetData);
var flags = dataTypes.ReadNextByte(packetData);
var hasFactorData = false;
@ -3088,7 +3092,10 @@ namespace MinecraftClient.Protocol.Handlers
}
case PacketTypesIn.HeldItemChange:
case PacketTypesIn.SetHeldSlot:
handler.OnHeldItemChange(dataTypes.ReadNextByte(packetData)); // Slot
var heldSlot = protocolVersion >= MC_1_21_4_Version
? dataTypes.ReadNextVarInt(packetData)
: dataTypes.ReadNextByte(packetData);
handler.OnHeldItemChange((byte)heldSlot);
break;
case PacketTypesIn.ScoreboardObjective:
var objectiveName = dataTypes.ReadNextString(packetData);
@ -6082,11 +6089,18 @@ namespace MinecraftClient.Protocol.Handlers
{
try
{
var packet = new List<byte>
List<byte> packet = new();
if (protocolVersion >= MC_1_20_6_Version)
{
(byte)windowId,
(byte)buttonId
};
packet.AddRange(DataTypes.GetVarInt(windowId));
packet.AddRange(DataTypes.GetVarInt(buttonId));
}
else
{
packet.Add((byte)windowId);
packet.Add((byte)buttonId);
}
SendPacket(PacketTypesOut.ClickWindowButton, packet);
return true;
}