diff --git a/go.mod b/go.mod index f5184e5dd..5629ddbfc 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/df-mc/atomic v1.10.0 github.com/df-mc/goleveldb v1.1.9 - github.com/df-mc/worldupgrader v1.0.9 + github.com/df-mc/worldupgrader v1.0.10 github.com/go-gl/mathgl v1.0.0 github.com/google/uuid v1.3.0 github.com/pelletier/go-toml v1.9.5 github.com/rogpeppe/go-internal v1.9.0 - github.com/sandertv/gophertunnel v1.32.2 + github.com/sandertv/gophertunnel v1.33.0 github.com/sirupsen/logrus v1.9.0 go.uber.org/atomic v1.10.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 diff --git a/go.sum b/go.sum index ca605e2b8..3e243a30d 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,8 @@ github.com/df-mc/atomic v1.10.0 h1:0ZuxBKwR/hxcFGorKiHIp+hY7hgY+XBTzhCYD2NqSEg= github.com/df-mc/atomic v1.10.0/go.mod h1:Gw9rf+rPIbydMjA329Jn4yjd/O2c/qusw3iNp4tFGSc= github.com/df-mc/goleveldb v1.1.9 h1:ihdosZyy5jkQKrxucTQmN90jq/2lUwQnJZjIYIC/9YU= github.com/df-mc/goleveldb v1.1.9/go.mod h1:+NHCup03Sci5q84APIA21z3iPZCuk6m6ABtg4nANCSk= -github.com/df-mc/worldupgrader v1.0.9 h1:hJxbovEEzhTg/TPZqpwg8BsVTVeoVgDp6q7dMoBlwmA= -github.com/df-mc/worldupgrader v1.0.9/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk= +github.com/df-mc/worldupgrader v1.0.10 h1:zR0GyIRmt89SpZU/AO3XplklXyuVMisqtHL4X+1NxO0= +github.com/df-mc/worldupgrader v1.0.10/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68= github.com/go-gl/mathgl v1.0.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= @@ -48,8 +48,8 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/sandertv/go-raknet v1.12.0 h1:olUzZlIJyX/pgj/mrsLCZYjKLNDsYiWdvQ4NIm3z0DA= github.com/sandertv/go-raknet v1.12.0/go.mod h1:Gx+WgZBMQ0V2UoouGoJ8Wj6CDrMBQ4SB2F/ggpl5/+Y= -github.com/sandertv/gophertunnel v1.32.2 h1:vlm6TonrgdESjcgY8Ixt4mHT4/bdih+NrnsqlBhaUok= -github.com/sandertv/gophertunnel v1.32.2/go.mod h1:+Dbhj3bs74gZoSkyab7kglx1Rbq8S5G7sJd/wr5Qm9g= +github.com/sandertv/gophertunnel v1.33.0 h1:agNDZVSvy14DXEXnADUe408bG/9teYfPPnPwHipwe58= +github.com/sandertv/gophertunnel v1.33.0/go.mod h1:+Dbhj3bs74gZoSkyab7kglx1Rbq8S5G7sJd/wr5Qm9g= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= diff --git a/server/block/chest.go b/server/block/chest.go index 7fcac2f0f..0dc5c07b6 100644 --- a/server/block/chest.go +++ b/server/block/chest.go @@ -184,7 +184,7 @@ func (Chest) EncodeItem() (name string, meta int16) { // EncodeBlock ... func (c Chest) EncodeBlock() (name string, properties map[string]any) { - return "minecraft:chest", map[string]any{"facing_direction": 2 + int32(c.Facing)} + return "minecraft:chest", map[string]any{"minecraft:cardinal_direction": c.Facing.String()} } // allChests ... diff --git a/server/block/ender_chest.go b/server/block/ender_chest.go index 85f991680..313423b28 100644 --- a/server/block/ender_chest.go +++ b/server/block/ender_chest.go @@ -123,7 +123,7 @@ func (EnderChest) EncodeItem() (name string, meta int16) { // EncodeBlock ... func (c EnderChest) EncodeBlock() (name string, properties map[string]interface{}) { - return "minecraft:ender_chest", map[string]interface{}{"facing_direction": 2 + int32(c.Facing)} + return "minecraft:ender_chest", map[string]any{"minecraft:cardinal_direction": c.Facing.String()} } // allEnderChests ... diff --git a/server/block/stonecutter.go b/server/block/stonecutter.go index 14a6699d1..b474cd588 100644 --- a/server/block/stonecutter.go +++ b/server/block/stonecutter.go @@ -54,7 +54,7 @@ func (Stonecutter) EncodeItem() (name string, meta int16) { // EncodeBlock ... func (s Stonecutter) EncodeBlock() (name string, properties map[string]interface{}) { - return "minecraft:stonecutter_block", map[string]interface{}{"facing_direction": 2 + int32(s.Facing)} + return "minecraft:stonecutter_block", map[string]any{"minecraft:cardinal_direction": s.Facing.String()} } // allStonecutters ... diff --git a/server/item/creative/creative_items.nbt b/server/item/creative/creative_items.nbt index e41594f1b..115d875a0 100644 Binary files a/server/item/creative/creative_items.nbt and b/server/item/creative/creative_items.nbt differ diff --git a/server/world/block_states.nbt b/server/world/block_states.nbt index cbbd1f41a..0cc5d2414 100644 Binary files a/server/world/block_states.nbt and b/server/world/block_states.nbt differ