mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
Packet Palette (Phase 2.1): - Create PacketPalette1212.cs with complete ID mapping for protocol 768 (131 clientbound + 60 serverbound play packets, plus config packets) - Add new PacketTypesIn enum values: EntityPositionSync, MoveMinecartAlongTrack, PlayerRotation, RecipeBookAdd/Remove/Settings, SetCursorItem, SetHeldSlot, SetPlayerInventory - Add new PacketTypesOut enum values: BundleItemSelected, ClientTickEnd - Update PacketType18Handler routing for 1.21.2 Data Components (Phase 1.4): - Create StructuredComponentsRegistry1212 with 67 components (was 57 in 1.21) reflecting the new 1.21.2 DataComponents ordering - Implement 11 new component parsers: ConsumableComponent, UseRemainderComponent, UseCooldownComponent, DamageResistantComponent, EnchantableComponent, EquippableComponent, RepairableComponent, GliderComponent, TooltipStyleComponent, DeathProtectionComponent, ItemModelComponent - Create FoodComponent1212 (simplified: nutrition/saturation/canAlwaysEat only; eatSeconds/effects/usingConvertsTo moved to consumable/use_remainder) - Create SubComponentRegistry1212 and route in StructuredComponentsHandler Protocol Fixes: - Fix PlayerPositionAndLook packet for 1.21.2 (new format: teleportId first, added deltaMovement Vec3, flags as Int instead of Byte) - Fix login success packet (remove strictErrorHandling read for >= 1.21.2) - Fix ClientSettings/ClientInformation packet (add particleStatus VarInt) - Add SetHeldSlot as alias for HeldItemChange in packet handler Verified: MCC connects to 1.21.2 vanilla server, stays connected, chat works. Made-with: Cursor
129 lines
5.2 KiB
C#
129 lines
5.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_21;
|
|
using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
|
|
|
|
namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_21_2;
|
|
|
|
public class ConsumableComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry)
|
|
: StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
|
|
{
|
|
public float ConsumeSeconds { get; set; }
|
|
public int Animation { get; set; }
|
|
public SoundEventSubComponent? Sound { get; set; }
|
|
public bool HasConsumeParticles { get; set; }
|
|
public List<ConsumeEffectData> Effects { get; set; } = new();
|
|
|
|
public override void Parse(Queue<byte> data)
|
|
{
|
|
ConsumeSeconds = dataTypes.ReadNextFloat(data);
|
|
Animation = dataTypes.ReadNextVarInt(data);
|
|
Sound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data);
|
|
HasConsumeParticles = dataTypes.ReadNextBool(data);
|
|
|
|
var effectCount = dataTypes.ReadNextVarInt(data);
|
|
for (var i = 0; i < effectCount; i++)
|
|
{
|
|
var effectTypeId = dataTypes.ReadNextVarInt(data);
|
|
var effectData = ReadConsumeEffectPayload(effectTypeId, data);
|
|
Effects.Add(new ConsumeEffectData(effectTypeId, effectData));
|
|
}
|
|
}
|
|
|
|
private byte[] ReadConsumeEffectPayload(int effectTypeId, Queue<byte> data)
|
|
{
|
|
var payload = new List<byte>();
|
|
switch (effectTypeId)
|
|
{
|
|
case 0: // apply_effects: List<MobEffectInstance> + probability(float)
|
|
var effectCount = dataTypes.ReadNextVarInt(data);
|
|
payload.AddRange(DataTypes.GetVarInt(effectCount));
|
|
for (var i = 0; i < effectCount; i++)
|
|
payload.AddRange(ReadMobEffectInstance(data));
|
|
payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data)));
|
|
break;
|
|
case 1: // remove_effects: HolderSet<MobEffect>
|
|
payload.AddRange(ReadHolderSet(data));
|
|
break;
|
|
case 2: // clear_all_effects: empty
|
|
break;
|
|
case 3: // teleport_randomly: float diameter
|
|
payload.AddRange(DataTypes.GetFloat(dataTypes.ReadNextFloat(data)));
|
|
break;
|
|
case 4: // play_sound: Holder<SoundEvent>
|
|
var sound = (SoundEventSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.SoundEvent, data);
|
|
payload.AddRange(sound.Serialize());
|
|
break;
|
|
}
|
|
return payload.ToArray();
|
|
}
|
|
|
|
private byte[] ReadMobEffectInstance(Queue<byte> data)
|
|
{
|
|
var result = new List<byte>();
|
|
var effectId = dataTypes.ReadNextVarInt(data);
|
|
result.AddRange(DataTypes.GetVarInt(effectId));
|
|
result.AddRange(ReadMobEffectDetails(data));
|
|
return result.ToArray();
|
|
}
|
|
|
|
private byte[] ReadMobEffectDetails(Queue<byte> data)
|
|
{
|
|
var result = new List<byte>();
|
|
var amplifier = dataTypes.ReadNextVarInt(data);
|
|
result.AddRange(DataTypes.GetVarInt(amplifier));
|
|
var duration = dataTypes.ReadNextVarInt(data);
|
|
result.AddRange(DataTypes.GetVarInt(duration));
|
|
var ambient = dataTypes.ReadNextBool(data);
|
|
result.AddRange(DataTypes.GetBool(ambient));
|
|
var showParticles = dataTypes.ReadNextBool(data);
|
|
result.AddRange(DataTypes.GetBool(showParticles));
|
|
var showIcon = dataTypes.ReadNextBool(data);
|
|
result.AddRange(DataTypes.GetBool(showIcon));
|
|
var hasHiddenEffect = dataTypes.ReadNextBool(data);
|
|
result.AddRange(DataTypes.GetBool(hasHiddenEffect));
|
|
if (hasHiddenEffect)
|
|
result.AddRange(ReadMobEffectDetails(data));
|
|
return result.ToArray();
|
|
}
|
|
|
|
private byte[] ReadHolderSet(Queue<byte> data)
|
|
{
|
|
var result = new List<byte>();
|
|
var type = dataTypes.ReadNextVarInt(data);
|
|
result.AddRange(DataTypes.GetVarInt(type));
|
|
if (type == 0)
|
|
{
|
|
var tagName = dataTypes.ReadNextString(data);
|
|
result.AddRange(DataTypes.GetString(tagName));
|
|
}
|
|
else
|
|
{
|
|
for (var i = 0; i < type - 1; i++)
|
|
{
|
|
var id = dataTypes.ReadNextVarInt(data);
|
|
result.AddRange(DataTypes.GetVarInt(id));
|
|
}
|
|
}
|
|
return result.ToArray();
|
|
}
|
|
|
|
public override Queue<byte> Serialize()
|
|
{
|
|
var data = new List<byte>();
|
|
data.AddRange(DataTypes.GetFloat(ConsumeSeconds));
|
|
data.AddRange(DataTypes.GetVarInt(Animation));
|
|
if (Sound != null) data.AddRange(Sound.Serialize());
|
|
data.AddRange(DataTypes.GetBool(HasConsumeParticles));
|
|
data.AddRange(DataTypes.GetVarInt(Effects.Count));
|
|
foreach (var effect in Effects)
|
|
{
|
|
data.AddRange(DataTypes.GetVarInt(effect.EffectTypeId));
|
|
data.AddRange(effect.Payload);
|
|
}
|
|
return new Queue<byte>(data);
|
|
}
|
|
|
|
public record ConsumeEffectData(int EffectTypeId, byte[] Payload);
|
|
}
|