Merge branch 'develop' of https://github.com/MafiaHub/Framework into …

…rework-ui

CMakeLists.txt

@@ -17,7 +17,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/vendors)
 
 # Load the global headers one by one (a few ones have relative include path, so we are forced to do so)
 include_directories(
-    "${PROJECT_SOURCE_DIR}/vendors/nodejs/include"
     "${PROJECT_SOURCE_DIR}/vendors/glm"
     "${PROJECT_SOURCE_DIR}/vendors/minhook/include"
     "${PROJECT_SOURCE_DIR}/vendors/firebase/include"
@@ -27,26 +26,23 @@ include_directories(
     "${PROJECT_SOURCE_DIR}/vendors/ntdll"
     "${PROJECT_SOURCE_DIR}/vendors/semver"
     "${PROJECT_SOURCE_DIR}/vendors/imgui"
-    "${PROJECT_SOURCE_DIR}/vendors/lua/src"
     "${PROJECT_SOURCE_DIR}/vendors/sdl2/include"
     "${PROJECT_SOURCE_DIR}/vendors/spdlog/include"
     "${PROJECT_SOURCE_DIR}/vendors/optick/src"
     "${PROJECT_SOURCE_DIR}/vendors/steamworks/include"
     "${PROJECT_SOURCE_DIR}/vendors/galaxy/Include"
     "${PROJECT_SOURCE_DIR}/vendors/udis86"
     "${PROJECT_SOURCE_DIR}/vendors/httplib"
-    "${PROJECT_SOURCE_DIR}/vendors/lua-5.2.1/src"
-    "${PROJECT_SOURCE_DIR}/vendors/lua-5.3.6/src"
-    "${PROJECT_SOURCE_DIR}/vendors/lua-5.4.4/src"
+    "${PROJECT_SOURCE_DIR}/vendors/lua-5.4.4/src/lua54"
     "${PROJECT_SOURCE_DIR}/vendors/discord/src"
     "${PROJECT_SOURCE_DIR}/vendors/sentry/include"
     "${PROJECT_SOURCE_DIR}/vendors/curl/include"
-    "${PROJECT_SOURCE_DIR}/vendors/v8pp"
     "${PROJECT_SOURCE_DIR}/vendors/fmt/include"
     "${PROJECT_SOURCE_DIR}/vendors/libsig"
     "${PROJECT_SOURCE_DIR}/vendors/sfd"
     "${PROJECT_SOURCE_DIR}/vendors/cxxopts"
     "${PROJECT_SOURCE_DIR}/vendors/fu2"
+    "${PROJECT_SOURCE_DIR}/vendors/sol"
     "${PROJECT_SOURCE_DIR}/vendors/freetype/include"
     "${PROJECT_SOURCE_DIR}/vendors/StackWalker/Main/StackWalker"
     "${PROJECT_SOURCE_DIR}/vendors/ultralight/include"

README.md

@@ -9,7 +9,7 @@
 
 <br />
 <div align="center">
-  A suite of tools and libraries to accelerate multi-player modification development.
+  Opionated suite of tools and libraries to accelerate build multi-player modifications for AAA games.
 </div>
 
 <div align="center">
@@ -27,11 +27,10 @@
 This codebase provides a suite of tools and libraries to simplify the development of multi-player modifications and ensure consistency across all of them. The primary goal is to provide a common foundation and interface with shared functionality and data. It covers many fields we found necessary during the development of multi-player mods, such as:
 * **Networking**: The core of the framework provides all the necessary tools to synchronize data between players.
 * **ECS**: Backed by a robust ECS framework that simplifies entity management and world streaming, it is also easily extensible.
-* **Scripting**: The **Node.js** scripting layer provides an easy way to create and manage game modes used on game servers.
+* **Scripting**: The **Lua** scripting layer provides an easy way to create and manage game modes used on game servers.
 * **Logging**: It is always vital to log actions and errors, so the framework provides a simple way.
-* **GUI**: It provides a simple way to create and manage GUI elements using the **Ultralight** library.
+* **GUI**: It provides a simple way to create and manage GUI elements using the **Ultralight** and DearImGUI libraries.
 * **Sentry**: The framework provides a simple way to report errors and exceptions to the **Sentry** service.
-* **Firebase**: It easily stores and retrieves data from the **Firebase** service. Including stats, player data, and more.
 * **Externals**: Contains wrappers for various libraries and services used within the framework.
 * **Integrations**: Provides a simple server and client moddable setup combining various framework components, allowing you to focus on game-specific features.
 * **Utils**: It provides useful functions and classes throughout the framework.

cmake/FrameworkSetup.cmake

@@ -22,8 +22,13 @@ if(MSVC)
 endif()
 
 if(UNIX OR APPLE)
-    set(DISABLED_WARNS "-Wno-pedantic -Wno-unused-parameter -Wno-unused-result"
-        "-Wno-deprecated-declarations" "-Wno-invalid-offsetof")
+    set(DISABLED_WARNS 
+        -Wno-pedantic 
+        -Wno-unused-parameter 
+        -Wno-unused-result
+        -Wno-deprecated-declarations 
+        -Wno-invalid-offsetof
+    )
     add_compile_options(${DISABLED_WARNS})
     set(CMAKE_CXX_FLAGS "-std=c++20 ${CMAKE_CXX_FLAGS}")
-endif()
+endif()

code/framework/CMakeLists.txt

@@ -10,7 +10,6 @@ set(FRAMEWORK_SRC
     src/utils/config.cpp
     src/utils/interpolator.cpp
     src/utils/time.cpp
-    src/utils/job_system.cpp
     src/utils/command_listener.cpp
     src/utils/command_processor.cpp
     src/utils/hashing.cpp
@@ -19,8 +18,6 @@ set(FRAMEWORK_SRC
     src/utils/states/machine.cpp
 
     src/external/sentry/wrapper.cpp
-    src/external/firebase/wrapper.cpp
-    src/external/optick/wrapper.cpp
 
     src/world/engine.cpp
     src/world/server.cpp
@@ -34,12 +31,11 @@ set(FRAMEWORK_SRC
 )
 
 set(FRAMEWORK_SERVER_SRC
-    src/scripting/module.cpp
-    src/scripting/engines/node/engine.cpp
-    src/scripting/engines/node/sdk.cpp
+    src/scripting/client_engine.cpp
+    src/scripting/engine.cpp
     src/scripting/events.cpp
-
-    src/scripting/engines/node/v8_helpers/v8_try_catch.cpp
+    src/scripting/module.cpp
+    src/scripting/server_engine.cpp
 
     src/http/webserver.cpp
 
@@ -59,7 +55,6 @@ set(FRAMEWORK_CLIENT_SRC
     src/external/steam/wrapper.cpp
     src/external/discord/wrapper.cpp
     src/external/imgui/wrapper.cpp
-    src/external/sdl2/wrapper.cpp
 
     src/external/imgui/widgets/ui_base.cpp
 
@@ -139,7 +134,7 @@ macro(link_shared_deps target_name)
     endif()
 
     # Global libraries
-    target_link_libraries(${target_name} slikenet glm spdlog cppfs nlohmann_json Sentry httplib ${OPENSSL_LIBRARIES} Firebase Curl OptickCore flecs_static semver)
+    target_link_libraries(${target_name} slikenet glm spdlog cppfs nlohmann_json Sentry httplib ${OPENSSL_LIBRARIES} Curl flecs_static semver)
 
     # Required libraries for windows
     if(WIN32)
@@ -155,16 +150,16 @@ if(WIN32)
 endif()
 
 link_shared_deps(FrameworkServer)
-target_link_libraries(FrameworkServer NodeJS libsig v8pp)
+target_link_libraries(FrameworkServer libsig Lua54)
 
 # Platform-dependent post processing
 if(WIN32)
     target_link_directories(Framework PUBLIC ${CMAKE_SOURCE_DIR}/vendors/openssl/lib)
     target_link_libraries(Framework ws2_32 dbghelp crypt32 winmm iphlpapi psapi userenv)
 
-    target_link_libraries(FrameworkClient DiscordSDK DearImGUI SDL UltralightSDK)
+    target_link_libraries(FrameworkClient DiscordSDK DearImGUI UltralightSDK)
 
-    set(CLIENT_SHARED_LIBS minhook GalaxySDK SteamSDK udis86)
+    set(CLIENT_SHARED_LIBS minhook SteamSDK udis86)
     target_link_libraries(FrameworkClient ${CLIENT_SHARED_LIBS} ${FREETYPE_LIBRARY})
 
     link_shared_deps(FrameworkLoader)

code/framework/src/external/imgui/widgets/console.cpp

@@ -14,7 +14,6 @@
 #include <sstream>
 
 #include <external/imgui/helpers.hpp>
-#include <external/optick/wrapper.h>
 
 #include <logging/logger.h>
 
@@ -28,8 +27,6 @@ namespace Framework::External::ImGUI::Widgets {
     void Console::OnClose() {}
 
     void Console::OnUpdate() {
-        OPTICK_EVENT();
-
         auto ringBuffer = Logging::GetInstance()->GetRingBuffer();
 
         auto windowFlags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;