Skip to content

Commit ed3bb0d

Browse files
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
1 parent efd645a commit ed3bb0d

21 files changed

Lines changed: 0 additions & 25 deletions

File tree

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,6 @@ public Runtime selectRuntime(File modFile) {
212212
}
213213
Runtime selectedRuntime = MultiRTUtils.forceReread(nearestRuntime);
214214
int selectedJavaVersion = Math.max(javaVersion, selectedRuntime.javaVersion);
215-
// Don't allow versions higher than Java 17 because our caciocavallo implementation does not allow for it
216-
if(selectedJavaVersion > 17) {
217-
finalErrorDialog(getString(R.string.execute_jar_incompatible_runtime, selectedJavaVersion));
218-
return null;
219-
}
220215
return selectedRuntime;
221216
}
222217

app_pojavlauncher/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@
318318
<string name="log_view_button_output_on">المخرجات\nمفعلة</string>
319319
<string name="log_view_label_log_output">سِجل الإخراج:</string>
320320
<string name="execute_jar_failed_to_read_file">فشل في قراءة ملف .jar</string>
321-
<string name="execute_jar_incompatible_runtime">تنفيذ وظيفة .jar غير متوافق مع Java %d</string>
322321
<string name="controller_button_select">اختر</string>
323322
<string name="controller_button_trigger_left">الزناد الأيسر</string>
324323
<string name="controller_button_trigger_right">الزناد الأيمن</string>

app_pojavlauncher/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@
348348
<string name="log_view_button_output_on">Výstup\nZapnuto</string>
349349
<string name="log_view_label_log_output">Výstup záznamu:</string>
350350
<string name="execute_jar_failed_to_read_file">Selhalo čtení souboru .jar</string>
351-
<string name="execute_jar_incompatible_runtime">Funkce spouštění .jar souboru není kompatibilní s Javou %d</string>
352351
<string name="controller_button_a">A</string>
353352
<string name="controller_button_b">B</string>
354353
<string name="controller_button_x">X</string>

app_pojavlauncher/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ Um die offizielle Download-Quelle zu verwenden, drücke \"Auf offizielle Seite u
347347
<string name="log_view_button_output_on">Ausgabe\nAN</string>
348348
<string name="log_view_label_log_output">Protokoll-Ausgabe:</string>
349349
<string name="execute_jar_failed_to_read_file">Fehler beim Lesen der .jar-Datei</string>
350-
<string name="execute_jar_incompatible_runtime">Die Ausführung der .jar-Funktion ist nicht kompatibel mit Java %d</string>
351350
<string name="controller_button_select">Auswählen</string>
352351
<string name="controller_button_trigger_left">Linker Trigger</string>
353352
<string name="controller_button_trigger_right">Rechter Trigger</string>

app_pojavlauncher/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@
332332
<string name="log_view_button_output_on">Salida\nEncendido</string>
333333
<string name="log_view_label_log_output">Salida del registro:</string>
334334
<string name="execute_jar_failed_to_read_file">Falló al leer el archivo .jar</string>
335-
<string name="execute_jar_incompatible_runtime">La característica para ejecutar .jar no es compatible con Java %d</string>
336335
<string name="controller_button_a">A</string>
337336
<string name="controller_button_b">B</string>
338337
<string name="controller_button_x">X</string>

app_pojavlauncher/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@
341341
<string name="log_view_button_output_on">Sortie\nDésactivée</string>
342342
<string name="log_view_label_log_output">Sortie des logs :</string>
343343
<string name="execute_jar_failed_to_read_file">Impossible de lire le fichier .jar</string>
344-
<string name="execute_jar_incompatible_runtime">La fonction \"Exécuter le fichier .jar\" n\'est pas compatible avec Java%d</string>
345344
<string name="controller_button_select">Sélectionner</string>
346345
<string name="controller_button_trigger_left">Gâchette gauche</string>
347346
<string name="controller_button_trigger_right">Gâchette droite</string>

app_pojavlauncher/src/main/res/values-hu/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ mcl_indítás_letöltés_folyamatban"</string>
350350
<string name="log_view_button_output_on">Kimenet\nBE</string>
351351
<string name="log_view_label_log_output">Napló kimenet:</string>
352352
<string name="execute_jar_failed_to_read_file">A .jar beolvasása sikertelen</string>
353-
<string name="execute_jar_incompatible_runtime">A \".jar futtatása\" nem kompatibilis a Java %d-val/vel</string>
354353
<string name="controller_button_a">A</string>
355354
<string name="controller_button_b">B</string>
356355
<string name="controller_button_x">X</string>

app_pojavlauncher/src/main/res/values-in/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@
348348
<string name="log_view_button_output_on">Keluaran\nHIDUP</string>
349349
<string name="log_view_label_log_output">Keluaran log:</string>
350350
<string name="execute_jar_failed_to_read_file">Gagal membaca dokumen .jar</string>
351-
<string name="execute_jar_incompatible_runtime">Fitur eksekusi .jar tidak kompatibel dengan Java %d</string>
352351
<string name="controller_button_a">A</string>
353352
<string name="controller_button_b">B</string>
354353
<string name="controller_button_x">X</string>

app_pojavlauncher/src/main/res/values-it/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ se vuoi scaricare dalla sorgente ufficiale premi \"Passa al sito ufficiale"\ e r
345345
<string name="log_view_button_output_on">Output\nON</string>
346346
<string name="log_view_label_log_output">Registro log:</string>
347347
<string name="execute_jar_failed_to_read_file">Impossibile leggere il file .jar</string>
348-
<string name="execute_jar_incompatible_runtime">La funzione Esegui .jar non è compatibile con Java %d</string>
349348
<string name="controller_button_select">Seleziona</string>
350349
<string name="controller_button_trigger_left">Grilletto sinistro</string>
351350
<string name="controller_button_trigger_right">Grilletto destro</string>

app_pojavlauncher/src/main/res/values-iw/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@
336336
<string name="log_view_button_output_on">פלט\nפעיל</string>
337337
<string name="log_view_label_log_output">לוג פלט:</string>
338338
<string name="execute_jar_failed_to_read_file">נכשלה קריאת קובץ ה-.jar</string>
339-
<string name="execute_jar_incompatible_runtime">הפעלת .jar אינה תואמת ל-Java %d</string>
340339
<string name="controller_button_trigger_left">טריגר ימני</string>
341340
<string name="controller_button_trigger_right">טריגר שמאלי</string>
342341
<string name="controller_button_shoulder_left">Shoulder ימני</string>

0 commit comments

Comments
 (0)