mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
1e2b853b14
Both components had incorrect Parse/Serialize implementations that would cause packet deserialization misalignment when encountered in-game. PotionContentsComponent (3 bugs): - Serialize unconditionally wrote VarInt(PotionId) and Int(CustomColor) even when HasPotionId/HasCustomColor was false. The official format (PotionContents.STREAM_CODEC) uses Optional encoding: Bool(hasValue) followed by the value only when true. The extra bytes caused all subsequent fields in the packet to be read at wrong offsets. - Serialize omitted the VarInt(count) prefix for the custom effects list. The official codec uses ByteBufCodecs.list() which always writes a VarInt count header before the list elements. - Also fixed typo: PotiononId -> PotionId. InstrumentComponent (3 bugs): - The official Instrument.STREAM_CODEC uses ByteBufCodecs.holder() which encodes as VarInt(holderId): 0 = inline data, N>0 = registry ref (N-1). The SoundEvent field inside uses the same holder pattern. The old code unconditionally read SoundName (ResourceLocation) and HasFixedRange/ FixedRange even when SoundEventHolderId != 0 (registry reference case has no inline data). - UseDuration was read/written as Float, but the official codec uses ByteBufCodecs.VAR_INT. This caused a 4-byte vs variable-length mismatch that would shift all subsequent data. - HasFixedRange was read unconditionally when SoundEventHolderId == 0, but FixedRange was also read unconditionally. The official SoundEvent DIRECT_STREAM_CODEC uses Optional<Float> encoding: Bool(hasValue) followed by Float only when true. These components are used for potion items and goat horns respectively. Verified against official 1.20.6 decompiled source: - net.minecraft.world.item.alchemy.PotionContents (STREAM_CODEC) - net.minecraft.world.item.Instrument (STREAM_CODEC/DIRECT_STREAM_CODEC) - net.minecraft.sounds.SoundEvent (STREAM_CODEC/DIRECT_STREAM_CODEC) - net.minecraft.network.codec.ByteBufCodecs (holder/optional/list) Made-with: Cursor
68 lines
2.4 KiB
C#
68 lines
2.4 KiB
C#
using System.Collections.Generic;
|
|
using MinecraftClient.Inventory.ItemPalettes;
|
|
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
|
|
|
|
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_20_6;
|
|
|
|
public class InstrumentComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
|
|
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
|
|
{
|
|
// holder ID: 0 = inline instrument data, N>0 = registry reference (id = N-1)
|
|
public int InstrumentHolderId { get; set; }
|
|
|
|
// Inline instrument fields (only when InstrumentHolderId == 0):
|
|
// holder ID for SoundEvent: 0 = inline sound, N>0 = registry reference (id = N-1)
|
|
public int SoundEventHolderId { get; set; }
|
|
// Inline SoundEvent fields (only when SoundEventHolderId == 0):
|
|
public string? SoundLocation { get; set; }
|
|
public bool HasFixedRange { get; set; }
|
|
public float FixedRange { get; set; }
|
|
|
|
public int UseDuration { get; set; }
|
|
public float Range { get; set; }
|
|
|
|
public override void Parse(Queue<byte> data)
|
|
{
|
|
InstrumentHolderId = dataTypes.ReadNextVarInt(data);
|
|
|
|
if (InstrumentHolderId == 0)
|
|
{
|
|
SoundEventHolderId = dataTypes.ReadNextVarInt(data);
|
|
|
|
if (SoundEventHolderId == 0)
|
|
{
|
|
SoundLocation = dataTypes.ReadNextString(data);
|
|
HasFixedRange = dataTypes.ReadNextBool(data);
|
|
if (HasFixedRange)
|
|
FixedRange = dataTypes.ReadNextFloat(data);
|
|
}
|
|
|
|
UseDuration = dataTypes.ReadNextVarInt(data);
|
|
Range = dataTypes.ReadNextFloat(data);
|
|
}
|
|
}
|
|
|
|
public override Queue<byte> Serialize()
|
|
{
|
|
var data = new List<byte>();
|
|
data.AddRange(DataTypes.GetVarInt(InstrumentHolderId));
|
|
|
|
if (InstrumentHolderId == 0)
|
|
{
|
|
data.AddRange(DataTypes.GetVarInt(SoundEventHolderId));
|
|
|
|
if (SoundEventHolderId == 0)
|
|
{
|
|
data.AddRange(DataTypes.GetString(SoundLocation ?? ""));
|
|
data.AddRange(DataTypes.GetBool(HasFixedRange));
|
|
if (HasFixedRange)
|
|
data.AddRange(DataTypes.GetFloat(FixedRange));
|
|
}
|
|
|
|
data.AddRange(DataTypes.GetVarInt(UseDuration));
|
|
data.AddRange(DataTypes.GetFloat(Range));
|
|
}
|
|
|
|
return new Queue<byte>(data);
|
|
}
|
|
}
|