Cosmic
/
bedrocktool
mirror of https://github.com/CosmicStar98/bedrocktool.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Cosmic:5149487c184bdac5c9f1642e75eed19d6e78b980
Branches Tags
Cosmic:master
...
compare: Cosmic:ba7435c822ad0770ab963ad5961e961cc6c530bc
Branches Tags
Cosmic:master

3 Commits
5149487c18 ... ba7435c822

Author SHA1 Message Date
olebeck ba7435c822 store blocknbt per block not in subchunks 2023-04-21 03:20:57 +02:00
olebeck 5a550002d3 add it to gui 2023-04-21 00:58:20 +02:00
olebeck 63b94197ec add -capture for all commands 2023-04-21 00:55:52 +02:00
11 changed files with 63 additions and 64 deletions
Show Stats Expand all files Collapse all files

4
cmd/bedrocktool/main.go
View File

@ -99,11 +99,11 @@ func main() {
flag.BoolVar(&utils.Options.ExtraDebug, "extra-debug", false, locale.Loc("extra_debug", nil))
flag.StringVar(&utils.Options.PathCustomUserData, "userdata", "", locale.Loc("custom_user_data", nil))
flag.String("lang", "", "lang")
flag.BoolVar(&utils.Options.EnableDNS, "dns", false, locale.Loc("enable_dns", nil))
flag.BoolVar(&utils.Options.Capture, "capture", false, "Capture Packet log")
subcommands.Register(subcommands.HelpCommand(), "")
subcommands.ImportantFlag("debug")
subcommands.ImportantFlag("dns")
subcommands.ImportantFlag("capture")
subcommands.ImportantFlag("preload")
subcommands.HelpCommand()

4
handlers/capture.go
View File

@ -65,3 +65,7 @@ func NewPacketCapturer() *utils.ProxyHandler {
},
}
}
func init() {
utils.NewPacketCapturer = NewPacketCapturer
}

32
handlers/second-user/chunks.go
View File

@ -11,7 +11,7 @@ import (
func (s *secondaryUser) ResetWorld() {
s.chunks = make(map[world.ChunkPos]*chunk.Chunk)
s.blockNBT = make(map[protocol.SubChunkPos][]map[string]any)
s.blockNBTs = make(map[protocol.BlockPos][]map[string]any)
}
func (s *secondaryUser) processChangeDimension(pk *packet.ChangeDimension) {
@ -26,7 +26,6 @@ func (s *secondaryUser) processChangeDimension(pk *packet.ChangeDimension) {
func (s *secondaryUser) processLevelChunk(pk *packet.LevelChunk) {
// ignore empty chunks THANKS WEIRD SERVER SOFTWARE DEVS
if len(pk.RawPayload) == 0 {
logrus.Info(locale.Loc("empty_chunk", nil))
return
}
@ -45,11 +44,14 @@ func (s *secondaryUser) processLevelChunk(pk *packet.LevelChunk) {
logrus.Error(err)
return
}
if blockNBTs != nil {
s.blockNBT[protocol.SubChunkPos{
pk.Position.X(), 0, pk.Position.Z(),
}] = blockNBTs
for _, blockNBT := range blockNBTs {
x := blockNBT["x"].(int32)
y := blockNBT["y"].(int32)
z := blockNBT["z"].(int32)
s.blockNBTs[protocol.BlockPos{x, y, z}] = blockNBTs
}
s.chunks[world.ChunkPos(pk.Position)] = ch
for _, p := range s.server.Players() {
@ -83,11 +85,10 @@ func (s *secondaryUser) processSubChunk(pk *packet.SubChunk) {
offsets := make(map[world.ChunkPos]bool, len(pk.SubChunkEntries))
for _, sub := range pk.SubChunkEntries {
var (
absX = pk.Position[0] + int32(sub.Offset[0])
absY = pk.Position[1] + int32(sub.Offset[1])
absZ = pk.Position[2] + int32(sub.Offset[2])
subPos = protocol.SubChunkPos{absX, absY, absZ}
pos = world.ChunkPos{absX, absZ}
absX = pk.Position[0] + int32(sub.Offset[0])
absY = pk.Position[1] + int32(sub.Offset[1])
absZ = pk.Position[2] + int32(sub.Offset[2])
pos = world.ChunkPos{absX, absZ}
)
offsets[pos] = true
ch, ok := s.chunks[pos]
@ -95,12 +96,15 @@ func (s *secondaryUser) processSubChunk(pk *packet.SubChunk) {
logrus.Error(locale.Loc("subchunk_before_chunk", nil))
continue
}
blockNBT, err := ch.ApplySubChunkEntry(uint8(absY), &sub)
blockNBTs, err := ch.ApplySubChunkEntry(uint8(absY), &sub)
if err != nil {
logrus.Error(err)
}
if blockNBT != nil {
s.blockNBT[subPos] = blockNBT
for _, blockNBT := range blockNBTs {
x := blockNBT["x"].(int32)
y := blockNBT["y"].(int32)
z := blockNBT["z"].(int32)
s.blockNBTs[protocol.BlockPos{x, y, z}] = blockNBTs
}
chunk.LightArea([]*chunk.Chunk{ch}, 0, 0).Fill()

4
handlers/second-user/second-user.go
View File

@ -26,7 +26,7 @@ type secondaryUser struct {
hasCustomBlocks bool
chunks map[world.ChunkPos]*chunk.Chunk
blockNBT map[protocol.SubChunkPos][]map[string]any
blockNBTs map[protocol.BlockPos][]map[string]any
dimension world.Dimension
entities map[int64]*serverEntity
@ -40,7 +40,7 @@ func NewSecondUser() *utils.ProxyHandler {
},
chunks: make(map[world.ChunkPos]*chunk.Chunk),
blockNBT: make(map[protocol.SubChunkPos][]map[string]any),
blockNBTs: make(map[protocol.BlockPos][]map[string]any),
dimension: world.Overworld,
entities: make(map[int64]*serverEntity),
}

42
handlers/worlds/chunk.go
View File

@ -41,11 +41,13 @@ func (w *worldsHandler) processLevelChunk(pk *packet.LevelChunk) {
logrus.Error(err)
return
}
if blockNBTs != nil {
w.worldState.blockNBT[protocol.SubChunkPos{
pk.Position.X(), 0, pk.Position.Z(),
}] = blockNBTs
for _, blockNBT := range blockNBTs {
x := blockNBT["x"].(int32)
y := blockNBT["y"].(int32)
z := blockNBT["z"].(int32)
w.worldState.blockNBTs[protocol.BlockPos{x, y, z}] = blockNBT
}
w.worldState.chunks[pk.Position] = ch
max := w.worldState.dimension.Range().Height() / 16
@ -84,23 +86,25 @@ func (w *worldsHandler) processSubChunk(pk *packet.SubChunk) {
for _, sub := range pk.SubChunkEntries {
var (
absX = pk.Position[0] + int32(sub.Offset[0])
absY = pk.Position[1] + int32(sub.Offset[1])
absZ = pk.Position[2] + int32(sub.Offset[2])
subPos = protocol.SubChunkPos{absX, absY, absZ}
pos = protocol.ChunkPos{absX, absZ}
absX = pk.Position[0] + int32(sub.Offset[0])
absY = pk.Position[1] + int32(sub.Offset[1])
absZ = pk.Position[2] + int32(sub.Offset[2])
pos = protocol.ChunkPos{absX, absZ}
)
ch, ok := w.worldState.chunks[pos]
if !ok {
logrus.Error(locale.Loc("subchunk_before_chunk", nil))
continue
}
blockNBT, err := ch.ApplySubChunkEntry(uint8(absY), &sub)
blockNBTs, err := ch.ApplySubChunkEntry(uint8(absY), &sub)
if err != nil {
logrus.Error(err)
}
if blockNBT != nil {
w.worldState.blockNBT[subPos] = blockNBT
for _, blockNBT := range blockNBTs {
x := blockNBT["x"].(int32)
y := blockNBT["y"].(int32)
z := blockNBT["z"].(int32)
w.worldState.blockNBTs[protocol.BlockPos{x, y, z}] = blockNBT
}
posToRedraw[pos] = true
@ -131,19 +135,7 @@ func (w *worldsHandler) ProcessChunkPackets(pk packet.Packet) packet.Packet {
w.processSubChunk(pk)
case *packet.BlockActorData:
if w.settings.BlockUpdates {
sp := protocol.SubChunkPos{pk.Position.X() << 4, 0, pk.Position.Z() << 4}
b, ok := w.worldState.blockNBT[sp]
if !ok {
w.worldState.blockNBT[sp] = []map[string]any{pk.NBTData}
} else {
for i, v := range b {
x, y, z := v["x"].(int32), v["y"].(int32), v["z"].(int32)
if x == pk.Position.X() && y == pk.Position.Y() && z == pk.Position.Z() {
b[i] = pk.NBTData
break
}
}
}
w.worldState.blockNBTs[pk.Position] = pk.NBTData
}
case *packet.UpdateBlock:
if w.settings.BlockUpdates {

13
handlers/worlds/items.go
View File

@ -84,9 +84,6 @@ func (w *worldsHandler) processItemPacketsServer(pk packet.Packet) packet.Packet
break
}
pos := existing.OpenPacket.ContainerPosition
cp := protocol.SubChunkPos{pos.X() << 4, pos.Z() << 4}
// create inventory
inv := inventory.New(len(existing.Content.Content), nil)
for i, c := range existing.Content.Content {
@ -95,13 +92,9 @@ func (w *worldsHandler) processItemPacketsServer(pk packet.Packet) packet.Packet
}
// put into subchunk
nbts := w.worldState.blockNBT[cp]
for i, v := range nbts {
NBTPos := protocol.BlockPos{v["x"].(int32), v["y"].(int32), v["z"].(int32)}
if NBTPos == pos {
w.worldState.blockNBT[cp][i]["Items"] = nbtconv.InvToNBT(inv)
break
}
nbt, ok := w.worldState.blockNBTs[existing.OpenPacket.ContainerPosition]
if ok {
nbt["Items"] = nbtconv.InvToNBT(inv)
}
w.proxy.SendMessage(locale.Loc("saved_block_inv", nil))

16
handlers/worlds/world.go
View File

@ -55,7 +55,7 @@ type WorldSettings struct {
type worldState struct {
dimension world.Dimension
chunks map[protocol.ChunkPos]*chunk.Chunk
blockNBT map[protocol.SubChunkPos][]map[string]any
blockNBTs map[protocol.BlockPos]map[string]any
entities map[uint64]*entityState
openItemContainers map[byte]*itemContainer
Name string
@ -219,7 +219,7 @@ func (w *worldsHandler) Reset() {
w.worldState = worldState{
dimension: w.worldState.dimension,
chunks: make(map[protocol.ChunkPos]*chunk.Chunk),
blockNBT: make(map[protocol.SubChunkPos][]map[string]any),
blockNBTs: make(map[protocol.BlockPos]map[string]any),
entities: make(map[uint64]*entityState),
openItemContainers: make(map[byte]*itemContainer),
Name: w.currentName(),
@ -256,13 +256,13 @@ func (w *worldState) Save(folder string) (*mcdb.DB, error) {
}
// save block nbt data
blockNBT := make(map[world.ChunkPos][]map[string]any)
for scp, v := range w.blockNBT { // 3d to 2d
cp := world.ChunkPos{scp.X(), scp.Z()}
blockNBT[cp] = append(blockNBT[cp], v...)
chunkBlockNBT := make(map[world.ChunkPos][]map[string]any)
for bp, blockNBT := range w.blockNBTs { // 3d to 2d
cp := world.ChunkPos{bp.X() >> 4, bp.Z() >> 4}
chunkBlockNBT[cp] = append(chunkBlockNBT[cp], blockNBT)
}
for cp, v := range blockNBT {
err = provider.SaveBlockNBT(cp, v, w.dimension)
for cp, blockNBT := range chunkBlockNBT {
err = provider.SaveBlockNBT(cp, blockNBT, w.dimension)
if err != nil {
logrus.Error(err)
}

3
subcommands/capture.go
View File

@ -4,7 +4,6 @@ import (
"context"
"flag"
"github.com/bedrock-tool/bedrocktool/handlers"
"github.com/bedrock-tool/bedrocktool/locale"
"github.com/bedrock-tool/bedrocktool/utils"
)
@ -34,6 +33,6 @@ func (c *CaptureCMD) Execute(ctx context.Context, ui utils.UI) error {
return err
}
proxy.AlwaysGetPacks = true
proxy.AddHandler(handlers.NewPacketCapturer())
utils.Options.Capture = true
return proxy.Run(ctx, address, hostname)
}

3
ui/gui/settings/worlds.go
View File

@ -14,6 +14,7 @@ type worldSettings struct {
withPacks widget.Bool
voidGen widget.Bool
saveImage widget.Bool
PacketCapture widget.Bool
serverAddress widget.Editor
}
@ -21,6 +22,7 @@ func (s *worldSettings) Init() {
s.worlds = utils.ValidCMDs["worlds"].(*world.WorldCMD)
s.serverAddress.SingleLine = true
s.voidGen.Value = true
s.PacketCapture.Value = false
}
func (s *worldSettings) Apply() {
@ -37,6 +39,7 @@ func (s *worldSettings) Layout(gtx layout.Context, th *material.Theme) layout.Di
layout.Rigid(material.CheckBox(th, &s.withPacks, "with Packs").Layout),
layout.Rigid(material.CheckBox(th, &s.voidGen, "void Generator").Layout),
layout.Rigid(material.CheckBox(th, &s.saveImage, "save image").Layout),
layout.Rigid(material.CheckBox(th, &s.PacketCapture, "packet capture").Layout),
layout.Rigid(material.Editor(th, &s.serverAddress, "server Address").Layout),
)
}

4
utils/proxy.go
View File

@ -282,6 +282,7 @@ func (p *ProxyContext) IsClient(addr net.Addr) bool {
}
var NewDebugLogger func(bool) *ProxyHandler
var NewPacketCapturer func() *ProxyHandler
func (p *ProxyContext) connectClient(ctx context.Context, serverAddress string, cdpp **login.ClientData) (err error) {
GetTokenSource() // ask for login before listening
@ -337,6 +338,9 @@ func (p *ProxyContext) Run(ctx context.Context, serverAddress, name string) (err
if Options.Debug || Options.ExtraDebug {
p.AddHandler(NewDebugLogger(Options.ExtraDebug))
}
if Options.Capture {
p.AddHandler(NewPacketCapturer())
}
p.AddHandler(&ProxyHandler{
Name: "Commands",
PacketCB: p.CommandHandlerPacketCB,

2
utils/utils.go
View File

@ -30,7 +30,7 @@ var Options struct {
Preload bool
IsInteractive bool
ExtraDebug bool
EnableDNS bool
Capture bool
PathCustomUserData string
}