1.Update to SMAPI 3.6.1

2020-06-22 10:37:46 +08:00 · 2020-06-22 10:37:46 +08:00 · 2a79a72ff9
parent 9e620454df
commit 2a79a72ff9
24 changed files with 69 additions and 41 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -12,8 +12,8 @@ android {
        applicationId "com.zane.smapiinstaller"
        minSdkVersion 19
        targetSdkVersion 28
-        versionCode 45
-        versionName "1.5.4"
+        versionCode 46
+        versionName "1.5.5"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
--- a/app/src/main/assets/apk/StardewModdingAPI.dll
+++ b/app/src/main/assets/apk/StardewModdingAPI.dll
--- a/app/src/main/assets/downloadable_content_list.json
+++ b/app/src/main/assets/downloadable_content_list.json
@ -13,17 +13,17 @@
      "type": "COMPAT",
      "name": "SMAPI for Galaxy Store",
      "assetPath": "compat/samsung_138/",
-      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_15.zip",
-      "hash": "b214c0bd751c04ce7cba21b627a6ce822f1d1a95a5af43168a6b9d8da89e9cf0"
+      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_16.zip",
+      "hash": "20cf2ce515dcf05596d523387b244c9e14c235387db61545e7067835e5856626"
    },
    {
      "type": "COMPAT",
      "name": "SMAPI for Amazon Store",
      "assetPath": "compat/amazon_138/",
-      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_5.zip",
-      "hash": "6f2ea33551a71221c2f10446339b6e7e01b861c590edbe6e1bceb35aa7df53cf"
+      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_6.zip",
+      "hash": "f487f8f14fcdd0ee31ca4e3b731e6e9114bc4b43a50c930f651a939e927eeb5d"
    },
    {
      "type": "LOCALE",
--- a/app/src/main/assets/downloadable_content_list.json.en
+++ b/app/src/main/assets/downloadable_content_list.json.en
@ -13,17 +13,17 @@
      "type": "COMPAT",
      "name": "SMAPI for Galaxy Store",
      "assetPath": "compat/samsung_138/",
-      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_15.zip",
-      "hash": "b214c0bd751c04ce7cba21b627a6ce822f1d1a95a5af43168a6b9d8da89e9cf0"
+      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_16.zip",
+      "hash": "20cf2ce515dcf05596d523387b244c9e14c235387db61545e7067835e5856626"
    },
    {
      "type": "COMPAT",
      "name": "SMAPI for Amazon Store",
      "assetPath": "compat/amazon_138/",
-      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_5.zip",
-      "hash": "6f2ea33551a71221c2f10446339b6e7e01b861c590edbe6e1bceb35aa7df53cf"
+      "description": "SMAPI compat package for game 1.4.4.138 - latest, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_6.zip",
+      "hash": "f487f8f14fcdd0ee31ca4e3b731e6e9114bc4b43a50c930f651a939e927eeb5d"
    },
    {
      "type": "LOCALE",
--- a/app/src/main/assets/downloadable_content_list.json.in
+++ b/app/src/main/assets/downloadable_content_list.json.in
@ -13,17 +13,17 @@
      "type": "COMPAT",
      "name": "SMAPI untuk Galaxy Store",
      "assetPath": "compat/samsung_138/",
-      "description": "Paket kompatibilitas SMAPI untuk versi 1.4.4.138 - terbaru, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_15.zip",
-      "hash": "b214c0bd751c04ce7cba21b627a6ce822f1d1a95a5af43168a6b9d8da89e9cf0"
+      "description": "Paket kompatibilitas SMAPI untuk versi 1.4.4.138 - terbaru, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_16.zip",
+      "hash": "20cf2ce515dcf05596d523387b244c9e14c235387db61545e7067835e5856626"
    },
    {
      "type": "COMPAT",
      "name": "SMAPI untuk Amazon Store",
      "assetPath": "compat/amazon_138/",
-      "description": "Paket kompatibilitas SMAPI untuk versi 1.4.4.138 - terbaru, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_5.zip",
-      "hash": "6f2ea33551a71221c2f10446339b6e7e01b861c590edbe6e1bceb35aa7df53cf"
+      "description": "Paket kompatibilitas SMAPI untuk versi 1.4.4.138 - terbaru, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_6.zip",
+      "hash": "f487f8f14fcdd0ee31ca4e3b731e6e9114bc4b43a50c930f651a939e927eeb5d"
    },
    {
      "type": "LOCAL",
--- a/app/src/main/assets/downloadable_content_list.json.zh
+++ b/app/src/main/assets/downloadable_content_list.json.zh
@ -13,17 +13,17 @@
      "type": "COMPAT",
      "name": "SMAPI三星商店兼容包",
      "assetPath": "compat/samsung_138/",
-      "description": "SMAPI三星商店兼容包， 适用版本1.4.4.138至今, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_15.zip",
-      "hash": "b214c0bd751c04ce7cba21b627a6ce822f1d1a95a5af43168a6b9d8da89e9cf0"
+      "description": "SMAPI三星商店兼容包， 适用版本1.4.4.138至今, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_samsung_138_16.zip",
+      "hash": "20cf2ce515dcf05596d523387b244c9e14c235387db61545e7067835e5856626"
    },
    {
      "type": "COMPAT",
      "name": "SMAPI亚马逊商店兼容包",
      "assetPath": "compat/amazon_138/",
-      "description": "SMAPI亚马逊商店兼容包， 适用版本1.4.4.138至今, SMAPI 3.5.0.1",
-      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_5.zip",
-      "hash": "6f2ea33551a71221c2f10446339b6e7e01b861c590edbe6e1bceb35aa7df53cf"
+      "description": "SMAPI亚马逊商店兼容包， 适用版本1.4.4.138至今, SMAPI 3.6.1",
+      "url": "http://zaneyork.cn/download/compat/smapi_amazon_138_6.zip",
+      "hash": "f487f8f14fcdd0ee31ca4e3b731e6e9114bc4b43a50c930f651a939e927eeb5d"
    },
    {
      "type": "LOCALE",
--- a/app/src/main/assets/smapi/0Harmony.dll
+++ b/app/src/main/assets/smapi/0Harmony.dll
--- a/app/src/main/assets/smapi/MonoMod.RuntimeDetour.dll
+++ b/app/src/main/assets/smapi/MonoMod.RuntimeDetour.dll
--- a/app/src/main/assets/smapi/MonoMod.Utils.dll
+++ b/app/src/main/assets/smapi/MonoMod.Utils.dll
--- a/app/src/main/assets/smapi/TMXTile.dll
+++ b/app/src/main/assets/smapi/TMXTile.dll
--- a/app/src/main/assets/smapi_files_manifest.json
+++ b/app/src/main/assets/smapi_files_manifest.json
@ -24,6 +24,16 @@
    "assetPath": "assemblies/MonoGame.Framework.dll",
    "origin": 1
  },
+  {
+    "targetPath": "smapi-internal/MonoMod.RuntimeDetour.dll",
+    "assetPath": "smapi/MonoMod.RuntimeDetour.dll",
+    "origin": 0
+  },
+  {
+    "targetPath": "smapi-internal/MonoMod.Utils.dll",
+    "assetPath": "smapi/MonoMod.Utils.dll",
+    "origin": 0
+  },
  {
    "targetPath": "smapi-internal/mscorlib.dll",
    "assetPath": "assemblies/mscorlib.dll",
--- a/app/src/main/java/com/zane/smapiinstaller/MainActivity.java
+++ b/app/src/main/java/com/zane/smapiinstaller/MainActivity.java
@ -197,6 +197,7 @@ public class MainActivity extends AppCompatActivity {
        }
        menu.findItem(R.id.settings_developer_mode).setChecked(config.isDeveloperMode());
        menu.findItem(R.id.settings_disable_mono_mod).setChecked(config.isDisableMonoMod());
+        menu.findItem(R.id.settings_rewrite_in_parallel).setChecked(config.isRewriteInParallel());
        menu.findItem(R.id.settings_advanced_mode).setChecked(Boolean.parseBoolean(ConfigUtils.getConfig((MainApplication) getApplication(), AppConfigKey.ADVANCED_MODE, "false").getValue()));
        Constants.MOD_PATH = config.getModsPath();
        return super.onPrepareOptionsMenu(menu);
@ -226,6 +227,9 @@ public class MainActivity extends AppCompatActivity {
            case R.id.settings_disable_mono_mod:
                config.setDisableMonoMod(item.isChecked());
                break;
+            case R.id.settings_rewrite_in_parallel:
+                config.setRewriteInParallel(item.isChecked());
+                break;
            case R.id.settings_set_mod_path:
                DialogUtils.showInputDialog(toolbar, R.string.input, R.string.input_mods_path, Constants.MOD_PATH, Constants.MOD_PATH, (dialog, input) -> {
                    if (StringUtils.isNoneBlank(input)) {
--- a/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java
+++ b/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java
@ -63,7 +63,7 @@ public class Constants {
    /**
     * SMAPI版本
     */
-    public static final String SMAPI_VERSION = "3.5.0.1";
+    public static final String SMAPI_VERSION = "3.6.1";

    /**
     * 平台
--- a/app/src/main/java/com/zane/smapiinstaller/entity/FrameworkConfig.java
+++ b/app/src/main/java/com/zane/smapiinstaller/entity/FrameworkConfig.java
@ -37,6 +37,12 @@ public class FrameworkConfig {
    @JsonProperty("DisableMonoMod")
    private boolean DisableMonoMod = false;

+    /**
+     * 是否启用多线程重写
+     */
+    @JsonProperty("RewriteInParallel")
+    private boolean RewriteInParallel = false;
+
    /**
     * 最大日志大小
     */
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@ -30,29 +30,34 @@
            android:title="@string/settings_disable_mono_mod"
            app:showAsAction="never" />
        <item
-            android:id="@+id/settings_advanced_mode"
+            android:id="@+id/settings_rewrite_in_parallel"
            android:orderInCategory="104"
+            android:title="@string/settings_rewrite_in_parallel"
+            app:showAsAction="never" />
+        <item
+            android:id="@+id/settings_advanced_mode"
+            android:orderInCategory="105"
            android:title="@string/settings_advanced_mode"
            app:showAsAction="never" />
    </group>
    <item
        android:id="@+id/settings_set_mod_path"
-        android:orderInCategory="105"
+        android:orderInCategory="110"
        android:title="@string/settings_set_mod_path"
        app:showAsAction="never" />
    <item
        android:id="@+id/settings_set_max_log_size"
-        android:orderInCategory="106"
+        android:orderInCategory="111"
        android:title="@string/settings_set_max_log_size"
        app:showAsAction="never" />
    <item
        android:id="@+id/settings_language"
-        android:orderInCategory="107"
+        android:orderInCategory="112"
        android:title="@string/settings_set_language"
        app:showAsAction="never" />
    <item
        android:id="@+id/settings_translation_service"
-        android:orderInCategory="108"
+        android:orderInCategory="113"
        android:title="@string/settings_translation_service"
        app:showAsAction="never" />
 </menu>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">Registro detallado</string>
    <string name="signing_package">Firmando paquete deinstalación</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">Versión SMAPI: 3.5.0.1</string>
+    <string name="smapi_version">Versión SMAPI: 3.6.1</string>
    <string name="text_install_tip1">Nota: Requiere la versión del juego 1.4.5.138 o superior</string>
    <string name="text_install_tip2">El cuerpo del juego debe instalarse durante la actualización o instalación</string>
    <string name="unpacking_smapi_files">Desempacando</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">Journalisation détaillée</string>
    <string name="signing_package">Signature</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">Version SMAPI: 3.5.0.1</string>
+    <string name="smapi_version">Version SMAPI: 3.6.1</string>
    <string name="text_install_tip1">Remarques: La version du jeu 1.4.5.138 ou ultérieure est requise.</string>
    <string name="text_install_tip2">Le jeu de base est requis lors de la mise à jour / installation.</string>
    <string name="unpacking_smapi_files">Déballage</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">Catatan Terperinci</string>
    <string name="signing_package">Menandatangani</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">Versi SMAPI: 3.5.0.1</string>
+    <string name="smapi_version">Versi SMAPI: 3.6.1</string>
    <string name="text_install_tip1">Catatan: Dibutuhkan Stardew Valley versi 1.4.5.138 atau yang lebih baru.</string>
    <string name="text_install_tip2">Permainan dasar diperlukan saat memperbarui/menginstal.</string>
    <string name="unpacking_smapi_files">Membongkar</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">자세한 로그</string>
    <string name="signing_package">설치 패키지 서명</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">SMAPI버전: 3.5.0.1</string>
+    <string name="smapi_version">SMAPI버전: 3.6.1</string>
    <string name="text_install_tip1">참고 : 게임 버전 1.4.5.138 이상이 필요합니다</string>
    <string name="text_install_tip2">업데이트 또는 설치 중에 게임 본체를 설치해야합니다</string>
    <string name="unpacking_smapi_files">포장 풀기</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">Log detalhado</string>
    <string name="signing_package">Assinatura</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">Versão SMAPI: 3.5.0.1</string>
+    <string name="smapi_version">Versão SMAPI: 3.6.1</string>
    <string name="text_install_tip1">Notas: É necessária a versão do jogo 1.4.5.138 ou posterior.</string>
    <string name="text_install_tip2">O jogo base é necessário ao atualizar / instalar.</string>
    <string name="unpacking_smapi_files">Desembalar</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -61,7 +61,7 @@
    <string name="settings_verbose_logging">บันทึกอย่างละเอียด</string>
    <string name="signing_package">กำลังลงทะเบียนแอป</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">เวอร์ชั่น SMAPI: 3.5.0.1</string>
+    <string name="smapi_version">เวอร์ชั่น SMAPI: 3.6.1</string>
    <string name="text_install_tip1">หมายเหตุ: ต้องการเกมเวอร์ชั่น 1.4.5.138 หรือใหม่กว่า</string>
    <string name="text_install_tip2">ต้องการเกมหลักเมื่อทำการอัปเดต / ติดตั้ง</string>
    <string name="unpacking_smapi_files">กำลังแกะกล่อง</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -60,7 +60,7 @@
    <string name="settings_verbose_logging">詳細日誌</string>
    <string name="signing_package">正在簽名安裝包</string>
    <string name="smapi_game_name">SMAPI 星露谷物語</string>
-    <string name="smapi_version">SMAPI版本: 3.5.0.1</string>
+    <string name="smapi_version">SMAPI版本: 3.6.1</string>
    <string name="text_install_tip1">注意：需要 1.4.5.138 以上遊戲版本</string>
    <string name="text_install_tip2">更新或安裝期間需要安裝遊戲</string>
    <string name="unpacking_smapi_files">正在解包</string>
@ -80,4 +80,5 @@
    <string name="button_initial">初始化</string>
    <string name="error_directory_exists_with_same_filename">%1$s不是一個文件夾, 請手動刪除該文件</string>
    <string name="error_patch_crc_incorrect">增量更新%1$s失敗: CRC (%2$s))</string>
+    <string name="settings_rewrite_in_parallel">多線程重寫</string>
 </resources>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -60,7 +60,7 @@
    <string name="settings_verbose_logging">详细日志</string>
    <string name="signing_package">正在签名安装包</string>
    <string name="smapi_game_name">SMAPI星露谷物语</string>
-    <string name="smapi_version">SMAPI版本: 3.5.0.1</string>
+    <string name="smapi_version">SMAPI版本: 3.6.1</string>
    <string name="text_install_tip1">注意：需要不低于1.4.5.138版本的游戏本体</string>
    <string name="text_install_tip2">更新或安装期间需要安装游戏本体</string>
    <string name="unpacking_smapi_files">正在解包</string>
@ -80,4 +80,5 @@
    <string name="button_initial">初始化</string>
    <string name="error_directory_exists_with_same_filename">%1$s不是一个文件夹, 请手动删除该文件</string>
    <string name="error_patch_crc_incorrect">增量更新%1$s失败: CRC (%2$s))</string>
+    <string name="settings_rewrite_in_parallel">多线程重写</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -60,7 +60,7 @@
    <string name="settings_verbose_logging">Verbose Logging</string>
    <string name="signing_package">Signing</string>
    <string name="smapi_game_name">SMAPI Stardew Valley</string>
-    <string name="smapi_version">SMAPI Version: 3.5.0.1</string>
+    <string name="smapi_version">SMAPI Version: 3.6.1</string>
    <string name="text_install_tip1">Notes: Game version 1.4.5.138 or later is required.</string>
    <string name="text_install_tip2">The base game is required when updating/installing.</string>
    <string name="unpacking_smapi_files">Unpacking</string>
@ -84,4 +84,5 @@
    <string name="button_initial">Initial</string>
    <string name="error_directory_exists_with_same_filename">%1$s is not a directory, please delete it manually.</string>
    <string name="error_patch_crc_incorrect">Patch %1$s failed: CRC (%2$s))</string>
+    <string name="settings_rewrite_in_parallel">Rewrite in Parallel</string>
 </resources>