mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-20 17:39:46 +00:00
Merge pull request #1026 from ostermine/feat/can-be-placed
add can_be_placed block event
This commit is contained in:
commit
bccc6e154f
6 changed files with 68 additions and 0 deletions
|
|
@ -480,6 +480,11 @@ void PlayerController::processRightClick(
|
|||
}
|
||||
}
|
||||
if (chosenBlock != vox->id && chosenBlock) {
|
||||
if (!scripting::can_block_be_placed(
|
||||
&player, def, coord, state.rotation
|
||||
)) {
|
||||
return;
|
||||
}
|
||||
if (!player.isInfiniteItems()) {
|
||||
auto& slot = player.getInventory()->getSlot(player.getChosenSlot());
|
||||
slot.setCount(slot.getCount() - 1);
|
||||
|
|
|
|||
|
|
@ -451,6 +451,23 @@ static bool on_block_common(
|
|||
return result;
|
||||
}
|
||||
|
||||
bool scripting::can_block_be_placed(
|
||||
Player* player, const Block& block, const glm::ivec3& pos, int rotation
|
||||
) {
|
||||
if (!block.rt.funcsset.canbeplaced) {
|
||||
return true;
|
||||
}
|
||||
std::string name = block.name + ".canbeplaced";
|
||||
return lua::emit_event(
|
||||
lua::get_main_state(), name, [pos, player, rotation](auto L) {
|
||||
lua::pushivec_stack(L, pos);
|
||||
lua::pushinteger(L, player ? player->getId() : -1);
|
||||
lua::pushinteger(L, rotation);
|
||||
return 5;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
void scripting::on_block_placed(
|
||||
Player* player, const Block& block, const glm::ivec3& pos
|
||||
) {
|
||||
|
|
@ -717,6 +734,8 @@ void scripting::load_content_script(
|
|||
register_event(env, "on_breaking", prefix + ".breaking");
|
||||
funcsset.onbroken = register_event(env, "on_broken", prefix + ".broken");
|
||||
funcsset.onplaced = register_event(env, "on_placed", prefix + ".placed");
|
||||
funcsset.canbeplaced =
|
||||
register_event(env, "can_be_placed", prefix + ".canbeplaced");
|
||||
funcsset.onreplaced =
|
||||
register_event(env, "on_replaced", prefix + ".replaced");
|
||||
funcsset.oninteract =
|
||||
|
|
|
|||
|
|
@ -92,6 +92,9 @@ namespace scripting {
|
|||
void on_blocks_tick(const Block& block, int tps);
|
||||
void update_block(const Block& block, const glm::ivec3& pos);
|
||||
void random_update_block(const Block& block, const glm::ivec3& pos);
|
||||
bool can_block_be_placed(
|
||||
Player* player, const Block& block, const glm::ivec3& pos, int rotation
|
||||
);
|
||||
void on_block_placed(
|
||||
Player* player, const Block& block, const glm::ivec3& pos
|
||||
);
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ struct BlockFuncsSet {
|
|||
bool init : 1;
|
||||
bool update : 1;
|
||||
bool onplaced : 1;
|
||||
bool canbeplaced : 1;
|
||||
bool onbreaking : 1;
|
||||
bool onbroken : 1;
|
||||
bool onreplaced : 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue