From ed3bb0d179be2ea8335ca02af53c4e93f0766267 Mon Sep 17 00:00:00 2001 From: Rock Pie Date: Tue, 23 Jun 2026 04:19:51 +0100 Subject: [PATCH] fix: Allow AWT to use any java version * remove check against Java 17+ for the "Execute a .jar" option in the launcher because Java 17+ works now * remove localizations for incompatible Java runtimes for the "Execute .jar" feature --- .../java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java | 5 ----- app_pojavlauncher/src/main/res/values-ar/strings.xml | 1 - app_pojavlauncher/src/main/res/values-cs/strings.xml | 1 - app_pojavlauncher/src/main/res/values-de/strings.xml | 1 - app_pojavlauncher/src/main/res/values-es/strings.xml | 1 - app_pojavlauncher/src/main/res/values-fr/strings.xml | 1 - app_pojavlauncher/src/main/res/values-hu/strings.xml | 1 - app_pojavlauncher/src/main/res/values-in/strings.xml | 1 - app_pojavlauncher/src/main/res/values-it/strings.xml | 1 - app_pojavlauncher/src/main/res/values-iw/strings.xml | 1 - app_pojavlauncher/src/main/res/values-ko/strings.xml | 1 - app_pojavlauncher/src/main/res/values-ms/strings.xml | 1 - app_pojavlauncher/src/main/res/values-pl/strings.xml | 1 - app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml | 1 - app_pojavlauncher/src/main/res/values-ru/strings.xml | 1 - app_pojavlauncher/src/main/res/values-tr/strings.xml | 1 - app_pojavlauncher/src/main/res/values-uk/strings.xml | 1 - app_pojavlauncher/src/main/res/values-vi/strings.xml | 1 - app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml | 1 - app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml | 1 - app_pojavlauncher/src/main/res/values/strings.xml | 1 - 21 files changed, 25 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index d96967a91..d780113b4 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -212,11 +212,6 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc } Runtime selectedRuntime = MultiRTUtils.forceReread(nearestRuntime); int selectedJavaVersion = Math.max(javaVersion, selectedRuntime.javaVersion); - // Don't allow versions higher than Java 17 because our caciocavallo implementation does not allow for it - if(selectedJavaVersion > 17) { - finalErrorDialog(getString(R.string.execute_jar_incompatible_runtime, selectedJavaVersion)); - return null; - } return selectedRuntime; } diff --git a/app_pojavlauncher/src/main/res/values-ar/strings.xml b/app_pojavlauncher/src/main/res/values-ar/strings.xml index 300843dac..cbab981f1 100644 --- a/app_pojavlauncher/src/main/res/values-ar/strings.xml +++ b/app_pojavlauncher/src/main/res/values-ar/strings.xml @@ -318,7 +318,6 @@ المخرجات\nمفعلة سِجل الإخراج: فشل في قراءة ملف .jar - تنفيذ وظيفة .jar غير متوافق مع Java %d اختر الزناد الأيسر الزناد الأيمن diff --git a/app_pojavlauncher/src/main/res/values-cs/strings.xml b/app_pojavlauncher/src/main/res/values-cs/strings.xml index e19b6d806..5dba89c95 100644 --- a/app_pojavlauncher/src/main/res/values-cs/strings.xml +++ b/app_pojavlauncher/src/main/res/values-cs/strings.xml @@ -348,7 +348,6 @@ Výstup\nZapnuto Výstup záznamu: Selhalo čtení souboru .jar - Funkce spouštění .jar souboru není kompatibilní s Javou %d A B X diff --git a/app_pojavlauncher/src/main/res/values-de/strings.xml b/app_pojavlauncher/src/main/res/values-de/strings.xml index 0a2a4d0b0..6b09d62d8 100644 --- a/app_pojavlauncher/src/main/res/values-de/strings.xml +++ b/app_pojavlauncher/src/main/res/values-de/strings.xml @@ -347,7 +347,6 @@ Um die offizielle Download-Quelle zu verwenden, drücke \"Auf offizielle Seite u Ausgabe\nAN Protokoll-Ausgabe: Fehler beim Lesen der .jar-Datei - Die Ausführung der .jar-Funktion ist nicht kompatibel mit Java %d Auswählen Linker Trigger Rechter Trigger diff --git a/app_pojavlauncher/src/main/res/values-es/strings.xml b/app_pojavlauncher/src/main/res/values-es/strings.xml index 9f457512c..c1af7a9e4 100644 --- a/app_pojavlauncher/src/main/res/values-es/strings.xml +++ b/app_pojavlauncher/src/main/res/values-es/strings.xml @@ -332,7 +332,6 @@ Salida\nEncendido Salida del registro: Falló al leer el archivo .jar - La característica para ejecutar .jar no es compatible con Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-fr/strings.xml b/app_pojavlauncher/src/main/res/values-fr/strings.xml index 844d7038e..d48ba2a82 100644 --- a/app_pojavlauncher/src/main/res/values-fr/strings.xml +++ b/app_pojavlauncher/src/main/res/values-fr/strings.xml @@ -341,7 +341,6 @@ Sortie\nDésactivée Sortie des logs : Impossible de lire le fichier .jar - La fonction \"Exécuter le fichier .jar\" n\'est pas compatible avec Java%d Sélectionner Gâchette gauche Gâchette droite diff --git a/app_pojavlauncher/src/main/res/values-hu/strings.xml b/app_pojavlauncher/src/main/res/values-hu/strings.xml index e00a3e903..59080b09f 100644 --- a/app_pojavlauncher/src/main/res/values-hu/strings.xml +++ b/app_pojavlauncher/src/main/res/values-hu/strings.xml @@ -350,7 +350,6 @@ mcl_indítás_letöltés_folyamatban" Kimenet\nBE Napló kimenet: A .jar beolvasása sikertelen - A \".jar futtatása\" nem kompatibilis a Java %d-val/vel A B X diff --git a/app_pojavlauncher/src/main/res/values-in/strings.xml b/app_pojavlauncher/src/main/res/values-in/strings.xml index b48087ead..5cc1ed06c 100644 --- a/app_pojavlauncher/src/main/res/values-in/strings.xml +++ b/app_pojavlauncher/src/main/res/values-in/strings.xml @@ -348,7 +348,6 @@ Keluaran\nHIDUP Keluaran log: Gagal membaca dokumen .jar - Fitur eksekusi .jar tidak kompatibel dengan Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-it/strings.xml b/app_pojavlauncher/src/main/res/values-it/strings.xml index 3156a0895..8cc259c6a 100644 --- a/app_pojavlauncher/src/main/res/values-it/strings.xml +++ b/app_pojavlauncher/src/main/res/values-it/strings.xml @@ -345,7 +345,6 @@ se vuoi scaricare dalla sorgente ufficiale premi \"Passa al sito ufficiale"\ e r Output\nON Registro log: Impossibile leggere il file .jar - La funzione Esegui .jar non è compatibile con Java %d Seleziona Grilletto sinistro Grilletto destro diff --git a/app_pojavlauncher/src/main/res/values-iw/strings.xml b/app_pojavlauncher/src/main/res/values-iw/strings.xml index 22ae2f4ed..3bedfb965 100644 --- a/app_pojavlauncher/src/main/res/values-iw/strings.xml +++ b/app_pojavlauncher/src/main/res/values-iw/strings.xml @@ -336,7 +336,6 @@ פלט\nפעיל לוג פלט: נכשלה קריאת קובץ ה-.jar - הפעלת .jar אינה תואמת ל-Java %d טריגר ימני טריגר שמאלי Shoulder ימני diff --git a/app_pojavlauncher/src/main/res/values-ko/strings.xml b/app_pojavlauncher/src/main/res/values-ko/strings.xml index 740e47829..53288652d 100644 --- a/app_pojavlauncher/src/main/res/values-ko/strings.xml +++ b/app_pojavlauncher/src/main/res/values-ko/strings.xml @@ -345,7 +345,6 @@ 출력\n켬 로그 출력: .jar 파일을 읽지 못했습니다 - Java %d는 .jar 실행 기능과 호환되지 않습니다 선택 좌측 트리거 우측 트리거 diff --git a/app_pojavlauncher/src/main/res/values-ms/strings.xml b/app_pojavlauncher/src/main/res/values-ms/strings.xml index 835fe7cce..3dc329150 100644 --- a/app_pojavlauncher/src/main/res/values-ms/strings.xml +++ b/app_pojavlauncher/src/main/res/values-ms/strings.xml @@ -348,7 +348,6 @@ Output\nBUKA Output log: Gagal membaca fail .jar - Ciri pelaksanaan .jar adalah tidak serasi dengan Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-pl/strings.xml b/app_pojavlauncher/src/main/res/values-pl/strings.xml index eaaaef64f..f96dfba53 100644 --- a/app_pojavlauncher/src/main/res/values-pl/strings.xml +++ b/app_pojavlauncher/src/main/res/values-pl/strings.xml @@ -350,7 +350,6 @@ Wyjście\nWŁ. Dane wyjściowe dziennika: Nie udało się odczytać pliku .jar - Funkcja uruchamiania plików .jar nie jest zgodna z Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml b/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml index b1fdf706a..e4dd54111 100644 --- a/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml +++ b/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml @@ -321,7 +321,6 @@ SAÍDA\nLIGADA Registro de saída: Falha na leitura do arquivo .jar - O recurso Executar .jar não é compatível com Java %d Selecionar Botão esquerdo Botão direito diff --git a/app_pojavlauncher/src/main/res/values-ru/strings.xml b/app_pojavlauncher/src/main/res/values-ru/strings.xml index 729e94250..41042a508 100644 --- a/app_pojavlauncher/src/main/res/values-ru/strings.xml +++ b/app_pojavlauncher/src/main/res/values-ru/strings.xml @@ -345,7 +345,6 @@ Вывод\nВКЛ Журнал: Ошибка чтения .jar файла - Функция запуска .jar файлов несовместима с Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-tr/strings.xml b/app_pojavlauncher/src/main/res/values-tr/strings.xml index 2c88da054..e83cbcc24 100644 --- a/app_pojavlauncher/src/main/res/values-tr/strings.xml +++ b/app_pojavlauncher/src/main/res/values-tr/strings.xml @@ -348,7 +348,6 @@ ÇIKTI\nAÇIK Konsol çıktısı: .jar dosyası okunurken bir hata oluştu - .jar çalıştırma özelliği Java %d ile uyumlu değil A B X diff --git a/app_pojavlauncher/src/main/res/values-uk/strings.xml b/app_pojavlauncher/src/main/res/values-uk/strings.xml index 582b701c2..e713243f3 100644 --- a/app_pojavlauncher/src/main/res/values-uk/strings.xml +++ b/app_pojavlauncher/src/main/res/values-uk/strings.xml @@ -350,7 +350,6 @@ Вивід\nУВІМК. Вивід журналу: Помилка зчитування файлу .jar - Функція виконання .jar не сумісна з Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-vi/strings.xml b/app_pojavlauncher/src/main/res/values-vi/strings.xml index 2aa4bbc68..6b1355532 100644 --- a/app_pojavlauncher/src/main/res/values-vi/strings.xml +++ b/app_pojavlauncher/src/main/res/values-vi/strings.xml @@ -348,7 +348,6 @@ In ra MH\nBật Đầu ra nhật ký: Không thể đọc tệp .jar - Tính năng chạy tệp .jar không tương thích với Java %d A B X diff --git a/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml b/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml index 5577d3f02..5e94e5b86 100644 --- a/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml +++ b/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml @@ -352,7 +352,6 @@ 输出\n开 日志输出: .jar 文件读取失败 - 执行 .jar 功能与 Java %d 不兼容 A B X diff --git a/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml b/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml index 06bb14651..3335b0047 100644 --- a/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml +++ b/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml @@ -349,7 +349,6 @@ 輸出\n開 記錄檔輸出: .jar 檔案讀取失敗 - 執行 .jar 功能與 Java %d 不相容 A B X diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml index 6f695e916..938c92b7c 100644 --- a/app_pojavlauncher/src/main/res/values/strings.xml +++ b/app_pojavlauncher/src/main/res/values/strings.xml @@ -396,7 +396,6 @@ Output\nON Log output: Failed to read the .jar file - Execute .jar feature is not compatible with Java %d A B X