falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate files, moves packet id from data package

Browse Source
This commit is contained in:
Tnze
2021-02-18 21:29:16 +08:00
parent b4fc573118
commit ea0e0d1cae
19 changed files with 181 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ptypes/inventory.go
View File

@ -7,7 +7,7 @@ import (
"github.com/Tnze/go-mc/bot/world/entity"
"github.com/Tnze/go-mc/chat"
"github.com/Tnze/go-mc/data"
"github.com/Tnze/go-mc/data/packetid"
"github.com/Tnze/go-mc/nbt"
pk "github.com/Tnze/go-mc/net/packet"
)
@ -81,7 +81,7 @@ func (p *ConfirmTransaction) Decode(pkt pk.Packet) error {
func (p ConfirmTransaction) Encode() pk.Packet {
return pk.Marshal(
data.TransactionServerbound,
packetid.TransactionServerbound,
p.WindowID,
p.ActionID,
p.Accepted,

4
net/ptypes/misc.go
View File

@ -4,7 +4,7 @@ import (
"io/ioutil"
"github.com/Tnze/go-mc/chat"
"github.com/Tnze/go-mc/data"
"github.com/Tnze/go-mc/data/packetid"
pk "github.com/Tnze/go-mc/net/packet"
)
@ -84,7 +84,7 @@ func (p *PluginMessage) Decode(pkt pk.Packet) error {
func (p *PluginMessage) Encode() pk.Packet {
return pk.Marshal(
data.CustomPayloadServerbound,
packetid.CustomPayloadServerbound,
p.Channel,
p.Data,
)

28
net/ptypes/motion.go
View File

@ -2,7 +2,7 @@
package ptypes
import (
"github.com/Tnze/go-mc/data"
"github.com/Tnze/go-mc/data/packetid"
pk "github.com/Tnze/go-mc/net/packet"
)
@ -45,13 +45,10 @@ type PositionAndLookServerbound struct {
func (p PositionAndLookServerbound) Encode() pk.Packet {
return pk.Marshal(
data.PositionLook,
pk.Double(p.X),
pk.Double(p.Y),
pk.Double(p.Z),
pk.Float(p.Yaw),
pk.Float(p.Pitch),
pk.Boolean(p.OnGround),
packetid.PositionLook,
p.X, p.Y, p.Z,
p.Yaw, p.Pitch,
p.OnGround,
)
}
@ -63,11 +60,9 @@ type Position struct {
func (p Position) Encode() pk.Packet {
return pk.Marshal(
data.PositionServerbound,
pk.Double(p.X),
pk.Double(p.Y),
pk.Double(p.Z),
pk.Boolean(p.OnGround),
packetid.PositionServerbound,
p.X, p.Y, p.Z,
p.OnGround,
)
}
@ -79,9 +74,8 @@ type Look struct {
func (p Look) Encode() pk.Packet {
return pk.Marshal(
data.Look,
pk.Float(p.Yaw),
pk.Float(p.Pitch),
pk.Boolean(p.OnGround),
packetid.Look,
p.Yaw, p.Pitch,
p.OnGround,
)
}