diff --git a/app/build.gradle b/app/build.gradle index 6651c13..0a0c7c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,13 +10,16 @@ android { defaultConfig { applicationId "com.zane.smapiinstaller" minSdkVersion 21 - //noinspection ExpiringTargetSdkVersion + //noinspection ExpiredTargetSdkVersion targetSdkVersion 30 - versionCode 74 - versionName "3.18.2.2" + versionCode 75 + versionName "3.18.3.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true + lintOptions { + abortOnError false + } } buildTypes { diff --git a/app/src/main/java/com/zane/smapiinstaller/utils/ZipUtils.java b/app/src/main/java/com/zane/smapiinstaller/utils/ZipUtils.java index aa71021..54d2887 100644 --- a/app/src/main/java/com/zane/smapiinstaller/utils/ZipUtils.java +++ b/app/src/main/java/com/zane/smapiinstaller/utils/ZipUtils.java @@ -188,18 +188,20 @@ public class ZipUtils { taskBundle.join(); progressCallback.accept(100); } - for (String resourcePack : resourcePacks) { - try (ZipInput input = new ZipInput(resourcePack)) { - for (ZioEntry inEntry : input.entries.values()) { - if (inEntry.getName().startsWith("assets/Content")) { - ZioEntry zioEntry = new ZioEntry(inEntry.getName()); - zioEntry.setCompression(inEntry.getCompression()); - try (InputStream inputStream = inEntry.getInputStream()) { - ByteStreams.copy(inputStream, zioEntry.getOutputStream()); - } catch (IOException e) { - throw new RuntimeException(e); + if(resourcePacks != null) { + for (String resourcePack : resourcePacks) { + try (ZipInput input = new ZipInput(resourcePack)) { + for (ZioEntry inEntry : input.entries.values()) { + if (inEntry.getName().startsWith("assets/Content")) { + ZioEntry zioEntry = new ZioEntry(inEntry.getName()); + zioEntry.setCompression(inEntry.getCompression()); + try (InputStream inputStream = inEntry.getInputStream()) { + ByteStreams.copy(inputStream, zioEntry.getOutputStream()); + } catch (IOException e) { + throw new RuntimeException(e); + } + zipOutput.write(zioEntry); } - zipOutput.write(zioEntry); } } } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 42223ce..8d92ee0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -61,8 +61,8 @@ Registro detallado Firmando paquete deinstalación SMAPI Stardew Valley - Versión SMAPI: 3.7.6.1 - Nota: Requiere la versión del juego 1.4.5.148 o superior + Versión SMAPI: 3.18.3.1 + Nota: Requiere la versión del juego 1.5.6.39 o superior El cuerpo del juego debe instalarse durante la actualización o instalación Desempacando \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6266890..82a8891 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -61,8 +61,8 @@ Journalisation détaillée Signature SMAPI Stardew Valley - Version SMAPI: 3.7.6.1 - Remarques: La version du jeu 1.4.5.148 ou ultérieure est requise. + Version SMAPI: 3.18.3.1 + Remarques: La version du jeu 1.5.6.39 ou ultérieure est requise. Le jeu de base est requis lors de la mise à jour / installation. Déballage \ No newline at end of file diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b160f3d..ea7163f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -61,8 +61,8 @@ Catatan Terperinci Menandatangani SMAPI Stardew Valley - Versi SMAPI: 3.7.6.1 - Catatan: Dibutuhkan Stardew Valley versi 1.4.5.148 atau yang lebih baru. + Versi SMAPI: 3.18.3.1 + Catatan: Dibutuhkan Stardew Valley versi 1.5.6.39 atau yang lebih baru. Permainan dasar diperlukan saat memperbarui/menginstal. Membongkar diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 358d32d..52f12a3 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -61,8 +61,8 @@ 자세한 로그 설치 패키지 서명 SMAPI Stardew Valley - SMAPI버전: 3.7.6.1 - 참고 : 게임 버전 1.4.5.148 이상이 필요합니다 + SMAPI버전: 3.18.3.1 + 참고 : 게임 버전 1.5.6.39 이상이 필요합니다 업데이트 또는 설치 중에 게임 본체를 설치해야합니다 포장 풀기 \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 506d988..1a677b5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -61,8 +61,8 @@ Log detalhado Assinatura SMAPI Stardew Valley - Versão SMAPI: 3.7.6.1 - Notas: É necessária a versão do jogo 1.4.5.148 ou posterior. + Versão SMAPI: 3.18.3.1 + Notas: É necessária a versão do jogo 1.5.6.39 ou posterior. O jogo base é necessário ao atualizar / instalar. Desembalar \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index b97e5b7..ade89ce 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -61,8 +61,8 @@ บันทึกอย่างละเอียด กำลังลงทะเบียนแอป SMAPI Stardew Valley - เวอร์ชั่น SMAPI: 3.7.6.1 - หมายเหตุ: ต้องการเกมเวอร์ชั่น 1.4.5.148 หรือใหม่กว่า + เวอร์ชั่น SMAPI: 3.18.3.1 + หมายเหตุ: ต้องการเกมเวอร์ชั่น 1.5.6.39 หรือใหม่กว่า ต้องการเกมหลักเมื่อทำการอัปเดต / ติดตั้ง กำลังแกะกล่อง diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ff65708..9dca3a6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -60,8 +60,8 @@ Докдадний вхід Реєстрація SMAPI Stardew Valley - Версія SMAPI: 3.7.6.1 - Примітка: Необхідна версія гри 1.4.5.148 або вище. + Версія SMAPI: 3.18.3.1 + Примітка: Необхідна версія гри 1.5.6.39 або вище. Базова гра потрібна при оновленні/встановленні. Розпакування 红包码已复制\n支付宝首页搜索“9188262” 立即领红包 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 18b9321..0bee4ad 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -60,8 +60,8 @@ 詳細日誌 正在簽名安裝包 SMAPI 星露谷物語 - SMAPI版本: 3.7.6.1 - 注意：需要 1.4.5.148 以上遊戲版本 + SMAPI版本: 3.18.3.1 + 注意：需要 1.5.6.39 以上遊戲版本 更新或安裝期間需要安裝遊戲 正在解包 排序方式 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index eae43a9..1486567 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -60,8 +60,8 @@ 详细日志 正在签名安装包 SMAPI星露谷物语 - SMAPI版本: 3.7.6.1 - 注意：需要不低于1.4.5.148版本的游戏本体 + SMAPI版本: 3.18.3.1 + 注意：需要不低于1.5.6.39版本的游戏本体 更新或安装期间需要安装游戏本体 正在解包 排序方式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c5f214..8f34f93 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,8 +60,8 @@ Verbose Logging Signing SMAPI Stardew Valley - SMAPI Version: 3.7.6.1 - Notes: Game version 1.4.5.148 or later is required. + SMAPI Version: 3.18.3.1 + Notes: Game version 1.5.6.39 or later is required. The base game is required when updating/installing. Unpacking