attempt terraria fix

editions.yaml

@@ -163,7 +163,7 @@ terraria:
   features:
     - prudpv1
     - third-notif-param
-    - v3-8-15
+    - v3-8-13
     - match-making
     - ranking
   settings:

rnex-protocols/auth-protos/Cargo.toml

@@ -20,6 +20,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/base-protos/Cargo.toml

@@ -18,6 +18,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/ds-protos/Cargo.toml

@@ -19,6 +19,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/fpd-protos/Cargo.toml

@@ -18,6 +18,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/mm-protos/Cargo.toml

@@ -16,6 +16,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/mm-protos/src/matchmake.rs

@@ -1,11 +1,12 @@
 use cfg_if::cfg_if;
+#[cfg(all(not(any(feature="v3-8-13"))))]
+use rnex_rmc::string_set::StringSet;
 use rnex_rmc::{
     RmcSerialize,
     any::Any,
     method_id,
     response::ErrorCode,
     rmc_proto,
-    string_set::StringSet,
     util::{PID, station_url::StationUrl},
     variant::Variant,
 };
@@ -77,23 +78,46 @@ cfg_if! {
     }
 }
 
-#[derive(RmcSerialize, Debug, Clone)]
-#[rmc_struct(3)]
-pub struct MatchmakeSessionSearchCriteria {
-    pub attribs: Vec<StringSet<u32>>,
-    pub game_mode: String,
-    pub minimum_participants: String,
-    pub maximum_participants: String,
-    pub matchmake_system_type: String,
-    pub vacant_only: bool,
-    pub exclude_locked: bool,
-    pub exclude_non_host_pid: bool,
-    pub selection_method: u32,
-    pub vacant_participants: u16,
-    pub matchmake_param: MatchmakeParam,
-    pub exclude_user_password_set: bool,
-    pub exclude_system_password_set: bool,
-    pub refer_gid: u32,
+cfg_if! {
+    if #[cfg(feature = "v3-8-13")] {
+        #[derive(RmcSerialize, Debug, Clone)]
+        #[rmc_struct(3)]
+        pub struct MatchmakeSessionSearchCriteria {
+            pub attribs: Vec<String>,
+            pub game_mode: String,
+            pub minimum_participants: String,
+            pub maximum_participants: String,
+            pub matchmake_system_type: String,
+            pub vacant_only: bool,
+            pub exclude_locked: bool,
+            pub exclude_non_host_pid: bool,
+            pub selection_method: u32,
+            pub vacant_participants: u16,
+            pub matchmake_param: MatchmakeParam,
+            pub exclude_user_password_set: bool,
+            pub exclude_system_password_set: bool,
+            pub refer_gid: u32,
+        }
+    } else {
+        #[derive(RmcSerialize, Debug, Clone)]
+        #[rmc_struct(3)]
+        pub struct MatchmakeSessionSearchCriteria {
+            pub attribs: Vec<StringSet<u32>>,
+            pub game_mode: String,
+            pub minimum_participants: String,
+            pub maximum_participants: String,
+            pub matchmake_system_type: String,
+            pub vacant_only: bool,
+            pub exclude_locked: bool,
+            pub exclude_non_host_pid: bool,
+            pub selection_method: u32,
+            pub vacant_participants: u16,
+            pub matchmake_param: MatchmakeParam,
+            pub exclude_user_password_set: bool,
+            pub exclude_system_password_set: bool,
+            pub refer_gid: u32,
+        }
+    }
 }
 
 #[derive(RmcSerialize, Debug, Clone)]

rnex-protocols/msg-protos/Cargo.toml

@@ -17,6 +17,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/reggie-protos/Cargo.toml

@@ -17,6 +17,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-protocols/rk-protos/Cargo.toml

@@ -19,6 +19,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-prudp/Cargo.toml

@@ -24,6 +24,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-rmc/Cargo.toml

@@ -25,6 +25,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-rmc/src/lib.rs

@@ -38,7 +38,7 @@ pub mod config {
 
 pub use paste;
 pub use rnex_util as util;
-use tracing::{error, info, info_span};
+use tracing::{error, info};
 
 use crate::{
     RemoteCallError::ConnectionBroke,

rnex-server-nex-modules/rnex-auth/Cargo.toml

@@ -27,6 +27,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-base/Cargo.toml

@@ -22,6 +22,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-ds/Cargo.toml

@@ -31,6 +31,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-fpd/Cargo.toml

@@ -30,6 +30,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-mm/Cargo.toml

@@ -27,6 +27,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-msg/Cargo.toml

@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-node-holder/Cargo.toml

@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server-nex-modules/rnex-rk/Cargo.toml

@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server/Cargo.toml

@@ -25,6 +25,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server/backend-auth/Cargo.toml

@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server/backend-node-holder/Cargo.toml

@@ -18,6 +18,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server/backend-secure/Cargo.toml

@@ -24,6 +24,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]

rnex-server/src/lib.rs

@@ -4,7 +4,6 @@ use std::net::SocketAddr;
 use std::sync::Weak;
 use std::{
     any::{Any, TypeId, type_name},
-    borrow::Cow,
     collections::HashMap,
     env,
     error::Error,

rnex-util/Cargo.toml

@@ -21,6 +21,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]