Netease 1.18 Support

Makefile

@@ -38,7 +38,7 @@ endif
 ifneq ($(wildcard /usr/bin/aarch64-linux-gnu-gcc),)
 	TARGETS:=${TARGETS} current-arm64-executable
 endif
-ifneq ($(wildcard `pwd`/openwrt-sdk-21.02.2-ramips-mt7620_gcc-8.4.0_musl.Linux-x86_64),)
+ifneq ($(wildcard openwrt-sdk-21.02.2-ramips-mt7620_gcc-8.4.0_musl.Linux-x86_64),)
 	TARGETS:=${TARGETS} openwrt-mt7620-mipsel_24kc
 endif
 

fastbuilder/world_provider/provider.go

@@ -49,7 +49,7 @@ func DoCache(pkt *packet.LevelChunk) {
 }
 
 func quickCache(pkt *packet.LevelChunk) {
-	ChunkCache[world.ChunkPos{pkt.ChunkX,pkt.ChunkZ}]=pkt
+	ChunkCache[world.ChunkPos{pkt.Position[0],pkt.Position[1]}]=pkt
 }
 
 func wander(env *environment.PBEnvironment, position world.ChunkPos) {
@@ -101,8 +101,8 @@ func (p *OnlineWorldProvider) LoadChunk(position world.ChunkPos) (c *chunk.Chunk
 			select {
 			case inp=<-ChunkInput:
 				quickCache(inp)
-				fmt.Printf("Waiting for chunk: current: %d, %d | expected: %v\n",inp.ChunkX,inp.ChunkZ,position)
-				if(inp.ChunkX!=position[0]||inp.ChunkZ!=position[1]) {
+				fmt.Printf("Waiting for chunk: current: %d, %d | expected: %v\n",inp.Position[0],inp.Position[1],position)
+				if(inp.Position[0]!=position[0]||inp.Position[1]!=position[1]) {
 					continue
 				}
 			case <-time.After(2*time.Second):

io/special_tasks/export.go

@@ -47,6 +47,8 @@ func CreateExportTask(commandLine string, env *environment.PBEnvironment) *task.
 		cmdsender.Output(fmt.Sprintf("Failed to parse command: %v",err))
 		return nil
 	}
+	cmdsender.Output("Sorry, but compatibility works haven't been done yet, please use lexport.")
+	return nil
 	beginPos := cfg.Position
 	endPos := cfg.End
 	startX,endX,startZ,endZ:=0,0,0,0
@@ -109,7 +111,7 @@ func CreateExportTask(commandLine string, env *environment.PBEnvironment) *task.
 	}
 	providerChunksMap:=make(map[world_provider.ChunkPosDefine]world_provider.ChunkDefine)
 	for _,chunk:=range chunkPool{
-		providerChunksMap[world_provider.ChunkPosDefine{chunk.ChunkX,chunk.ChunkZ}]=world_provider.ChunkDefine(chunk)
+		providerChunksMap[world_provider.ChunkPosDefine{chunk.Position[0],chunk.Position[1]}]=world_provider.ChunkDefine(chunk)
 	}
 	var offlineWorld *world.World
 	offlineWorld=world.New(&world_provider.StubLogger{},32)
@@ -161,7 +163,7 @@ func CreateExportTask(commandLine string, env *environment.PBEnvironment) *task.
 						if(block=="command_block"){
 							mode=packet.CommandBlockImpulse
 						}else if(block=="repeating_command_block"){
-							mode=packet.CommandBlockRepeat
+							mode=packet.CommandBlockRepeating
 						}else if(block=="chain_command_block"){
 							mode=packet.CommandBlockChain
 						}
@@ -394,7 +396,7 @@ func CreateLegacyExportTask(commandLine string, env *environment.PBEnvironment)
 							if(curblockname=="command_block"){
 								mode=packet.CommandBlockImpulse
 							}else if(curblockname=="repeating_command_block"){
-								mode=packet.CommandBlockRepeat
+								mode=packet.CommandBlockRepeating
 							}else if(curblockname=="chain_command_block"){
 								mode=packet.CommandBlockChain
 							}

main.go

@@ -506,22 +506,10 @@ func runClient(env *environment.PBEnvironment) {
 	}
 	env.UQHolder.(*uqHolder.UQHolder).UpdateFromConn(conn)
 	for {
-		pk, data, err := conn.ReadPacketAndBytes()
+		pk, err := conn.ReadPacket()
 		if err != nil {
 			panic(err)
 		}
-		if captureFp != nil {
-			buf := make([]byte, 4)
-			binary.LittleEndian.PutUint32(buf, uint32(len(data)))
-			_, err := captureFp.Write(buf)
-			if err != nil {
-				panic("dump to capture file (len hdr) fail " + err.Error())
-			}
-			_, err = captureFp.Write(data)
-			if err != nil {
-				panic("dump to capture file fail " + err.Error())
-			}
-		}
 		if env.OmegaAdaptorHolder != nil {
 			env.OmegaAdaptorHolder.(*embed.EmbeddedAdaptor).FeedPacket(pk)
 			continue
@@ -536,9 +524,6 @@ func runClient(env *environment.PBEnvironment) {
 			}
 			return string(marshal)
 		}
-		if env.ExternalConnectionHandler != nil {
-			env.ExternalConnectionHandler.(*external.ExternalConnectionHandler).PacketChannel <- data
-		}
 
 		switch p := pk.(type) {
 		case *packet.PyRpc:
@@ -678,8 +663,8 @@ func runClient(env *environment.PBEnvironment) {
 			if args.ShouldEnableOmegaSystem() {
 				world_provider.GlobalLRUMemoryChunkCacher.AdjustCacheLevel(7)
 			}
-			world_provider.GlobalLRUMemoryChunkCacher.OnNewChunk(world_provider.ChunkPosDefine{p.ChunkX, p.ChunkZ}, p)
-			world_provider.GlobalChunkFeeder.OnNewChunk(world_provider.ChunkPosDefine{p.ChunkX, p.ChunkZ}, p)
+			world_provider.GlobalLRUMemoryChunkCacher.OnNewChunk(world_provider.ChunkPosDefine{p.Position[0], p.Position[1]}, p)
+			world_provider.GlobalChunkFeeder.OnNewChunk(world_provider.ChunkPosDefine{p.Position[0], p.Position[1]}, p)
 		case *packet.UpdateBlock:
 			channel, h := commandSender.BlockUpdateSubscribeMap.LoadAndDelete(p.Position)
 			if h {