Merge branch 'Anuken:master' into SpaceEarthEX-patch-2

Anuken · Oct 19, 2024 · 104b364 · 104b364
2 parents ec48a11 + 176fa35
commit 104b364
Show file tree

Hide file tree

Showing 37 changed files with 39 additions and 2 deletions.
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
@@ -749,6 +749,7 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
@@ -726,6 +726,7 @@ error.mapnotfound = Файл карты не знойдзены!
 error.io = Сеткавая памылка ўводу-высновы.
 error.any = Невядомая сеткавая памылка.
 error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дождж
 weather.snowing.name = Снег

diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
@@ -733,6 +733,7 @@ error.mapnotfound = Не е намерен файл с карта!
 error.io = Мрежова I/O грешка.
 error.any = Неизвестна мрежова грешка.
 error.bloom = Неуспешно инициализиране на Сияния.\nВашето устройство може да не поддържа този ефект.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дъжд
 weather.snowing.name = Сняг

diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
@@ -737,6 +737,7 @@ error.mapnotfound = El fitxer del mapa no s’ha trobat!
 error.io = S’ha produït un error d’entrada/sortida de la xarxa.
 error.any = S’ha produït un error de xarxa desconegut.
 error.bloom = No s’ha pogut inicialitzar l’efecte «bloom».\nPotser el dispositiu no admet aquesta funció.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Pluja
 weather.snowing.name = Neu

diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
@@ -735,6 +735,7 @@ error.mapnotfound = Soubor s mapou nebyl nalezen!
 error.io = Vstupně/výstupní (I/O) chyba sítě.
 error.any = Neznámá chyba sítě.
 error.bloom = Chyba inicializace filtru Bloom.\nTvé zařízení ho nejspíš nepodporuje.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Déšť
 weather.snowing.name = Sníh

diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Bane-filen er blevet væk!
 error.io = Network I/O-fejl.
 error.any = Ukendt netværksfejl.
 error.bloom = Kunne ikke etablere bloom-effekt.\nMåske understøtter din enhed den ikke.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Regn
 weather.snowing.name = Sne

diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
@@ -744,6 +744,7 @@ error.mapnotfound = Kartendatei nicht gefunden!
 error.io = Netzwerk-I/O-Fehler.
 error.any = Unbekannter Netzwerkfehler.
 error.bloom = Bloom konnte nicht initialisiert werden.\nEs kann sein, dass dein Gerät es nicht unterstützt.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Regen
 weather.snowing.name = Schnee

diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
@@ -741,6 +741,7 @@ error.mapnotfound = ¡Archivo de mapa no encontrado!
 error.io = Error I/O de conexión.
 error.any = Error de red desconocido.
 error.bloom = Error al cargar el efecto de bloom.\nPuede que tu dispositivo no sea compatible con esta característica.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Lluvia
 weather.snowing.name = Nieve

diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Maailmafaili ei leitud!
 error.io = Võrgu sisend-väljundi viga.
 error.any = Teadmata viga võrgus.
 error.bloom = Bloom-efekti lähtestamine ebaõnnestus.\nSinu seade ei pruugi seda efekti toetada.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
@@ -729,6 +729,7 @@ error.mapnotfound = Ez da mapa-fitxategia aurkitu!
 error.io = Sareko irteera/sarrera errorea.
 error.any = Sareko errore ezezaguna.
 error.bloom = Ezin izan da distira hasieratu.\nAgian zure gailuak ez du onartzen.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Karttatiedostoa ei löydy!
 error.io = Verkon I/O-virhe.
 error.any = Tuntematon verkon virhe.
 error.bloom = Bloomin initialisointi epäonnistui.\nLaitteesi ei ehkä tue sitä.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Sade
 weather.snowing.name = Lumi

diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Hindi nakita ang file ng mapa!
 error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Nabigong simulan ang bloom.\nMaaaring hindi ito sinusuportahan ng iyong device.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
@@ -747,6 +747,7 @@ error.mapnotfound = Fichier de carte introuvable !
 error.io = Erreur de Réseau (I/O)
 error.any = Erreur de réseau inconnue.
 error.bloom = Échec de l'initialisation du flou lumineux.\nIl se peut que votre appareil ne le prenne pas en charge.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Pluie
 weather.snowing.name = Neige

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
@@ -749,6 +749,7 @@ error.mapnotfound = A pályafájl nem található!
 error.io = Internet I/O hiba.
 error.any = Ismeretlen hálózati hiba.
 error.bloom = A bloom hatás előkészítése nem sikerült.\nElőfordulhat, hogy az eszköz nem támogatja.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Eső
 weather.snowing.name = Hóesés

diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
@@ -749,6 +749,7 @@ error.mapnotfound = File peta tidak ditemaukan!
 error.io = Terjadi kesalahan jaringan I/O.
 error.any = Terjadi kesalahan Jaringan tidak diketahui.
 error.bloom = Gagal untuk menjalankan efek bloom.\nPerangkat Anda mungkin tidak mendukung fitur ini.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Hujan
 weather.snowing.name = Salju

diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
@@ -731,6 +731,7 @@ error.mapnotfound = Mappa non trovata!
 error.io = Errore I/O di rete.
 error.any = Errore di rete sconosciuto.
 error.bloom = Errore dell'avvio delle shaders.\nIl tuo dispositivo potrebbe non supportarle.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Pioggia
 weather.snowing.name = Neve

diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
@@ -735,6 +735,7 @@ error.mapnotfound = マップファイルが見つかりません!
 error.io = I/O ネットワークエラーです。
 error.any = 不明なネットワークエラーです。
 error.bloom = ブルームの初期化に失敗しました。\n恐らくあなたのデバイスではブルームがサポートされていません。
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = 雨
 weather.snowing.name = 雪

diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
@@ -749,6 +749,7 @@ error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류
 error.any = 알 수 없는 네트워크 오류
 error.bloom = 블룸 그래픽 효과를 적용하지 못했습니다.\n기기가 이 기능을 지원하지 않는 것일 수도 있습니다.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = 비
 weather.snowing.name = 눈

diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Žemėlapis nerastas!
 error.io = Tinklo I/O klaida.
 error.any = Nžinoma tinklo klaida.
 error.bloom = Nepavyko inicijuoti spindėjimo.\nJūsų įrenginys gali nepalaikyti šios funkcijos.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
@@ -738,6 +738,7 @@ error.mapnotfound = Kaartbestand niet gevonden!
 error.io = Netwerk I/O fout.
 error.any = Onbekende netwerk fout.
 error.bloom = Bloom aanzetten mislukt.\nJe apparaat ondersteunt het waarschijnlijk niet.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Regen
 weather.snowing.name = Sneeuw

diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
@@ -733,6 +733,7 @@ error.mapnotfound = Plik mapy nie został znaleziony!
 error.io = Błąd sieciowy I/O.
 error.any = Nieznany błąd sieci.
 error.bloom = Nie udało się załadować funkcji bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Deszcz
 weather.snowing.name = Śnieg

diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
@@ -741,6 +741,7 @@ error.mapnotfound = Arquivo de mapa não encontrado!
 error.io = Erro I/O de internet.
 error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu dispositivo talvez não o suporte.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Chuva
 weather.snowing.name = Neve

diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Ficheiro de mapa não encontrado!
 error.io = Erro I/O de internet.
 error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu aparelho talvez não o suporte.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
@@ -735,6 +735,7 @@ error.mapnotfound = Fișierul hărții nu a fost găsit!
 error.io = Eroare de rețea I/O.
 error.any = Eroare de rețea necunoscută.
 error.bloom = Inițializarea strălucirii a eșuat.\nS-ar putea ca dispozitivul tău să nu suporte funcția.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Ploaie
 weather.snowing.name = Ninsoare

diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
@@ -735,6 +735,7 @@ error.mapnotfound = Файл карты не найден!
 error.io = Сетевая ошибка ввода-вывода.
 error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дождь
 weather.snowing.name = Снегопад

diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
@@ -736,6 +736,7 @@ error.mapnotfound = Datoteka mape nije pronađena!
 error.io = I/O mrežna greška.
 error.any = Nepoznata greška u mreži.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Kiša
 weather.snowing.name = Sneg

diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Okänt nätverksfel.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
@@ -736,6 +736,7 @@ error.mapnotfound = ไม่พบไฟล์แมพ
 error.io = ข้อผิดพลาด I/O ของเครือข่าย
 error.any = ข้อผิดพลาด: เครือข่ายที่ไม่รู้จัก
 error.bloom = ไม่สามารถเริ่มต้นบลูมได้\nอุปกรณ์ของคุณอาจไม่รองรับ
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = ฝน
 weather.snowing.name = หิมะตก

diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
@@ -727,6 +727,7 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow

diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
@@ -735,6 +735,7 @@ error.mapnotfound = Harita dosyası bulunamadı!
 error.io = Ağ I/O hatası.
 error.any = Bilinmeyen ağ hatası.
 error.bloom = Kamaşma başlatılamadı.\nCihazınız bu özelliği desteklemiyor olabilir.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Yağmur
 weather.snowing.name = Kar

diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
@@ -743,6 +743,7 @@ error.mapnotfound = Файл мапи не знайдено!
 error.io = Мережева помилка введення-виведення.
 error.any = Невідома мережева помилка
 error.bloom = Не вдалося ініціалізувати світіння.\nВаш пристрій, мабуть, не підтримує це.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Дощ
 weather.snowing.name = Сніг

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
@@ -749,6 +749,7 @@ error.mapnotfound = Không tìm thấy tệp bản đồ!
 error.io = Lỗi mạng đầu vào/ra.
 error.any = Lỗi mạng không xác định.
 error.bloom = Không khởi tạo được hiệu ứng phát sáng.\nThiết bị của bạn có thể không hỗ trợ.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = Mưa
 weather.snowing.name = Tuyết

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
@@ -744,6 +744,7 @@ error.mapnotfound = 找不到地图文件！
 error.io = 网络I/O错误。
 error.any = 未知网络错误。
 error.bloom = 未能初始化光效。 \n您的设备可能不支持。
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = 降雨
 weather.snowing.name = 降雪

diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
@@ -741,6 +741,7 @@ error.mapnotfound = 找不到地圖！
 error.io = 網路錯誤。
 error.any = 未知網路錯誤。
 error.bloom = 初始化特效失敗。\n您的裝置可能不支援
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround to this issue.
 
 weather.rain.name = 雨
 weather.snowing.name = 雪

diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -107,6 +107,8 @@ void modError(Throwable error){
             ui.showErrorMessage("@feature.unsupported");
         }else if(error instanceof HttpStatusException st){
             ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase())));
+        }else if(error.getMessage() != null && error.getMessage().toLowerCase(Locale.ROOT).contains("writable dex")){
+            ui.showException("@error.moddex", error);
         }else{
             ui.showException(error);
         }
@@ -189,7 +191,7 @@ void setup(){
                                 mods.importMod(file);
                                 setup();
                             }catch(Exception e){
-                                ui.showException(e);
+                                ui.showException(e.getMessage() != null && e.getMessage().toLowerCase(Locale.ROOT).contains("writable dex") ? "@error.moddex" : "", e);
                                 Log.err(e);
                             }
                         }, "zip", "jar");

diff --git a/gradle.properties b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=c1e3b23ddd
+archash=079015dec0