protocol: Support 1.19.80

minecraft/conn.go

@@ -1009,6 +1009,8 @@ func (conn *Conn) startGame() {
 		Dimension:                    data.Dimension,
 		WorldSpawn:                   data.WorldSpawn,
 		EditorWorld:                  data.EditorWorld,
+		CreatedInEditor:              data.CreatedInEditor,
+		ExportedFromEditor:           data.ExportedFromEditor,
 		PersonaDisabled:              data.PersonaDisabled,
 		CustomSkinsDisabled:          data.CustomSkinsDisabled,
 		GameRules:                    data.GameRules,
@@ -1205,6 +1207,8 @@ func (conn *Conn) handleStartGame(pk *packet.StartGame) error {
 		Dimension:                    pk.Dimension,
 		WorldSpawn:                   pk.WorldSpawn,
 		EditorWorld:                  pk.EditorWorld,
+		CreatedInEditor:              pk.CreatedInEditor,
+		ExportedFromEditor:           pk.ExportedFromEditor,
 		PersonaDisabled:              pk.PersonaDisabled,
 		CustomSkinsDisabled:          pk.CustomSkinsDisabled,
 		GameRules:                    pk.GameRules,

minecraft/game_data.go

@@ -56,6 +56,12 @@ type GameData struct {
 	// EditorWorld is a value to dictate if the world is in editor mode, a special mode recently introduced adding
 	// "powerful tools for editing worlds, intended for experienced creators."
 	EditorWorld bool
+	// CreatedInEditor is a value to dictate if the world was created as a project in the editor mode. The functionality
+	// of this field is currently unknown.
+	CreatedInEditor bool
+	// ExportedFromEditor is a value to dictate if the world was exported from editor mode. The functionality of this
+	// field is currently unknown.
+	ExportedFromEditor bool
 	// WorldGameMode is the game mode that a player gets when it first spawns in the world. It is shown in the
 	// settings and is used if the PlayerGameMode is set to 5.
 	WorldGameMode int32

minecraft/protocol/info.go

@@ -2,7 +2,7 @@ package protocol
 
 const (
 	// CurrentProtocol is the current protocol version for the version below.
-	CurrentProtocol = 575
+	CurrentProtocol = 582
 	// CurrentVersion is the current version of Minecraft as supported by the `packet` package.
-	CurrentVersion = "1.19.70"
+	CurrentVersion = "1.19.80"
 )

minecraft/protocol/packet/compressed_biome_definition_list .go

@@ -0,0 +1,18 @@
+package packet
+
+import (
+	"github.com/sandertv/gophertunnel/minecraft/protocol"
+)
+
+type CompressedBiomeDefinitionList struct {
+	SerialisedBiomeDefinitions []byte
+}
+
+// ID ...
+func (*CompressedBiomeDefinitionList) ID() uint32 {
+	return IDCompressedBiomeDefinitionList
+}
+
+func (pk *CompressedBiomeDefinitionList) Marshal(io protocol.IO) {
+	io.Bytes(&pk.SerialisedBiomeDefinitions)
+}

minecraft/protocol/packet/id.go

@@ -201,4 +201,7 @@ const (
 	IDCameraPresets
 	IDUnlockedRecipes
 	IDCameraInstruction = iota + 101
+	IDCompressedBiomeDefinitionList
+	IDTrimData
+	IDOpenSign
 )

minecraft/protocol/packet/level_event.go

@@ -41,6 +41,7 @@ const (
 	LevelEventSoundPointedDripstoneLand    = 1064
 	LevelEventSoundDyeUsed                 = 1065
 	LevelEventSoundInkSacUsed              = 1066
+	LevelEventSoundAmethystResonate        = 1067
 	LevelEventQueueCustomMusic             = 1900
 	LevelEventPlayCustomMusic              = 1901
 	LevelEventStopCustomMusic              = 1902
@@ -111,6 +112,12 @@ const (
 	LevelEventStartBlockCracking           = 3600
 	LevelEventStopBlockCracking            = 3601
 	LevelEventUpdateBlockCracking          = 3602
+	LevelEventParticlesCrackBlockDown      = 3603
+	LevelEventParticlesCrackBlockUp        = 3604
+	LevelEventParticlesCrackBlockNorth     = 3605
+	LevelEventParticlesCrackBlockSouth     = 3606
+	LevelEventParticlesCrackBlockWest      = 3607
+	LevelEventParticlesCrackBlockEast      = 3608
 	LevelEventAllPlayersSleeping           = 9800
 	LevelEventSleepingPlayers              = 9801
 	LevelEventJumpPrevented                = 9810

minecraft/protocol/packet/open_sign.go

@@ -0,0 +1,27 @@
+package packet
+
+import (
+	"github.com/go-gl/mathgl/mgl32"
+	"github.com/sandertv/gophertunnel/minecraft/protocol"
+)
+
+// OpenSign is sent by the server to open a sign for editing. As of 1.19.80, the player can interact with a sign to edit
+// either the text on either side instead of just the front.
+type OpenSign struct {
+	// Position is the position of the sign to edit. The client uses this position to get the data of the sign, including
+	// the existing text and formatting etc.
+	Position mgl32.Vec3
+	// FrontSide dictates whether the front side of the sign should be opened for editing. If false, the back side is
+	// assumed to be edited.
+	FrontSide bool
+}
+
+// ID ...
+func (*OpenSign) ID() uint32 {
+	return IDOpenSign
+}
+
+func (pk *OpenSign) Marshal(io protocol.IO) {
+	io.Vec3(&pk.Position)
+	io.Bool(&pk.FrontSide)
+}

minecraft/protocol/packet/photo_info_request.go

@@ -4,7 +4,7 @@ import (
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
 )
 
-// PhotoInfoRequest is sent by the client to request photo information from the server.
+// PhotoInfoRequest is sent by the client to request photo information from the server. This packet was deprecated in 1.19.80.
 type PhotoInfoRequest struct {
 	// PhotoID is the ID of the photo.
 	PhotoID int64

minecraft/protocol/packet/pool.go

@@ -224,7 +224,10 @@ func init() {
 		IDCameraPresets:                     func() Packet { return &CameraPresets{} },
 		IDUnlockedRecipes:                   func() Packet { return &UnlockedRecipes{} },
 		// ---
-		IDCameraInstruction: func() Packet { return &CameraInstruction{} },
+		IDCameraInstruction:             func() Packet { return &CameraInstruction{} },
+		IDCompressedBiomeDefinitionList: func() Packet { return &CompressedBiomeDefinitionList{} },
+		IDTrimData:                      func() Packet { return &TrimData{} },
+		IDOpenSign:                      func() Packet { return &OpenSign{} },
 	}
 	for id, pk := range packets {
 		Register(id, pk)

minecraft/protocol/packet/request_chunk_radius.go

@@ -11,6 +11,9 @@ type RequestChunkRadius struct {
 	// ChunkRadius is the requested chunk radius. This value is always the value set in the settings of the
 	// player.
 	ChunkRadius int32
+	// MaxChunkRadius is the maximum chunk radius that the player wants to receive. The reason for the client sending this
+	// is currently unknown.
+	MaxChunkRadius int32
 }
 
 // ID ...
@@ -20,4 +23,5 @@ func (*RequestChunkRadius) ID() uint32 {
 
 func (pk *RequestChunkRadius) Marshal(io protocol.IO) {
 	io.Varint32(&pk.ChunkRadius)
+	io.Varint32(&pk.MaxChunkRadius)
 }

minecraft/protocol/packet/start_game.go

@@ -75,6 +75,12 @@ type StartGame struct {
 	// EditorWorld is a value to dictate if the world is in editor mode, a special mode recently introduced adding
 	// "powerful tools for editing worlds, intended for experienced creators."
 	EditorWorld bool
+	// CreatedInEditor is a value to dictate if the world was created as a project in the editor mode. The functionality
+	// of this field is currently unknown.
+	CreatedInEditor bool
+	// ExportedFromEditor is a value to dictate if the world was exported from editor mode. The functionality of this
+	// field is currently unknown.
+	ExportedFromEditor bool
 	// DayCycleLockTime is the time at which the day cycle was locked if the day cycle is disabled using the
 	// respective game rule. The client will maintain this time as long as the day cycle is disabled.
 	DayCycleLockTime int32
@@ -227,6 +233,7 @@ type StartGame struct {
 	ChatRestrictionLevel uint8
 	// DisablePlayerInteractions is true if the client should ignore other players when interacting with the world.
 	DisablePlayerInteractions bool
+	UseBlockNetworkIDHashes   bool
 }
 
 // ID ...
@@ -251,6 +258,8 @@ func (pk *StartGame) Marshal(io protocol.IO) {
 	io.UBlockPos(&pk.WorldSpawn)
 	io.Bool(&pk.AchievementsDisabled)
 	io.Bool(&pk.EditorWorld)
+	io.Bool(&pk.CreatedInEditor)
+	io.Bool(&pk.ExportedFromEditor)
 	io.Varint32(&pk.DayCycleLockTime)
 	io.Varint32(&pk.EducationEditionOffer)
 	io.Bool(&pk.EducationFeaturesEnabled)
@@ -305,4 +314,5 @@ func (pk *StartGame) Marshal(io protocol.IO) {
 	io.Uint64(&pk.ServerBlockStateChecksum)
 	io.UUID(&pk.WorldTemplateID)
 	io.Bool(&pk.ClientSideGeneration)
+	io.Bool(&pk.UseBlockNetworkIDHashes)
 }

minecraft/protocol/packet/trim_data.go

@@ -0,0 +1,20 @@
+package packet
+
+import (
+	"github.com/sandertv/gophertunnel/minecraft/protocol"
+)
+
+type TrimData struct {
+	Patterns  []protocol.TrimPattern
+	Materials []protocol.TrimMaterial
+}
+
+// ID ...
+func (*TrimData) ID() uint32 {
+	return IDTrimData
+}
+
+func (pk *TrimData) Marshal(io protocol.IO) {
+	protocol.Slice(io, &pk.Patterns)
+	protocol.Slice(io, &pk.Materials)
+}

minecraft/protocol/recipe.go

@@ -66,6 +66,7 @@ const (
 	RecipeShapelessChemistry
 	RecipeShapedChemistry
 	RecipeSmithingTransform
+	RecipeSmithingTrim
 )
 
 // Recipe represents a recipe that may be sent in a CraftingData packet to let the client know what recipes
@@ -99,6 +100,8 @@ func lookupRecipe(recipeType int32, x *Recipe) bool {
 		*x = &ShapedChemistryRecipe{}
 	case RecipeSmithingTransform:
 		*x = &SmithingTransformRecipe{}
+	case RecipeSmithingTrim:
+		*x = &SmithingTrimRecipe{}
 	default:
 		return false
 	}
@@ -127,6 +130,8 @@ func lookupRecipeType(x Recipe, recipeType *int32) bool {
 		*recipeType = RecipeShapedChemistry
 	case *SmithingTransformRecipe:
 		*recipeType = RecipeSmithingTransform
+	case *SmithingTrimRecipe:
+		*recipeType = RecipeSmithingTrim
 	default:
 		return false
 	}
@@ -254,6 +259,8 @@ type SmithingTransformRecipe struct {
 	// RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too,
 	// but its functionality is not exactly known.
 	RecipeID string
+	// Template is the item that is used to shape the Base item based on the Addition being applied.
+	Template ItemDescriptorCount
 	// Base is the item that the Addition is being applied to in the smithing table.
 	Base ItemDescriptorCount
 	// Addition is the item that is being added to the Base item to result in a modified item.
@@ -265,6 +272,10 @@ type SmithingTransformRecipe struct {
 	Block string
 }
 
+type SmithingTrimRecipe struct {
+	ShapelessRecipe
+}
+
 // Marshal ...
 func (recipe *ShapelessRecipe) Marshal(w *Writer) {
 	marshalShapeless(w, recipe)
@@ -363,6 +374,7 @@ func (recipe *MultiRecipe) Unmarshal(r *Reader) {
 // Marshal ...
 func (recipe *SmithingTransformRecipe) Marshal(w *Writer) {
 	w.String(&recipe.RecipeID)
+	w.ItemDescriptorCount(&recipe.Template)
 	w.ItemDescriptorCount(&recipe.Base)
 	w.ItemDescriptorCount(&recipe.Addition)
 	w.Item(&recipe.Result)
@@ -373,13 +385,24 @@ func (recipe *SmithingTransformRecipe) Marshal(w *Writer) {
 // Unmarshal ...
 func (recipe *SmithingTransformRecipe) Unmarshal(r *Reader) {
 	r.String(&recipe.RecipeID)
+	r.ItemDescriptorCount(&recipe.Template)
 	r.ItemDescriptorCount(&recipe.Base)
 	r.ItemDescriptorCount(&recipe.Addition)
 	r.Item(&recipe.Result)
 	r.String(&recipe.Block)
 	r.Varuint32(&recipe.RecipeNetworkID)
 }
 
+// Marshal ...
+func (recipe *SmithingTrimRecipe) Marshal(w *Writer) {
+	marshalShapeless(w, &recipe.ShapelessRecipe)
+}
+
+// Unmarshal ...
+func (recipe *SmithingTrimRecipe) Unmarshal(r *Reader) {
+	marshalShapeless(r, &recipe.ShapelessRecipe)
+}
+
 // marshalShaped ...
 func marshalShaped(r IO, recipe *ShapedRecipe) {
 	r.String(&recipe.RecipeID)

minecraft/protocol/trim.go

@@ -0,0 +1,25 @@
+package protocol
+
+type TrimPattern struct {
+	ItemName  string
+	PatternID string
+}
+
+// Marshal ...
+func (x *TrimPattern) Marshal(r IO) {
+	r.String(&x.ItemName)
+	r.String(&x.PatternID)
+}
+
+type TrimMaterial struct {
+	MaterialID string
+	Colour     string
+	ItemName   string
+}
+
+// Marshal ...
+func (x *TrimMaterial) Marshal(r IO) {
+	r.String(&x.MaterialID)
+	r.String(&x.Colour)
+	r.String(&x.ItemName)
+}