tag stuff

ZeppelinMC · Aug 13, 2024 · 651e65b · 651e65b
1 parent 20c9dfd
commit 651e65b
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ zeppelin-mem-profile
 zeppelin.exe
 /zeppelin
 /world_old
-server.properties
+server.properties
+/q
+data.qfg
diff --git a/net/io/compress/gzip.go b/net/io/compress/gzip.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/4kills/go-libdeflate/v2"
 	"github.com/zeppelinmc/zeppelin/net/io/buffers"
-	"github.com/zeppelinmc/zeppelin/net/io/util"
 )
 
 // Decompress gunzip. The data returned is only safe to use until the next operation
@@ -18,7 +17,7 @@ func DecompressGzip(data io.Reader, compressedLength int, decompressedLength *in
 		compressedBuffer.Grow(compressedLength)
 	}
 
-	if _, err := compressedBuffer.ReadFrom(util.NewReaderMaxxer(data, compressedLength)); err != nil {
+	if _, err := data.Read(compressedBuffer.Bytes()[:compressedLength]); err != nil {
 		return nil, err
 	}
 
@@ -53,7 +52,7 @@ func CompressGzip(decompressedData io.Reader, decompressedLength int, compressed
 		decompressedBuffer.Grow(decompressedLength)
 	}
 
-	if _, err := decompressedBuffer.ReadFrom(util.NewReaderMaxxer(decompressedData, decompressedLength)); err != nil {
+	if _, err := decompressedData.Read(decompressedBuffer.Bytes()[:decompressedLength]); err != nil {
 		return nil, err
 	}
 

diff --git a/net/io/compress/zlib.go b/net/io/compress/zlib.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/4kills/go-libdeflate/v2"
 	"github.com/zeppelinmc/zeppelin/net/io/buffers"
-	"github.com/zeppelinmc/zeppelin/net/io/util"
 )
 
 // Decompress zlib. If decompressedLength is provided, the data returned will only be safe to use until the next operation
@@ -19,7 +18,7 @@ func DecompressZlib(data io.Reader, compressedLength int, decompressedLength *in
 		compressedBuffer.Grow(compressedLength)
 	}
 
-	if _, err := compressedBuffer.ReadFrom(util.NewReaderMaxxer(data, compressedLength)); err != nil {
+	if _, err := data.Read(compressedBuffer.Bytes()[:compressedLength]); err != nil {
 		return nil, err
 	}
 
@@ -54,7 +53,7 @@ func CompressZlib(decompressedData io.Reader, decompressedLength int, compressed
 		decompressedBuffer.Grow(decompressedLength)
 	}
 
-	if _, err := decompressedBuffer.ReadFrom(util.NewReaderMaxxer(decompressedData, decompressedLength)); err != nil {
+	if _, err := decompressedData.Read(decompressedBuffer.Bytes()[:decompressedLength]); err != nil {
 		return nil, err
 	}
 

diff --git a/net/packet/play/updateTags.go b/net/packet/play/updateTags.go
@@ -43,5 +43,39 @@ func (u *UpdateTags) Encode(w io.Writer) error {
 }
 
 func (u *UpdateTags) Decode(r io.Reader) error {
-	return nil //TODO
+	var length int32
+	if _, err := r.VarInt(&length); err != nil {
+		return err
+	}
+	u.Tags = make(map[string]map[string][]int32, length)
+
+	for i := int32(0); i < length; i++ {
+		var registry string
+		if err := r.String(&registry); err != nil {
+			return err
+		}
+		var length int32
+		if _, err := r.VarInt(&length); err != nil {
+			return err
+		}
+
+		u.Tags[registry] = make(map[string][]int32, length)
+		for i := int32(0); i < length; i++ {
+			var tagName string
+			if err := r.String(&tagName); err != nil {
+				return err
+			}
+			var count int32
+			if _, err := r.VarInt(&count); err != nil {
+				return err
+			}
+			u.Tags[registry][tagName] = make([]int32, count)
+			for i := int32(0); i < count; i++ {
+				if _, err := r.VarInt(&u.Tags[registry][tagName][i]); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
 }
diff --git a/server/session/std/handler/useItemOn.go b/server/session/std/handler/useItemOn.go
@@ -2,11 +2,13 @@ package handler
 
 import (
 	"math"
+	"slices"
 
 	"github.com/zeppelinmc/zeppelin/net"
 	"github.com/zeppelinmc/zeppelin/net/metadata"
 	"github.com/zeppelinmc/zeppelin/net/packet"
 	"github.com/zeppelinmc/zeppelin/net/packet/play"
+	"github.com/zeppelinmc/zeppelin/server/registry"
 	"github.com/zeppelinmc/zeppelin/server/session/std"
 	"github.com/zeppelinmc/zeppelin/server/world/block"
 	"github.com/zeppelinmc/zeppelin/server/world/block/pos"
@@ -53,6 +55,8 @@ func handleUseItemOn(s *std.StandardSession, pk packet.Packet) {
 		return
 	}
 
+	currentBlockName, _ := b.Encode()
+
 	var blockX, blockY, blockZ = use.BlockX, use.BlockY, use.BlockZ
 	yaw, _ := s.Player().Rotation()
 
@@ -80,6 +84,12 @@ func handleUseItemOn(s *std.StandardSession, pk packet.Packet) {
 		axis, facing = "x", "east"
 	}
 
+	replaceable := slices.Index(std.Tags.Tags["minecraft:block"]["minecraft:replaceable"], registry.Block.Get(currentBlockName)) != -1
+
+	if replaceable {
+		blockX, blockY, blockZ = use.BlockX, use.BlockY, use.BlockZ
+	}
+
 	currentBlock, err := dimension.Block(blockX, blockY, blockZ)
 	if err == nil {
 		name, _ := currentBlock.Encode()

diff --git a/server/session/std/session.go b/server/session/std/session.go
@@ -266,11 +266,12 @@ func (session *StandardSession) Configure() error {
 		session.registryIndexes[packet.RegistryId] = slices.Clone(packet.Indexes)
 	}
 	configuration.RegistryPacketsMutex.Unlock()
-	if err := session.WritePacket(updateTags); err != nil {
+
+	if err := session.WritePacket(configuration.FinishConfiguration{}); err != nil {
 		return err
 	}
 
-	if err := session.WritePacket(configuration.FinishConfiguration{}); err != nil {
+	if err := session.WritePacket(Tags); err != nil {
 		return err
 	}
 	return nil

diff --git a/server/session/std/tags.bin b/server/session/std/tags.bin
diff --git a/server/session/std/tags.go b/server/session/std/tags.go
diff --git a/server/world/chunk/encode.go b/server/world/chunk/encode.go
@@ -119,7 +119,6 @@ func (chunk *Chunk) Encode(biomeIndexes []string) *play.ChunkDataUpdateLight {
 		case blockBitsPerEntry == 0:
 			stateId, _ := section.BlockStateId(blockPalette[0])
 			w.VarInt(stateId)
-
 		case blockBitsPerEntry >= 4 && blockBitsPerEntry <= 8:
 			w.VarInt(int32(len(blockPalette)))
 			for _, e := range blockPalette {

diff --git a/server/world/level/region/region_dec.go b/server/world/level/region/region_dec.go
@@ -1,7 +1,6 @@
 package region
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
 	"io"
@@ -119,7 +118,7 @@ func (r *File) GetChunk(x, z int32) (*chunk.Chunk, error) {
 		return nil, fmt.Errorf("chunk %d %d not found", x, z)
 	}
 
-	var rawReader = bufio.NewReader(util.NewReaderAtMaxxer(r.reader, int(length), int64(offset)+5))
+	var rawReader = util.NewReaderAtMaxxer(r.reader, int(length), int64(offset)+5)
 
 	var data []byte
 
@@ -143,10 +142,11 @@ func (r *File) GetChunk(x, z int32) (*chunk.Chunk, error) {
 		return nil, fmt.Errorf("invalid compression method %d", compression)
 	}
 
-	var anvil = anvilChunks.Get().(*anvilChunk)
-	defer anvilChunks.Put(anvil)
+	//var anvil = anvilChunks.Get().(*anvilChunk)
+	//defer anvilChunks.Put(anvil)
+	var anvil anvilChunk
 
-	if err := nbt.Unmarshal(data, anvil); err != nil {
+	if err := nbt.Unmarshal(data, &anvil); err != nil {
 		return nil, err
 	}
 
@@ -174,7 +174,7 @@ func (r *File) GetChunk(x, z int32) (*chunk.Chunk, error) {
 			blocks[i] = b
 		}
 
-		r.chunks[hash].Sections[i] = section.New(sec.Y, blocks, slices.Clone(sec.BlockStates.Data), sec.Biomes.Palette, slices.Clone(sec.Biomes.Data), *(*[]byte)(unsafe.Pointer(&sec.SkyLight)), *(*[]byte)(unsafe.Pointer(&sec.BlockLight)))
+		r.chunks[hash].Sections[i] = section.New(sec.Y, blocks, sec.BlockStates.Data, sec.Biomes.Palette, sec.Biomes.Data, *(*[]byte)(unsafe.Pointer(&sec.SkyLight)), *(*[]byte)(unsafe.Pointer(&sec.BlockLight)))
 	}
 	if emptySections == len(r.chunks[hash].Sections) && r.generateEmpty && r.generator != nil {
 		r.chunks[hash] = new(chunk.Chunk)