diff --git a/Cargo.lock b/Cargo.lock index c2821cb..3a0e241 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2443,25 +2443,6 @@ dependencies = [ "zip", ] -[[package]] -name = "oj_factory_web" -version = "1.1.0" -dependencies = [ - "actix-files", - "actix-web", - "base64", - "clap", - "env_logger", - "git-version", - "handlebars", - "libfj", - "log", - "oj_rc_core", - "oj_rc_factory", - "serde", - "serde_json", -] - [[package]] name = "oj_polariton_auth" version = "1.1.0" @@ -2589,6 +2570,25 @@ dependencies = [ "tokio", ] +[[package]] +name = "oj_rc_factory_web" +version = "1.1.0" +dependencies = [ + "actix-files", + "actix-web", + "base64", + "clap", + "env_logger", + "git-version", + "handlebars", + "libfj", + "log", + "oj_rc_core", + "oj_rc_factory", + "serde", + "serde_json", +] + [[package]] name = "oj_rc_lobby" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index a20a789..c291cf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,9 @@ members = [ "rc_chat", "rc_chat_room", "rc_singleplayer", "rc_singleplayer_room", "rc_lobby", "rc_lobby_room", - "rc_core", "rc_database", "rc_factory", - "rc_factory_web" ,"rc_multiplayer", + "rc_core", "rc_database", + "rc_factory", "rc_factory_web", + "rc_multiplayer", "rc_plugins", ] diff --git a/rc_core/src/persist/vehicle_factory.rs b/rc_core/src/persist/vehicle_factory.rs index 5bf5b3a..e85f449 100644 --- a/rc_core/src/persist/vehicle_factory.rs +++ b/rc_core/src/persist/vehicle_factory.rs @@ -15,7 +15,7 @@ impl super::config::SelfValidator for FactoryConfig { } fn default_variant() -> AdapterSettings { - AdapterSettings::None + AdapterSettings::BuiltIn } #[derive(Serialize, Deserialize, Clone, Debug)] diff --git a/rc_factory_web/Cargo.toml b/rc_factory_web/Cargo.toml index 4db98c0..dd55313 100644 --- a/rc_factory_web/Cargo.toml +++ b/rc_factory_web/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "oj_factory_web" +name = "oj_rc_factory_web" version.workspace = true edition.workspace = true repository.workspace = true diff --git a/utils/package_release.py b/utils/package_release.py index 20ef75c..578bc8f 100755 --- a/utils/package_release.py +++ b/utils/package_release.py @@ -38,7 +38,7 @@ BINARIES_TO_INCLUDE = { "oj_rc_social": lambda name: generate_ip_redirect_script(name, 4535), "oj_rc_social_room": generate_ip_script, "oj_rc_lobby": lambda name: generate_ip_redirect_script(name, 4541), "oj_rc_lobby_room": lambda name: generate_ip_redirect_script(name, 4542), "oj_rc_multiplayer": generate_ip_script, - "oj_factory_web": generate_ip_script, + "oj_rc_factory_web": generate_ip_script, } PROJECT_FOLDERS_TO_INCLUDE = [