dan/flying-squid
1
0
Fork 0
mirror of https://github.com/danbulant/flying-squid synced 2026-06-17 21:41:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Almost done with entities, needs some more finishing touches

Browse source
This commit is contained in:
DemiPixel 2015-11-10 21:12:53 -08:00
parent 9c61b7b009
commit f0c17d38b4
4 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/playerPlugins/commands.js
View file

@ -320,7 +320,7 @@ function inject(serv, player) {
},
action({id}) {
serv.spawnMob(id, player.world, player.entity.position.scaled(1/32), {
velocity: Vec3((Math.random() - 0.5) * 5 + 5, Math.random()*10 + 10, (Math.random() - 0.5) * 5 + 5)
velocity: Vec3((Math.random() - 0.5) * 10, Math.random()*10 + 10, (Math.random() - 0.5) * 10)
});
}
})

24
src/lib/playerPlugins/digging.js
View file

@ -70,12 +70,22 @@ function inject(serv,player)
});
}
function completeDigging(location)
async function completeDigging(location)
{
clearInterval(animationInterval);
var diggingTime=new Date()-startDiggingTime;
if(expectedDiggingTime-diggingTime<100)
if(expectedDiggingTime-diggingTime<100) {
player.changeBlock(location,0,0);
// Drop block
var vec = Vec3(location.x, location.y, location.z);
var id = await player.world.getBlockType(vec);
var damage = await player.world.getBlockData(vec);
serv.spawnObject(2, player.world, vec.clone().add(Vec3(0.5, 0.5, 0.5)), {
velocity: Vec3(Math.random()*4 - 2, Math.random()*2 + 2, Math.random()*4 - 2),
itemId: id,
itemDamage: damage
});
}
else
{
player._client.write("block_change",{
@ -86,16 +96,8 @@ function inject(serv,player)
}
async function creativeDigging(location)
function creativeDigging(location)
{
var vec = Vec3(location.x, location.y, location.z);
var id = await player.world.getBlockType(vec);
var damage = await player.world.getBlockData(vec);
serv.spawnObject(2, player.world, vec.clone().add(Vec3(0.5, 0.5, 0.5)), {
velocity: Vec3(Math.random()*4 - 2, Math.random()*2 + 2, Math.random()*4 - 2),
itemId: id,
itemDamage: damage
});
return player.changeBlock(location,0,0);
}

10
src/lib/playerPlugins/world.js
View file

@ -7,6 +7,16 @@ function inject(serv, player) {
player.spawnEntity = entity => {
player._client.write(entity.spawnPacketName, entity.getSpawnPacket());
if (typeof entity.itemId != 'undefined') {
entity.setMetadata([{
"key": 10,
"type": 5,
"value": {
blockId: entity.itemId,
itemDamage: entity.itemDamage
}
}]);
}
};
player.sendChunk = (chunkX,chunkZ,column) =>

40
src/lib/serverPlugins/entities.js
View file

@ -2,21 +2,27 @@ var Entity=require("prismarine-entity");
var blocks=require("minecraft-data")(require("../version")).blocks;
var mobs=require("minecraft-data")(require("../version")).entitiesByName;
var vec3 = require("vec3");
var EventEmitter = require('events').EventEmitter;
var util = require('util');
module.exports = inject;
function inject(serv) {
util.inherits(Entity, EventEmitter);
serv.initEntity = (type, entityType, world, position) => {
serv.entityMaxId++;
var entity = new Entity(serv.entityMaxId);
EventEmitter.call(entity);
entity.type = type;
entity.spawnPacketName = '';
entity.entityType = entityType;
entity.world = world;
entity.position = position;
entity.lastPositionPlayersUpdated = entity.position.clone();
entity.nearbyEntities = [];
entity.viewDistance = 15;
entity.viewDistance = 150;
entity.bornTime = Date.now();
serv.entities[entity.id] = entity;
@ -25,6 +31,11 @@ function inject(serv) {
else if (entity.type == 'object') entity.spawnPacketName = 'spawn_entity';
else if (entity.type == 'mob') entity.spawnPacketName = 'spawn_entity_living';
entity.on("positionChanged",() => {
if(entity.position.distanceTo(entity.lastPositionPlayersUpdated)>2*32)
entity.updateAndSpawn();
});
entity.setMetadata = (data) => {
serv._writeNearby('entity_metadata', {
entityId: entity.id,
@ -74,6 +85,7 @@ function inject(serv) {
entity.sendPosition = ({oldPos,onGround}) => {
var diff = entity.position.minus(oldPos);
if(diff.abs().x>127 || diff.abs().y>127 || diff.abs().z>127)
serv._writeNearby('entity_teleport', {
entityId: entity.id,
@ -83,7 +95,7 @@ function inject(serv) {
yaw: entity.yaw,
pitch: entity.pitch,
onGround: onGround
});
}, entity);
else serv._writeNearby('rel_entity_move', {
entityId: entity.id,
dX: diff.x,
@ -91,6 +103,8 @@ function inject(serv) {
dZ: diff.z,
onGround: onGround
}, entity);
entity.emit('positionChanged', oldPos);
}
entity.getSpawnPacket = () => {
@ -156,14 +170,14 @@ function inject(serv) {
if (entity.type == 'player') {
entity.player.despawnEntities(entitiesToRemove);
entitiesToAdd.forEach(entity.player.spawnEntity);
entity.player.lastPositionPlayersUpdated=entity.position;
entity.player.lastPositionPlayersUpdated=entity.position.clone();
} else {
entity.lastPositionPlayersUpdated=entity.position.clone();
}
var playersToAdd = entitiesToAdd.filter(e => e.type == 'player').map(e => e.player);
var playersToRemove = entitiesToRemove.filter(e => e.type == 'player').map(e => e.player);
console.log('players',playersToAdd.length,playersToRemove.length,'ents',entitiesToAdd.length,entitiesToRemove.length);
playersToRemove.forEach(p => p.despawnEntities([entity]));
playersToRemove.forEach(p => p.entity.nearbyEntities=p.entity.getNearby());
playersToAdd.forEach(p => p.spawnEntity(entity));
@ -186,19 +200,10 @@ function inject(serv) {
object.friction = vec3(10*32, 0, 10*32).floored();
object.size = vec3(0.25*32, 0.25*32, 0.25*32); // Hardcoded, will be dependent on type!
object.deathTime = 60*1000; // 60 seconds
object.itemId = itemId;
object.itemDamage = itemDamage;
object.updateAndSpawn();
if (typeof itemId != 'undefined') {
object.setMetadata([{
"key": 10,
"type": 5,
"value": {
blockId: itemId,
itemDamage: itemDamage
}
}]);
}
}
serv.spawnMob = (type, world, position, {pitch=0,yaw=0,headPitch=0,velocity=vec3(0,0,0),metadata=[]}={}) => {
@ -226,7 +231,8 @@ function inject(serv) {
}
if (!entity.velocity || !entity.size) return;
var oldPosAndOnGround = await entity.calculatePhysics(delta);
if (entity.type == 'mob') entity.sendPosition(oldPosAndOnGround);
if (!oldPosAndOnGround.oldPos.equals(vec3(0,0,0)))
if (entity.type == 'mob') entity.sendPosition(oldPosAndOnGround);
})
).catch((err)=> setTimeout(() => {throw err;},0));
});