add 'on_block_removed' event
This commit is contained in:
@@ -109,6 +109,7 @@ LevelScreen::~LevelScreen() {
|
||||
scripting::on_frontend_close();
|
||||
// unblock all bindings
|
||||
input.getBindings().enableAll();
|
||||
playerController->getPlayer()->chunks->saveAndClear();
|
||||
controller->onWorldQuit();
|
||||
engine.getPaths().setCurrentWorldFolder("");
|
||||
}
|
||||
@@ -278,5 +279,6 @@ void LevelScreen::onEngineShutdown() {
|
||||
if (hud->isInventoryOpen()) {
|
||||
hud->closeInventory();
|
||||
}
|
||||
controller->processBeforeQuit();
|
||||
controller->saveWorld();
|
||||
}
|
||||
|
||||
@@ -366,7 +366,9 @@ void EngineController::reconfigPacks(
|
||||
);
|
||||
}
|
||||
} else {
|
||||
auto world = controller->getLevel()->getWorld();
|
||||
auto level = controller->getLevel();
|
||||
auto world = level->getWorld();
|
||||
controller->processBeforeQuit();
|
||||
controller->saveWorld();
|
||||
|
||||
auto names = PacksManager::getNames(world->getPacks());
|
||||
|
||||
@@ -27,7 +27,8 @@ LevelController::LevelController(
|
||||
: settings(engine->getSettings()),
|
||||
level(std::move(levelPtr)),
|
||||
chunks(std::make_unique<ChunksController>(*level)),
|
||||
playerTickClock(20, 3) {
|
||||
playerTickClock(20, 3),
|
||||
localPlayer(clientPlayer) {
|
||||
|
||||
level->events->listen(LevelEventType::CHUNK_PRESENT, [](auto, Chunk* chunk) {
|
||||
scripting::on_chunk_present(*chunk, chunk->flags.loaded);
|
||||
@@ -121,6 +122,13 @@ void LevelController::update(float delta, bool pause) {
|
||||
level->entities->clean();
|
||||
}
|
||||
|
||||
void LevelController::processBeforeQuit() {
|
||||
if (localPlayer) {
|
||||
localPlayer->chunks->saveAndClear();
|
||||
}
|
||||
scripting::process_before_quit();
|
||||
}
|
||||
|
||||
void LevelController::saveWorld() {
|
||||
auto world = level->getWorld();
|
||||
if (world->isNameless()) {
|
||||
|
||||
@@ -20,6 +20,7 @@ class LevelController {
|
||||
std::unique_ptr<ChunksController> chunks;
|
||||
|
||||
util::Clock playerTickClock;
|
||||
Player* localPlayer;
|
||||
public:
|
||||
LevelController(Engine* engine, std::unique_ptr<Level> level, Player* clientPlayer);
|
||||
|
||||
@@ -27,6 +28,7 @@ public:
|
||||
/// @param pause is world and player simulation paused
|
||||
void update(float delta, bool pause);
|
||||
|
||||
void processBeforeQuit();
|
||||
void saveWorld();
|
||||
|
||||
void onWorldQuit();
|
||||
|
||||
@@ -119,6 +119,7 @@ static int l_close_world(lua::State* L) {
|
||||
if (controller == nullptr) {
|
||||
throw std::runtime_error("no world open");
|
||||
}
|
||||
controller->processBeforeQuit();
|
||||
bool save_world = lua::toboolean(L, 1);
|
||||
if (save_world) {
|
||||
controller->saveWorld();
|
||||
|
||||
@@ -341,6 +341,13 @@ void scripting::on_world_save() {
|
||||
}
|
||||
}
|
||||
|
||||
void scripting::process_before_quit() {
|
||||
auto L = lua::get_main_state();
|
||||
if (lua::getglobal(L, "__vc_process_before_quit")) {
|
||||
lua::call_nothrow(L, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void scripting::on_world_quit() {
|
||||
auto L = lua::get_main_state();
|
||||
for (auto& pack : content_control->getAllContentPacks()) {
|
||||
@@ -677,6 +684,8 @@ void scripting::load_content_script(
|
||||
register_event(env, "on_blocks_tick", prefix + ".blockstick");
|
||||
funcsset.onblockpresent =
|
||||
register_event(env, "on_block_present", prefix + ".blockpresent");
|
||||
funcsset.onblockremoved =
|
||||
register_event(env, "on_block_removed", prefix + ".blockremoved");
|
||||
}
|
||||
|
||||
void scripting::load_content_script(
|
||||
|
||||
@@ -81,6 +81,7 @@ namespace scripting {
|
||||
void on_world_load(LevelController* controller);
|
||||
void on_world_tick(int tps);
|
||||
void on_world_save();
|
||||
void process_before_quit();
|
||||
void on_world_quit();
|
||||
void cleanup(const std::vector<std::string>& nonReset);
|
||||
void on_blocks_tick(const Block& block, int tps);
|
||||
|
||||
@@ -51,6 +51,7 @@ struct BlockFuncsSet {
|
||||
bool onblocktick : 1;
|
||||
bool onblockstick : 1;
|
||||
bool onblockpresent : 1;
|
||||
bool onblockremoved : 1;
|
||||
};
|
||||
|
||||
struct CoordSystem {
|
||||
|
||||
@@ -19,6 +19,7 @@ static uint8_t get_events_bits(const Block& def) {
|
||||
auto funcsset = def.rt.funcsset;
|
||||
bits |= BlockRegisterEvent::UPDATING_BIT * funcsset.onblocktick;
|
||||
bits |= BlockRegisterEvent::PRESENT_EVENT_BIT * funcsset.onblockpresent;
|
||||
bits |= BlockRegisterEvent::REMOVED_EVENT_BIT * funcsset.onblockremoved;
|
||||
return bits;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ struct BlockRegisterEvent {
|
||||
static inline constexpr uint8_t REGISTER_BIT = 0x1;
|
||||
static inline constexpr uint8_t UPDATING_BIT = 0x2;
|
||||
static inline constexpr uint8_t PRESENT_EVENT_BIT = 0x4;
|
||||
static inline constexpr uint8_t REMOVED_EVENT_BIT = 0x8;
|
||||
uint8_t bits;
|
||||
blockid_t id;
|
||||
glm::ivec3 coord;
|
||||
|
||||
Reference in New Issue
Block a user