feat: add version routing, structured components, and metadata for MC 1.21.11

- Add MC_1_21_11_Version constant (protocol 774)
- Create StructuredComponentsRegistry12111 with 104 components (8 new:
  use_effects, minimum_attack_charge, damage_type, attack_range,
  piercing_weapon, kinetic_weapon, swing_animation, zombie_nautilus/variant)
- Add 6 new component classes for 1.21.11 wire formats
- Add RegistryEitherHolderComponent for holderRegistry-backed EitherHolder
- Add ZombieNautilusVariant and HumanoidArm cases in DataTypes.ReadNextMetadata
- Update all version routing in Protocol18, PacketType18Handler,
  EntityMetadataPalette, StructuredComponentsHandler, and ProtocolHandler
- Bump MCHighestVersion to 1.21.11

Made-with: Cursor
This commit is contained in:
BruceChen 2026-03-22 00:56:04 +08:00
parent 50b4b3c8fe
commit 6c36dc341a
14 changed files with 361 additions and 12 deletions

View file

@ -0,0 +1,38 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
public class AttackRangeComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public float MinRange { get; set; }
public float MaxRange { get; set; }
public float MinCreativeRange { get; set; }
public float MaxCreativeRange { get; set; }
public float HitboxMargin { get; set; }
public float MobFactor { get; set; }
public override void Parse(Queue<byte> data)
{
MinRange = dataTypes.ReadNextFloat(data);
MaxRange = dataTypes.ReadNextFloat(data);
MinCreativeRange = dataTypes.ReadNextFloat(data);
MaxCreativeRange = dataTypes.ReadNextFloat(data);
HitboxMargin = dataTypes.ReadNextFloat(data);
MobFactor = dataTypes.ReadNextFloat(data);
}
public override Queue<byte> Serialize()
{
var bytes = new List<byte>();
bytes.AddRange(DataTypes.GetFloat(MinRange));
bytes.AddRange(DataTypes.GetFloat(MaxRange));
bytes.AddRange(DataTypes.GetFloat(MinCreativeRange));
bytes.AddRange(DataTypes.GetFloat(MaxCreativeRange));
bytes.AddRange(DataTypes.GetFloat(HitboxMargin));
bytes.AddRange(DataTypes.GetFloat(MobFactor));
return new Queue<byte>(bytes);
}
}

View file

@ -0,0 +1,47 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
public class KineticWeaponComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public override void Parse(Queue<byte> data)
{
dataTypes.ReadNextVarInt(data); // contactCooldownTicks
dataTypes.ReadNextVarInt(data); // delayTicks
ReadOptionalCondition(data); // dismountConditions
ReadOptionalCondition(data); // knockbackConditions
ReadOptionalCondition(data); // damageConditions
dataTypes.ReadNextFloat(data); // forwardMovement
dataTypes.ReadNextFloat(data); // damageMultiplier
ReadOptionalSoundEventHolder(data); // sound
ReadOptionalSoundEventHolder(data); // hitSound
}
private void ReadOptionalCondition(Queue<byte> data)
{
if (!dataTypes.ReadNextBool(data)) return;
dataTypes.ReadNextVarInt(data); // maxDurationTicks
dataTypes.ReadNextFloat(data); // minSpeed
dataTypes.ReadNextFloat(data); // minRelativeSpeed
}
private void ReadOptionalSoundEventHolder(Queue<byte> data)
{
if (!dataTypes.ReadNextBool(data)) return;
var holderId = dataTypes.ReadNextVarInt(data);
if (holderId == 0)
{
dataTypes.ReadNextString(data);
if (dataTypes.ReadNextBool(data))
dataTypes.ReadNextFloat(data);
}
}
public override Queue<byte> Serialize()
{
return new Queue<byte>();
}
}

View file

@ -0,0 +1,37 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
public class PiercingWeaponComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public bool DealsKnockback { get; set; }
public bool Dismounts { get; set; }
public override void Parse(Queue<byte> data)
{
DealsKnockback = dataTypes.ReadNextBool(data);
Dismounts = dataTypes.ReadNextBool(data);
ReadOptionalSoundEventHolder(data);
ReadOptionalSoundEventHolder(data);
}
private void ReadOptionalSoundEventHolder(Queue<byte> data)
{
if (!dataTypes.ReadNextBool(data)) return;
var holderId = dataTypes.ReadNextVarInt(data);
if (holderId == 0)
{
dataTypes.ReadNextString(data);
if (dataTypes.ReadNextBool(data))
dataTypes.ReadNextFloat(data);
}
}
public override Queue<byte> Serialize()
{
return new Queue<byte>();
}
}

View file

@ -0,0 +1,38 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
/// <summary>
/// EitherHolder backed by holderRegistry (VarInt = raw registry ID, 0 is valid).
/// Used for DamageType and ZombieNautilusVariant where the holder codec is holderRegistry(),
/// unlike the holder() codec used in SoundEvent (where 0 means inline).
/// </summary>
public class RegistryEitherHolderComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public bool IsHolder { get; set; }
public int HolderId { get; set; }
public string? ResourceKey { get; set; }
public override void Parse(Queue<byte> data)
{
IsHolder = dataTypes.ReadNextBool(data);
if (IsHolder)
HolderId = dataTypes.ReadNextVarInt(data);
else
ResourceKey = dataTypes.ReadNextString(data);
}
public override Queue<byte> Serialize()
{
var bytes = new List<byte>();
bytes.AddRange(DataTypes.GetBool(IsHolder));
if (IsHolder)
bytes.AddRange(DataTypes.GetVarInt(HolderId));
else
bytes.AddRange(DataTypes.GetString(ResourceKey ?? ""));
return new Queue<byte>(bytes);
}
}

View file

@ -0,0 +1,26 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
public class SwingAnimationComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public int AnimationType { get; set; }
public int Duration { get; set; }
public override void Parse(Queue<byte> data)
{
AnimationType = dataTypes.ReadNextVarInt(data);
Duration = dataTypes.ReadNextVarInt(data);
}
public override Queue<byte> Serialize()
{
var bytes = new List<byte>();
bytes.AddRange(DataTypes.GetVarInt(AnimationType));
bytes.AddRange(DataTypes.GetVarInt(Duration));
return new Queue<byte>(bytes);
}
}

View file

@ -0,0 +1,29 @@
using System.Collections.Generic;
using MinecraftClient.Inventory.ItemPalettes;
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_11;
public class UseEffectsComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
{
public bool CanSprint { get; set; }
public bool InteractVibrations { get; set; }
public float SpeedMultiplier { get; set; }
public override void Parse(Queue<byte> data)
{
CanSprint = dataTypes.ReadNextBool(data);
InteractVibrations = dataTypes.ReadNextBool(data);
SpeedMultiplier = dataTypes.ReadNextFloat(data);
}
public override Queue<byte> Serialize()
{
var bytes = new List<byte>();
bytes.AddRange(DataTypes.GetBool(CanSprint));
bytes.AddRange(DataTypes.GetBool(InteractVibrations));
bytes.AddRange(DataTypes.GetFloat(SpeedMultiplier));
return new Queue<byte>(bytes);
}
}