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

Fix inventory handling across protocol versions

Browse source
This commit is contained in:
Anon 2026-06-05 20:26:29 +02:00
parent 03e2e0d3fd
commit 5228670131
9 changed files with 364 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ namespace MinecraftClient.Protocol.Handlers
internal const int MC_1_8_Version = 47;
internal const int MC_1_9_Version = 107;
internal const int MC_1_9_1_Version = 108;
internal const int MC_1_9_2_Version = 109;
internal const int MC_1_10_Version = 210;
internal const int MC_1_11_Version = 315;
internal const int MC_1_11_2_Version = 316;
@ -835,15 +836,15 @@ namespace MinecraftClient.Protocol.Handlers
dimensionTypeName =
dataTypes.ReadNextString(packetData); // Dimension Type: Identifier
break;
case >= MC_1_16_2_Version:
dimensionType =
dataTypes.ReadNextNbt(
packetData); // Dimension Type: NBT Tag Compound
break;
default:
dataTypes.ReadNextString(packetData);
break;
}
case >= MC_1_16_2_Version:
dimensionType =
dataTypes.ReadNextNbt(
packetData); // Dimension Type: NBT Tag Compound
break;
default:
dimensionTypeName = dataTypes.ReadNextString(packetData);
break;
}
currentDimension = 0;
break;
@ -1408,14 +1409,14 @@ namespace MinecraftClient.Protocol.Handlers
dimensionTypeNameRespawn =
dataTypes.ReadNextString(packetData); // Dimension Type: Identifier
break;
case >= MC_1_16_2_Version:
dimensionTypeRespawn =
dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound
break;
default:
dataTypes.ReadNextString(packetData);
break;
}
case >= MC_1_16_2_Version:
dimensionTypeRespawn =
dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound
break;
default:
dimensionTypeNameRespawn = dataTypes.ReadNextString(packetData);
break;
}
currentDimension = 0;
}
@ -4027,6 +4028,21 @@ namespace MinecraftClient.Protocol.Handlers
int blockEntityCount = dataTypes.ReadNextVarInt(packetData);
for (int i = 0; i < blockEntityCount; i++)
{
if (protocolVersion < MC_1_18_1_Version)
{
Dictionary<string, object>? blockEntityNbt = dataTypes.ReadNextNbt(packetData);
if (blockEntityNbt.TryGetValue("x", out var nbtX)
&& blockEntityNbt.TryGetValue("y", out var nbtY)
&& blockEntityNbt.TryGetValue("z", out var nbtZ))
{
handler.OnBlockEntityData(
new Location(Convert.ToInt32(nbtX), Convert.ToInt32(nbtY), Convert.ToInt32(nbtZ)),
blockEntityNbt);
}
continue;
}
int packedXZ = dataTypes.ReadNextByte(packetData);
int y = dataTypes.ReadNextShort(packetData);
dataTypes.ReadNextVarInt(packetData); // Block entity type registry id
@ -5616,7 +5632,7 @@ namespace MinecraftClient.Protocol.Handlers
private static byte ToLegacyBlockPlacementCursor(float cursor)
{
return (byte)Math.Clamp((int)(cursor * 16.0f), 0, byte.MaxValue);
return (byte)Math.Clamp((int)(cursor * 16.0f), 0, 15);
}
public bool SendHeldItemChange(short slot)
@ -5752,16 +5768,11 @@ namespace MinecraftClient.Protocol.Handlers
switch (protocolVersion)
{
// 1.18+
case >= MC_1_18_1_Version:
// 1.17.1+
case >= MC_1_17_1_Version:
packet.AddRange(DataTypes.GetVarInt(stateId)); // State ID
packet.AddRange(dataTypes.GetShort((short)slotId)); // Slot ID
break;
// 1.17.1
case MC_1_17_1_Version:
packet.AddRange(dataTypes.GetShort((short)slotId)); // Slot ID
packet.AddRange(DataTypes.GetVarInt(stateId)); // State ID
break;
// Older
default:
packet.AddRange(dataTypes.GetShort((short)slotId)); // Slot ID