Merge remote-tracking branch 'origin/QuestCraft' into QuestCraft

QuestCraftPlusPlus · Apr 3, 2024 · 07255e0 · 07255e0
2 parents 6c20b77 + f889f4a
commit 07255e0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/pojlib/install/Installer.java b/src/main/java/pojlib/install/Installer.java
@@ -92,7 +92,7 @@ public static String installAssets(VersionInfo minecraftVersionInfo, String game
         Logger.getInstance().appendToLog("Downloading assets");
         JsonObject assets = APIHandler.getFullUrl(minecraftVersionInfo.assetIndex.url, JsonObject.class);
 
-        ThreadPoolExecutor tp = new ThreadPoolExecutor(5, 5, 100, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
+        ThreadPoolExecutor tp = new ThreadPoolExecutor(8, 8, 100, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
 
         for (Map.Entry<String, JsonElement> entry : assets.getAsJsonObject("objects").entrySet()) {
             AsyncDownload thread = new AsyncDownload(entry, minecraftVersionInfo, gameDir);

diff --git a/src/main/java/pojlib/util/DownloadUtils.java b/src/main/java/pojlib/util/DownloadUtils.java
@@ -32,6 +32,7 @@ private static void download(URL url, OutputStream os) throws IOException {
         while (true) {
             try {
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                conn.setRequestProperty("User-Agent", "QuestCraft");
                 conn.setConnectTimeout(10000);
                 conn.setDoInput(true);
                 conn.connect();

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
@@ -54,7 +54,7 @@ LOCAL_SRC_FILES := ./OpenOVR/OCOVR.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_LDLIBS := -llog -landroid -lGLESv2 -lvulkan -lEGL
+LOCAL_LDLIBS := -llog -landroid -lGLESv3 -lvulkan -lEGL
 LOCAL_CFLAGS := -DXR_USE_PLATFORM_ANDROID -DXR_USE_GRAPHICS_API_OPENGL_ES
 LOCAL_SHARED_LIBRARIES := openxr_loader
 LOCAL_WHOLE_STATIC_LIBRARIES := ocovr

diff --git a/src/main/jni/OpenOVR/OCOVR.a b/src/main/jni/OpenOVR/OCOVR.a
diff --git a/src/main/jni/OpenOVR/libDrvOpenXR.a b/src/main/jni/OpenOVR/libDrvOpenXR.a
diff --git a/src/main/jni/OpenOVR/libOCCore.a b/src/main/jni/OpenOVR/libOCCore.a