Development and Production servers

Author: michaljaz

src/client/scripts/AssetLoader.js

@@ -1,5 +1,5 @@
 import * as THREE from "three";
-import {FBXLoader} from "three/examples/jsm/loaders/FBXLoader.js";
+import { FBXLoader } from "three/examples/jsm/loaders/FBXLoader.js";
 
 class AssetLoader {
     constructor() {
@@ -20,12 +20,10 @@ class AssetLoader {
             var assetsLoaded = 0;
 
             for (const assetName in assets) {
-                if (!assets.hasOwnProperty(assetName))
-                    continue;
+                if (!assets.hasOwnProperty(assetName)) continue;
 
                 let asset = assets[assetName];
 
-
                 switch (asset.type) {
                     case "texture":
                         textureLoader.load(asset.path, (texture) => {
@@ -46,7 +44,7 @@ class AssetLoader {
                         });
                         break;
                     case "image":
-                        let img = new Image();
+                        var img = new Image();
                         img.onload = () => {
                             this.assets.set(assetName, img);
                             assetsLoaded++;
@@ -67,13 +65,12 @@ class AssetLoader {
                         break;
                 }
             }
-        })
-
+        });
     }
 
     get(assetName) {
         return this.assets.get(assetName);
     }
 }
 
-export {AssetLoader};
+export { AssetLoader };

src/client/scripts/EventHandler.js

@@ -53,7 +53,7 @@ class EventHandler {
             if (z.code === "Enter" && this.gameState === "chat") {
                 this.game.chat.command($(".com_i").val());
                 $(".com_i").val("");
-                this.setState("game")
+                this.setState("game");
             }
             if (
                 z.code === "KeyE" &&

src/client/scripts/Setup.js

@@ -3,19 +3,19 @@ import TWEEN from "@tweenjs/tween.js";
 import Stats from "stats-js";
 import * as dat from "dat.gui";
 import io from "socket.io-client";
-import {DistanceBasedFog} from "./DistanceBasedFog.js";
-import {UrlParams} from "./UrlParams.js";
-import {gpuInfo} from "./gpuInfo.js";
-import {World} from "./World/World.js";
-import {InventoryBar} from "./InventoryBar.js";
-import {Chat} from "./Chat.js";
-import {Entities} from "./Entities.js";
-import {PlayerInInventory} from "./PlayerInInventory.js";
-import {BlockBreak} from "./BlockBreak.js";
-import {BlockPlace} from "./BlockPlace.js";
-import {EventHandler} from "./EventHandler.js";
+import { DistanceBasedFog } from "./DistanceBasedFog.js";
+import { UrlParams } from "./UrlParams.js";
+import { gpuInfo } from "./gpuInfo.js";
+import { World } from "./World/World.js";
+import { InventoryBar } from "./InventoryBar.js";
+import { Chat } from "./Chat.js";
+import { Entities } from "./Entities.js";
+import { PlayerInInventory } from "./PlayerInInventory.js";
+import { BlockBreak } from "./BlockBreak.js";
+import { BlockPlace } from "./BlockPlace.js";
+import { EventHandler } from "./EventHandler.js";
 
-async function Setup(game, cb) {
+async function Setup(game) {
     return new Promise((resolve) => {
         game.canvas = document.querySelector("#c");
         game.pcanvas = document.querySelector("#c_player");
@@ -25,7 +25,12 @@ async function Setup(game, cb) {
         });
         game.renderer.sortObjects = true;
         game.scene = new THREE.Scene();
-        game.camera = new THREE.PerspectiveCamera(game.fov.normal, 2, 0.1, 1000);
+        game.camera = new THREE.PerspectiveCamera(
+            game.fov.normal,
+            2,
+            0.1,
+            1000
+        );
         game.camera.rotation.order = "YXZ";
         game.camera.position.set(26, 26, 26);
         game.scene.add(new THREE.AmbientLight(0xdddddd));
@@ -62,7 +67,9 @@ async function Setup(game, cb) {
             };
             game.distanceBasedFog.farnear.x = (game.params.chunkdist - 1) * 16;
             game.distanceBasedFog.farnear.y = game.params.chunkdist * 16;
-            gui.add(game.world.material, "wireframe").name("Wireframe").listen();
+            gui.add(game.world.material, "wireframe")
+                .name("Wireframe")
+                .listen();
             var chunkDist = gui
                 .add(game.params, "chunkdist", 0, 10, 1)
                 .name("Render distance")
@@ -85,7 +92,7 @@ async function Setup(game, cb) {
             };
             resolve();
         });
-    })
+    });
 }
 
-export {Setup};
+export { Setup };

src/client/scripts/UrlParams.js

@@ -190,11 +190,15 @@ var UrlParams = function (game, cb) {
     }
     if (game.server === "" || game.server === null) {
         reload = true;
-        game.server = "185.228.139.97";
+        game.server = game.production
+            ? game.servers.production[0]
+            : game.servers.development[0];
     }
     if (game.serverPort === "" || game.serverPort === null) {
         reload = true;
-        game.serverPort = "25564";
+        game.serverPort = game.production
+            ? game.servers.production[1]
+            : game.servers.development[1];
     }
     if (game.premium === "" || game.premium === null) {
         reload = true;

src/client/scripts/index.js

@@ -1,17 +1,21 @@
 import * as THREE from "three";
 import TWEEN from "@tweenjs/tween.js";
 import swal from "sweetalert";
-import {AssetLoader} from "./AssetLoader.js";
-import {Setup} from "./Setup.js";
+import { AssetLoader } from "./AssetLoader.js";
+import { Setup } from "./Setup.js";
 
 class Game {
     constructor() {
-
-        if (PRODUCTION) {
+        this.production = PRODUCTION;
+        if (this.production) {
             console.log("Running in production mode");
         } else {
             console.log("Running in development mode");
         }
+        this.servers = {
+            production: ["185.228.139.97", "25564"],
+            development: ["localhost", "25565"],
+        };
         this.fov = {
             normal: 70,
             sprint: 80,
@@ -30,8 +34,6 @@ class Game {
         };
         this.headHeight = 17;
         this.gamemode = null;
-
-
     }
 
     async init() {
@@ -192,4 +194,4 @@ class Game {
 window.onload = () => {
     let game = new Game();
     game.init();
-}
+};

src/index.js

@@ -76,7 +76,7 @@ io.sockets.on("connection", function (socket) {
         socket.emit("kicked", reason);
     });
     bot.on("message", function (msg) {
-        let message = msg.toAnsi()
+        let message = msg.toAnsi();
 
         const replacements = [
             [/&/g, "&"],
@@ -180,8 +180,7 @@ io.sockets.on("connection", function (socket) {
                 clearInterval(interval);
                 console.log(`[\x1b[31m-\x1b[0m] ${query.nick}`);
                 bot.end();
-            } catch (error) {
-            }
+            } catch (error) {}
         });
         socket.on("dig", function (pos) {
             var block = bot.blockAt(vec3(pos[0], pos[1] - 16, pos[2]));