From 5590e865c79e47d5cdc04e82dd47e902ed96d60c Mon Sep 17 00:00:00 2001 From: TwistedAsylumMC Date: Wed, 4 Dec 2024 10:15:52 +0000 Subject: [PATCH] minecraft/protocol: More camera docs & document filtered fields --- minecraft/protocol/camera.go | 8 ++++---- minecraft/protocol/item_stack.go | 3 ++- minecraft/protocol/packet/disconnect.go | 3 ++- minecraft/protocol/packet/set_title.go | 3 ++- minecraft/protocol/packet/text.go | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/minecraft/protocol/camera.go b/minecraft/protocol/camera.go index 8218027f..5cae6455 100644 --- a/minecraft/protocol/camera.go +++ b/minecraft/protocol/camera.go @@ -168,10 +168,10 @@ type CameraPreset struct { HorizontalRotationLimit Optional[mgl32.Vec2] // VerticalRotationLimit is the vertical rotation limit of the camera. VerticalRotationLimit Optional[mgl32.Vec2] - // ContinueTargeting determines whether the camera should continue targeting the entity or not. + // ContinueTargeting determines whether the camera should continue targeting when using aim assist. ContinueTargeting Optional[bool] - // BlockListeningRadius ... - BlockListeningRadius Optional[float32] + // TrackingRadius is the radius around the camera that the aim assist should track targets. + TrackingRadius Optional[float32] // 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] @@ -206,7 +206,7 @@ func (x *CameraPreset) Marshal(r IO) { OptionalFunc(r, &x.HorizontalRotationLimit, r.Vec2) OptionalFunc(r, &x.VerticalRotationLimit, r.Vec2) OptionalFunc(r, &x.ContinueTargeting, r.Bool) - OptionalFunc(r, &x.BlockListeningRadius, r.Float32) + OptionalFunc(r, &x.TrackingRadius, r.Float32) OptionalFunc(r, &x.ViewOffset, r.Vec2) OptionalFunc(r, &x.EntityOffset, r.Vec3) OptionalFunc(r, &x.Radius, r.Float32) diff --git a/minecraft/protocol/item_stack.go b/minecraft/protocol/item_stack.go index 949957c6..e1b5c206 100644 --- a/minecraft/protocol/item_stack.go +++ b/minecraft/protocol/item_stack.go @@ -259,7 +259,8 @@ type StackResponseSlotInfo struct { StackNetworkID int32 // CustomName is the custom name of the item stack. It is used in relation to text filtering. CustomName string - // FilteredCustomName is always set to empty and the usage is currently unknown. + // FilteredCustomName is a filtered version of CustomName with all the profanity removed. The client will + // use this over CustomName if this field is not empty and they have the "Filter Profanity" setting enabled. FilteredCustomName string // DurabilityCorrection is the current durability of the item stack. This durability will be shown // client-side after the response is sent to the client. diff --git a/minecraft/protocol/packet/disconnect.go b/minecraft/protocol/packet/disconnect.go index 94e629e5..8d0378aa 100644 --- a/minecraft/protocol/packet/disconnect.go +++ b/minecraft/protocol/packet/disconnect.go @@ -16,7 +16,8 @@ type Disconnect struct { // Message is an optional message to show when disconnected. This message is only written if the // HideDisconnectionScreen field is set to true. Message string - // FilteredMessage is always set to empty and the usage is currently unknown. + // FilteredMessage is a filtered version of Message with all the profanity removed. The client will use + // this over Message if this field is not empty and they have the "Filter Profanity" setting enabled. FilteredMessage string } diff --git a/minecraft/protocol/packet/set_title.go b/minecraft/protocol/packet/set_title.go index 538842e2..672dbfb9 100644 --- a/minecraft/protocol/packet/set_title.go +++ b/minecraft/protocol/packet/set_title.go @@ -39,7 +39,8 @@ type SetTitle struct { XUID string // PlatformOnlineID is either a uint64 or an empty string. PlatformOnlineID string - // FilteredMessage is always set to empty and the usage is currently unknown. + // FilteredMessage is a filtered version of Message with all the profanity removed. The client will use + // this over Message if this field is not empty and they have the "Filter Profanity" setting enabled. FilteredMessage string } diff --git a/minecraft/protocol/packet/text.go b/minecraft/protocol/packet/text.go index 4ffc2c6f..11dc31db 100644 --- a/minecraft/protocol/packet/text.go +++ b/minecraft/protocol/packet/text.go @@ -46,7 +46,8 @@ type Text struct { // Nintendo Switch). It is otherwise an empty string, and is used to decide which players are able to // chat with each other. PlatformChatID string - // FilteredMessage is always set to empty and the usage is currently unknown. + // FilteredMessage is a filtered version of Message with all the profanity removed. The client will use + // this over Message if this field is not empty and they have the "Filter Profanity" setting enabled. FilteredMessage string }