chat/translate.go: Added way to encapsulate translations with, for ex…

…ample, colours.
df-mc · Dec 20, 2024 · 02cd499 · 02cd499
1 parent 34289b5
commit 02cd499
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/server/player/chat/chat.go b/server/player/chat/chat.go
@@ -40,15 +40,15 @@ func (chat *Chat) WriteString(s string) (n int, err error) {
 	return len(s), nil
 }
 
-func (chat *Chat) Writet(t Translation) {
+func (chat *Chat) Writet(t Translatable, a ...any) {
 	chat.m.Lock()
 	defer chat.m.Unlock()
 	for _, subscriber := range chat.subscribers {
 		if translator, ok := subscriber.(Translator); ok {
-			translator.Messaget(t)
+			translator.Messaget(t, a...)
 			continue
 		}
-		subscriber.Message(t.String())
+		subscriber.Message(t.F(a...).String())
 	}
 }
 

diff --git a/server/player/chat/subscriber.go b/server/player/chat/subscriber.go
@@ -18,7 +18,7 @@ type Subscriber interface {
 }
 
 type Translator interface {
-	Messaget(t Translation)
+	Messaget(t Translatable, a ...any)
 }
 
 // StdoutSubscriber is an implementation of Subscriber that forwards messages

diff --git a/server/player/chat/translate.go b/server/player/chat/translate.go
@@ -2,12 +2,13 @@ package chat
 
 import (
 	"fmt"
+	"github.com/sandertv/gophertunnel/minecraft/text"
 )
 
-var JoinMessage = translate("%multiplayer.player.joined", 1, "%v joined the game")
-var QuitMessage = translate("%multiplayer.player.left", 1, "%v left the game")
+var MessageJoin = Translate("%multiplayer.player.joined", 1, "%v joined the game").Enc("<yellow>%v</yellow>")
+var MessageQuit = Translate("%multiplayer.player.left", 1, "%v left the game").Enc("<yellow>%v</yellow>")
 
-func translate(format string, params int, fallback string) Translatable {
+func Translate(format string, params int, fallback string) Translatable {
 	return Translatable{format: format, params: params, fallback: fallback}
 }
 
@@ -17,6 +18,12 @@ type Translatable struct {
 	fallback string
 }
 
+func (t Translatable) Enc(format string) Translatable {
+	t.format = text.Colourf(format, t.format)
+	t.fallback = text.Colourf(format, t.fallback)
+	return t
+}
+
 func (t Translatable) F(a ...any) Translation {
 	if len(a) != t.params {
 		panic(fmt.Sprintf("translation '%v' requires exactly %v parameters, got %v", t.format, t.params, len(a)))

diff --git a/server/player/player.go b/server/player/player.go
@@ -223,8 +223,8 @@ func (p *Player) Messagef(f string, a ...any) {
 	p.session().SendMessage(fmt.Sprintf(f, a...))
 }
 
-func (p *Player) Messaget(t chat.Translation) {
-	p.session().SendTranslation(t)
+func (p *Player) Messaget(t chat.Translatable, a ...any) {
+	p.session().SendTranslation(t.F(a...))
 }
 
 // SendPopup sends a formatted popup to the player. The popup is shown above the hotbar of the player and

diff --git a/server/session/session.go b/server/session/session.go
@@ -18,7 +18,6 @@ import (
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/login"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
-	"github.com/sandertv/gophertunnel/minecraft/text"
 	"io"
 	"log/slog"
 	"net"
@@ -225,7 +224,7 @@ func (s *Session) Spawn(c Controllable, tx *world.Tx) {
 
 	chat.Global.Subscribe(c)
 	if s.joinMessage != "" {
-		_, _ = fmt.Fprintln(chat.Global, text.Colourf("<yellow>%v</yellow>", fmt.Sprintf(s.joinMessage, s.conn.IdentityData().DisplayName)))
+		chat.Global.Writet(chat.MessageJoin, s.conn.IdentityData().DisplayName)
 	}
 
 	go s.background()
@@ -256,8 +255,7 @@ func (s *Session) close(tx *world.Tx, c Controllable) {
 	s.chunkLoader.Close(tx)
 
 	if s.quitMessage != "" {
-		chat.Global.Writet(chat.QuitMessage.F(s.conn.IdentityData().DisplayName))
-		_, _ = fmt.Fprintln(chat.Global, text.Colourf("<yellow>%v</yellow>", fmt.Sprintf(s.quitMessage, s.conn.IdentityData().DisplayName)))
+		chat.Global.Writet(chat.MessageQuit, s.conn.IdentityData().DisplayName)
 	}
 	chat.Global.Unsubscribe(c)