mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-07-30 18:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Allow AWT to use any java version

Browse Source 
* 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
This commit is contained in:
Rock Pie
2026-06-23 04:19:51 +01:00
committed by GitHub
parent efd645abe7
commit ed3bb0d179
21 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View File

@@ -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;
}

1
app_pojavlauncher/src/main/res/values-ar/strings.xml
View File

@@ -318,7 +318,6 @@
<string name="log_view_button_output_on">المخرجات\nمفعلة</string>
<string name="log_view_label_log_output">سِجل الإخراج:</string>
<string name="execute_jar_failed_to_read_file">فشل في قراءة ملف .jar</string>
<string name="execute_jar_incompatible_runtime">تنفيذ وظيفة .jar غير متوافق مع Java %d</string>
<string name="controller_button_select">اختر</string>
<string name="controller_button_trigger_left">الزناد الأيسر</string>
<string name="controller_button_trigger_right">الزناد الأيمن</string>

1
app_pojavlauncher/src/main/res/values-cs/strings.xml
View File

@@ -348,7 +348,6 @@
<string name="log_view_button_output_on">Výstup\nZapnuto</string>
<string name="log_view_label_log_output">Výstup záznamu:</string>
<string name="execute_jar_failed_to_read_file">Selhalo čtení souboru .jar</string>
<string name="execute_jar_incompatible_runtime">Funkce spouštění .jar souboru není kompatibilní s Javou %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-de/strings.xml
View File

@@ -347,7 +347,6 @@ Um die offizielle Download-Quelle zu verwenden, drücke \"Auf offizielle Seite u
<string name="log_view_button_output_on">Ausgabe\nAN</string>
<string name="log_view_label_log_output">Protokoll-Ausgabe:</string>
<string name="execute_jar_failed_to_read_file">Fehler beim Lesen der .jar-Datei</string>
<string name="execute_jar_incompatible_runtime">Die Ausführung der .jar-Funktion ist nicht kompatibel mit Java %d</string>
<string name="controller_button_select">Auswählen</string>
<string name="controller_button_trigger_left">Linker Trigger</string>
<string name="controller_button_trigger_right">Rechter Trigger</string>

1
app_pojavlauncher/src/main/res/values-es/strings.xml
View File

@@ -332,7 +332,6 @@
<string name="log_view_button_output_on">Salida\nEncendido</string>
<string name="log_view_label_log_output">Salida del registro:</string>
<string name="execute_jar_failed_to_read_file">Falló al leer el archivo .jar</string>
<string name="execute_jar_incompatible_runtime">La característica para ejecutar .jar no es compatible con Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-fr/strings.xml
View File

@@ -341,7 +341,6 @@
<string name="log_view_button_output_on">Sortie\nDésactivée</string>
<string name="log_view_label_log_output">Sortie des logs :</string>
<string name="execute_jar_failed_to_read_file">Impossible de lire le fichier .jar</string>
<string name="execute_jar_incompatible_runtime">La fonction \"Exécuter le fichier .jar\" n\'est pas compatible avec Java%d</string>
<string name="controller_button_select">Sélectionner</string>
<string name="controller_button_trigger_left">Gâchette gauche</string>
<string name="controller_button_trigger_right">Gâchette droite</string>

1
app_pojavlauncher/src/main/res/values-hu/strings.xml
View File

@@ -350,7 +350,6 @@ mcl_indítás_letöltés_folyamatban"</string>
<string name="log_view_button_output_on">Kimenet\nBE</string>
<string name="log_view_label_log_output">Napló kimenet:</string>
<string name="execute_jar_failed_to_read_file">A .jar beolvasása sikertelen</string>
<string name="execute_jar_incompatible_runtime">A \".jar futtatása\" nem kompatibilis a Java %d-val/vel</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-in/strings.xml
View File

@@ -348,7 +348,6 @@
<string name="log_view_button_output_on">Keluaran\nHIDUP</string>
<string name="log_view_label_log_output">Keluaran log:</string>
<string name="execute_jar_failed_to_read_file">Gagal membaca dokumen .jar</string>
<string name="execute_jar_incompatible_runtime">Fitur eksekusi .jar tidak kompatibel dengan Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-it/strings.xml
View File

@@ -345,7 +345,6 @@ se vuoi scaricare dalla sorgente ufficiale premi \"Passa al sito ufficiale"\ e r
<string name="log_view_button_output_on">Output\nON</string>
<string name="log_view_label_log_output">Registro log:</string>
<string name="execute_jar_failed_to_read_file">Impossibile leggere il file .jar</string>
<string name="execute_jar_incompatible_runtime">La funzione Esegui .jar non è compatibile con Java %d</string>
<string name="controller_button_select">Seleziona</string>
<string name="controller_button_trigger_left">Grilletto sinistro</string>
<string name="controller_button_trigger_right">Grilletto destro</string>

1
app_pojavlauncher/src/main/res/values-iw/strings.xml
View File

@@ -336,7 +336,6 @@
<string name="log_view_button_output_on">פלט\nפעיל</string>
<string name="log_view_label_log_output">לוג פלט:</string>
<string name="execute_jar_failed_to_read_file">נכשלה קריאת קובץ ה-.jar</string>
<string name="execute_jar_incompatible_runtime">הפעלת .jar אינה תואמת ל-Java %d</string>
<string name="controller_button_trigger_left">טריגר ימני</string>
<string name="controller_button_trigger_right">טריגר שמאלי</string>
<string name="controller_button_shoulder_left">Shoulder ימני</string>

1
app_pojavlauncher/src/main/res/values-ko/strings.xml
View File

@@ -345,7 +345,6 @@
<string name="log_view_button_output_on">출력\n켬</string>
<string name="log_view_label_log_output">로그 출력:</string>
<string name="execute_jar_failed_to_read_file">.jar 파일을 읽지 못했습니다</string>
<string name="execute_jar_incompatible_runtime">Java %d는 .jar 실행 기능과 호환되지 않습니다</string>
<string name="controller_button_select">선택</string>
<string name="controller_button_trigger_left">좌측 트리거</string>
<string name="controller_button_trigger_right">우측 트리거</string>

1
app_pojavlauncher/src/main/res/values-ms/strings.xml
View File

@@ -348,7 +348,6 @@
<string name="log_view_button_output_on">Output\nBUKA</string>
<string name="log_view_label_log_output">Output log:</string>
<string name="execute_jar_failed_to_read_file">Gagal membaca fail .jar</string>
<string name="execute_jar_incompatible_runtime">Ciri pelaksanaan .jar adalah tidak serasi dengan Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-pl/strings.xml
View File

@@ -350,7 +350,6 @@
<string name="log_view_button_output_on">Wyjście\nWŁ.</string>
<string name="log_view_label_log_output">Dane wyjściowe dziennika:</string>
<string name="execute_jar_failed_to_read_file">Nie udało się odczytać pliku .jar</string>
<string name="execute_jar_incompatible_runtime">Funkcja uruchamiania plików .jar nie jest zgodna z Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml
View File

@@ -321,7 +321,6 @@
<string name="log_view_button_output_on">SAÍDA\nLIGADA</string>
<string name="log_view_label_log_output">Registro de saída:</string>
<string name="execute_jar_failed_to_read_file">Falha na leitura do arquivo .jar</string>
<string name="execute_jar_incompatible_runtime">O recurso Executar .jar não é compatível com Java %d</string>
<string name="controller_button_select">Selecionar</string>
<string name="controller_button_trigger_left">Botão esquerdo</string>
<string name="controller_button_trigger_right">Botão direito</string>

1
app_pojavlauncher/src/main/res/values-ru/strings.xml
View File

@@ -345,7 +345,6 @@
<string name="log_view_button_output_on">Вывод\nВКЛ</string>
<string name="log_view_label_log_output">Журнал:</string>
<string name="execute_jar_failed_to_read_file">Ошибка чтения .jar файла</string>
<string name="execute_jar_incompatible_runtime">Функция запуска .jar файлов несовместима с Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-tr/strings.xml
View File

@@ -348,7 +348,6 @@
<string name="log_view_button_output_on">ÇIKTI\nAÇIK</string>
<string name="log_view_label_log_output">Konsol çıktısı:</string>
<string name="execute_jar_failed_to_read_file">.jar dosyası okunurken bir hata oluştu</string>
<string name="execute_jar_incompatible_runtime">.jar çalıştırma özelliği Java %d ile uyumlu değil</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-uk/strings.xml
View File

@@ -350,7 +350,6 @@
<string name="log_view_button_output_on">Вивід\nУВІМК.</string>
<string name="log_view_label_log_output">Вивід журналу:</string>
<string name="execute_jar_failed_to_read_file">Помилка зчитування файлу .jar</string>
<string name="execute_jar_incompatible_runtime">Функція виконання .jar не сумісна з Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-vi/strings.xml
View File

@@ -348,7 +348,6 @@
<string name="log_view_button_output_on">In ra MH\nBật</string>
<string name="log_view_label_log_output">Đầu ra nhật ký:</string>
<string name="execute_jar_failed_to_read_file">Không thể đọc tệp .jar</string>
<string name="execute_jar_incompatible_runtime">Tính năng chạy tệp .jar không tương thích với Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml
View File

@@ -352,7 +352,6 @@
<string name="log_view_button_output_on">输出\n开</string>
<string name="log_view_label_log_output">日志输出：</string>
<string name="execute_jar_failed_to_read_file">.jar 文件读取失败</string>
<string name="execute_jar_incompatible_runtime">执行 .jar 功能与 Java %d 不兼容</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml
View File

@@ -349,7 +349,6 @@
<string name="log_view_button_output_on">輸出\n開</string>
<string name="log_view_label_log_output">記錄檔輸出：</string>
<string name="execute_jar_failed_to_read_file">.jar 檔案讀取失敗</string>
<string name="execute_jar_incompatible_runtime">執行 .jar 功能與 Java %d 不相容</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>

1
app_pojavlauncher/src/main/res/values/strings.xml
View File

@@ -396,7 +396,6 @@
<string name="log_view_button_output_on">Output\nON</string>
<string name="log_view_label_log_output">Log output:</string>
<string name="execute_jar_failed_to_read_file">Failed to read the .jar file</string>
<string name="execute_jar_incompatible_runtime">Execute .jar feature is not compatible with Java %d</string>
<string name="controller_button_a">A</string>
<string name="controller_button_b">B</string>
<string name="controller_button_x">X</string>