Merge remote-tracking branch 'upstream/master'

pull sebs changes

Author: ethaniccc

minecraft/protocol/camera.go

@@ -72,6 +72,9 @@ type CameraInstructionSet struct {
 	Rotation Optional[mgl32.Vec2]
 	// Facing is a vector that the camera will always face towards during the duration of the instruction.
 	Facing Optional[mgl32.Vec3]
+	// ViewOffset is an offset based on a pivot point to the player, causing the camera to be shifted in a
+	// certain direction.
+	ViewOffset Optional[mgl32.Vec2]
 	// Default determines whether the camera is a default camera or not.
 	Default Optional[bool]
 }
@@ -83,6 +86,7 @@ func (x *CameraInstructionSet) Marshal(r IO) {
 	OptionalFunc(r, &x.Position, r.Vec3)
 	OptionalFunc(r, &x.Rotation, r.Vec2)
 	OptionalFunc(r, &x.Facing, r.Vec3)
+	OptionalFunc(r, &x.ViewOffset, r.Vec2)
 	OptionalFunc(r, &x.Default, r.Bool)
 }
 

minecraft/protocol/packet/level_sound_event.go

@@ -491,6 +491,12 @@ const (
 	SoundEventDecoratedPotInsert
 	SoundEventDecoratedPotInsertFail
 	SoundEventCrafterDisableSlot
+	_
+	_
+	_
+	_
+	_
+	_
 	SoundEventCopperBulbTurnOn
 	SoundEventCopperBulbTurnOff
 	SoundEventAmbientInAir
@@ -524,12 +530,6 @@ const (
 	SoundEventMaceHeavySmashGround
 	SoundEventOminousItemSpawnerSpawnItemBegin
 	_
-	_
-	_
-	_
-	_
-	_
-	_
 	SoundEventApplyEffectBadOmen
 	SoundEventApplyEffectRaidOmen
 	SoundEventApplyEffectTrialOmen

minecraft/protocol/packet/server_bound_diagnostics.go

@@ -5,7 +5,8 @@ import (
 )
 
 // ServerBoundDiagnostics is sent by the client to tell the server about the performance diagnostics
-// of the client. It is sent by the client roughly every 500ms or 10 in-game ticks.
+// of the client. It is sent by the client roughly every 500ms or 10 in-game ticks when the
+// "Creator > Enable Client Diagnostics" setting is enabled.
 type ServerBoundDiagnostics struct {
 	// AverageFramesPerSecond is the average amount of frames per second that the client has been
 	// running at.