From 89a6747c218e49cfd6d05c636dd2e02288153a15 Mon Sep 17 00:00:00 2001
From: Xertis <118364459+Xertis@users.noreply.github.com>
Date: Sun, 22 Mar 2026 22:59:57 +0300
Subject: [PATCH] rename on_content_loading to on_scripts_loading

---
 src/content/ContentLoader.cpp     | 2 +-
 src/content/ContentPack.hpp       | 4 +++-
 src/logic/scripting/scripting.cpp | 6 +++---
 src/logic/scripting/scripting.hpp | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 47af7232a..ee2903bb6 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -497,7 +497,7 @@ void ContentLoader::loadWorldScript(ContentPackRuntime& runtime) {
 }
 
 void ContentLoader::loadScripts(Content& content) {
-    scripting::on_content_loading();
+    scripting::on_scripts_loading();
     load_scripts(content, content.blocks);
     load_scripts(content, content.items);
 
diff --git a/src/content/ContentPack.hpp b/src/content/ContentPack.hpp
index 146858f55..9940732fb 100644
--- a/src/content/ContentPack.hpp
+++ b/src/content/ContentPack.hpp
@@ -130,7 +130,9 @@ struct WorldFuncsSet {
 };
 
 struct MainFuncsSet {
-    bool oncontentloading;
+    bool oncontentinitialization;
+    bool onscriptsloading;
+    bool oncontentloaded;
 };
 
 class ContentPackRuntime {
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index b49f2c5ee..2be28695b 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -637,11 +637,11 @@ void scripting::on_content_initialization() {
     }
 }
 
-void scripting::on_content_loading() {
+void scripting::on_scripts_loading() {
     auto L = lua::get_main_state();
     
     for (auto& pack : content_control->getAllContentPacks()) {
-        lua::emit_event(L, pack.id + ":.oncontentloading", [](auto L) {
+        lua::emit_event(L, pack.id + ":.onscriptsloading", [](auto L) {
             return 0;
         });
     }
@@ -804,7 +804,7 @@ void scripting::load_main_script(
     lua::pop(lua::get_main_state(), load_script(env, "main", file, fileName));
 
     register_event(env, "on_content_initialization", prefix + ":.oncontentinitialization");
-    register_event(env, "on_content_loading", prefix + ":.oncontentloading");
+    register_event(env, "on_scripts_loading", prefix + ":.onscriptsloading");
     register_event(env, "on_content_loaded", prefix + ":.oncontentloaded");
 }
 
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index 90f5ac1ea..b9152921e 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -165,7 +165,7 @@ namespace scripting {
     void on_content_initialization();
 
     /// @brief Called on Content loading
-    void on_content_loading();
+    void on_scripts_loading();
 
     /// @brief Called on Content loading finish
     void on_content_loaded();