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
50 lines
2 KiB
C#
50 lines
2 KiB
C#
using System.Collections.Generic;
|
|
using MinecraftClient.Inventory.ItemPalettes;
|
|
using MinecraftClient.Protocol.Handlers.StructuredComponents.Components.Subcomponents;
|
|
using MinecraftClient.Protocol.Handlers.StructuredComponents.Components.Subcomponents._1_20_6;
|
|
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
|
|
|
|
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_20_6;
|
|
|
|
public class PotionContentsComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
|
|
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
|
|
{
|
|
public bool HasPotionId { get; set; }
|
|
public int PotionId { get; set; }
|
|
public bool HasCustomColor { get; set; }
|
|
public int CustomColor { get; set; }
|
|
public List<PotionEffectSubComponent> Effects { get; set; } = new();
|
|
|
|
public override void Parse(Queue<byte> data)
|
|
{
|
|
HasPotionId = dataTypes.ReadNextBool(data);
|
|
if (HasPotionId)
|
|
PotionId = dataTypes.ReadNextVarInt(data);
|
|
|
|
HasCustomColor = dataTypes.ReadNextBool(data);
|
|
if (HasCustomColor)
|
|
CustomColor = dataTypes.ReadNextInt(data);
|
|
|
|
var numberOfEffects = dataTypes.ReadNextVarInt(data);
|
|
for (var i = 0; i < numberOfEffects; i++)
|
|
Effects.Add((PotionEffectSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.PotionEffect, data));
|
|
}
|
|
|
|
public override Queue<byte> Serialize()
|
|
{
|
|
var data = new List<byte>();
|
|
data.AddRange(DataTypes.GetBool(HasPotionId));
|
|
if (HasPotionId)
|
|
data.AddRange(DataTypes.GetVarInt(PotionId));
|
|
|
|
data.AddRange(DataTypes.GetBool(HasCustomColor));
|
|
if (HasCustomColor)
|
|
data.AddRange(DataTypes.GetInt(CustomColor));
|
|
|
|
data.AddRange(DataTypes.GetVarInt(Effects.Count));
|
|
foreach (var effect in Effects)
|
|
data.AddRange(effect.Serialize());
|
|
|
|
return new Queue<byte>(data);
|
|
}
|
|
}
|