Merge pull request #160 from demipixel/fx

FX

doc/API.md

@@ -840,7 +840,7 @@ Emitted when a player places a block
 - position: Position they're attempting to place the block
 - id: Id of block being placed
 - damage: Data of block being placed
-- reference (u): Reference block that was placed on
+- reference (u): Reference block (position) that was placed on
 - direction (u): Direction vector from reference to position
 - playSound: Which sound to play (Default: true)
 - sound: Sound to play (Default: default sound for that material)

src/lib/plugins/chest.js

@@ -2,13 +2,13 @@ var Vec3 = require("vec3").Vec3;
 
 module.exports.player=function(player)
 {
-  player._client.on('block_place', async ({location} = {}) => {
-    var referencePosition=new Vec3(location.x,location.y,location.z);
+  player.on('placeBlock_cancel', async (opt, cancel) => {
     if (player.crouching) return;
     try {
-      var id = await player.world.getBlockType(referencePosition);
-      var blockAbove = await player.world.getBlockType(referencePosition.clone().add(new Vec3(0, 1, 0)));
+      var id = await player.world.getBlockType(opt.reference);
+      var blockAbove = await player.world.getBlockType(opt.reference.plus(new Vec3(0, 1, 0)));
       if (id == 54) {
+        opt.playSound = false;
         if (blockAbove) {
           return;
         }
@@ -18,6 +18,7 @@ module.exports.player=function(player)
           windowTitle: JSON.stringify("Chest"),
           slotCount: 9 * 3 + 8 // 3 rows, make nicer later
         });
+        cancel();
       }
     }
     catch(err) {

src/lib/plugins/communication.js

@@ -48,4 +48,7 @@ module.exports.entity=function(entity,serv)
 
   entity._writeOthersNearby = (packetName, packetFields) =>
     serv._writeArray(packetName, packetFields, entity.getNearbyPlayers());
+
+  entity._writeNearby = (packetName, packetFields) =>
+    serv._writeArray(packetName, packetFields, entity.getNearbyPlayers().concat(entity.type == 'player' ? [entity] : []));
 };

src/lib/plugins/effects.js

@@ -0,0 +1,91 @@
+
+module.exports.entity = function(entity, serv) {
+  entity.effects = {};
+  for (var i = 1; i <= 23; i++) { // 23 in 1.8, 27 in 1.9
+    entity.effects[i] = null; // Just so we know it's a real potion and not undefined/not existant
+  }
+
+  entity.sendEffect = (effectId, {amplifier=0,duration=30*20,particles=true,whitelist,blacklist=[]}={}) => {
+    if (!whitelist) whitelist = serv.getNearby(entity);
+    if (entity.type == 'player' && [1].indexOf(effectId) != -1) entity.sendAbilities();
+    var sendTo = whitelist.filter(p => blacklist.indexOf(p) == -1);
+    var data = {
+      entityId: entity.id,
+      effectId: effectId,
+      amplifier: amplifier,
+      duration: duration,
+      hideParticles: !particles
+    };
+    serv._writeArray('entity_effect', data, sendTo);
+  };
+
+  entity.sendRemoveEffect = (effectId, {whitelist,blacklist=[]}={}) => {
+    if (!whitelist) whitelist = serv.getNearby(entity);
+    var sendTo = whitelist.filter(p => blacklist.indexOf(p) == -1);
+    serv._writeArray('remove_entity_effect', {
+      entityId: entity.id,
+      effectId: effectId
+    }, sendTo);
+  };
+
+  entity.addEffect = (effectId, opt={}) => {
+    var amp = typeof opt.amplifier == 'undefined' ? 0 : opt.amplifier;
+    if (!entity.effects[effectId] || opt.override || amp < entity.effects[effectId].amplifier) {
+      entity.effects[effectId] = {
+        amplifier: opt.amplifier || 0,
+        duration: opt.duration || 30*20,
+        particles: opt.particles || true,
+        end: Date.now() + (opt.duration || 30*20)*1000/20 // 1000/20 == convert from ticks to milliseconds
+      };
+      entity.sendEffect(effectId, opt);
+      return true;
+    } else return false;
+  }
+
+  entity.removeEffect = (effectId, opt) => {
+    entity.effects[effectId] = null;
+    entity.sendRemoveEffect(effectId, opt);
+  };
+
+  serv.on('tick', () => {
+    Object.keys(entity.effects).forEach(effectId => {
+      var e = entity.effects[effectId];
+      if (e && e.end <= Date.now()) entity.removeEffect(effectId);
+    });
+  });
+};
+
+module.exports.player = function(player, serv) {
+  player.commands.add({
+    base: 'effect',
+    info: 'Give player an effect',
+    usage: '/effect <player> <effect> [seconds] [amplifier] [hideParticles]',
+    parse(str) {
+      return str.match(/(.+?) (\d+)(?: (\d+))?(?: (\d+))?(?: (true|false))?|.*? clear/) || false;
+    },
+    action(params) {
+      var targets = player.selectorString(params[1]);
+      if (params[2] == 'clear') {
+        targets.forEach(e => Object.keys(e.effects).forEach(effectId => {
+          if (e.effects[effectId] != null) e.removeEffect(effectId);
+        }));
+      } else {
+        targets.forEach(e => {
+          var effId = parseInt(params[2]);
+          if (e.effects[effId]) {
+            e.removeEffect(effId);
+          }
+          e.addEffect(effId, {
+            amplifier: parseInt(params[4]) || 0,
+            duration: parseInt(params[3]) * 20 || 30 * 20,
+            particles: params[5] != 'true' // hidesParticles vs particles (i.e. "showParticles")
+          });
+        });
+      }
+      var chatSelect = (targets.length == 1 ? (targets[0].type == 'player' ? targets[0].username : 'entity') : 'entities');
+      if (params[2] == 'clear') player.chat('Remove all effects from ' + chatSelect + '.' );
+      else player.chat('Gave ' + chatSelect + ' effect ' + params[2] + '(' + (params[4] || 0) + ') for ' + 
+                        (parseInt(params[3]) || 30) + ' seconds');
+    }
+  });
+}

src/lib/plugins/login.js

@@ -94,6 +94,7 @@ module.exports.player=function(player,serv)
         gamemode: player.gameMode
       }]
     });
+    player.sendAbilities();
   };
 
   function fillTabList()
@@ -161,6 +162,7 @@ module.exports.player=function(player,serv)
     player.sendSpawnPosition();
     player.sendSelfPosition();
     player.updateHealth(player.health);
+    player.sendAbilities();
 
 
     updateTime();

src/lib/plugins/physics.js

@@ -37,6 +37,22 @@ module.exports.entity=function(entity){
     return { position: newPos, onGround: yBlock}
   };
 
+  entity.sendVelocity = (vel, maxVel) => {
+    var velocity = vel.scaled(32).floored(); // Make fixed point
+    var maxVelocity = maxVel.scaled(32).floored();
+    var scaledVelocity = velocity.scaled(8000/32/20).floored(); // from fixed-position/second to unit => 1/8000 blocks per tick
+    entity._writeNearby('entity_velocity', {
+      entityId: entity.id,
+      velocityX: scaledVelocity.x,
+      velocityY: scaledVelocity.y,
+      velocityZ: scaledVelocity.z
+    });
+    if (entity.type != 'player') {
+      if (maxVelocity) entity.velocity = addVelocityWithMax(entity.velocity, velocity, maxVelocity);
+      else entity.velocity.add(velocity);
+    }
+  };
+
 
   function getMoveAmount(dir, block, entity, delta, sizeSigned) {
     if (block) {
@@ -70,4 +86,32 @@ module.exports.entity=function(entity){
   function clamp(a, b, c) {
     return Math.max(a, Math.min(b, c));
   }
-};
+
+  function addVelocityWithMax(current, newVel, max) {
+    var x, y, z;
+    if (current.x > max.x || current.x < -max.x) x = current.x;
+    else x = Math.max(-max.x, Math.min(max.x, current.x + newVel.x));
+    if (current.y > max.y || current.y < -max.y) y = current.y;
+    else y = Math.max(-max.y, Math.min(max.y, current.y + newVel.y));
+    if (current.z > max.z || current.z < -max.z) z = current.z;
+    else z = Math.max(-max.z, Math.min(max.z, current.z + newVel.z));
+    return new Vec3(x, y, z);
+  }
+};
+
+module.exports.player = function(player, serv) {
+  player.commands.add({
+    base: 'velocity',
+    info: 'Push velocity on player(s)',
+    usage: '/velocity <player> <x> <y> <z>',
+    op: true,
+    parse(str) {
+      return str.match(/(.+?) (\d+) (\d+) (\d+)/) || false;
+    },
+    action(params) {
+      var selector = player.selectorString(params[1]);
+      var vec = new Vec3(parseInt(params[2]), parseInt(params[3]), parseInt(params[4]));
+      selector.forEach(e => e.sendVelocity(vec, vec.scaled(5)));
+    }
+  });
+}

src/lib/plugins/pvp.js

@@ -45,7 +45,7 @@ module.exports.player=function(player,serv)
       return str || false;
     },
     action(sel) {
-      var arr = serv.selectorString(sel, player.position.scaled(1/32), player.world);
+      var arr = player.selectorString(sel);
       if (arr.length==0) throw new UserError('Could not find player');
 
       arr.map(entity => entity.takeDamage({damage:20}));

src/lib/plugins/updatePositions.js

@@ -67,6 +67,22 @@ module.exports.player=function(player)
     var notCancelled = await player.sendPosition(position.scaled(32).floored(), false, true);
     if (notCancelled) player.sendSelfPosition();
   }
+
+  player.sendAbilities = () => { // TODO: Fix all of this...
+    var godmode = player.gameMode == 1 || player.gameMode == 3;
+    var canFly = player.gameMode == 1 || player.gameMode == 3;
+    var isFlying = !player.onGround && canFly;
+    var creativeMode = player.gameMode == 1;
+    var f = (+godmode*8) + (+canFly*4) + (+isFlying*2) + (+creativeMode*1);
+    var walkingSpeed = 0.2 * (1 + (player.effects[1] != null ? (player.effects[1].amplifier + 1) : 0) * 0.2)
+    var flyingSpeed = 0.1;
+    /*console.log(walkingSpeed, flyingSpeed);
+    player._client.write('abilities', { // FIIIIXXXXXXX
+      flags: f,
+      walkingSpeed: walkingSpeed,
+      flyingSpeed: flyingSpeed
+    });*/ 
+  }
 };
 
 module.exports.entity=function(entity,serv){
@@ -104,34 +120,7 @@ module.exports.entity=function(entity,serv){
     });
   };
 
-  entity.sendVelocity = (vel, maxVel) => {
-    var velocity = vel.scaled(32).floored(); // Make fixed point
-    var maxVelocity = maxVel.scaled(32).floored();
-    var scaledVelocity = velocity.scaled(8000/32/20).floored(); // from fixed-position/second to unit => 1/8000 blocks per tick
-    entity._writeOthersNearby('entity_velocity', {
-      entityId: entity.id,
-      velocityX: scaledVelocity.x,
-      velocityY: scaledVelocity.y,
-      velocityZ: scaledVelocity.z
-    });
-    if (entity.type != 'player') {
-      if (maxVelocity) entity.velocity = addVelocityWithMax(entity.velocity, velocity, maxVelocity);
-      else entity.velocity.add(velocity);
-    }
-  };
-
   entity.teleport = (pos) => { // Overwritten in players inject above
     entity.sendPosition(pos.scaled(32), false, true);
   }
-
-  function addVelocityWithMax(current, newVel, max) {
-    var x, y, z;
-    if (current.x > max.x || current.x < -max.x) x = current.x;
-    else x = Math.max(-max.x, Math.min(max.x, current.x + newVel.x));
-    if (current.y > max.y || current.y < -max.y) y = current.y;
-    else y = Math.max(-max.y, Math.min(max.y, current.y + newVel.y));
-    if (current.z > max.z || current.z < -max.z) z = current.z;
-    else z = Math.max(-max.z, Math.min(max.z, current.z + newVel.z));
-    return new Vec3(x, y, z);
-  }
 };