CHUNKS!

Author: hcortezr

src/pocketnode/level/chunk/Chunk.js

@@ -228,12 +228,22 @@ class Chunk {
     }
 
     getHighestBlock(x, z){
-        return this.getHighestSubChunk().getHighestBlock(x, z);
+        let index = this.getHighestSubChunkIndex();
+        if(index === -1){
+            return -1;
+        }
+
+        for(let  y = index; y >= 0; --y){
+            let height = this.getSubChunk(y).getHighestBlock(x, z) | (y << 4);
+            if(height !== -1){
+                return height;
+            }
+        }
+
+        return -1;
     }
 
-    getFilledSubChunks(){
-        //this.pruneEmptySubChunks();
-        //return this._subChunks.size;
+    getHighestSubChunkIndex(){
         let y;
         for(y = this._subChunks.size - 1; y >= 0; --y){
             if(this._subChunks.get(y) instanceof EmptySubChunk){
@@ -242,7 +252,13 @@ class Chunk {
             break;
         }
 
-        return y + 1;
+        return y;
+    }
+
+    getFilledSubChunks(){
+        //this.pruneEmptySubChunks();
+        //return this._subChunks.size;
+        return this.getHighestSubChunkIndex() + 1;
     }
 
     pruneEmptySubChunks(){

src/pocketnode/network/PlayerSessionAdapter.js

@@ -123,35 +123,37 @@ class PlayerSessionAdapter {
     handleRequestChunkRadius(packet){
         this.player.setViewDistance(packet.radius);
 
-        let distance = this.player.getViewDistance();
-        for(let chunkX = -distance; chunkX <= distance; chunkX++) {
-            for(let chunkZ = -distance; chunkZ <= distance; chunkZ++) {
-                let chunk = new Chunk(chunkX, chunkZ);
-
-                for(let x = 0; x < 16; x++){
-                    for(let z = 0; z < 16; z++){
-                        let y = 0;
-                        chunk.setBlockId(x, y++, z, 7);
-                        chunk.setBlockId(x, y++, z, 3);
-                        chunk.setBlockId(x, y++, z, 3);
-                        chunk.setBlockId(x, y, z, 2);
-
-                        /*for (let i = y - 1; i >= 0; i--) {
-                            chunk.setBlockSkyLight(x, y, z, 0);
-                        }*/
+        Async(function() {
+            let distance = this.player.getViewDistance();
+            for (let chunkX = -distance; chunkX <= distance; chunkX++) {
+                for (let chunkZ = -distance; chunkZ <= distance; chunkZ++) {
+                    let chunk = new Chunk(chunkX, chunkZ);
+
+                    for (let x = 0; x < 16; x++) {
+                        for (let z = 0; z < 16; z++) {
+                            let y = 0;
+                            chunk.setBlockId(x, y++, z, 7);
+                            chunk.setBlockId(x, y++, z, 3);
+                            chunk.setBlockId(x, y++, z, 3);
+                            chunk.setBlockId(x, y, z, 2);
+
+                            /*for (let i = y - 1; i >= 0; i--) {
+                                chunk.setBlockSkyLight(x, y, z, 0);
+                            }*/
+                        }
                     }
-                }
 
-                //chunk.recalculateHeightMap();
-                //if(chunkX === -distance && chunkZ === -distance) console.log(`${chunk.toBinary().length}`);// > ${chunk.toBinary().toString("hex")}`);
+                    chunk.recalculateHeightMap();
+                    if (chunkX === -distance && chunkZ === -distance) console.log(`${chunk.toBinary().length} > ${chunk.toBinary().toString("hex")}`);
 
-                this.player.sendChunk(chunk);
+                    this.player.sendChunk(chunk);
+                }
             }
-        }
-
-        console.log("done sending chunks");
-        this.player.sendPlayStatus(PlayStatusPacket.PLAYER_SPAWN);
-
+        }.bind(this))
+            .then(function(){
+                console.log("done sending chunks");
+                this.player.sendPlayStatus(PlayStatusPacket.PLAYER_SPAWN);
+            }.bind(this));
         return true;
     }
 

src/pocketnode/network/minecraft/NetworkBinaryStream.js

@@ -1,6 +1,6 @@
 const UUID = pocketnode("utils/UUID");
 
-class NetworkBinaryStream extends (pocketnode.RUNNING_LOCALLY ? require("../../../../../PocketNode-BinaryStream") : require("pocketnode-binarystream")) {
+class NetworkBinaryStream extends require("pocketnode-binarystream") {
     /**
      * @return {string}
      */
@@ -13,9 +13,9 @@ class NetworkBinaryStream extends (pocketnode.RUNNING_LOCALLY ? require("../../.
      * @return {NetworkBinaryStream}
      */
     writeString(v){
-        this.writeUnsignedVarInt(v.length);
+        this.writeUnsignedVarInt(Buffer.byteLength(v));
         if(v.length === 0) return this;
-        this.append(Buffer.from(v));
+        this.append(Buffer.from(v, "utf8"));
         return this;
     }
 

src/pocketnode/network/minecraft/protocol/FullChunkDataPacket.js

@@ -20,7 +20,7 @@ class FullChunkDataPacket extends DataPacket {
     _decodePayload(){
         this.chunkX = this.readVarInt();
         this.chunkZ = this.readVarInt();
-        this.data = this.readString(true);
+        this.data = this.read(this.readUnsignedVarInt());
     }
 
     _encodePayload(){

src/pocketnode/utils/methods/Globals.js

@@ -229,4 +229,7 @@ global.createInterval = function(fn, interval){
 
         this.stop = () => clearTimeout(this.timer);
     });
-};
+};
+
+global.TRAVIS_BUILD = process.argv.indexOf("--travis-build") !== -1;
+global.RUNNING_LOCALLY = (process.argv.indexOf("--local") !== -1 || process.argv.indexOf("-l") !== -1);