1.21.6 Clientbound PlayState Packets

codec/component/equippable.go

@@ -1,23 +1,28 @@
 package component
 
 import (
-	"git.konjactw.dev/patyhank/minego/codec/data/slot"
+	"git.konjactw.dev/patyhank/minego/codec/slot"
 	pk "github.com/Tnze/go-mc/net/packet"
 )
 
 //codec:gen
 type Equippable struct {
-	Slot               int32 `mc:"VarInt"` // 0=mainhand, 1=feet, 2=legs, etc.
-	EquipSound         SoundEvent
-	HasModel           bool
-	Model              pk.Option[pk.Identifier, *pk.Identifier]
-	HasCameraOverlay   bool
-	CameraOverlay      pk.Option[pk.Identifier, *pk.Identifier]
+	Slot         int32 `mc:"VarInt"` // 0=mainhand, 1=feet, 2=legs, etc.
+	EquipSoundID int32 `mc:"VarInt"`
+	//opt:id:EquipSoundID
+	EquipSoundEvent *SoundEvent
+	HasModel        bool
+	//opt:optional:HasModel
+	Model            string `mc:"Identifier"`
+	HasCameraOverlay bool
+	//opt:optional:HasCameraOverlay
+	CameraOverlay      string `mc:"Identifier"`
 	HasAllowedEntities bool
-	AllowedEntities    pk.Option[pk.IDSet, *pk.IDSet]
-	Dispensable        bool
-	Swappable          bool
-	DamageOnHurt       bool
+	//opt:optional:HasAllowedEntities
+	AllowedEntitiesID pk.IDSet
+	Dispensable       bool
+	Swappable         bool
+	DamageOnHurt      bool
 }
 
 func (*Equippable) Type() slot.ComponentID {