RepoMirrors
/
basin
mirror of https://github.com/basinserver/basin/
1
0
Fork 0
Code Issues Releases Wiki Activity

levers, repeaters, lamps

This commit is contained in:
JavaProphet 2018-01-16 13:26:15 -08:00
parent 4d267010c5
commit 65b11ba865
4 changed files with 73 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
basin/src/block.c
View File

@ -23,10 +23,19 @@
#include "item.h"
#include "block.h"
#include <unistd.h>
#include <math.h>
struct collection* block_infos;
struct collection* block_materials;
void onBlockUpdate_checkPlace(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
struct block_info* bi = getBlockInfo(blk);
if (bi != NULL && bi->canBePlaced != NULL && !(*bi->canBePlaced)(world, blk, x, y, z)) {
setBlockWorld(world, 0, x, y, z);
dropBlockDrops(world, blk, NULL, x, y, z);
}
}
uint8_t getBlockPower_block(struct world* world, block blk, int32_t x, int32_t y, int32_t z, uint8_t face) {
if (blk >> 4 == BLK_REDSTONEDUST >> 4) {
return blk & 0x0f;
@ -35,8 +44,14 @@ uint8_t getBlockPower_block(struct world* world, block blk, int32_t x, int32_t y
} else if (blk >> 4 == BLK_DIODE_1 >> 4) {
uint8_t ori = blk & 0x03;
if ((ori == 0 && face == NORTH) || (ori == 1 && face == EAST) || (ori == 2 && face == SOUTH) || (ori == 3 && face == WEST)) return 16;
} else if (blk >> 4 == BLK_BLOCKREDSTONE >> 4) {
} else if (blk >> 4 == BLK_BLOCKREDSTONE >> 4 || blk == (BLK_PRESSUREPLATEWOOD | 0x01) || blk == (BLK_PRESSUREPLATESTONE | 0x01)) {
return 16;
} else if (blk >> 4 == BLK_WEIGHTEDPLATE_LIGHT >> 4 || blk >> 4 == BLK_WEIGHTEDPLATE_HEAVY >> 4 || blk >> 4 == BLK_DAYLIGHTDETECTOR >> 4) {
return blk & 0x0f;
} else if ((blk >> 4 == BLK_DETECTORRAIL >> 4 || blk >> 4 == BLK_TRIPWIRESOURCE >> 4 || blk >> 4 == BLK_LEVER >> 4 || blk >> 4 == BLK_BUTTON >> 4 || blk >> 4 == BLK_BUTTON_1 >> 4) && (blk & 0x08)) {
return 16;
} else if (blk >> 4 == BLK_COMPARATOR_1 >> 4) {
//TODO:
}
return 0;
}
@ -94,6 +109,22 @@ int canBePlaced_torch(struct world* world, block blk, int32_t x, int32_t y, int3
return 0;
}
block onBlockPlacedPlayer_lever(struct player* player, struct world* world, block blk, int32_t x, int32_t y, int32_t z, uint8_t face) {
uint32_t h = (uint32_t) floor(player->entity->yaw / 90. + .5) & 3;
uint8_t f = 0;
if (h == 0) f = SOUTH;
else if (h == 1) f = WEST;
else if (h == 2) f = NORTH;
else if (h == 3) f = EAST;
if (face == NORTH) return blk | 0x04;
else if (face == SOUTH) return blk | 0x03;
else if (face == EAST) return blk | 0x01;
else if (face == WEST) return blk | 0x02;
else if (face == YN) return blk | (f == EAST || f == WEST ? 0x00 : 0x07);
else if (face == YP) return blk | (f == NORTH || f == SOUTH ? 0x05 : 0x06);
return blk;
}
//TODO: burnout on redstone torches
void onBlockUpdate_redstonetorch(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
@ -109,7 +140,6 @@ void onBlockUpdate_redstonetorch(struct world* world, block blk, int32_t x, int3
else if (ori == 4) rori = NORTH;
else if (ori == 5) rori = YN;
offsetCoordByFace(&ax, &ay, &az, rori);
block b = getBlockWorld(world, ax, ay, az);
uint8_t arori = YN;
if (rori == WEST) arori = EAST;
else if (rori == EAST) arori = WEST;
@ -117,7 +147,6 @@ void onBlockUpdate_redstonetorch(struct world* world, block blk, int32_t x, int3
else if (rori == SOUTH) arori = NORTH;
else if (rori == YN) arori = YP;
uint8_t ppower = getPropogatedPower_block(world, getChunk(world, ax >> 4, az >> 4), ax, ay, az, arori);
printf("torch: %u\n", ppower);
if (blk >> 4 == BLK_NOTGATE >> 4 && ppower == 0) {
setBlockWorld(world, BLK_NOTGATE_1 | (blk & 0x0f), x, y, z);
} else if (blk >> 4 == BLK_NOTGATE_1 >> 4 && ppower > 1) {
@ -128,7 +157,6 @@ void onBlockUpdate_redstonetorch(struct world* world, block blk, int32_t x, int3
void onBlockUpdate_redstonedust(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
struct chunk* ch = getChunk(world, x >> 4, z >> 4);
uint8_t maxPower = getPropogatedPower_block(world, ch, x, y, z, -1);
printf("maxdust: %u\n", maxPower);
if (maxPower != (blk & 0x0f)) {
setBlockWorld_guess(world, ch, BLK_REDSTONEDUST | maxPower, x, y, z);
}
@ -140,6 +168,16 @@ void onBlockUpdate_repeater(struct world* world, block blk, int32_t x, int32_t y
scheduleBlockTick(world, x, y, z, 2 * (((blk & 0x0f) >> 2) + 1));
}
void onBlockUpdate_lamp(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
struct chunk* ch = getChunk(world, x >> 4, z >> 4);
uint8_t maxPower = getPropogatedPower_block(world, ch, x, y, z, -1);
if (maxPower > 0 && blk >> 4 == BLK_REDSTONELIGHT >> 4) {
setBlockWorld_guess(world, ch, BLK_REDSTONELIGHT_1, x, y, z);
} else if (maxPower == 0 && blk >> 4 == BLK_REDSTONELIGHT_1 >> 4) {
setBlockWorld_guess(world, ch, BLK_REDSTONELIGHT, x, y, z);
}
}
int scheduledTick_repeater(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
uint8_t ori = blk & 0x03;
/*int32_t sx = x;
@ -209,6 +247,14 @@ void onBlockInteract_repeater(struct world* world, block blk, int32_t x, int32_t
setBlockWorld(world, (blk >> 4 << 4) | (((((blk & 0x0f) >> 2) + 1) & 0x03) << 2) | (blk & 0x03), x, y, z);
}
void onBlockInteract_lever(struct world* world, block blk, int32_t x, int32_t y, int32_t z, struct player* player, uint8_t face, float curPosX, float curPosY, float curPosZ) {
if (blk >> 4 == BLK_LEVER >> 4 && (blk & 0x08)) {
setBlockWorld(world, BLK_LEVER | (blk & 0x07), x, y, z);
} else if (blk >> 4 == BLK_LEVER >> 4 && !(blk & 0x08)) {
setBlockWorld(world, BLK_LEVER | (blk & 0x07) | 0x08, x, y, z);
}
}
int canBePlaced_redstone(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
block b = getBlockWorld(world, x, y - 1, z);
struct block_info* bi = getBlockInfo(b);
@ -261,7 +307,10 @@ void onBlockUpdate_door(struct world* world, block blk, int32_t x, int32_t y, in
int upper = blk & 0b1000;
if (!upper && !isNormalCube(bi)) goto delete;
b = getBlockWorld(world, x, y + (upper ? -1 : 1), z);
if (b >> 4 == blk >> 4) return;
if (b >> 4 == blk >> 4) {
//TODO: power open
return;
}
delete:;
setBlockWorld(world, 0, x, y, z);
if (!upper) dropBlockDrops(world, blk, NULL, x, y, z);
@ -272,7 +321,6 @@ void onBlockInteract_woodendoor(struct world* world, block blk, int32_t x, int32
uint8_t isUpper = curMeta & 0b1000;
uint8_t lowerMeta = isUpper ? getBlockWorld(world, x, y - 1, z) & 0x0f : curMeta;
uint8_t open = (lowerMeta & 0b0100) >> 2;
printf("%i\n", open);
open = !open;
lowerMeta = (lowerMeta & 0b1011) | (open << 2);
setBlockWorld(world, (blk & 0xfff0) | lowerMeta, x, y + (isUpper ? -1 : 0), z);
@ -555,6 +603,12 @@ int falling_canFallThrough(block b) {
}
void onBlockUpdate_falling(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
if (y > 0 && falling_canFallThrough(getBlockWorld(world, x, y - 1, z))) {
scheduleBlockTick(world, x, y, z, 4);
}
}
int scheduledTick_falling(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
if (y > 0 && falling_canFallThrough(getBlockWorld(world, x, y - 1, z))) {
setBlockWorld(world, 0, x, y, z);
struct entity* e = newEntity(nextEntityID++, (double) x + .5, (double) y, (double) z + .5, ENT_FALLINGBLOCK, 0., 0.);
@ -562,6 +616,7 @@ void onBlockUpdate_falling(struct world* world, block blk, int32_t x, int32_t y,
e->objectData = blk >> 4;
spawnEntity(world, e);
}
return 0;
}
void sponge_floodfill(struct world* world, int32_t x, int32_t y, int32_t z, int32_t* pos, uint32_t* removed) {
@ -768,14 +823,6 @@ int canBePlaced_requiresoulsand(struct world* world, block blk, int32_t x, int32
return b == BLK_HELLSAND;
}
void onBlockUpdate_checkPlace(struct world* world, block blk, int32_t x, int32_t y, int32_t z) {
struct block_info* bi = getBlockInfo(blk);
if (bi != NULL && bi->canBePlaced != NULL && !(*bi->canBePlaced)(world, blk, x, y, z)) {
setBlockWorld(world, 0, x, y, z);
dropBlockDrops(world, blk, NULL, x, y, z);
}
}
void dropItems_hugemushroom(struct world* world, block blk, int32_t x, int32_t y, int32_t z, int fortune) {
int ct = rand() % 10 - 7;
if (ct > 0) {
@ -1811,8 +1858,11 @@ void init_blocks() {
tmp = getBlockInfo(BLK_FARMLAND);
tmp->randomTick = &randomTick_farmland;
getBlockInfo(BLK_SAND)->onBlockUpdate = &onBlockUpdate_falling;
getBlockInfo(BLK_SAND)->scheduledTick = &scheduledTick_falling;
getBlockInfo(BLK_GRAVEL)->onBlockUpdate = &onBlockUpdate_falling;
getBlockInfo(BLK_GRAVEL)->scheduledTick = &scheduledTick_falling;
getBlockInfo(BLK_ANVIL)->onBlockUpdate = &onBlockUpdate_falling;
getBlockInfo(BLK_ANVIL)->scheduledTick = &scheduledTick_falling;
getBlockInfo(BLK_SPONGE_DRY)->onBlockUpdate = &onBlockUpdate_sponge;
for (block b = BLK_DOOROAK; b < BLK_DOOROAK + 16; b++) {
tmp = getBlockInfo(b);
@ -1874,5 +1924,9 @@ void init_blocks() {
getBlockInfo(BLK_DIODE_1)->onBlockInteract = &onBlockInteract_repeater;
getBlockInfo(BLK_DIODE)->canBePlaced = &canBePlaced_redstone;
getBlockInfo(BLK_DIODE_1)->canBePlaced = &canBePlaced_redstone;
getBlockInfo(BLK_REDSTONELIGHT)->onBlockUpdate = &onBlockUpdate_lamp;
getBlockInfo(BLK_REDSTONELIGHT_1)->onBlockUpdate = &onBlockUpdate_lamp;
getBlockInfo(BLK_LEVER)->onBlockInteract = &onBlockInteract_lever;
getBlockInfo(BLK_LEVER)->onBlockPlacedPlayer = &onBlockPlacedPlayer_lever;
//TODO: redstone torch burnout
}

2
basin/src/entity.c
View File

@ -59,7 +59,7 @@ void add_entity_info(uint32_t eid, struct entity_info* bm) {
}
int onTick_fallingblock(struct world* world, struct entity* ent) {
// mc has some methods to prevent dupes here, we should see if basin is afflicted
// TODO: mc has some methods to prevent dupes here, we should see if basin is afflicted
if (ent->onGround && ent->age > 1) {
block b = getBlockWorld(world, (int32_t) floor(ent->x), (int32_t) floor(ent->y), (int32_t) floor(ent->z));
if (!falling_canFallThrough(b)) {

6
basin/src/player.c
View File

@ -533,7 +533,7 @@ void player_receive_packet(struct player* player, struct packet* inp) {
//}
//}
if (!bad) {
if (canPlayerPlaceBlock(player, tbb, x, y, z, face)) {
if ((tbb = canPlayerPlaceBlock(player, tbb, x, y, z, face))) {
if (setBlockWorld(player->world, tbb, x, y, z)) {
setBlockWorld(player->world, b2, x, y, z);
setSlot(player, player->inventory, 36 + player->currentItem, ci, 1, 1);
@ -1593,7 +1593,7 @@ void freePlayer(struct player* player) {
xfree(player);
}
int canPlayerPlaceBlock(struct player* player, block blk, int32_t x, int32_t y, int32_t z, uint8_t face) {
block canPlayerPlaceBlock(struct player* player, block blk, int32_t x, int32_t y, int32_t z, uint8_t face) {
struct block_info* bi = getBlockInfo(blk);
block tbb = blk;
if (bi != NULL && bi->onBlockPlacedPlayer != NULL) tbb = (*bi->onBlockPlacedPlayer)(player, player->world, tbb, x, y, z, face);
@ -1606,5 +1606,5 @@ int canPlayerPlaceBlock(struct player* player, block blk, int32_t x, int32_t y,
return 0;
}
block b = getBlockWorld(player->world, x, y, z);
return b == 0 || getBlockInfo(b)->material->replacable;
return (b == 0 || getBlockInfo(b)->material->replacable) ? tbb : 0;
}

2
basin/src/player.h
View File

@ -91,6 +91,6 @@ void setPlayerGamemode(struct player* player, int gamemode);
void freePlayer(struct player* player);
int canPlayerPlaceBlock(struct player* player, uint16_t blk, int32_t x, int32_t y, int32_t z, uint8_t face);
block canPlayerPlaceBlock(struct player* player, uint16_t blk, int32_t x, int32_t y, int32_t z, uint8_t face);
#endif /* PLAYER_H_ */