mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
a36ba23ba6
Audited all 8 high-complexity structured components against official 1.20.6 decompiled STREAM_CODEC definitions. Found and fixed bugs in 3 components plus a systemic NBT serialization issue: TrimComponent (ID 35): - Serialize had TrimPatternType and ShowInTooltip incorrectly nested inside the TrimMaterialType==0 branch; moved them outside to match Parse logic - Description fields (TrimMaterial.description, TrimPattern.description) were read/written as String but official codec uses ComponentSerialization (NBT Tag format); changed to ReadNextNbt/GetNbt ProfileComponent (ID 46): - Serialize was missing the HasUniqueId Bool prefix before UUID - Serialize only wrote properties when count > 0 but omitted the VarInt count prefix entirely when empty; now always writes VarInt count WrittenBookContentComponent (ID 34): - Page content uses Filterable<Component> where Component is NBT-encoded via ComponentSerialization.STREAM_CODEC, not plain String; changed Parse to use ReadNextNbt and Serialize to use GetNbt - Added RawContentNbt/FilteredContentNbt fields to BookPage record for round-trip NBT preservation - Removed unnecessary ChatParser.ParseText on title (it's a plain string) DataTypes.GetNbt: - Added TAG_String root support for 1.20.4+ (chat components like "Page 1" are encoded as TAG_String, not TAG_Compound) - Fixed root name handling: versions >= 1.20.2 omit the root compound name, but GetNbt was unconditionally writing it Components confirmed correct (no changes needed): - FoodComponentComponent (ID 20), ToolComponent (ID 22), InstrumentComponent (ID 40), PotionContentsComponent (ID 31), AttributeModifiersComponent (ID 12) Made-with: Cursor
77 lines
No EOL
3 KiB
C#
77 lines
No EOL
3 KiB
C#
using System;
|
|
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 ProfileComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry) : StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
|
|
{
|
|
public bool HasName { get; set; }
|
|
public string? Name { get; set; } = null!;
|
|
public bool HasUniqueId { get; set; }
|
|
public Guid Uuid { get; set; }
|
|
public int NumberOfProperties { get; set; }
|
|
public List<ProfileProperty> ProfileProperties { get; set; } = [];
|
|
|
|
public override void Parse(Queue<byte> data)
|
|
{
|
|
HasName = dataTypes.ReadNextBool(data);
|
|
|
|
if(HasName)
|
|
Name = dataTypes.ReadNextString(data);
|
|
|
|
HasUniqueId = dataTypes.ReadNextBool(data);
|
|
|
|
if (HasUniqueId)
|
|
Uuid = dataTypes.ReadNextUUID(data);
|
|
|
|
NumberOfProperties = dataTypes.ReadNextVarInt(data);
|
|
for (var i = 0; i < NumberOfProperties; i++)
|
|
{
|
|
var propertyName = dataTypes.ReadNextString(data);
|
|
var propertyValue = dataTypes.ReadNextString(data);
|
|
var hasSignature = dataTypes.ReadNextBool(data);
|
|
var signature = hasSignature ? dataTypes.ReadNextString(data) : null;
|
|
|
|
ProfileProperties.Add(new ProfileProperty(propertyName, propertyValue, hasSignature, signature));
|
|
}
|
|
}
|
|
|
|
public override Queue<byte> Serialize()
|
|
{
|
|
var data = new List<byte>();
|
|
|
|
data.AddRange(DataTypes.GetBool(HasName));
|
|
if (HasName)
|
|
{
|
|
if (string.IsNullOrEmpty(Name))
|
|
throw new NullReferenceException("Can't serialize the ProfileComponent because the Name is null/empty!");
|
|
|
|
data.AddRange(DataTypes.GetString(Name));
|
|
}
|
|
|
|
data.AddRange(DataTypes.GetBool(HasUniqueId));
|
|
if (HasUniqueId)
|
|
data.AddRange(DataTypes.GetUUID(Uuid));
|
|
|
|
data.AddRange(DataTypes.GetVarInt(ProfileProperties.Count));
|
|
foreach (var profileProperty in ProfileProperties)
|
|
{
|
|
data.AddRange(DataTypes.GetString(profileProperty.Name));
|
|
data.AddRange(DataTypes.GetString(profileProperty.Value));
|
|
data.AddRange(DataTypes.GetBool(profileProperty.HasSignature));
|
|
if (profileProperty.HasSignature)
|
|
{
|
|
if(string.IsNullOrEmpty(profileProperty.Signature))
|
|
throw new NullReferenceException("Can't serialize the ProfileComponent because HasSignature is true, but the Signature is null/empty!");
|
|
|
|
data.AddRange(DataTypes.GetString(profileProperty.Signature));
|
|
}
|
|
}
|
|
|
|
return new Queue<byte>(data);
|
|
}
|
|
}
|
|
|
|
public record ProfileProperty(string Name, string Value, bool HasSignature, string? Signature); |