diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index a4c34673..96a9110e 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -48,7 +48,8 @@ jobs: ./gradlew clean build cd .. mkdir Natives/build/Release-iphoneos/PojavLauncher.app/libs - cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/launcher.jar + cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/launcher.jar + cp JavaApp/libs/* Natives/build/Release-iphoneos/PojavLauncher.app/libs/ - name: Sign and Package IPA run: | diff --git a/JavaApp/build.gradle b/JavaApp/build.gradle index 328469c5..20e8fe95 100644 --- a/JavaApp/build.gradle +++ b/JavaApp/build.gradle @@ -13,8 +13,6 @@ repositories { } dependencies { - implementation "com.google.code.gson:gson:2.8.6" - implementation fileTree(dir: 'libs', include: ['*.jar']) } /* diff --git a/JavaApp/libs/compat-1.0.0.jar b/JavaApp/libs/compat-1.0.0.jar deleted file mode 100644 index 45b3a859..00000000 Binary files a/JavaApp/libs/compat-1.0.0.jar and /dev/null differ diff --git a/JavaApp/libs/gson-2.8.6.jar b/JavaApp/libs/gson-2.8.6.jar new file mode 100644 index 00000000..4765c4af Binary files /dev/null and b/JavaApp/libs/gson-2.8.6.jar differ diff --git a/JavaApp/libs/javafx-mx.jar b/JavaApp/libs/javafx-mx.jar deleted file mode 100644 index a5f42496..00000000 Binary files a/JavaApp/libs/javafx-mx.jar and /dev/null differ diff --git a/JavaApp/libs/jfxrt.jar b/JavaApp/libs/jfxrt.jar deleted file mode 100644 index 255a7974..00000000 Binary files a/JavaApp/libs/jfxrt.jar and /dev/null differ diff --git a/JavaApp/libs/jfxswt.jar b/JavaApp/libs/jfxswt.jar deleted file mode 100644 index 12c65dea..00000000 Binary files a/JavaApp/libs/jfxswt.jar and /dev/null differ diff --git a/JavaApp/libs/jsr305-1.0.jar b/JavaApp/libs/jsr305.jar similarity index 100% rename from JavaApp/libs/jsr305-1.0.jar rename to JavaApp/libs/jsr305.jar diff --git a/JavaApp/libs/sfntly-1.0.0.jar b/JavaApp/libs/sfntly-1.0.0.jar deleted file mode 100644 index 656b6644..00000000 Binary files a/JavaApp/libs/sfntly-1.0.0.jar and /dev/null differ diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index 7af60985..aaf83a20 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -42,7 +42,7 @@ int launchJVM(int argc, char *argv[]) { char *args_path = "/var/mobile/Documents/minecraft/overrideargs.txt"; char *log_path = "/var/mobile/Documents/minecraft/latestlog.txt"; - char *main_jar = "/Applications/PojavLauncher.app/launcher.jar"; + char *classpath = "/Applications/PojavLauncher.app/libs/launcher.jar:/Applications/PojavLauncher.app/libs/ExagearApacheCommons.jar:/Applications/PojavLauncher.app/libs/gson-2.8.6.jar:/Applications/PojavLauncher.app/libs/jsr305.jar"; debug("Staring logging STDIO as jrelog:V\n"); // Redirect stdio to latestlog.txt @@ -74,7 +74,7 @@ int launchJVM(int argc, char *argv[]) { fclose(argsFile); } margv[margc++] = "-cp"; - margv[margc++] = main_jar; + margv[margc++] = classpath; margv[margc++] = "net.kdt.pojavlaunch.PLaunchApp"; for (int i = 0; i < argc; i++) {