Fetch from upstream. (#1)

* packet/level_sound_event.go: Add missing sound event enums (Sandertv#264)

* minecraft/conn.go: Introduce Proto() method for accessing a conn's protocol (Sandertv#265)

* protocol/events.go: Support the latest events (Sandertv#257)

* protocol/trim.go: Fix typos in documentation (Sandertv#255)

* packet/compression.go: Update documentation about default compression (Sandertv#260)

* packet/event.go: Fix marshaling for Event packet

* README.md: Removed Sponsors section.

* .github/FUNDING.yml: Remove github funding

* minecraft/protocol: Support 1.21.30

* protocol/packet: Update deprecation docs (Sandertv#254)

---------

Co-authored-by: ambiennt <[email protected]>
Co-authored-by: Doge <[email protected]>
Co-authored-by: Smell of curry <[email protected]>
Co-authored-by: TwistedAsylumMC <[email protected]>
Co-authored-by: Sandertv <[email protected]>

Author: 6 people

.github/FUNDING.yml

@@ -19,11 +19,6 @@ Additionally, a MITM proxy is implemented in the [main.go file](https://github.c
 Gophertunnel supports only one version at a time (generally the latest official Minecraft release), but multiple protocols can be supported with the API. Generally, a new
 minor version is tagged when gophertunnel supports a new Minecraft version that was not previously supported.
 
-## Sponsors
-[![Become Patron](https://img.shields.io/badge/dynamic/json?logo=patreon&style=for-the-badge&color=%23e85b46&label=Patreon&query=data.attributes.patron_count&suffix=%20patrons&url=https%3A%2F%2Fwww.patreon.com%2Fapi%2Fcampaigns%2F2832539)](https://patreon.com/sandertv)
-
-Gophertunnel is sponsored by all my gopher sponsors. A special thanks goes to the Very Important Gophers!
-
 ## Contact
 [![Chat on Discord](https://img.shields.io/badge/Chat-On%20Discord-738BD7.svg?style=for-the-badge)](https://discord.com/invite/U4kFWHhTNR)
 

README.md

@@ -234,6 +234,11 @@ func (conn *Conn) GameData() GameData {
 	return conn.gameData
 }
 
+// Proto returns the protocol of the connection.
+func (conn *Conn) Proto() Protocol {
+	return conn.proto
+}
+
 // StartGame starts the game for a client that connected to the server. StartGame should be called for a Conn
 // obtained using a minecraft.Listener. The game data passed will be used to spawn the player in the world of
 // the server. To spawn a Conn obtained from a call to minecraft.Dial(), use Conn.DoSpawn().
@@ -928,19 +933,6 @@ func (conn *Conn) handleClientToServerHandshake() error {
 				URL:         pack.DownloadURL(),
 			})
 		}
-
-		// If it has behaviours, add it to the behaviour pack list. If not, we add it to the texture packs
-		// list.
-		if pack.HasBehaviours() {
-			behaviourPack := protocol.BehaviourPackInfo{UUID: pack.UUID(), Version: pack.Version(), Size: uint64(pack.Len())}
-			if pack.HasScripts() {
-				// One of the resource packs has scripts, so we set HasScripts in the packet to true.
-				pk.HasScripts = true
-				behaviourPack.HasScripts = true
-			}
-			pk.BehaviourPacks = append(pk.BehaviourPacks, behaviourPack)
-			continue
-		}
 		texturePack := protocol.TexturePackInfo{UUID: pack.UUID(), Version: pack.Version(), Size: uint64(pack.Len())}
 		if pack.Encrypted() {
 			texturePack.ContentKey = pack.ContentKey()
@@ -1014,7 +1006,7 @@ func (conn *Conn) handleClientCacheStatus(pk *packet.ClientCacheStatus) error {
 func (conn *Conn) handleResourcePacksInfo(pk *packet.ResourcePacksInfo) error {
 	// First create a new resource pack queue with the information in the packet so we can download them
 	// properly later.
-	totalPacks := len(pk.TexturePacks) + len(pk.BehaviourPacks)
+	totalPacks := len(pk.TexturePacks)
 	conn.packQueue = &resourcePackQueue{
 		packAmount:       totalPacks,
 		downloadingPacks: make(map[string]downloadingPack),
@@ -1045,29 +1037,6 @@ func (conn *Conn) handleResourcePacksInfo(pk *packet.ResourcePacksInfo) error {
 			contentKey: pack.ContentKey,
 		}
 	}
-	for index, pack := range pk.BehaviourPacks {
-		if _, ok := conn.packQueue.downloadingPacks[pack.UUID]; ok {
-			conn.log.Printf("handle ResourcePacksInfo: duplicate behaviour pack (UUID=%v)\n", pack.UUID)
-			conn.packQueue.packAmount--
-			continue
-		}
-		if conn.downloadResourcePack != nil && !conn.downloadResourcePack(uuid.MustParse(pack.UUID), pack.Version, index, totalPacks) {
-			conn.ignoredResourcePacks = append(conn.ignoredResourcePacks, exemptedResourcePack{
-				uuid:    pack.UUID,
-				version: pack.Version,
-			})
-			conn.packQueue.packAmount--
-			continue
-		}
-		// This UUID_Version is a hack Mojang put in place.
-		packsToDownload = append(packsToDownload, pack.UUID+"_"+pack.Version)
-		conn.packQueue.downloadingPacks[pack.UUID] = downloadingPack{
-			size:       pack.Size,
-			buf:        bytes.NewBuffer(make([]byte, 0, pack.Size)),
-			newFrag:    make(chan []byte),
-			contentKey: pack.ContentKey,
-		}
-	}
 
 	if len(packsToDownload) != 0 {
 		conn.expect(packet.IDResourcePackDataInfo, packet.IDResourcePackChunkData)

minecraft/conn.go

@@ -39,6 +39,12 @@ func (x *AttributeValue) Marshal(r IO) {
 // holds a default value, maximum and minimum value, name and its current value.
 type Attribute struct {
 	AttributeValue
+	// DefaultMin is the default minimum value of the attribute. It's not clear why this field must be sent to
+	// the client, but it is required regardless.
+	DefaultMin float32
+	// DefaultMax is the default maximum value of the attribute. It's not clear why this field must be sent to
+	// the client, but it is required regardless.
+	DefaultMax float32
 	// Default is the default value of the attribute. It's not clear why this field must be sent to the
 	// client, but it is required regardless.
 	Default float32
@@ -51,6 +57,8 @@ func (x *Attribute) Marshal(r IO) {
 	r.Float32(&x.Min)
 	r.Float32(&x.Max)
 	r.Float32(&x.Value)
+	r.Float32(&x.DefaultMin)
+	r.Float32(&x.DefaultMax)
 	r.Float32(&x.Default)
 	r.String(&x.Name)
 	Slice(r, &x.Modifiers)

minecraft/protocol/attribute.go

@@ -152,9 +152,15 @@ type CameraPreset struct {
 	RotX Optional[float32]
 	// RotY is the default yaw of the camera.
 	RotY Optional[float32]
+	// RotationSpeed is the speed at which the camera should rotate.
+	RotationSpeed Optional[float32]
+	// SnapToTarget determines whether the camera should snap to the target entity or not.
+	SnapToTarget Optional[bool]
 	// ViewOffset is only used in a follow_orbit camera and controls an offset based on a pivot point to the
 	// player, causing it to be shifted in a certain direction.
 	ViewOffset Optional[mgl32.Vec2]
+	// EntityOffset controls the offset from the entity that the camera should be rendered at.
+	EntityOffset Optional[mgl32.Vec3]
 	// Radius is only used in a follow_orbit camera and controls how far away from the player the camera should
 	// be rendered.
 	Radius Optional[float32]
@@ -174,7 +180,10 @@ func (x *CameraPreset) Marshal(r IO) {
 	OptionalFunc(r, &x.PosZ, r.Float32)
 	OptionalFunc(r, &x.RotX, r.Float32)
 	OptionalFunc(r, &x.RotY, r.Float32)
+	OptionalFunc(r, &x.RotationSpeed, r.Float32)
+	OptionalFunc(r, &x.SnapToTarget, r.Bool)
 	OptionalFunc(r, &x.ViewOffset, r.Vec2)
+	OptionalFunc(r, &x.EntityOffset, r.Vec3)
 	OptionalFunc(r, &x.Radius, r.Float32)
 	OptionalFunc(r, &x.AudioListener, r.Uint8)
 	OptionalFunc(r, &x.PlayerEffects, r.Bool)

minecraft/protocol/camera.go

@@ -112,12 +112,12 @@ const (
 type FullContainerName struct {
 	// ContainerID is the ID of the container that the slot was in.
 	ContainerID byte
-	// DynamicContainerID is the ID of the container if it is dynamic. If the container is not dynamic, this field is
-	// set to 0.
-	DynamicContainerID uint32
+	// DynamicContainerID is the ID of the container if it is dynamic. If the container is not dynamic, this
+	// field should be left empty. A non-optional value of 0 is assumed to be non-empty.
+	DynamicContainerID Optional[uint32]
 }
 
 func (x *FullContainerName) Marshal(r IO) {
 	r.Uint8(&x.ContainerID)
-	r.Uint32(&x.DynamicContainerID)
+	OptionalFunc(r, &x.DynamicContainerID, r.Uint32)
 }