Merge branch 'TeamFlos:main' into main

Author: Springstreak

Cargo.lock

@@ -16,7 +16,45 @@ edition = "2021"
 license = "GPL-3.0-only"
 
 [workspace.dependencies]
+anyhow = "1.0"
+async-trait = "0.1.89"
+base64 = "0.22.1"
+bitflags = "2.10.0"
+chrono = "0.4.43"
+fluent = "0.17.0"
+fluent-syntax = "0.12.0"
+futures-util = "0.3.31"
+hex = "0.4.3"
+image = { version = "0.25.9", default-features = false }
+lru = "0.16.3"
+lyon = "1.0.16"
+nalgebra = "0.34.1"
+once_cell = "1.21.3"
+pollster = "0.4.0"
+rand = "0.8.5"
+regex = "1.12.2"
+reqwest = { version = "0.13.1", default-features = false }
+serde = "1.0.228"
+serde_json = "1.0.49"
+serde_yaml = "0.9.34"
+sha2 = "0.10.9"
+sys-locale = "0.3.2"
+tempfile = "3.24.0"
 tokio = "1.38.2"
+tracing = "0.1.44"
+uuid = "1.20.0"
+walkdir = "2.5.0"
+zip = { version = "7.2.0", default-features = false }
+
+macroquad = { git = "https://github.com/Mivik/prpr-macroquad", rev = "c2d2e71", default-features = false }
+miniquad = { git = "https://github.com/Mivik/prpr-miniquad", rev = "3a3a121" }
+phira = { path = "phira", default-features = false }
+phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp", rev = "6967475" }
+phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp", rev = "6967475" }
+prpr = { path = "prpr", default-features = false }
+prpr-avc = { path = "prpr-avc" }
+prpr-l10n = { path = "prpr-l10n" }
+sasa = { git = "https://github.com/Mivik/sasa", rev = "63d019c", default-features = false }
 
 [profile.release]
 opt-level = 2

Cargo.toml

@@ -1,6 +1,6 @@
 # Phira
 
-![Phira](https://files-cf.phira.cn/github-showcase.png)
+![Phira Showcase](https://phira.5wyxi.com/files/github-showcase.png)
 
 ## 下载
 

README-zh_CN.md

@@ -1,6 +1,6 @@
 # Phira
 
-![Phira](https://files-cf.phira.cn/github-showcase.png)
+![Phira Showcase](https://phira.5wyxi.com/files/github-showcase.png)
 
 [中文版本](./README-zh_CN.md)
 

README.md

@@ -1,8 +1,8 @@
 [package]
 name = "phira-main"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
-phira = { path = "../phira" }
+phira = { workspace = true }

assets/bold.ttf

@@ -4,19 +4,27 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "*"
-chrono = "0.4.41"
-futures-util = "0.3.31"
-log = "0.4.27"
-macroquad = { git = "https://github.com/Mivik/prpr-macroquad", default-features = false }
+anyhow = { workspace = true }
+chrono = { workspace = true }
+futures-util = { workspace = true }
+log = "0.4.29"
+macroquad = { workspace = true, default-features = false }
 pretty_env_logger = "0.5.0"
-reqwest = { version = "0.12.19",default-features = false, features = ["json", "stream", "gzip", "charset", "http2", "system-proxy", "rustls-tls"] }
-serde = { version = "*", features = ["derive"] }
-serde_yaml = "*"
+reqwest = { workspace = true, default-features = false, features = [
+    "json",
+    "stream",
+    "gzip",
+    "charset",
+    "http2",
+    "system-proxy",
+    "rustls",
+] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
 tokio = { workspace = true }
-uuid = { version = "1.17.0", features = ["v4"] }
+uuid = { workspace = true, features = ["v4"] }
 
-phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
-phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
-prpr = { path = "../prpr" }
-serde_json = "1.0.140"
+phira-mp-client = { workspace = true }
+phira-mp-common = { workspace = true }
+prpr = { workspace = true }

phira-main/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "phira"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 
 [lib]
 crate-type = ["lib", "cdylib"]
@@ -15,74 +15,73 @@ aa = []
 event_debug = []
 
 [dependencies]
-anyhow = "1.0"
-arc-swap = "1.7.1"
-base64 = "0.22.1"
-bitflags = "2.9.1"
-bytes = "1.10.1"
+anyhow = { workspace = true }
+arc-swap = "1.8.1"
+async-trait = { workspace = true }
+base64 = { workspace = true }
+bitflags = { workspace = true }
+bytes = "1.11.0"
+bytesize = "2.3.1"
 cacache = { version = "13.1.0", default-features = false, features = [
     "tokio-runtime",
 ] }
-chrono = { version = "0.4.41", features = ["serde"] }
-futures-util = "0.3.31"
-hex = "0.4.3"
-image = { version = "0.25.6", default-features = false, features = [
+chrono = { workspace = true, features = ["serde"] }
+futures-util = { workspace = true }
+hex = { workspace = true }
+image = { workspace = true, default-features = false, features = [
     "bmp",
     "gif",
     "jpeg",
     "png",
     "rayon",
     "webp",
 ] }
-lru = "0.14.0"
-lyon = "*"
-macroquad = { git = "https://github.com/Mivik/prpr-macroquad", default-features = false }
-nalgebra = "*"
-once_cell = "*"
-pollster = "0.4.0"
-prpr = { path = "../prpr", features = ["log"], default-features = false }
-prpr-l10n = { path = "../prpr-l10n" }
-rand = "0.8.5"
-regex = "1.11.1"
-reqwest = { version = "0.12.19", default-features = false, features = [
+logos = "0.16.1"
+lru = { workspace = true }
+lyon = { workspace = true }
+macroquad = { workspace = true, default-features = false }
+nalgebra = { workspace = true }
+once_cell = { workspace = true }
+pollster = { workspace = true }
+prpr = { workspace = true, features = ["log"], default-features = false }
+prpr-l10n = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true, default-features = false, features = [
     "json",
     "stream",
     "gzip",
     "charset",
     "http2",
     "system-proxy",
-    "rustls-tls",
+    "rustls",
+    "query",
 ] }
-serde = { version = "*", features = ["derive"] }
-serde_json = "*"
-serde_yaml = "0.9.34"
-sha2 = "*"
+semver = { version = "1.0.27", features = ["serde"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+sha2 = { workspace = true }
 smallvec = "1.15.1"
 tap = "1.0.1"
-tempfile = "3.20.0"
+tempfile = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
-tracing = "0.1.41"
-walkdir = "2.5.0"
-zip = "4.0.0"
+tracing = { workspace = true }
+uuid = { workspace = true, features = ["v4"] }
+walkdir = { workspace = true }
+zip = { workspace = true }
 zstd = "0.13"
 
-phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
-phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
-uuid = { version = "1.17.0", features = ["v4"] }
-logos = "0.15.0"
-semver = { version = "1.0.26", features = ["serde"] }
-async-trait = "0.1.88"
-bytesize = "2.0.1"
+phira-mp-client = { workspace = true }
+phira-mp-common = { workspace = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-sys = "0.2"
 ndk-context = "0.1"
-sasa = { git = "https://github.com/Mivik/sasa", default-features = false, features = [
-    "oboe",
-] }
+sasa = { workspace = true, default-features = false, features = ["oboe"] }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-sasa = { git = "https://github.com/Mivik/sasa" }
+sasa = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
 objc = "*"
@@ -92,5 +91,5 @@ objc-foundation = "*"
 dotenv-build = "0.1"
 
 [dev-dependencies]
-fluent = "0.17.0"
-fluent-syntax = "0.12.0"
+fluent = { workspace = true }
+fluent-syntax = { workspace = true }

phira-monitor/Cargo.toml

@@ -2,5 +2,5 @@
 chap-c1 = Zukunfts Relikte
 chap-c1-intro =
   Im Jahr 137 n. Chr. ereignete sich im Land Phira's ein wundersames Ereignis.
-Der Himmel öffnete sich, und unzählige Bauwerke und Maschinen stürzten auf die Erde und trugen magische Artefakte aus der Zukunft in sich.
-Dies stürzte den Kontinent in Panik und Chaos...
+  Der Himmel öffnete sich, und unzählige Bauwerke und Maschinen stürzten auf die Erde und trugen magische Artefakte aus der Zukunft in sich.
+  Dies stürzte den Kontinent in Panik und Chaos...

phira/Cargo.toml

@@ -39,6 +39,7 @@ item-music = Music Volume
 item-sfx = SFX Volume
 item-bgm = BGM Volume
 item-cali = Adjust Offset
+item-preferred-sample-rate = Preferred Sample Rate
 
 item-show-acc = Real-Time Accuracy
 item-dc-pause = Double-Tap to Pause