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

Update /bot for 1.18

Browse Source
This commit is contained in:
Tnze
2021-12-11 02:40:41 +08:00
parent a70aaa81d6
commit 97b706f6eb
10 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bot/screen/screen.go
View File

@ -12,14 +12,19 @@ import (
)
type Manager struct {
c *bot.Client
Screens map[int]Container
Inventory Inventory
Cursor Slot
events EventsListener
// The last received State ID from server
stateID int32
}
func NewManager(c *bot.Client, e EventsListener) *Manager {
m := &Manager{
c: c,
Screens: make(map[int]Container),
events: e,
}
@ -33,6 +38,18 @@ func NewManager(c *bot.Client, e EventsListener) *Manager {
return m
}
//func (m *Manager) ContainerClick(id int, slot int16, button byte, mode int32) error {
// return m.c.Conn.WritePacket(pk.Marshal(
// packetid.ServerboundContainerClick,
// pk.UnsignedByte(id),
// pk.VarInt(m.stateID),
// pk.Short(slot),
// pk.Byte(button),
// pk.VarInt(mode),
// pk.VarInt()
// ))
//}
func (m *Manager) onOpenScreen(p pk.Packet) error {
var (
ContainerID pk.VarInt
@ -72,6 +89,7 @@ func (m *Manager) onSetContentPacket(p pk.Packet) error {
); err != nil {
return Error{err}
}
m.stateID = int32(StateID)
// copy the slot data to container
container, ok := m.Screens[int(ContainerID)]
if !ok {
@ -113,19 +131,21 @@ func (m *Manager) onCloseScreen(p pk.Packet) error {
func (m *Manager) onSetSlot(p pk.Packet) (err error) {
var (
ContainerID pk.Byte
StateID pk.VarInt
SlotID pk.Short
ItemStack Slot
SlotData Slot
)
if err := p.Scan(&ContainerID, &SlotID, &ItemStack); err != nil {
if err := p.Scan(&ContainerID, &StateID, &SlotID, &SlotData); err != nil {
return Error{err}
}
m.stateID = int32(StateID)
if ContainerID == -1 && SlotID == -1 {
m.Cursor = ItemStack
m.Cursor = SlotData
} else if ContainerID == -2 {
err = m.Inventory.onSetSlot(int(SlotID), ItemStack)
err = m.Inventory.onSetSlot(int(SlotID), SlotData)
} else if c, ok := m.Screens[int(ContainerID)]; ok {
err = c.onSetSlot(int(SlotID), ItemStack)
err = c.onSetSlot(int(SlotID), SlotData)
}
if m.events.SetSlot != nil {