Implement entity riding

server/entity/rideable.go

@@ -0,0 +1,20 @@
+package entity
+
+import (
+	"github.com/go-gl/mathgl/mgl32"
+	"github.com/go-gl/mathgl/mgl64"
+)
+
+// Rideable is an interface for entities that can be ridden.
+type Rideable interface {
+	// SeatPositions returns the possible seat positions for an entity in the order that they will be filled.
+	SeatPositions() []mgl32.Vec3
+	// Riders returns a slice entities that are currently riding an entity in the order that they were added.
+	Riders() []Rider
+	// AddRider adds a rider to the entity.
+	AddRider(e Rider)
+	// RemoveRider removes a rider from the entity.
+	RemoveRider(e Rider)
+	// Move moves the entity using the given vector, yaw, and pitch.
+	Move(vector mgl64.Vec2, yaw, pitch float32)
+}

server/entity/rider.go

@@ -0,0 +1,16 @@
+package entity
+
+import (
+	"github.com/df-mc/dragonfly/server/world"
+	"github.com/go-gl/mathgl/mgl32"
+)
+
+// Rider is an interface for entities that can ride other entities.
+type Rider interface {
+	// SeatPosition returns the Rider's current seat position.
+	SeatPosition() mgl32.Vec3
+	// MountEntity mounts the Rider to an entity if the entity is Rideable and if there is a seat available.
+	MountEntity(e Rideable)
+	// RidingEntity returns the entity the player is currently riding and the player's seat index.
+	RidingEntity() (world.Entity, int)
+}

server/player/player.go

@@ -28,6 +28,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/particle"
 	"github.com/df-mc/dragonfly/server/world/sound"
+	"github.com/go-gl/mathgl/mgl32"
 	"github.com/go-gl/mathgl/mgl64"
 	"github.com/google/uuid"
 	"go.uber.org/atomic"
@@ -70,6 +71,10 @@ type Player struct {
 	armour       *inventory.Armour
 	heldSlot     *atomic.Uint32
 
+	seatPosition atomic.Value
+	ridingMu     sync.Mutex
+	riding       world.Entity
+
 	sneaking, sprinting, swimming, flying,
 	invisible, immobile, onGround, usingItem atomic.Bool
 	usingSince atomic.Int64
@@ -117,6 +122,7 @@ func New(name string, skin skin.Skin, pos mgl64.Vec3) *Player {
 		speed:    *atomic.NewFloat64(0.1),
 		nameTag:  *atomic.NewString(name),
 		heldSlot: atomic.NewUint32(0),
+		riding:   nil,
 		locale:   language.BritishEnglish,
 		scale:    *atomic.NewFloat64(1),
 	}
@@ -125,6 +131,7 @@ func New(name string, skin skin.Skin, pos mgl64.Vec3) *Player {
 	p.vel.Store(mgl64.Vec3{})
 	p.immunity.Store(time.Now())
 	p.breakingPos.Store(cube.Pos{})
+	p.seatPosition.Store(mgl32.Vec3{0, 0, 0})
 	return p
 }
 
@@ -2050,6 +2057,110 @@ func (p *Player) PunchAir() {
 	})
 }
 
+// MountEntity mounts the player to an entity if the entity is rideable and if there is a seat available.
+func (p *Player) MountEntity(r entity.Rideable) {
+	if e, ok := r.(world.Entity); ok {
+		if p.seat(e) == -1 {
+			r.AddRider(p)
+			p.setRiding(e)
+			riders := r.Riders()
+			seat := len(riders)
+			positions := r.SeatPositions()
+			if len(positions) >= seat {
+				p.seatPosition.Store(positions[seat-1])
+				p.updateState()
+				driver := false
+				if seat-1 == 0 {
+					driver = true
+				}
+				for _, v := range p.viewers() {
+					v.ViewEntityMount(p, e, driver)
+				}
+			}
+		} else {
+			// Check and update seat position
+			p.checkSeats(e)
+		}
+	}
+}
+
+// DismountEntity dismounts the player from an entity.
+func (p *Player) DismountEntity() {
+	e, _ := p.RidingEntity()
+	if e != nil {
+		if rideable, ok := e.(entity.Rideable); ok {
+			rideable.RemoveRider(p)
+			p.setRiding(nil)
+			for _, v := range p.viewers() {
+				v.ViewEntityDismount(p, e)
+			}
+			for _, r := range rideable.Riders() {
+				r.MountEntity(rideable)
+			}
+		}
+	}
+}
+
+// checkSeats moves a player to the seat corresponding to their current index within the slice of riders.
+func (p *Player) checkSeats(e world.Entity) {
+	if rideable, ok := e.(entity.Rideable); ok {
+		seat := p.seat(e)
+		if seat != -1 {
+			positions := rideable.SeatPositions()
+			if positions[seat] != p.seatPosition.Load() {
+				p.seatPosition.Store(positions[seat])
+				if seat == 0 {
+					for _, v := range p.viewers() {
+						v.ViewEntityMount(p, e, true)
+					}
+				}
+				p.updateState()
+			}
+		}
+	}
+}
+
+// SeatPosition returns the position of the player's seat.
+func (p *Player) SeatPosition() mgl32.Vec3 {
+	return p.seatPosition.Load().(mgl32.Vec3)
+}
+
+// seat returns the index of a player within the slice of riders.
+func (p *Player) seat(e world.Entity) int {
+	if rideable, ok := e.(entity.Rideable); ok {
+		riders := rideable.Riders()
+		for i, r := range riders {
+			if r == p {
+				return i
+			}
+		}
+	}
+	return -1
+}
+
+// setRiding saves the entity the Rider is currently riding.
+func (p *Player) setRiding(e world.Entity) {
+	p.ridingMu.Lock()
+	p.riding = e
+	p.ridingMu.Unlock()
+}
+
+// RidingEntity returns the entity the player is currently riding and the player's seat index.
+func (p *Player) RidingEntity() (world.Entity, int) {
+	p.ridingMu.Lock()
+	defer p.ridingMu.Unlock()
+	if p.riding != nil {
+		riders := p.riding.(entity.Rideable).Riders()
+		for i, r := range riders {
+			if r == p {
+				return p.riding, i
+			}
+		}
+		return p.riding, -1
+	}
+	return nil, -1
+}
+
 // EncodeEntity ...
 func (p *Player) EncodeEntity() string {
 	return "minecraft:player"

server/session/controllable.go

@@ -3,11 +3,13 @@ package session
 import (
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/cmd"
+	"github.com/df-mc/dragonfly/server/entity"
 	"github.com/df-mc/dragonfly/server/entity/effect"
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/player/form"
 	"github.com/df-mc/dragonfly/server/player/skin"
 	"github.com/df-mc/dragonfly/server/world"
+	"github.com/go-gl/mathgl/mgl32"
 	"github.com/go-gl/mathgl/mgl64"
 	"github.com/google/uuid"
 )
@@ -58,6 +60,11 @@ type Controllable interface {
 	Flying() bool
 	StopFlying()
 
+	SeatPosition() mgl32.Vec3
+	MountEntity(e entity.Rideable)
+	DismountEntity()
+	RidingEntity() (world.Entity, int)
+
 	StartBreaking(pos cube.Pos, face cube.Face)
 	ContinueBreaking(face cube.Face)
 	FinishBreaking()

server/session/entity_metadata.go

@@ -1,6 +1,7 @@
 package session
 
 import (
+	"github.com/df-mc/dragonfly/server/entity"
 	"github.com/df-mc/dragonfly/server/entity/effect"
 	"github.com/df-mc/dragonfly/server/world"
 	"image/color"
@@ -52,6 +53,13 @@ func parseEntityMetadata(e world.Entity) entityMetadata {
 	if s, ok := e.(scaled); ok {
 		m[dataKeyScale] = float32(s.Scale())
 	}
+
+	if r, ok := e.(entity.Rider); ok {
+		m[dataKeyRiderSeatPosition] = r.SeatPosition()
+		if rd, _ := r.RidingEntity(); rd != nil {
+			m.setFlag(dataKeyFlags, dataFlagRiding)
+		}
+	}
 	if n, ok := e.(named); ok {
 		m[dataKeyNameTag] = n.NameTag()
 		m[dataKeyAlwaysShowNameTag] = uint8(1)
@@ -98,6 +106,7 @@ const (
 	dataKeyScale             = 38
 	dataKeyBoundingBoxWidth  = 53
 	dataKeyBoundingBoxHeight = 54
+	dataKeyRiderSeatPosition = 56
 	dataKeyAlwaysShowNameTag = 81
 )
 

server/session/handler_interact.go

@@ -26,6 +26,10 @@ func (h *InteractHandler) Handle(p packet.Packet, s *Session) error {
 			WindowID:      0,
 			ContainerType: 0xff,
 		})
+	case packet.InteractActionLeaveVehicle:
+		if e, _ := s.c.RidingEntity(); e != nil {
+			s.c.DismountEntity()
+		}
 	default:
 		return fmt.Errorf("unexpected interact packet action %v", pk.ActionType)
 	}

server/session/handler_inventory_transaction.go

@@ -3,6 +3,7 @@ package session
 import (
 	"fmt"
 	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/entity"
 	"github.com/df-mc/dragonfly/server/event"
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
@@ -111,6 +112,10 @@ func (h *InventoryTransactionHandler) handleUseItemOnEntityTransaction(data *pro
 	}
 	switch data.ActionType {
 	case protocol.UseItemOnEntityActionInteract:
+		// Check if the entity is rideable, and if so ride the entity.
+		if r, ok := e.(entity.Rideable); ok {
+			s.c.MountEntity(r)
+		}
 		s.c.UseItemOnEntity(e)
 	case protocol.UseItemOnEntityActionAttack:
 		s.c.AttackEntity(e)

server/session/handler_player_auth_input.go

@@ -32,6 +32,14 @@ func (h PlayerAuthInputHandler) handleMovement(pk *packet.PlayerAuthInput, s *Se
 		}
 	}
 
+	// Check if player is riding an entity, and move the entity.
+	riding, seat := s.c.RidingEntity()
+	if seat == 0 {
+		rideable, _ := riding.(entity.Rideable)
+		m := pk.MoveVector
+		rideable.Move(mgl64.Vec2{float64(m[0]), float64(m[1])}, pk.Yaw, pk.Pitch)
+	}
+
 	pk.Position = pk.Position.Sub(mgl32.Vec3{0, 1.62}) // Subtract the base offset of players from the pos.
 
 	newPos := vec32To64(pk.Position)

server/session/world.go

@@ -348,6 +348,31 @@ func (s *Session) ViewEntityTeleport(e world.Entity, position mgl64.Vec3) {
 	}
 }
 
+// ViewEntityMount ...
+func (s *Session) ViewEntityMount(r world.Entity, rd world.Entity, driver bool) {
+	linkType := protocol.EntityLinkPassenger
+	if driver {
+		linkType = protocol.EntityLinkRider
+	}
+	s.writePacket(&packet.SetActorLink{EntityLink: protocol.EntityLink{
+		RiddenEntityUniqueID: int64(s.entityRuntimeID(rd)),
+		RiderEntityUniqueID:  int64(s.entityRuntimeID(r)),
+		Type:                 byte(linkType),
+		RiderInitiated:       true,
+	}})
+}
+
+// ViewEntityDismount ...
+func (s *Session) ViewEntityDismount(r world.Entity, rd world.Entity) {
+	s.writePacket(&packet.SetActorLink{EntityLink: protocol.EntityLink{
+		RiddenEntityUniqueID: int64(s.entityRuntimeID(rd)),
+		RiderEntityUniqueID:  int64(s.entityRuntimeID(r)),
+		Type:                 byte(protocol.EntityLinkRemove),
+		RiderInitiated:       true,
+		Immediate:            true,
+	}})
+}
+
 // ViewEntityItems ...
 func (s *Session) ViewEntityItems(e world.Entity) {
 	runtimeID := s.entityRuntimeID(e)

server/world/viewer.go

@@ -29,6 +29,11 @@ type Viewer interface {
 	// ViewEntityTeleport views the teleportation of an entity. The entity is immediately moved to a different
 	// target position.
 	ViewEntityTeleport(e Entity, position mgl64.Vec3)
+	// ViewEntityMount views one entity mounting another. It is called when any entity mounts another or
+	// changes its role (passenger or driver).
+	ViewEntityMount(r Entity, rd Entity, driver bool)
+	// ViewEntityDismount views one entity dismounting another. It is called when any entity is dismounted.
+	ViewEntityDismount(r Entity, rd Entity)
 	// ViewChunk views the chunk passed at a particular position. It is called for every chunk loaded using
 	// the world.Loader.
 	ViewChunk(pos ChunkPos, c *chunk.Chunk, blockNBT map[cube.Pos]Block)