diff --git a/conn.go b/conn.go index 73da8fe..86ad12c 100644 --- a/conn.go +++ b/conn.go @@ -349,7 +349,7 @@ func (c *conn) translatePacket(pk packet.Packet, serverSent bool) packet.Packet } pk.AbilityData.EntityUniqueID = c.translateUniqueID(pk.AbilityData.EntityUniqueID, serverSent) case *packet.AddVolumeEntity: - pk.EntityRuntimeID = c.translateRuntimeID(pk.EntityRuntimeID, serverSent) + pk.EntityRuntimeID = uint32(c.translateRuntimeID(uint64(pk.EntityRuntimeID), serverSent)) case *packet.AdventureSettings: pk.PlayerUniqueID = c.translateUniqueID(pk.PlayerUniqueID, serverSent) case *packet.AgentAnimation: @@ -367,7 +367,7 @@ func (c *conn) translatePacket(pk packet.Packet, serverSent bool) packet.Packet pk.CameraEntityUniqueID = c.translateUniqueID(pk.CameraEntityUniqueID, serverSent) pk.TargetPlayerUniqueID = c.translateUniqueID(pk.TargetPlayerUniqueID, serverSent) case *packet.ChangeMobProperty: - pk.EntityUniqueID = c.translateRuntimeID(pk.EntityUniqueID, serverSent) + pk.EntityUniqueID = int64(c.translateRuntimeID(uint64(pk.EntityUniqueID), serverSent)) case *packet.ClientBoundMapItemData: for i, x := range pk.TrackedObjects { if x.Type == protocol.MapObjectTypeEntity { @@ -443,7 +443,7 @@ func (c *conn) translatePacket(pk packet.Packet, serverSent bool) packet.Packet case *packet.RemoveActor: pk.EntityUniqueID = c.translateUniqueID(pk.EntityUniqueID, serverSent) case *packet.RemoveVolumeEntity: - pk.EntityRuntimeID = c.translateRuntimeID(pk.EntityRuntimeID, serverSent) + pk.EntityRuntimeID = uint32(c.translateRuntimeID(uint64(pk.EntityRuntimeID), serverSent)) case *packet.Respawn: pk.EntityRuntimeID = c.translateRuntimeID(pk.EntityRuntimeID, serverSent) case *packet.SetActorData: diff --git a/go.mod b/go.mod index 74058c6..118ebf1 100644 --- a/go.mod +++ b/go.mod @@ -8,23 +8,25 @@ require ( github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 github.com/cooldogedev/spectral v0.0.5 github.com/cooldogedev/spectrum v0.0.43 - github.com/df-mc/dragonfly v0.10.6-0.20250915205312-2e9501025724 + github.com/df-mc/dragonfly v0.10.11-0.20251229144828-00510a3ec3b8 github.com/golang/snappy v1.0.0 github.com/google/uuid v1.6.0 github.com/quic-go/quic-go v0.54.0 - github.com/sandertv/gophertunnel v1.49.0 + github.com/sandertv/gophertunnel v1.52.3-0.20251229134550-877d232cdab3 ) require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/df-mc/goleveldb v1.1.9 // indirect - github.com/df-mc/worldupgrader v1.0.19 // indirect + github.com/df-mc/jsonc v1.0.5 // indirect + github.com/df-mc/worldupgrader v1.0.20 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/go-gl/mathgl v1.2.0 // indirect github.com/go-jose/go-jose/v4 v4.1.2 // indirect - github.com/klauspost/compress v1.18.0 // indirect + github.com/klauspost/compress v1.18.1 // indirect github.com/muhammadmuzzammil1998/jsonc v1.0.0 // indirect github.com/onsi/gomega v1.38.2 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6 // indirect github.com/segmentio/fasthash v1.0.3 // indirect go.uber.org/mock v0.6.0 // indirect diff --git a/go.sum b/go.sum index 3f0deb6..13398cc 100644 --- a/go.sum +++ b/go.sum @@ -26,10 +26,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/df-mc/dragonfly v0.10.6-0.20250915205312-2e9501025724 h1:EO44QF3WKP9b6/HWUySvwZtd2MWEH+bItLNXU98hDEI= github.com/df-mc/dragonfly v0.10.6-0.20250915205312-2e9501025724/go.mod h1:1B3NiEGWj0S9U4QlsL58HPvnmgPlaFCm/pCVWdnrMH0= +github.com/df-mc/dragonfly v0.10.11-0.20251229144828-00510a3ec3b8 h1:mZduNm40n/5vbI4noglpicyJ2LN43d21cNhRgBBZp9Q= +github.com/df-mc/dragonfly v0.10.11-0.20251229144828-00510a3ec3b8/go.mod h1:GswnEb3ZqH8wY+rBdbW603QlmFssBIBJk9yActVUAho= 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/jsonc v1.0.5 h1:O7oh07kbS5AYY+l2Fji6l4h0iHcdjKbxCtK5VlZlLMU= +github.com/df-mc/jsonc v1.0.5/go.mod h1:+Q++JuCE9IKiP8v7sWImdf/RjQX0nfXyfX6PdfTTmc4= github.com/df-mc/worldupgrader v1.0.19 h1:BnwRe/lVv9IhwRWZK5olvTYNTKWh7rhFdqNPDMnoKFM= github.com/df-mc/worldupgrader v1.0.19/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk= +github.com/df-mc/worldupgrader v1.0.20 h1:wfJyG3bFeaM/HXy7TCiO4HKVw3Mf3N4gPFmgxMHsKnc= +github.com/df-mc/worldupgrader v1.0.20/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= @@ -76,6 +82,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co= +github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -97,6 +105,8 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -111,6 +121,8 @@ github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6 h1:ZfK7NCzID github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6/go.mod h1:/yysjwfCXm2+2OY8mBazLzcxJ3irnylKCyG3FLgUPVU= github.com/sandertv/gophertunnel v1.49.0 h1:9FIl4GGYMrFTmBPgkOTUskGWRQHIg4NMpY8JdM6SrCg= github.com/sandertv/gophertunnel v1.49.0/go.mod h1:lmRarAmn25V/+QeiUbUDXeA26bEaNlX1wGEM/rj39ew= +github.com/sandertv/gophertunnel v1.52.3-0.20251229134550-877d232cdab3 h1:D6c4lWTJw22D6yAFSP5MtPhFX/B6Bxb3Cf8d2UvTCak= +github.com/sandertv/gophertunnel v1.52.3-0.20251229134550-877d232cdab3/go.mod h1:IhLg93aMPY/rKgB7lKxTzOZ6i11OgkL0WinVs+gMvlI= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=