feat: update assets

.idea/compiler.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="My_Application.app" target="21" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

app/build.gradle.kts

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId = "dev.amizing25.robinsr"
-        minSdk = 24
+        minSdk = 30
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
@@ -59,6 +59,8 @@ tasks.register<Exec>("buildRust") {
         "cargo", "ndk",
         "-t", "arm64-v8a",
         "-t", "armeabi-v7a",
+        "-t", "x86",
+        "-t", "x86_64",
         "-o", "../jniLibs",
         "build", "--release"
     )

app/src/main/java/dev/amizing25/robinsr/MainActivity.kt

@@ -153,22 +153,20 @@ class MainActivity : AppCompatActivity() {
     /// Notification channel ///
 
     private fun createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val channel = NotificationChannel(
-            val channel = NotificationChannel(
+            RustService.CHANNEL_ID,
-                RustService.CHANNEL_ID,
+            "Service Channel",
-                "Service Channel",
+            NotificationManager.IMPORTANCE_LOW
-                NotificationManager.IMPORTANCE_LOW
+        ).apply {
-            ).apply {
+            description = "Background service notifications"
-                description = "Background service notifications"
+            lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+            setSound(null, null)
-                setSound(null, null)
+            enableLights(false)
-                enableLights(false)
+            enableVibration(false)
-                enableVibration(false)
-            }
-
-            val manager = getSystemService(NotificationManager::class.java)
-            manager.createNotificationChannel(channel)
         }
+
+        val manager = getSystemService(NotificationManager::class.java)
+        manager.createNotificationChannel(channel)
     }
 
     /// Permission stuff ///
@@ -294,13 +292,17 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun writeJsonIfNotExist(context: Context, dst: File, src: Int) {
-        if (!dst.exists()) {
+        try {
-            context.resources.openRawResource(src).use { input ->
+            if (!dst.exists()) {
-                dst.outputStream().use { output ->
+                context.resources.openRawResource(src).use { input ->
-                    input.copyTo(output)
+                    dst.outputStream().use { output ->
-                    LogRepository.addLog("wrote $dst into media directory")
+                        input.copyTo(output)
+                        LogRepository.addLog("wrote $dst into media directory")
+                    }
                 }
             }
+        } catch(e: Exception) {
+            LogRepository.addLog(e.toString())
         }
     }
 }

app/src/main/res/raw/versions.json

@@ -1,26 +1,98 @@
-{  
+{
-  "OSBETAWin3.1.51": {
+    "OSBETAWin3.1.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9574749_cf833d944ab2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
+        "ifix_version": "0",
-  },
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
-  "CNBETAWin3.1.51": {
+        "lua_version": "9567078"
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
+    },
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
+    "CNBETAWin3.1.51": {
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9573347_b03981f01966",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9574749_cf833d944ab2",
-  },
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
-  "OSBETAWin3.1.52": {
+        "ifix_version": "0",
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "lua_version": "9567078"
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+    },
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
+    "OSBETAAndroid3.1.51": {
-  },
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
-  "CNBETAWin3.1.52": {
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9574749_cf833d944ab2",
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "ifix_version": "0",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
+        "lua_version": "9567078"
-  }
+    },
-}
+    "CNBETAAndroid3.1.51": {
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9573347_b03981f01966",
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9574749_cf833d944ab2",
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
+        "ifix_version": "0",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
+        "lua_version": "9567078"
+    },
+    "OSBETAWin3.1.52": {
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
+        "ifix_version": "0",
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+        "lua_version": "9615588"
+    },
+    "CNBETAWin3.1.52": {
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
+        "ifix_version": "0",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+        "lua_version": "9615588"
+    },
+    "OSBETAAndroid3.1.52": {
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
+        "ifix_version": "0",
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+        "lua_version": "9615588"
+    },
+    "CNBETAAndroid3.1.52": {
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9614772_b674c1e08556",
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9614804_4a927001828b",
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
+        "ifix_version": "0",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
+        "lua_version": "9615588"
+    },
+    "OSBETAWin3.1.53": {
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9697258_e86620fd557e",
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9706936_f0d9c0308622",
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9685341_7378b1f100ee",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
+        "lua_version": "9685341",
+        "ifix_version": "0"
+    },
+    "CNBETAWin3.1.53": {
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9697258_e86620fd557e",
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9706936_f0d9c0308622",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9685341_7378b1f100ee",
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
+        "lua_version": "9685341",
+        "ifix_version": "0"
+    },
+    "OSBETAAndroid3.1.53": {
+        "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9697258_e86620fd557e",
+        "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9706936_f0d9c0308622",
+        "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9685341_7378b1f100ee",
+        "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253",
+        "lua_version": "9685341",
+        "ifix_version": "0"
+    },
+    "CNBETAAndroid3.1.53": {
+        "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9697258_e86620fd557e",
+        "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9706936_f0d9c0308622",
+        "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9685341_7378b1f100ee",
+        "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253",
+        "lua_version": "9685341",
+        "ifix_version": "0"
+    }
+}

app/src/main/rust/assets/persistent

@@ -1,21 +0,0 @@
-{
-  "lineups": {
-    "0": 1403,
-    "1": 1407,
-    "2": 8001,
-    "3": 1405
-  },
-  "position": {
-    "x": -26968,
-    "y": 78953,
-    "z": 14457,
-    "rot_y": 11858
-  },
-  "scene": {
-    "plane_id": 20411,
-    "floor_id": 20411001,
-    "entry_id": 2041101
-  },
-  "main_character": "FemaleRememberance",
-  "march_type": "MarchHunt"
-}

app/src/main/rust/assets/versions.json

@@ -1,26 +0,0 @@
-{  
-  "OSBETAWin3.1.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
-  },
-  "CNBETAWin3.1.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
-  },
-  "OSBETAWin3.1.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
-  },
-  "CNBETAWin3.1.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
-  }
-}

app/src/main/rust/src/lib.rs

@@ -128,22 +128,22 @@ pub extern "system" fn Java_dev_amizing25_robinsr_RustLib_stopServer(_env: JNIEn
 
 fn check_assets() {
     if std::fs::read("res.json").is_err() {
-        let _ = std::fs::write("res.json", include_str!("../assets/res.json"));
+        let _ = std::fs::write("res.json", include_str!("../../res/raw/res.json"));
     };
 
     if std::fs::read("freesr_data.json").is_err() {
         let _ = std::fs::write(
             "freesr-data.json",
-            include_str!("../assets/freesr-data.json"),
+            include_str!("../../res/raw/freesr_data.json"),
         );
     };
 
     if std::fs::read("persistent").is_err() {
-        let _ = std::fs::write("res.json", include_str!("../assets/persistent"));
+        let _ = std::fs::write("res.json", include_str!("../../res/raw/persistent"));
     };
 
     if std::fs::read("versions.json").is_err() {
-        let _ = std::fs::write("versions.json", include_str!("../assets/versions.json"));
+        let _ = std::fs::write("versions.json", include_str!("../../res/raw/versions.json"));
     };
 
     if let Ok(dir) = std::fs::read_dir(".") {