hopefully these changes are for the best

Author: hcortezr

src/pocketnode/level/chunk/Chunk.js

@@ -7,7 +7,7 @@ class Chunk {
         this._x = 0;
         this._z = 0;
 
-        this._height = 256;
+        this._height = 16;
 
         /**
          * @type {Map<number, SubChunk>}
@@ -40,24 +40,8 @@ class Chunk {
         this._x = x;
         this._z = z;
 
-        if(subChunks.size !== 0) {
-            for (let [y, chunk] of subChunks) {
-                if (y < 0 || y >= this._height) {
-                    throw new Error("Invalid subchunk index " + y);
-                }
-
-                if (chunk.isEmpty()) {
-                    this._subChunks.set(y, new EmptySubChunk());
-                } else {
-                    this._subChunks.set(y, chunk);
-                }
-            }
-        }
-
-        for(let i = 0; i < this._height; ++i){
-            if(!this._subChunks.has(i)){
-                this._subChunks.set(i, new EmptySubChunk());
-            }
+        for(let y = 0; y < this._height; y++){
+            this._subChunks.set(y, subChunks.has(y) ? subChunks.get(y) : new EmptySubChunk());
         }
 
         if(heightMap.length === 256){
@@ -76,7 +60,7 @@ class Chunk {
             if(biomes.length !== 0){
                 throw new Error("Wrong Biomes value count, expected 256, got "+biomes.length);
             }else{
-                this._biomes = new Array(256).fill(0);
+                this._biomes = new Array(256).fill(0x00);
             }
         }
     }
@@ -162,7 +146,7 @@ class Chunk {
     }
 
     setBlockData(x, y, z, data){
-        return this.getSubChunk(y >> 4).setBlockData(x, y & 0x0f, z, data);
+        return this.getSubChunk(y >> 4, true).setBlockData(x, y & 0x0f, z, data);
     }
 
     getBlockLight(x, y, z){
@@ -181,17 +165,10 @@ class Chunk {
         return this.getSubChunk(y >> 4, true).setBlockSkyLight(x, y & 0x0f, z, level);
     }
 
-    getSubChunk(y, generateNew = false){
-        if(y < 0 || y >= this._height){
-            return new EmptySubChunk();
-        }else if(generateNew && this._subChunks.has(y) instanceof EmptySubChunk){
-            this._subChunks.set(y, new SubChunk());
-        }
-
-        if(this._subChunks.get(y) === null){
-            throw new Error("something broke..");
+    getSubChunk(y, genNew = false){
+        if(genNew && this._subChunks.get(y) instanceof EmptySubChunk){
+            return this._subChunks.set(y, new SubChunk()).get(y);
         }
-
         return this._subChunks.get(y);
     }
 
@@ -222,28 +199,24 @@ class Chunk {
     }
 
     recalculateHeightMap(){
-        for(let z = 0; z < 16; ++z){
-            for(let x = 0; x < 16; ++x){
-                let id = this.getHighestBlockId(x, z);
-
+        for(let x = 0; x < 16; x++){
+            for(let z = 0; z < 16; z++){
                 this.setHeightMap(x, z, this.getHighestBlock(x, z) + 1);
             }
         }
     }
 
     getHighestSubChunk(){
-        let highest = new EmptySubChunk();
-        for(let y = 16; y > 0; --y){
-            if(this._subChunks.has(y)){
+        for(let y = 15; y >= 0; y--){
+            if(!this._subChunks.has(y)){
                 continue;
             }
             if(this._subChunks.get(y).isEmpty()){
                 continue;
             }
-            highest = this._subChunks.get(y);
-            break;
+            return this._subChunks.get(y);
         }
-        return highest;
+        return new EmptySubChunk();
     }
 
     getHighestBlockId(x, z){
@@ -264,14 +237,16 @@ class Chunk {
     }
 
     pruneEmptySubChunks(){
-        for(let [y, subChunk] of this._subChunks){
-            if(y < 0 || y >= this._height){
-                this._subChunks.delete(y);
-            }else if(subChunk instanceof EmptySubChunk){
+        for(let y = 15; y >= 0; y--){
+            if(!this._subChunks.has(y)){
                 continue;
-            }else if(subChunk.isEmpty()){
-                this._subChunks.set(y, new EmptySubChunk());
             }
+
+            if(!this._subChunks.get(y).isEmpty()){
+                return;
+            }
+
+            this._subChunks.delete(y);
         }
     }
 
@@ -305,12 +280,11 @@ class Chunk {
         let subChunkCount = this.getFilledSubChunks();
 
         stream.writeByte(subChunkCount);
-        for(let i = 0; i < subChunkCount; i++){
-            stream.append(this._subChunks.get(i).toBinary());
+        for(let y = 0; y < subChunkCount; ++y){
+            stream.append(this._subChunks.get(y).toBinary());
         }
 
-        this._heightMap.forEach(v => stream.writeShort(v));
-
+        this._heightMap.forEach(v => stream.writeLShort(v));
         this._biomes.forEach(v => stream.writeByte(v));
         stream.writeByte(0);
 
@@ -319,7 +293,7 @@ class Chunk {
         return stream.getBuffer();
     }
 
-    static getIndex(x, y, z){
+    static getIdIndex(x, y, z){
         return (x << 12) | (z << 8) | y;
     }
 

src/pocketnode/level/chunk/SubChunk.js

@@ -39,11 +39,11 @@ class SubChunk extends SubChunkInterface {
     }
 
     getBlockId(x, y, z){
-        return this._blockIds[SubChunk.getIndex(x, y, z)];
+        return this._blockIds[SubChunk.getIdIndex(x, y, z)];
     }
 
     setBlockId(x, y, z, id){
-        this._blockIds[SubChunk.getIndex(x, y, z)] = id;
+        this._blockIds[SubChunk.getIdIndex(x, y, z)] = id;
         return true;
     }
 
@@ -95,10 +95,10 @@ class SubChunk extends SubChunkInterface {
         }
     }
 
-    setBlockSkyLight(x, y, z){
+    setBlockSkyLight(x, y, z, level){
         let i = SubChunk.getLightIndex(x, y, z);
         let byte = this._skyLight[i];
-        if((y & 1) === 0){
+        if((y & 0x01) === 0){
             this._skyLight[i] = (byte & 0xf0) | (level & 0x0f);
         }else{
             this._skyLight[i] = ((level & 0x0f) << 4) | (byte & 0x0f);
@@ -107,15 +107,13 @@ class SubChunk extends SubChunkInterface {
     }
 
     getHighestBlockId(x, z){
-        let low = (x << 8) | (z << 4);
-        let i = low | 0x0f;
-        for(; i >= low; --i){
-            if(this._blockIds[i] !== 0x00){
-                return i & 0x0f;
+        for(let y = 15; y >= 0; y--){
+            let id = this.getBlockId(x, y, z);
+            if(id !== 0){
+                return id;
             }
         }
-
-        return -1;
+        return 0;
     }
 
     getHighestBlockData(x, z){
@@ -124,7 +122,7 @@ class SubChunk extends SubChunkInterface {
 
     getHighestBlock(x, z){
         for(let y = 15; y >= 0; y--){
-            if(this.getBlockData(x, y, z) !== 0){
+            if(this.getBlockId(x, y, z) !== 0){
                 return y;
             }
         }
@@ -133,12 +131,10 @@ class SubChunk extends SubChunkInterface {
     }
 
     toBinary(){
-        let a = Buffer.from(this._blockIds);
-        let b = Buffer.from(this._blockData);
-        return Buffer.concat([a, b]);
+        return Buffer.from([0x00, ...this._blockIds, ...this._blockData]);
     }
 
-    static getIndex(x, y, z){
+    static getIdIndex(x, y, z){
         return (x << 8) | (z << 4) | y;
     }
 
@@ -151,4 +147,6 @@ class SubChunk extends SubChunkInterface {
     }
 }
 
+let subchunk = new SubChunk();
+
 module.exports = SubChunk;