changes

SolDev69 · May 20, 2024 · 671b0bd · 671b0bd
1 parent 74934e8
commit 671b0bd
Show file tree

Hide file tree

Showing 11 changed files with 211 additions and 211 deletions.
diff --git a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version
@@ -1 +1 @@
-1687691695196
+1716170694497
diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version
@@ -1 +1 @@
-1692525087345
+1716170694527
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version
@@ -1 +1 @@
-1703946470579
+1716170694562
diff --git a/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.c b/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.c
@@ -117,10 +117,10 @@ void gl_make_current(gl_render_window_t* bundle) {
         return;
     }
     bool hasSetMainWindow = false;
-    if(pojav_environ->mainWindowBundle == NULL) {
-        pojav_environ->mainWindowBundle = (basic_render_window_t*)bundle;
-        __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is now %p", pojav_environ->mainWindowBundle);
-        pojav_environ->mainWindowBundle->newNativeSurface = pojav_environ->pojavWindow;
+    if(solcraft_environ->mainWindowBundle == NULL) {
+        solcraft_environ->mainWindowBundle = (basic_render_window_t*)bundle;
+        __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is now %p", solcraft_environ->mainWindowBundle);
+        solcraft_environ->mainWindowBundle->newNativeSurface = solcraft_environ->pojavWindow;
         hasSetMainWindow = true;
     }
     __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Making current, surface=%p, nativeSurface=%p, newNativeSurface=%p", bundle->surface, bundle->nativeSurface, bundle->newNativeSurface);
@@ -131,9 +131,9 @@ void gl_make_current(gl_render_window_t* bundle) {
         currentBundle = bundle;
     }else {
         if(hasSetMainWindow) {
-            pojav_environ->mainWindowBundle->newNativeSurface = NULL;
-            gl_swap_surface((gl_render_window_t*)pojav_environ->mainWindowBundle);
-            pojav_environ->mainWindowBundle = NULL;
+            solcraft_environ->mainWindowBundle->newNativeSurface = NULL;
+            gl_swap_surface((gl_render_window_t*)solcraft_environ->mainWindowBundle);
+            solcraft_environ->mainWindowBundle = NULL;
         }
         __android_log_print(ANDROID_LOG_ERROR, g_LogTag, "eglMakeCurrent returned with error: %04x", eglGetError_p());
     }
@@ -159,15 +159,15 @@ void gl_swap_buffers() {
 }
 
 void gl_setup_window() {
-    if(pojav_environ->mainWindowBundle != NULL) {
+    if(solcraft_environ->mainWindowBundle != NULL) {
         __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is not NULL, changing state");
-        pojav_environ->mainWindowBundle->state = STATE_RENDERER_NEW_WINDOW;
-        pojav_environ->mainWindowBundle->newNativeSurface = pojav_environ->pojavWindow;
+        solcraft_environ->mainWindowBundle->state = STATE_RENDERER_NEW_WINDOW;
+        solcraft_environ->mainWindowBundle->newNativeSurface = solcraft_environ->pojavWindow;
     }
 }
 
 void gl_swap_interval(int swapInterval) {
-    if(pojav_environ->force_vsync) swapInterval = 1;
+    if(solcraft_environ->force_vsync) swapInterval = 1;
 
     eglSwapInterval_p(g_EglDisplay, swapInterval);
 }
diff --git a/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.c b/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.c
@@ -94,16 +94,16 @@ void osm_make_current(osm_render_window_t* bundle) {
     }
     bool hasSetMainWindow = false;
     currentBundle = bundle;
-    if(pojav_environ->mainWindowBundle == NULL) {
-        pojav_environ->mainWindowBundle = (basic_render_window_t*) bundle;
-        __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is now %p", pojav_environ->mainWindowBundle);
-        pojav_environ->mainWindowBundle->newNativeSurface = pojav_environ->pojavWindow;
+    if(solcraft_environ->mainWindowBundle == NULL) {
+        solcraft_environ->mainWindowBundle = (basic_render_window_t*) bundle;
+        __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is now %p", solcraft_environ->mainWindowBundle);
+        solcraft_environ->mainWindowBundle->newNativeSurface = solcraft_environ->pojavWindow;
         hasSetMainWindow = true;
     }
     if(bundle->nativeSurface == NULL) {
         //prepare the buffer for our first render!
         osm_swap_surfaces(bundle);
-        if(hasSetMainWindow) pojav_environ->mainWindowBundle->state = STATE_RENDERER_ALIVE;
+        if(hasSetMainWindow) solcraft_environ->mainWindowBundle->state = STATE_RENDERER_ALIVE;
     }
     osm_set_no_render_buffer(&bundle->buffer);
     osm_apply_current_ll();
@@ -129,15 +129,15 @@ void osm_swap_buffers() {
 }
 
 void osm_setup_window() {
-    if(pojav_environ->mainWindowBundle != NULL) {
+    if(solcraft_environ->mainWindowBundle != NULL) {
         __android_log_print(ANDROID_LOG_INFO, g_LogTag, "Main window bundle is not NULL, changing state");
-        pojav_environ->mainWindowBundle->state = STATE_RENDERER_NEW_WINDOW;
-        pojav_environ->mainWindowBundle->newNativeSurface = pojav_environ->pojavWindow;
+        solcraft_environ->mainWindowBundle->state = STATE_RENDERER_NEW_WINDOW;
+        solcraft_environ->mainWindowBundle->newNativeSurface = solcraft_environ->pojavWindow;
     }
 }
 
 void osm_swap_interval(int swapInterval) {
-    if(pojav_environ->mainWindowBundle != NULL && pojav_environ->mainWindowBundle->nativeSurface != NULL) {
-        setNativeWindowSwapInterval(pojav_environ->mainWindowBundle->nativeSurface, swapInterval);
+    if(solcraft_environ->mainWindowBundle != NULL && solcraft_environ->mainWindowBundle->nativeSurface != NULL) {
+        setNativeWindowSwapInterval(solcraft_environ->mainWindowBundle->nativeSurface, swapInterval);
     }
 }
diff --git a/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c b/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c
@@ -23,13 +23,13 @@ void (*glReadPixels_p) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum
 void dlsym_OSMesa() {
     char* main_osm_libname = getenv("POJAVEXEC_OSMESA");
     char* main_path = NULL;
-    if(pojav_environ->config_renderer == RENDERER_VK_ZINK) {
+    if(solcraft_environ->config_renderer == RENDERER_VK_ZINK) {
         if(main_osm_libname == NULL) main_osm_libname = "libOSMesa.so";
         if(asprintf(&main_path, "%s/%s", getenv("POJAV_NATIVEDIR"), main_osm_libname) == -1) {
             abort();
         }
         free(main_path);
-    } else if(pojav_environ->config_renderer == RENDERER_VIRGL) {
+    } else if(solcraft_environ->config_renderer == RENDERER_VIRGL) {
         if(asprintf(&main_path, "%s/libOSMesa_znL.so", getenv("POJAV_NATIVEDIR")) == -1) {
             abort();
         }