simple conversion between save.Chunk and level.Chunk
This commit is contained in:
Tnze
@ -1,18 +1,9 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"math/bits"
|
||||
"strings"
|
||||
"sync"
|
||||
"unsafe"
|
||||
|
||||
"github.com/Tnze/go-mc/data/block"
|
||||
"github.com/Tnze/go-mc/data/packetid"
|
||||
"github.com/Tnze/go-mc/level"
|
||||
pk "github.com/Tnze/go-mc/net/packet"
|
||||
"github.com/Tnze/go-mc/save"
|
||||
)
|
||||
|
||||
type Level interface {
|
||||
@ -26,160 +17,19 @@ type LevelInfo struct {
|
||||
HashedSeed uint64
|
||||
}
|
||||
|
||||
type ChunkPos struct{ X, Z int }
|
||||
type Chunk struct {
|
||||
sync.Mutex
|
||||
Sections []Section
|
||||
HeightMaps *level.BitStorage
|
||||
}
|
||||
|
||||
func EmptyChunk(secs int) *Chunk {
|
||||
sections := make([]Section, secs)
|
||||
for i := range sections {
|
||||
sections[i] = Section{
|
||||
blockCount: 0,
|
||||
States: level.NewStatesPaletteContainer(16*16*16, 0),
|
||||
Biomes: level.NewBiomesPaletteContainer(4*4*4, 0),
|
||||
}
|
||||
}
|
||||
return &Chunk{
|
||||
Sections: sections,
|
||||
HeightMaps: level.NewBitStorage(bits.Len(uint(secs)*16), 16*16, nil),
|
||||
}
|
||||
}
|
||||
|
||||
func ChunkFromSave(c *save.Chunk) *Chunk {
|
||||
sections := make([]Section, len(c.Sections))
|
||||
for i := range sections {
|
||||
data := *(*[]uint64)((unsafe.Pointer)(&c.Sections[i].BlockStates.Data))
|
||||
palette := c.Sections[i].BlockStates.Palette
|
||||
rawPalette := make([]int, len(palette))
|
||||
for i, v := range palette {
|
||||
// TODO: Consider the properties of block, not only index the block name
|
||||
rawPalette[i] = int(stateIDs[strings.TrimPrefix(v.Name, "minecraft:")])
|
||||
}
|
||||
sections[i].States = level.NewStatesPaletteContainerWithData(16*16*16, data, rawPalette)
|
||||
}
|
||||
return &Chunk{
|
||||
Sections: sections,
|
||||
HeightMaps: nil,
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: This map should be moved to data/block.
|
||||
var stateIDs map[string]uint32
|
||||
|
||||
func init() {
|
||||
for i, v := range block.StateID {
|
||||
name := block.ByID[v].Name
|
||||
if _, ok := stateIDs[name]; !ok {
|
||||
stateIDs[name] = i
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Chunk) WriteTo(w io.Writer) (int64, error) {
|
||||
data, err := c.Data()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return pk.Tuple{
|
||||
// Heightmaps
|
||||
pk.NBT(struct {
|
||||
MotionBlocking []uint64 `nbt:"MOTION_BLOCKING"`
|
||||
}{c.HeightMaps.Raw()}),
|
||||
pk.ByteArray(data),
|
||||
pk.VarInt(0), // TODO: Block Entity
|
||||
}.WriteTo(w)
|
||||
}
|
||||
|
||||
func (c *Chunk) Data() ([]byte, error) {
|
||||
var buff bytes.Buffer
|
||||
for _, section := range c.Sections {
|
||||
_, err := section.WriteTo(&buff)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return buff.Bytes(), nil
|
||||
}
|
||||
|
||||
type Section struct {
|
||||
blockCount int16
|
||||
States *level.PaletteContainer
|
||||
Biomes *level.PaletteContainer
|
||||
}
|
||||
|
||||
func (s *Section) GetBlock(i int) int {
|
||||
return s.States.Get(i)
|
||||
}
|
||||
func (s *Section) SetBlock(i int, v int) {
|
||||
// TODO: Handle cave air and void air
|
||||
if s.States.Get(i) != 0 {
|
||||
s.blockCount--
|
||||
}
|
||||
if v != 0 {
|
||||
s.blockCount++
|
||||
}
|
||||
s.States.Set(i, v)
|
||||
}
|
||||
|
||||
func (s *Section) WriteTo(w io.Writer) (int64, error) {
|
||||
return pk.Tuple{
|
||||
pk.Short(s.blockCount),
|
||||
s.States,
|
||||
s.Biomes,
|
||||
}.WriteTo(w)
|
||||
}
|
||||
|
||||
func (s *Section) ReadFrom(r io.Reader) (int64, error) {
|
||||
return pk.Tuple{
|
||||
pk.Short(s.blockCount),
|
||||
s.States,
|
||||
s.Biomes,
|
||||
}.ReadFrom(r)
|
||||
}
|
||||
|
||||
type lightData struct {
|
||||
SkyLightMask pk.BitSet
|
||||
BlockLightMask pk.BitSet
|
||||
SkyLight []pk.ByteArray
|
||||
BlockLight []pk.ByteArray
|
||||
}
|
||||
|
||||
func bitSetRev(set pk.BitSet) pk.BitSet {
|
||||
rev := make(pk.BitSet, len(set))
|
||||
for i := range rev {
|
||||
rev[i] = ^set[i]
|
||||
}
|
||||
return rev
|
||||
}
|
||||
|
||||
func (l *lightData) WriteTo(w io.Writer) (int64, error) {
|
||||
return pk.Tuple{
|
||||
pk.Boolean(true), // Trust Edges
|
||||
l.SkyLightMask,
|
||||
l.BlockLightMask,
|
||||
bitSetRev(l.SkyLightMask),
|
||||
bitSetRev(l.BlockLightMask),
|
||||
pk.Array(l.SkyLight),
|
||||
pk.Array(l.BlockLight),
|
||||
}.WriteTo(w)
|
||||
}
|
||||
|
||||
type SimpleDim struct {
|
||||
numOfSection int
|
||||
Columns map[ChunkPos]*Chunk
|
||||
Columns map[level.ChunkPos]*level.Chunk
|
||||
}
|
||||
|
||||
func NewSimpleDim(secs int) *SimpleDim {
|
||||
return &SimpleDim{
|
||||
numOfSection: secs,
|
||||
Columns: make(map[ChunkPos]*Chunk),
|
||||
Columns: make(map[level.ChunkPos]*level.Chunk),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *SimpleDim) LoadChunk(pos ChunkPos, c *Chunk) {
|
||||
func (s *SimpleDim) LoadChunk(pos level.ChunkPos, c *level.Chunk) {
|
||||
s.Columns[pos] = c
|
||||
}
|
||||
|
||||
@ -197,12 +47,6 @@ func (s *SimpleDim) PlayerJoin(p *Player) {
|
||||
packetid.ClientboundLevelChunkWithLight,
|
||||
pk.Int(pos.X), pk.Int(pos.Z),
|
||||
column,
|
||||
&lightData{
|
||||
SkyLightMask: make(pk.BitSet, (16*16*16-1)>>6+1),
|
||||
BlockLightMask: make(pk.BitSet, (16*16*16-1)>>6+1),
|
||||
SkyLight: []pk.ByteArray{},
|
||||
BlockLight: []pk.ByteArray{},
|
||||
},
|
||||
)
|
||||
column.Unlock()
|
||||
|
||||
@ -214,7 +58,7 @@ func (s *SimpleDim) PlayerJoin(p *Player) {
|
||||
|
||||
err := p.WritePacket(Packet757(pk.Marshal(
|
||||
packetid.ClientboundPlayerPosition,
|
||||
pk.Double(0), pk.Double(0), pk.Double(0),
|
||||
pk.Double(0), pk.Double(143), pk.Double(0),
|
||||
pk.Float(0), pk.Float(0),
|
||||
pk.Byte(0),
|
||||
pk.VarInt(0),
|
||||
|
||||
Reference in New Issue
Block a user