some minor changes

Author: hcortezr

package-lock.json

@@ -1,8 +1,8 @@
 {
   "name": "pocketnode",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Server software written in Javascript for Minecraft: PE",
-  "main": "start.js",
+  "main": "src/pocketnode/PocketNode.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "docs": "rm -rf ./docs && jsdoc ./ -r -c ./jsdoc.json -d docs"
@@ -19,6 +19,7 @@
   "dependencies": {
     "adm-zip": "^0.4.7",
     "raknet": "git+https://github.com/PocketNode/RakNet.git",
+    "pocketnode-language": "git+https://github.com/PocketNode/PocketNode-Language.git",
     "time-stamp": "^2.0.0"
   },
   "devDependencies": {

package.json

@@ -5,30 +5,36 @@ require("./utils/methods/Globals");
 const Logger = pocketnode("logger/Logger");
 const Server = pocketnode("Server");
 
-class PocketNode {
-    constructor(){
-        this.START_TIME = Date.now();
-        this.NAME = "PocketNode";
-        this.CODENAME = "[BEGINNINGS]";
-        this.VERSION = "0.0.3";
-        this.API_VERSION = "1.0.0";
-
-        let logger = new Logger("Server");
-        let paths = {
-            file: Path.normalize(__dirname + "/../"),
-            data: Path.normalize(__dirname + "/../../"),
-            plugins: Path.normalize(__dirname + "/../../plugins/")
-        };
-
-        logger.info("Loading PocketNode...");
-
-        global.TRAVIS_BUILD = process.argv.join(" ").indexOf("--travis-build") !== -1;
-
-        let server = new Server(this, logger, paths);
-        if(TRAVIS_BUILD === true){
-            server.shutdown();
+function PocketNode(paths){
+    this.START_TIME = Date.now();
+    this.NAME = "PocketNode";
+    this.CODENAME = "[BEGINNINGS]";
+    this.VERSION = "0.0.4";
+    this.API_VERSION = "1.0.0";
+
+    let logger = new Logger("Server");
+    let path = {
+        file: Path.normalize(__dirname + "/../"),
+        data: Path.normalize(__dirname + "/../../"),
+        plugins: Path.normalize(__dirname + "/../../plugins/")
+    };
+
+    for(let i in paths){
+        if(typeof path[i] !== "undefined"){
+            path[i] = paths[i];
         }
     }
+
+    logger.info("Loading PocketNode...");
+
+    global.TRAVIS_BUILD = process.argv.indexOf("--travis-build") !== -1;
+
+    let server = new Server(this, logger, path);
+    if(TRAVIS_BUILD === true){
+        server.shutdown();
+    }
+
+    return server;
 }
 
 module.exports = PocketNode;

src/pocketnode/PocketNode.js

@@ -68,6 +68,8 @@ class Server {
         this._playerList = new PlayerList();
 
         this._levels = new Map();
+
+        this._entityCount = 0;
     }
 
     constructor(PocketNode, logger, paths){

src/pocketnode/Server.js

@@ -16,15 +16,7 @@ const Position = pocketnode("level/Position");
 * A Location is a Position with added Yaw and Pitch references. Yaw and Pitch are used for rotation.
 * @class
 */
-class Location extends Position
-{
-
-    initVars()
-    {
-        this.yaw;
-        this.pitch;
-    }
-
+class Location extends Position {
     /**
      * Represents a Position with added Yaw and Pitch references
      * @constructor
@@ -35,11 +27,10 @@ class Location extends Position
 	 * @param {Number}   pitch
 	 * @param {Level}    level
 	 */
-	constructor(x = 0, y = 0, z = 0, yaw = 0.0, pitch = 0.0, level = null)
-    {
+	constructor(x = 0, y = 0, z = 0, yaw = 0.0, pitch = 0.0, level = null){
+        super(x, y, z, level);
 		this.yaw = yaw;
 		this.pitch = pitch;
-		super(x, y, z, level);
 	}
 
     /**

src/pocketnode/level/Location.js

@@ -145,3 +145,5 @@ class Position extends Vector3
     }
 
 }
+
+module.exports = Position;

src/pocketnode/level/Position.js

@@ -1,4 +1,5 @@
-const RakNetServer = (process.argv.length === 3 && process.argv[2] === "LOCAL" ? require("../../../../RakNet") : require("raknet"));
+const RakNetServer = ((process.argv.indexOf("--local") !== -1 || process.argv.indexOf("-l") !== -1) ? require("../../../../RakNet") : require("raknet"));
+
 const Logger = pocketnode("logger/Logger");
 
 const PacketPool = pocketnode("network/minecraft/protocol/PacketPool");
@@ -21,7 +22,7 @@ class RakNetAdapter {
             .setVersion(server.getVersion())
             .setOnlinePlayers(server.getOnlinePlayerCount())
             .setMaxPlayers(server.getMaxPlayers())
-            .setGamemode("Creative");
+            .setGamemode(server.getGamemodeName(server.getGamemode()));
         this.packetPool = new PacketPool();
         this.logger = server.getLogger();
         this.players = new PlayerList();

src/pocketnode/network/RakNetAdapter.js

@@ -36,7 +36,7 @@ class ResourcePackManager {
 
         this._config.get("entries", []).forEach((pack, priority) => {
             try{
-                let packPath = SFS.fixPath(path + "/" + pack);
+                let packPath = SFS.normalize(path + "/" + pack);
                 if(SFS.fileExists(packPath)){
                     let newPack = null;
                     if(SFS.isDir(packPath)){

src/pocketnode/resourcepacks/ResourcePackManager.js

@@ -28,7 +28,7 @@ class Config {
         }else{
             if(this.type === Config.DETECT){
                 switch(Path.extname(this.file)){
-                    case "js":
+                    case ".json":
                         this.type = Config.JSON;
                         break;
                 }
@@ -169,4 +169,4 @@ class Config {
     }
 }
 
-module.exports = Config;
+module.exports = Config;