Merge pull request michaljaz#29 from Picoseconds/threejs-javascript

Lightbulb pull request

Author: michaljaz

src/client/scripts/EventHandler.js

@@ -108,17 +108,23 @@ class EventHandler {
                 _this.gameState === "gameLock"
             ) {
                 _this.game.socket.emit("move", _this.controls[z.code], true);
-                if (_this.controls[z.code] === "sprint") {
-                    var to = {
-                        fov: _this.game.fov + 10,
-                    };
-                    new TWEEN.Tween(_this.game.camera)
-                        .to(to, 200)
-                        .easing(TWEEN.Easing.Quadratic.Out)
-                        .onUpdate(function () {
-                            return _this.game.camera.updateProjectionMatrix();
-                        })
-                        .start();
+                switch (_this.controls[z.code]) {
+                    case "sprint":
+                        var to = {
+                            fov: _this.game.fov,
+                        };
+                        new TWEEN.Tween(_this.game.camera)
+                            .to(to, 200)
+                            .easing(TWEEN.Easing.Quadratic.Out)
+                            .onUpdate(function () {
+                                return _this.game.camera.updateProjectionMatrix();
+                            })
+                            .start();
+                        break;
+
+                    case "sneak":
+                        _this.game.headHeight = 16.7;
+                        break;
                 }
             }
         });
@@ -127,17 +133,23 @@ class EventHandler {
             delete _this.keys[z.code];
             if (_this.controls[z.code] !== undefined) {
                 _this.game.socket.emit("move", _this.controls[z.code], false);
-                if (_this.controls[z.code] === "sprint") {
-                    var to = {
-                        fov: _this.game.fov,
-                    };
-                    new TWEEN.Tween(_this.game.camera)
-                        .to(to, 200)
-                        .easing(TWEEN.Easing.Quadratic.Out)
-                        .onUpdate(function () {
-                            return _this.game.camera.updateProjectionMatrix();
-                        })
-                        .start();
+                switch (_this.controls[z.code]) {
+                    case "sprint":
+                        var to = {
+                            fov: _this.game.fov,
+                        };
+                        new TWEEN.Tween(_this.game.camera)
+                            .to(to, 200)
+                            .easing(TWEEN.Easing.Quadratic.Out)
+                            .onUpdate(function () {
+                                return _this.game.camera.updateProjectionMatrix();
+                            })
+                            .start();
+                        break;
+
+                    case "sneak":
+                        _this.game.headHeight = 17;
+                        break;
                 }
             }
         });

src/client/scripts/InventoryBar.js

@@ -14,6 +14,15 @@ var InventoryBar = class InventoryBar {
         }
     }
 
+    setGamemode(gamemode) {
+        // mineflayer doesn't currently include support for spectator mode
+        if (gamemode === "creative") {
+            $((gamemode === "spectator" ? ".inv_bar, .inv_cursor" : "") + ".player_hp, .player_food, .xp_bar_empty, xp_bar").css("display", "none");
+        } else {
+            $(".player_hp, .player_food, .xp_bar_empty, xp_bar").css("display", "initial");
+        }
+    }
+
     setHp(points) {
         var lista = {};
         for (let i = 1; i <= 10; i++) {

src/client/scripts/index.js

@@ -16,6 +16,12 @@ import { BlockPlace } from "./BlockPlace.js";
 import { DistanceBasedFog } from "./DistanceBasedFog.js";
 import { EventHandler } from "./EventHandler.js";
 
+const dimNamesInt = {
+    "-1": "minecraft:nether",
+    0: "minecraft:overworld",
+    1: "minecraft:end",
+};
+
 class Game {
     constructor() {
         var _this = this;
@@ -49,6 +55,9 @@ class Game {
             "minecraft:overworld": [165 / 255, 192 / 255, 254 / 255],
             "minecraft:the_end": [1 / 255, 20 / 255, 51 / 255],
             "minecraft:the_nether": [133 / 255, 40 / 255, 15 / 255],
+
+            "minecraft:end": [1 / 255, 20 / 255, 51 / 255],
+            "minecraft:nether": [133 / 255, 40 / 255, 15 / 255],
         };
         this.camera = new THREE.PerspectiveCamera(this.fov, 2, 0.1, 1000);
         this.camera.rotation.order = "YXZ";
@@ -75,6 +84,7 @@ class Game {
         );
         this.stats.showPanel(0);
         document.body.appendChild(this.stats.dom);
+        this.headHeight = 17;
         this.pii = new PlayerInInventory(this);
         this.bb = new BlockBreak(this);
         this.bp = new BlockPlace(this);
@@ -101,12 +111,25 @@ class Game {
             _this.camera.rotation.y = yaw;
             _this.camera.rotation.x = pitch;
         });
-        this.socket.on("dimension", function (dim) {
+        this.socket.on("dimension", function (dim, format) {
+            switch (format) {
+                case "int":
+                    dim = dimNamesInt[dim];
+                    break;
+
+                case "world":
+                    // idk what this is yet
+                    break;
+            }
+
             _this.dimension = dim;
             console.log(`Player dimension has been changed: ${dim}`);
             _this.world.resetWorld();
+
             var bg = _this.dimBg[dim];
             if (bg === undefined) {
+                bg = _this.dimBg["minecraft:overworld"];
+
                 _this.scene.background = new THREE.Color(
                     ..._this.dimBg["minecraft:overworld"]
                 );
@@ -122,6 +145,9 @@ class Game {
         this.socket.on("mapChunk", function (sections, x, z) {
             _this.world.computeSections(sections, x, z);
         });
+        this.socket.on("game", function (gameData) {
+            _this.inv_bar.setGamemode(gameData.gameMode);
+        });
         this.socket.on("hp", function (points) {
             _this.inv_bar.setHp(points);
         });
@@ -135,15 +161,17 @@ class Game {
             _this.chat.log(msg);
         });
         this.socket.on("kicked", function (reason) {
-            _this.chat.log("You have been kicked! Reason: " + JSON.parse(reason).text);
+            _this.chat.log(
+                "You have been kicked! Reason: " + JSON.parse(reason).text
+            );
         });
         this.socket.on("xp", function (xp) {
             _this.inv_bar.setXp(xp.level, xp.progress);
         });
         this.socket.on("move", function (pos) {
             var to = {
                 x: pos.x - 0.5,
-                y: pos.y + 17,
+                y: pos.y + _this.headHeight,
                 z: pos.z - 0.5,
             };
             new TWEEN.Tween(_this.camera.position)

src/index.js

@@ -54,7 +54,15 @@ io.sockets.on("connection", function (socket) {
         socket.emit("mapChunk", cell.sections, packet.x, packet.z);
     });
     bot._client.on("respawn", function (packet) {
-        socket.emit("dimension", packet.dimension.value.effects.value);
+        socket.emit(
+            "dimension",
+            packet.dimension,
+            bot.supportFeature("dimensionIsAWorld")
+                ? "world"
+                : bot.supportFeature("dimensionIsAString")
+                ? "string"
+                : "int"
+        );
     });
     bot.on("heldItemChanged", function (item) {
         heldItem = item;
@@ -95,6 +103,9 @@ io.sockets.on("connection", function (socket) {
     bot.on("diggingAborted", function (block) {
         socket.emit("diggingAborted", block);
     });
+    bot.on("game", function () {
+        socket.emit("game", bot.game);
+    });
     var inv = "";
     var interval = setInterval(function () {
         var inv_new = JSON.stringify(bot.inventory.slots);
@@ -153,6 +164,7 @@ io.sockets.on("connection", function (socket) {
             } else if (state === "left") {
                 state = "right";
             }
+
             bot.setControlState(state, toggle);
         });
         socket.on("command", function (com) {