diff --git a/Cargo.lock b/Cargo.lock index a3da88a..1fbe3cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,6 +572,14 @@ dependencies = [ "tracing", ] +[[package]] +name = "icarus" +version = "0.0.0" +source = "git+https://github.com/redstrate/Icarus?branch=ver%2F2025.04.16.0000.0000#5d5f1dded6949b790307546c9ddc0604af636451" +dependencies = [ + "physis", +] + [[package]] name = "icu_collections" version = "2.0.0" @@ -720,11 +728,11 @@ dependencies = [ "binrw", "bitflags", "fastrand", + "icarus", "md5", "minijinja", "mlua", "physis", - "physis-sheets", "reqwest", "rkon", "rusqlite", @@ -1025,14 +1033,6 @@ dependencies = [ "libz-rs-sys", ] -[[package]] -name = "physis-sheets" -version = "0.0.0" -source = "git+https://github.com/redstrate/PhysisSheets#4d11e27a1e31bb482184626d1e7a51fc5e673674" -dependencies = [ - "physis", -] - [[package]] name = "pin-project-lite" version = "0.2.16" diff --git a/Cargo.toml b/Cargo.toml index 495c131..5b6bee2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,4 +104,4 @@ rkon = { version = "0.1" } tower-http = { version = "0.6", features = ["fs"] } # excel sheet data -physis-sheets = { git = "https://github.com/redstrate/PhysisSheets", features = ["Warp", "Tribe", "ClassJob", "World", "TerritoryType", "Race"], default-features = false } +icarus = { git = "https://github.com/redstrate/Icarus", branch = "ver/2025.04.16.0000.0000", features = ["Warp", "Tribe", "ClassJob", "World", "TerritoryType", "Race"], default-features = false } diff --git a/src/common/gamedata.rs b/src/common/gamedata.rs index 0e3ada4..d58abd1 100644 --- a/src/common/gamedata.rs +++ b/src/common/gamedata.rs @@ -1,9 +1,9 @@ +use icarus::ClassJob::ClassJobSheet; +use icarus::World::WorldSheet; +use icarus::{Tribe::TribeSheet, Warp::WarpSheet}; use physis::common::{Language, Platform}; use physis::exd::{EXD, ExcelRowKind}; use physis::exh::EXH; -use physis_sheets::ClassJob::ClassJobSheet; -use physis_sheets::World::WorldSheet; -use physis_sheets::{Tribe::TribeSheet, Warp::WarpSheet}; use crate::{common::Attributes, config::get_config}; diff --git a/src/inventory/mod.rs b/src/inventory/mod.rs index cfa15b7..6ab99ca 100644 --- a/src/inventory/mod.rs +++ b/src/inventory/mod.rs @@ -1,5 +1,5 @@ +use icarus::Race::RaceSheet; use physis::common::Language; -use physis_sheets::Race::RaceSheet; use serde::{Deserialize, Serialize}; use crate::common::GameData; diff --git a/src/world/zone.rs b/src/world/zone.rs index d8f4972..25f0267 100644 --- a/src/world/zone.rs +++ b/src/world/zone.rs @@ -1,3 +1,4 @@ +use icarus::TerritoryType::TerritoryTypeSheet; use physis::{ common::Language, gamedata::GameData, @@ -5,7 +6,6 @@ use physis::{ ExitRangeInstanceObject, InstanceObject, LayerEntryData, LayerGroup, PopRangeInstanceObject, }, }; -use physis_sheets::TerritoryType::TerritoryTypeSheet; /// Represents a loaded zone #[derive(Default)]