buildAndServer

Author: michaljaz

README.md

@@ -14,6 +14,8 @@ Zalecamy instalację:<br>
 #Instalacja repozytorium
 git clone https://github.com/michaljaz/web-minecraft
 cd web-minecraft
+
+#Instalacja niezbędnych bibliotek
 npm install
 
 #Uruchamianie serwera i przeglądarki

atlas.js build/atlas.jsatlas.js renamed to build/atlas.js

@@ -1,4 +1,3 @@
-
 const path = require('path');
 const fs = require('fs');
 const { createCanvas, loadImage } = require('canvas')
@@ -14,9 +13,9 @@ var loadedImages=0;
 var atlasSize=36
 var miniAtlasSize=27
 
-var path1=path.join(__dirname, "client/assets/blocks/blocksAtlas-full.png");
-var path2=path.join(__dirname, "client/assets/blocks/blocksMapping-full.json");
-var path3=path.join(__dirname, "client/assets/blocks/blocksMapping.json");
+var path1=path.join(__dirname, "../client/assets/blocks/blocksAtlas-full.png");
+var path2=path.join(__dirname, "../client/assets/blocks/blocksMapping-full.json");
+var path3=path.join(__dirname, "../client/assets/blocks/blocksMapping.json");
 
 firstLoad()
 
@@ -41,11 +40,11 @@ function NWW(a,b){
     return a*b/NWD(a,b)
 }
 function firstLoad(){
-    folderName="client/assets/blocks/images";
+    folderName="../client/assets/blocks/images";
     const directoryPath = path.join(__dirname, folderName);
     fs.readdir(directoryPath, function (err, files) {
         files.forEach(function (file) {
-            filePath=`${folderName}/${file}`
+            filePath=`${__dirname}/${folderName}/${file}`
             if(path.extname(file)==".png"){
                 addImageToLoad(filePath,file)
             }

coffee/bundle.coffee build/coffee/bundle.coffeecoffee/bundle.coffee renamed to build/coffee/bundle.coffee

@@ -4,8 +4,8 @@
   "description": "Render Minecrafta w przegladarce",
   "scripts": {
     "start": "node start.js",
-    "coffee": "coffee -o client/ -cw coffee/",
-    "atlas": "node atlas.js"
+    "coffee": "coffee -o client/ -cw build/coffee/",
+    "atlas": "node build/atlas.js"
   },
   "repository": {
     "type": "git",
@@ -23,6 +23,7 @@
     "express": "^4.17.1",
     "http": "0.0.1-security",
     "opn": "^6.0.0",
+    "path": "^0.12.7",
     "socket.io": "^2.3.0"
   }
 }

coffee/workers/terrain.coffee build/coffee/workers/terrain.coffeecoffee/workers/terrain.coffee renamed to build/coffee/workers/terrain.coffee

@@ -0,0 +1,13 @@
+module.exports = function(port) {
+	const express = require('express');
+	const app = express();
+
+	app.use(express.static(__dirname + "/../client/"));
+	app.use((req, res, next) => {
+	  res.set('Cache-Control', 'no-store')
+	  next()
+	})
+	app.listen(port, () => {
+	  console.log(`Running: \x1b[35m\x1b[4mhttp://localhost:${port}\x1b[0m`);
+	});
+}

package-lock.json

@@ -0,0 +1,46 @@
+module.exports = function(port) {
+  const http = require('http');
+  const fs = require('fs');
+
+  var server1 = http.createServer();
+  var io = require("socket.io")(server1);
+  var world={};
+  function saveWorld(){
+    fs.writeFile(__dirname+"/savedWorld.json",JSON.stringify(world),function (callback){})
+  }
+  function restoreWorld(){
+    world=JSON.parse(fs.readFileSync(__dirname+'/savedWorld.json'))
+  }
+  restoreWorld()
+  var players={};
+
+  io.sockets.on("connection", function(socket) {
+    console.log("[\x1b[32m+\x1b[0m] "+socket.id)
+    socket.emit("firstLoad",world)
+    socket.on("playerUpdate",function (data){
+      players[socket.id]=data
+      io.sockets.emit("playerUpdate",players)
+    })
+    socket.on("blockUpdate",function (block){
+      block[0]=Math.floor(block[0])
+      block[1]=Math.floor(block[1])
+      block[2]=Math.floor(block[2])
+      world[`${block[0]}:${block[1]}:${block[2]}`]=block[3];
+      if(block[3]==0){
+        delete world[`${block[0]}:${block[1]}:${block[2]}`]
+        // console.log("Block removed",`${block[0]}:${block[1]}:${block[2]}`)
+      }else{
+        // console.log("Block placed",`${block[0]}:${block[1]}:${block[2]}`)
+      }
+      io.sockets.emit("blockUpdate",block)
+      saveWorld()
+    })
+    socket.on("disconnect", function() {
+      console.log("[\x1b[31m-\x1b[0m] " + socket.id);
+      delete players[socket.id]
+    });
+  });
+  server1.listen(port);
+}
+
+

package.json

@@ -1,62 +1,6 @@
-const http = require('http');
 var opn = require('opn');
-const { exec } = require("child_process");
-const express = require('express');
-const app = express();
-const fs = require('fs');
 
-var socketPort=35565;
-var serverPort=25565;
-
-//Socketio
-  var server1 = http.createServer();
-  var io = require("socket.io")(server1);
-  var world={};
-  function saveWorld(){
-    fs.writeFile("savedWorld.json",JSON.stringify(world),function (callback){})
-  }
-  function restoreWorld(){
-    world=JSON.parse(fs.readFileSync('savedWorld.json'))
-  }
-  restoreWorld()
-  var players={};
-
-  io.sockets.on("connection", function(socket) {
-    console.log("[\x1b[32m+\x1b[0m] "+socket.id)
-    socket.emit("firstLoad",world)
-    socket.on("playerUpdate",function (data){
-      players[socket.id]=data
-      io.sockets.emit("playerUpdate",players)
-    })
-    socket.on("blockUpdate",function (block){
-      block[0]=Math.floor(block[0])
-      block[1]=Math.floor(block[1])
-      block[2]=Math.floor(block[2])
-      world[`${block[0]}:${block[1]}:${block[2]}`]=block[3];
-      if(block[3]==0){
-        delete world[`${block[0]}:${block[1]}:${block[2]}`]
-        // console.log("Block removed",`${block[0]}:${block[1]}:${block[2]}`)
-      }else{
-        // console.log("Block placed",`${block[0]}:${block[1]}:${block[2]}`)
-      }
-      io.sockets.emit("blockUpdate",block)
-      saveWorld()
-    })
-    socket.on("disconnect", function() {
-      console.log("[\x1b[31m-\x1b[0m] " + socket.id);
-      delete players[socket.id]
-    });
-  });
-  server1.listen(socketPort);
-
-//Webserver
-  app.use(express.static(__dirname + "/client/"));
-  app.use((req, res, next) => {
-    res.set('Cache-Control', 'no-store')
-    next()
-  })
-  app.listen(serverPort, () => {
-    console.log(`Running: \x1b[35m\x1b[4mhttp://localhost:${serverPort}\x1b[0m`);
-    opn(`http://localhost:${serverPort}`)
-  });
+require("./server/websocket.js")(35565)
+require("./server/express.js")(25565)
 
+opn(`http://localhost:25565`)