diff --git a/app_pojavlauncher/src/main/assets/arc_dns_injector.jar b/app_pojavlauncher/src/main/assets/arc_dns_injector.jar index 3c9ddd6bf..fe94aba81 100644 Binary files a/app_pojavlauncher/src/main/assets/arc_dns_injector.jar and b/app_pojavlauncher/src/main/assets/arc_dns_injector.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/jsr305.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/jsr305.jar deleted file mode 100644 index 59222d9ca..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/jsr305.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar index 4f389e2b6..039202c41 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-jemalloc.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-jemalloc.jar deleted file mode 100644 index 9b2bbcdb9..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-jemalloc.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-openal.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-openal.jar deleted file mode 100644 index b715ea92d..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-openal.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-opengl.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-opengl.jar deleted file mode 100644 index 1db08ec64..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-opengl.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-stb.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-stb.jar deleted file mode 100644 index 00170036b..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-stb.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-tinyfd.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-tinyfd.jar deleted file mode 100644 index 60d2cb4ba..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-tinyfd.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl.jar deleted file mode 100644 index 291a93dea..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl.jar and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version index 9ad47c4e5..4f567668d 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -1652063179136 \ No newline at end of file +1652110329813 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index ceec3e5e3..0a4f878a0 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -267,40 +267,6 @@ public class PojavLoginActivity extends BaseActivity { PojavProfile.setCurrentProfile(this, null); } - private void repackLWJGL3(boolean ignoreExistence) throws IOException { - File outFile = new File(Tools.DIR_GAME_HOME + "/lwjgl3/lwjgl-fat.jar"); - File outTmpFile = new File(Tools.DIR_GAME_HOME + "/lwjgl3/lwjgl-fat.jar.tmp"); - File[] innerFiles = outTmpFile.getParentFile().listFiles(); - - if (outFile.exists() && !ignoreExistence) { - return; - } - outFile.delete(); - outTmpFile.delete(); - - java.util.jar.Manifest manifest = new java.util.jar.Manifest(); - manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); - JarOutputStream outJar = new JarOutputStream(new FileOutputStream(outTmpFile), manifest); - outJar.setLevel(9); - - for (File file : innerFiles) { - if (!file.getName().endsWith(".jar")) continue; - JarInputStream inJar = new JarInputStream(new FileInputStream(file)); - JarEntry entry; - while ((entry = inJar.getNextJarEntry()) != null) { - // avoid some duplicated entries - if (entry.getSize() == 0 || entry.getName().equals("META-INF/INDEX.LIST") || entry.getName().startsWith("META-INF/versions")) continue; - outJar.putNextEntry(new JarEntry(entry.getName())); - IOUtils.copy(inJar, outJar); - } - inJar.close(); - file.delete(); - } - - outJar.close(); - outTmpFile.renameTo(outFile); - } - private boolean unpackComponent(AssetManager am, String component) throws IOException { File versionFile = new File(Tools.DIR_GAME_HOME + "/" + component + "/version"); InputStream is = am.open("components/" + component + "/version"); @@ -384,7 +350,7 @@ public class PojavLoginActivity extends BaseActivity { // Since the Java module system doesn't allow multiple JARs to declare the same module, // we repack them to a single file here - repackLWJGL3(unpackComponent(am, "lwjgl3")); + unpackComponent(am, "lwjgl3"); if(!installRuntimeAutomatically(am,MultiRTUtils.getRuntimes().size() > 0)) { MultiRTConfigDialog.openRuntimeSelector(this, MultiRTConfigDialog.MULTIRT_PICK_RUNTIME_STARTUP); diff --git a/jre_lwjgl3glfw/build.gradle b/jre_lwjgl3glfw/build.gradle index 52c7dde56..85aaec96c 100644 --- a/jre_lwjgl3glfw/build.gradle +++ b/jre_lwjgl3glfw/build.gradle @@ -14,6 +14,12 @@ jar { // Auto update the version with a timestamp so the project jar gets updated by Pojav File versionFile = file("../app_pojavlauncher/src/main/assets/components/lwjgl3/version") versionFile.write(String.valueOf(new Date().getTime())) + from { + configurations.default.collect { + println(it.getName()) + it.isDirectory() ? it : zipTree(it) + } + } } java { diff --git a/jre_lwjgl3glfw/libs/lwjgl-core-3.2.3.jar b/jre_lwjgl3glfw/libs/lwjgl-core-3.2.3.jar deleted file mode 100644 index 756d423fd..000000000 Binary files a/jre_lwjgl3glfw/libs/lwjgl-core-3.2.3.jar and /dev/null differ diff --git a/jre_lwjgl3glfw/libs/lwjgl-openal-3.2.3.jar b/jre_lwjgl3glfw/libs/lwjgl-openal-3.2.3.jar deleted file mode 100644 index 9ccbc2e10..000000000 Binary files a/jre_lwjgl3glfw/libs/lwjgl-openal-3.2.3.jar and /dev/null differ diff --git a/jre_lwjgl3glfw/libs/lwjgl-opengl-3.2.3.jar b/jre_lwjgl3glfw/libs/lwjgl-opengl-3.2.3.jar deleted file mode 100644 index 6b0f45982..000000000 Binary files a/jre_lwjgl3glfw/libs/lwjgl-opengl-3.2.3.jar and /dev/null differ