start inventory handling

compression bug fix(@bn4t)

Co-authored-by: Angel <aimjel@users.noreply.github.com>

Author: oq-x

.gitignore

@@ -25,4 +25,5 @@ server-icon.png
 /server/session/a_test.go
 /qnbt2
 /qnbt2test.go
-/main
+/main
+/qnbt

go.mod

@@ -15,6 +15,8 @@ require (
 
 require github.com/oq-x/unsafe2 v0.0.0-20240901191313-2b7bec1d9e3b
 
+require github.com/grailbio/base v0.0.11 // indirect
+
 require (
 	github.com/4kills/go-zlib v1.2.0
 	github.com/aimjel/minecraft v0.0.0-20240907220502-e1fe5798908b

go.sum

@@ -1,6 +1,7 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"math/rand"
 	"net/http"

main.go

@@ -92,11 +92,7 @@ var pkcppool = sync.Pool{
 	},
 }
 
-func (conn *Conn) WritePacket(pk packet.Encodeable) error {
-	if conn.encrypted {
-		conn.write_mu.Lock()
-		defer conn.write_mu.Unlock()
-	} //no lock seems to work fine without encryption (?)
+func (conn *Conn) wpk(pk packet.Encodeable) error {
 	if PacketEncodeInterceptor != nil {
 		if PacketEncodeInterceptor(conn, pk) {
 			return nil
@@ -142,7 +138,7 @@ func (conn *Conn) WritePacket(pk packet.Encodeable) error {
 		return err
 	} else { // yes compression
 		if conn.listener.cfg.CompressionThreshold > int32(packetBuf.Len())-6 { // packet is too small to be compressed
-			i := encoding.PutVarInt(packetBuf.Bytes()[:3], int32(packetBuf.Len()-6))
+			i := encoding.PutVarInt(packetBuf.Bytes()[:3], int32(packetBuf.Len()-3))
 			if i != 2 {
 				packetBuf.Bytes()[i] |= 0x80
 			}
@@ -176,6 +172,14 @@ func (conn *Conn) WritePacket(pk packet.Encodeable) error {
 	}
 }
 
+func (conn *Conn) WritePacket(pk packet.Encodeable) error {
+	if conn.encrypted {
+		conn.write_mu.Lock()
+		defer conn.write_mu.Unlock()
+	} //no lock seems to work fine without encryption (?)
+	return conn.wpk(pk)
+}
+
 // 1MiB
 var MaxCompressedPacketSize = 1024 * 1024
 

protocol/nbt/qnbt/native/be.go

@@ -0,0 +1,62 @@
+package play
+
+import (
+	"github.com/zeppelinmc/zeppelin/protocol/net/io/encoding"
+	"github.com/zeppelinmc/zeppelin/protocol/net/slot"
+)
+
+// serverbound
+const PacketIdClickContainer = 0x0E
+
+type ClickContainer struct {
+	WindowId     byte
+	State        int32
+	Slot         int16
+	Button       int8
+	Mode         int32
+	ChangedSlots []ChangedSlot
+	CarriedItem  slot.Slot
+}
+
+type ChangedSlot struct {
+	slot.Slot
+	Num int16
+}
+
+func (ClickContainer) ID() int32 {
+	return PacketIdClickContainer
+}
+
+func (c *ClickContainer) Decode(r encoding.Reader) error {
+	if err := r.Ubyte(&c.WindowId); err != nil {
+		return err
+	}
+	if _, err := r.VarInt(&c.State); err != nil {
+		return err
+	}
+	if err := r.Short(&c.Slot); err != nil {
+		return err
+	}
+	if err := r.Byte(&c.Button); err != nil {
+		return err
+	}
+	if _, err := r.VarInt(&c.Mode); err != nil {
+		return err
+	}
+	var len int32
+	if _, err := r.VarInt(&len); err != nil {
+		return err
+	}
+	c.ChangedSlots = make([]ChangedSlot, len)
+
+	for i := int32(0); i < len; i++ {
+		if err := r.Short(&c.ChangedSlots[i].Num); err != nil {
+			return err
+		}
+		if err := c.ChangedSlots[i].Decode(r); err != nil {
+			return err
+		}
+	}
+
+	return c.CarriedItem.Decode(r)
+}

protocol/nbt/qnbt/native/le.go

@@ -40,6 +40,7 @@ var ServerboundPool = map[int32]map[int32]func() packet.Decodeable{
 		0x08: func() packet.Decodeable { return &play.ChunkBatchReceived{} },
 		0x07: func() packet.Decodeable { return &play.PlayerSession{} },
 		0x0A: func() packet.Decodeable { return &play.ClientInformation{} },
+		0x0E: func() packet.Decodeable { return &play.ClickContainer{} },
 		0x0F: func() packet.Decodeable { return &play.CloseContainer{} },
 		0x12: func() packet.Decodeable { return &play.ServerboundPluginMessage{} },
 		0x16: func() packet.Decodeable { return &play.Interact{} },