Compare commits

..

No commits in common. "master" and "1.0.0" have entirely different histories.

12 changed files with 16528 additions and 136 deletions

8
.idea/compiler.xml generated
View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

@ -1,98 +1,26 @@
{ {
"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_9574749_cf833d944ab2", "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
"ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253", "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
"ifix_version": "0", "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
"lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f", },
"lua_version": "9567078" "CNBETAWin3.1.51": {
}, "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966",
"CNBETAWin3.1.51": { "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9589567_9c50629b0369",
"asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_9573347_b03981f01966", "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f",
"ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_9574749_cf833d944ab2", "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
"ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253", },
"ifix_version": "0", "OSBETAWin3.1.52": {
"lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_9567078_0e2b6acf6a2f", "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
"lua_version": "9567078" "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
}, "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
"OSBETAAndroid3.1.51": { "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
"asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9573347_b03981f01966", },
"ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9574749_cf833d944ab2", "CNBETAWin3.1.52": {
"ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253", "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_9614772_b674c1e08556",
"ifix_version": "0", "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_9614804_4a927001828b",
"lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9567078_0e2b6acf6a2f", "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_9615588_bd4aff54bc1a",
"lua_version": "9567078" "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253"
}, }
"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"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,21 @@
{
"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"
}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,26 @@
{
"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"
}
}

View File

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