fix logger not being and other thing maybe
This commit is contained in:
@@ -279,5 +279,6 @@ func NewConn() (ret *Conn) {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
ret.Loop = event.NewLoop()
|
ret.Loop = event.NewLoop()
|
||||||
|
ret.Log = slog.Default()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-5
@@ -157,10 +157,6 @@ func (c *Component) UnmarshalJSON(data []byte) error {
|
|||||||
|
|
||||||
// ToNBT converts the component to a format suitable for the nbt package.
|
// ToNBT converts the component to a format suitable for the nbt package.
|
||||||
func (c *Component) ToNBT() any {
|
func (c *Component) ToNBT() any {
|
||||||
if c.isSimpleText() {
|
|
||||||
return c.Text
|
|
||||||
}
|
|
||||||
|
|
||||||
m := make(map[string]any)
|
m := make(map[string]any)
|
||||||
if c.Bold != nil {
|
if c.Bold != nil {
|
||||||
m["bold"] = boolToByte(*c.Bold)
|
m["bold"] = boolToByte(*c.Bold)
|
||||||
@@ -494,7 +490,8 @@ func Pretty(s string) *Component {
|
|||||||
|
|
||||||
// PrettyF returns a Component from a formatted string.
|
// PrettyF returns a Component from a formatted string.
|
||||||
func PrettyF(format string, args ...any) *Component {
|
func PrettyF(format string, args ...any) *Component {
|
||||||
return Pretty(fmt.Sprintf(format, args...))
|
s := fmt.Sprintf(format, args...)
|
||||||
|
return Pretty(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
var colorToCode = map[string]byte{
|
var colorToCode = map[string]byte{
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/admin-else/strom/nbt"
|
||||||
|
"github.com/google/go-cmp/cmp"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestComponent_JSON(t *testing.T) {
|
func TestComponent_JSON(t *testing.T) {
|
||||||
@@ -216,3 +219,31 @@ func TestComponent_String(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPrettyToNbt(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
f string
|
||||||
|
want nbt.Anon
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "real data",
|
||||||
|
f: `§dno gooning`,
|
||||||
|
want: nbt.Anon{Value: map[string]interface{}{"extra": []interface{}{map[string]interface{}{"color": "light_purple", "text": "no gooning"}}}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "reset thing",
|
||||||
|
f: "§3Any§bProtect§3 » §rffff",
|
||||||
|
want: nbt.Anon{Value: map[string]interface{}{"extra": []interface{}{map[string]interface{}{"color": "dark_aqua", "text": "Any"}, map[string]interface{}{"color": "aqua", "text": "Protect"}, map[string]interface{}{"color": "dark_aqua", "text": " » "}, map[string]interface{}{"text": "ffff"}}, "text": ""}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
a := Pretty(tt.f).AsNBT()
|
||||||
|
b := tt.want
|
||||||
|
if !cmp.Equal(a, b) {
|
||||||
|
t.Errorf("PrettyToNbt() = %v, want %v", a, b)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user