refactor: PreLoader and GameLoader for CMake integration (#2)

Author: Lodingglue

CMakeLists.txt

@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 3.22.1)
+project(preloader)
+
+
+file(GLOB_RECURSE PRELOADER_SRC
+        "src/**/*.cpp"
+)
+
+
+
+add_library(preloader SHARED ${PRELOADER_SRC})
+
+
+target_include_directories(preloader
+        PRIVATE src
+)
+
+target_compile_definitions(preloader
+        PRIVATE PRELOADER_EXPORT UNICODE
+)
+
+
+include(FetchContent)
+
+FetchContent_Declare(
+        nlohmann_json
+        GIT_REPOSITORY https://github.com/nlohmann/json.git
+        GIT_TAG v3.11.3
+)
+FetchContent_MakeAvailable(nlohmann_json)
+
+FetchContent_Declare(
+        fmt
+        GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+        GIT_TAG 10.2.1
+)
+FetchContent_MakeAvailable(fmt)
+
+find_library(log-lib log)
+find_library(android-lib android)
+find_library(egl-lib EGL)
+find_library(gles-lib GLESv3)
+
+
+if(CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a")
+    set(GLOSSHOOK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/ARM/libGlossHook.a")
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
+    set(GLOSSHOOK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/ARM64/libGlossHook.a")
+else()
+    message(FATAL_ERROR "Unsupported ABI: ${CMAKE_ANDROID_ARCH_ABI}")
+endif()
+
+
+target_link_libraries(preloader
+        PRIVATE
+        ${GLOSSHOOK_PATH}
+        ${log-lib}
+        ${android-lib}
+        ${egl-lib}
+        ${gles-lib}
+        nlohmann_json::nlohmann_json
+        fmt::fmt
+)

src/pl/PreLoader.cpp

@@ -1,35 +1,108 @@
-#include "internal/AndroidUtils.h"
-#include "internal/ModManager.h"
+//
+// Created by mrjar on 10/5/2025.
+//
+
+#include <jni.h>
 #include <android/native_activity.h>
 #include <dlfcn.h>
+#include <android/log.h>
+#include "internal/AndroidUtils.h"
+#include "internal/ModManager.h"
+
+#define LOG_TAG "NativeLoader"
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
 
 JavaVM *g_vm = nullptr;
 
-static void (*ANativeActivity_onCreate_minecraft)(ANativeActivity *, void *,
-                                                  size_t) = nullptr;
+static std::string g_modsDir;
+static std::string g_cacheDir;
+static bool g_modsInitialized = false;
 
-extern "C" void ANativeActivity_onCreate(ANativeActivity *activity,
-                                         void *savedState,
-                                         size_t savedStateSize) {
-  if (ANativeActivity_onCreate_minecraft) {
-    ANativeActivity_onCreate_minecraft(activity, savedState, savedStateSize);
-  }
+static void (*onCreate)(ANativeActivity*, void*, size_t) = nullptr;
+static void (*onFinish)(ANativeActivity*) = nullptr;
+static void (*androidMain)(struct android_app*) = nullptr;
+
+extern "C" {
+
+
+JNIEXPORT void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_t savedStateSize) {
+    if (onCreate) {
+        onCreate(activity, savedState, savedStateSize);
+    } else {
+        LOGE("ANativeActivity_onCreate function not loaded");
+    }
 }
 
-JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) {
-  g_vm = vm;
-  JNIEnv *env = nullptr;
-  if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_4) != JNI_OK)
+JNIEXPORT void ANativeActivity_finish(ANativeActivity* activity) {
+    if (onFinish) {
+        onFinish(activity);
+    }
+}
+
+JNIEXPORT void android_main(struct android_app* state) {
+    if (androidMain) {
+        androidMain(state);
+    } else {
+        LOGE("android_main function not loaded");
+    }
+}
+
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+    g_vm = vm;
+    JNIEnv* env = nullptr;
+    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_4) != JNI_OK)
+        return JNI_VERSION_1_4;
+
+    auto paths = AndroidUtils::FetchContextPaths(env);
+    g_modsDir = paths.modsDir;
+    g_cacheDir = paths.cacheDir;
+
     return JNI_VERSION_1_4;
+}
+
+JNIEXPORT void JNICALL
+Java_org_levimc_launcher_core_minecraft_MinecraftActivity_nativeOnLauncherLoaded(
+        JNIEnv* env,
+        jobject thiz,
+        jstring libPath
+) {
+    const char* path = env->GetStringUTFChars(libPath, nullptr);
+
+    void* handle = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
+    if (!handle) {
+        LOGE("Failed to load library: %s", dlerror());
+        env->ReleaseStringUTFChars(libPath, path);
+        return;
+    }
 
-  auto paths = AndroidUtils::FetchContextPaths(env);
-  ModManager::LoadAndInitializeEnabledMods(paths.modsDir, paths.cacheDir, g_vm);
+    onCreate = reinterpret_cast<decltype(onCreate)>(dlsym(handle, "ANativeActivity_onCreate"));
+    onFinish = reinterpret_cast<decltype(onFinish)>(dlsym(handle, "ANativeActivity_finish"));
+    androidMain = reinterpret_cast<decltype(androidMain)>(dlsym(handle, "android_main"));
+
+    if (!onCreate || !androidMain) {
+        LOGE("Failed to resolve required symbols");
+    } else {
+        LOGD("Successfully loaded Minecraft native functions");
+    }
+    env->ReleaseStringUTFChars(libPath, path);
+    if (!g_modsInitialized && !g_modsDir.empty()) {
+        ModManager::LoadAndInitializeEnabledMods(g_modsDir, g_cacheDir, g_vm);
+        g_modsInitialized = true;
+        LOGD("Mods initialized successfully");
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_org_levimc_launcher_core_minecraft_MinecraftLauncher_nativeOnLauncherLoaded(
+        JNIEnv* env,
+        jobject thiz,
+        jstring libPath
+) {
+
+
+    Java_org_levimc_launcher_core_minecraft_MinecraftActivity_nativeOnLauncherLoaded(env, thiz, libPath);
+}
 
-  void *handle = dlopen("libminecraftpe.so", RTLD_LAZY);
-  if (handle) {
-    ANativeActivity_onCreate_minecraft =
-        (void (*)(ANativeActivity *, void *, size_t))dlsym(
-            handle, "ANativeActivity_onCreate");
-  }
-  return JNI_VERSION_1_4;
 }