Replace lowercase primary constructor parameter references (dataTypes.,
subComponentRegistry., itemPalette.) with PascalCase base class property
references (DataTypes., SubComponentRegistry., ItemPalette.) in method
bodies of all StructuredComponent and SubComponent subclasses.
This eliminates CS9107 warnings where subclass primary constructor
parameters shadow the base class properties they are assigned to.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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
