prepared
This commit is contained in:
Generated
+50
@@ -309,6 +309,7 @@ dependencies = [
|
|||||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"packet_sniffer 0.1.0",
|
"packet_sniffer 0.1.0",
|
||||||
"photon_decode 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"photon_decode 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
"timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@@ -546,6 +547,14 @@ dependencies = [
|
|||||||
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro2"
|
||||||
|
version = "1.0.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "python3-sys"
|
name = "python3-sys"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -563,6 +572,14 @@ dependencies = [
|
|||||||
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
|
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quote"
|
||||||
|
version = "1.0.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.5.6"
|
version = "0.5.6"
|
||||||
@@ -721,6 +738,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.98"
|
version = "1.0.98"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde_derive"
|
||||||
|
version = "1.0.104"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
@@ -762,6 +792,16 @@ dependencies = [
|
|||||||
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
version = "1.0.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "synstructure"
|
name = "synstructure"
|
||||||
version = "0.10.2"
|
version = "0.10.2"
|
||||||
@@ -878,6 +918,11 @@ name = "unicode-xid"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-xid"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "utf8-ranges"
|
name = "utf8-ranges"
|
||||||
version = "1.0.4"
|
version = "1.0.4"
|
||||||
@@ -985,8 +1030,10 @@ dependencies = [
|
|||||||
"checksum pnet_sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "682b2eca84cc440bce8336813f78eb6d3cb0fed89fe0e87ae22acfca8363f176"
|
"checksum pnet_sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "682b2eca84cc440bce8336813f78eb6d3cb0fed89fe0e87ae22acfca8363f176"
|
||||||
"checksum pnet_transport 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5faa55dcf725487a699adcff88dfea8f17ea34fa2640528866d9acbb4e3a104f"
|
"checksum pnet_transport 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5faa55dcf725487a699adcff88dfea8f17ea34fa2640528866d9acbb4e3a104f"
|
||||||
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
|
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
|
||||||
|
"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
|
||||||
"checksum python3-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f3a8ebed3f1201fda179f3960609dbbc10cd8c75e9f2afcb03788278f367d8ea"
|
"checksum python3-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f3a8ebed3f1201fda179f3960609dbbc10cd8c75e9f2afcb03788278f367d8ea"
|
||||||
"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
|
"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
|
||||||
|
"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
|
||||||
"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
|
"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
|
||||||
"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
||||||
"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
||||||
@@ -1008,11 +1055,13 @@ dependencies = [
|
|||||||
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
||||||
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
||||||
"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113"
|
"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113"
|
||||||
|
"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
|
||||||
"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
|
"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
|
||||||
"checksum simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9c948a5a26cd38340ddbeaa557a8c8a5ce4442408eb60453bee2bb3c84a3fb"
|
"checksum simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9c948a5a26cd38340ddbeaa557a8c8a5ce4442408eb60453bee2bb3c84a3fb"
|
||||||
"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
|
"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
|
||||||
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
|
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
|
||||||
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
|
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
|
||||||
|
"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
|
||||||
"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
|
"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
|
||||||
"checksum syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317"
|
"checksum syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317"
|
||||||
"checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
|
"checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
|
||||||
@@ -1026,6 +1075,7 @@ dependencies = [
|
|||||||
"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
|
"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
|
||||||
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
|
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
|
||||||
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
||||||
|
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
|
||||||
"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
|
"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
|
||||||
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
||||||
"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
|
"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
|
||||||
|
|||||||
@@ -22,7 +22,10 @@ timer = "0.1"
|
|||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
lazy_static = "1.2"
|
lazy_static = "1.2"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
fake_clock = "0.3.0"
|
fake_clock = "0.3.0"
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
macro_rules! decode_number {
|
||||||
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
match p {
|
||||||
|
Value::Short(v) => Some(*v as usize),
|
||||||
|
Value::Integer(v) => Some(*v as usize),
|
||||||
|
Value::Byte(v) => Some(*v as usize),
|
||||||
|
_ => {
|
||||||
|
error!("Failed to decode {}", $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
error!("Index {} not found in {}", $index, $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! decode_string {
|
||||||
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
match p {
|
||||||
|
Value::String(v) => Some(v.clone()),
|
||||||
|
_ => {
|
||||||
|
error!("Failed to decode {}", $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! decode_string_vec {
|
||||||
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
match p {
|
||||||
|
Value::Array(arr) => {
|
||||||
|
let mut ret = vec![];
|
||||||
|
for v in arr {
|
||||||
|
if let Value::String(s) = v {
|
||||||
|
ret.push(s.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(ret)
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
error!("Failed to decode {}", $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! decode_number_vec {
|
||||||
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
match p {
|
||||||
|
Value::Array(arr) => {
|
||||||
|
let mut ret = vec![];
|
||||||
|
for v in arr {
|
||||||
|
match v {
|
||||||
|
Value::Short(v) => {
|
||||||
|
ret.push(*v as u32);
|
||||||
|
},
|
||||||
|
Value::Byte(v) => {
|
||||||
|
ret.push(*v as u32);
|
||||||
|
},
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(ret)
|
||||||
|
},
|
||||||
|
Value::ByteArray(v) => {
|
||||||
|
Some(v.iter().map(|b| *b as u32).collect::<Vec<u32>>())
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
error!("Failed to decode {}", $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! decode_float {
|
||||||
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
match p {
|
||||||
|
Value::Float(v) => Some(*v as f32),
|
||||||
|
_ => {
|
||||||
|
error!("Failed to decode {}", $name);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -3,8 +3,48 @@ use std::fs::File;
|
|||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
|
use serde::{Deserialize};
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
enum ParamType
|
||||||
|
{
|
||||||
|
Number
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct Param
|
||||||
|
{
|
||||||
|
name: String,
|
||||||
|
id: u32,
|
||||||
|
param_type: ParamType
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct Message
|
||||||
|
{
|
||||||
|
name: String,
|
||||||
|
code: u32,
|
||||||
|
params: Vec<Param>
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
save_file("itemdb.rs", &generate_itemdb());
|
save_file("itemdb.rs", &generate_itemdb());
|
||||||
|
save_file("messages.rs", &generate_messages());
|
||||||
|
}
|
||||||
|
|
||||||
|
fn generate_messages() -> String {
|
||||||
|
let mut out = String::new();
|
||||||
|
|
||||||
|
out.push_str(r"
|
||||||
|
use log::*;
|
||||||
|
|
||||||
|
use photon_decode::Parameters;
|
||||||
|
use photon_decode::Value;
|
||||||
|
");
|
||||||
|
|
||||||
|
out.push_str(include_str!("assets/decode_macros.rs"));
|
||||||
|
|
||||||
|
out
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_itemdb() -> String {
|
fn generate_itemdb() -> String {
|
||||||
|
|||||||
@@ -165,6 +165,7 @@ where
|
|||||||
fn into_game_message(photon_message: photon_decode::Message) -> Option<game_protocol::Message> {
|
fn into_game_message(photon_message: photon_decode::Message) -> Option<game_protocol::Message> {
|
||||||
static REQUEST_CONSTANT: usize = 10000;
|
static REQUEST_CONSTANT: usize = 10000;
|
||||||
static RESPONSE_CONSTANT: usize = 1000;
|
static RESPONSE_CONSTANT: usize = 1000;
|
||||||
|
error!("Photon message: {:?}", photon_message);
|
||||||
match photon_message {
|
match photon_message {
|
||||||
photon_decode::Message::Event(e) => {
|
photon_decode::Message::Event(e) => {
|
||||||
if e.code != 2 && e.parameters.get(&252u8).is_some() {
|
if e.code != 2 && e.parameters.get(&252u8).is_some() {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use super::packet::Packet;
|
|||||||
use photon_decode::Parameters;
|
use photon_decode::Parameters;
|
||||||
use photon_decode::Value;
|
use photon_decode::Value;
|
||||||
|
|
||||||
macro_rules! deserialize_number {
|
macro_rules! decode_number {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
match p {
|
match p {
|
||||||
@@ -13,7 +13,7 @@ macro_rules! deserialize_number {
|
|||||||
Value::Integer(v) => Some(*v as usize),
|
Value::Integer(v) => Some(*v as usize),
|
||||||
Value::Byte(v) => Some(*v as usize),
|
Value::Byte(v) => Some(*v as usize),
|
||||||
_ => {
|
_ => {
|
||||||
error!("Failed to deserialize {}", $name);
|
error!("Failed to decode {}", $name);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,13 +24,13 @@ macro_rules! deserialize_number {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! deserialize_string {
|
macro_rules! decode_string {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
match p {
|
match p {
|
||||||
Value::String(v) => Some(v.clone()),
|
Value::String(v) => Some(v.clone()),
|
||||||
_ => {
|
_ => {
|
||||||
error!("Failed to deserialize {}", $name);
|
error!("Failed to decode {}", $name);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@ macro_rules! deserialize_string {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! deserialize_string_vec {
|
macro_rules! decode_string_vec {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
match p {
|
match p {
|
||||||
@@ -55,7 +55,7 @@ macro_rules! deserialize_string_vec {
|
|||||||
Some(ret)
|
Some(ret)
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
error!("Failed to deserialize {}", $name);
|
error!("Failed to decode {}", $name);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ macro_rules! deserialize_string_vec {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! deserialize_number_vec {
|
macro_rules! decode_number_vec {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
match p {
|
match p {
|
||||||
@@ -89,7 +89,7 @@ macro_rules! deserialize_number_vec {
|
|||||||
Some(v.iter().map(|b| *b as u32).collect::<Vec<u32>>())
|
Some(v.iter().map(|b| *b as u32).collect::<Vec<u32>>())
|
||||||
},
|
},
|
||||||
_ => {
|
_ => {
|
||||||
error!("Failed to deserialize {}", $name);
|
error!("Failed to decode {}", $name);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -99,13 +99,13 @@ macro_rules! deserialize_number_vec {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! deserialize_float {
|
macro_rules! decode_float {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
match p {
|
match p {
|
||||||
Value::Float(v) => Some(*v as f32),
|
Value::Float(v) => Some(*v as f32),
|
||||||
_ => {
|
_ => {
|
||||||
error!("Failed to deserialize {}", $name);
|
error!("Failed to decode {}", $name);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,10 +123,10 @@ pub struct ChatSay {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ChatSay {
|
impl ChatSay {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
let source = deserialize_number!(val, 0, "ChatSay::source")?;
|
let source = decode_number!(val, 0, "ChatSay::source")?;
|
||||||
let source_name = deserialize_string!(val, 1, "ChatSay::source_name")?;
|
let source_name = decode_string!(val, 1, "ChatSay::source_name")?;
|
||||||
let text = deserialize_string!(val, 2, "ChatSay::text")?;
|
let text = decode_string!(val, 2, "ChatSay::text")?;
|
||||||
Some(Message::ChatSay(Self {
|
Some(Message::ChatSay(Self {
|
||||||
source,
|
source,
|
||||||
source_name,
|
source_name,
|
||||||
@@ -147,18 +147,18 @@ pub struct NewCharacter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl NewCharacter {
|
impl NewCharacter {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("NewCharacter parameters: {:?}", val);
|
info!("NewCharacter parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "NewCharacter::source")?;
|
let source = decode_number!(val, 0, "NewCharacter::source")?;
|
||||||
|
|
||||||
let character_name = deserialize_string!(val, 1, "NewCharacter::character_name")?;
|
let character_name = decode_string!(val, 1, "NewCharacter::character_name")?;
|
||||||
|
|
||||||
let health = deserialize_float!(val, 18, "NewCharacter::health")?;
|
let health = decode_float!(val, 18, "NewCharacter::health")?;
|
||||||
let max_health = deserialize_float!(val, 19, "NewCharacter::max_health")?;
|
let max_health = decode_float!(val, 19, "NewCharacter::max_health")?;
|
||||||
|
|
||||||
let energy = deserialize_float!(val, 22, "NewCharacter::energy")?;
|
let energy = decode_float!(val, 22, "NewCharacter::energy")?;
|
||||||
let max_energy = deserialize_float!(val, 23, "NewCharacter::max_energy")?;
|
let max_energy = decode_float!(val, 23, "NewCharacter::max_energy")?;
|
||||||
let item_array = deserialize_number_vec!(val, 33, "NewCharacter::items")?;
|
let item_array = decode_number_vec!(val, 33, "NewCharacter::items")?;
|
||||||
let items = Items::from(&item_array);
|
let items = Items::from(&item_array);
|
||||||
|
|
||||||
Some(Message::NewCharacter(Self {
|
Some(Message::NewCharacter(Self {
|
||||||
@@ -181,11 +181,11 @@ pub struct HealthUpdate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl HealthUpdate {
|
impl HealthUpdate {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("HealthUpdate parameters: {:?}", val);
|
info!("HealthUpdate parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "HealthUpdate::source")?;
|
let source = decode_number!(val, 0, "HealthUpdate::source")?;
|
||||||
let target = deserialize_number!(val, 7, "HealthUpdate::target")?;
|
let target = decode_number!(val, 7, "HealthUpdate::target")?;
|
||||||
let value = deserialize_float!(val, 3, "HealthUpdate::value")?;
|
let value = decode_float!(val, 3, "HealthUpdate::value")?;
|
||||||
|
|
||||||
Some(Message::HealthUpdate(Self {
|
Some(Message::HealthUpdate(Self {
|
||||||
source,
|
source,
|
||||||
@@ -204,13 +204,13 @@ pub struct RegenerationHealthChanged {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl RegenerationHealthChanged {
|
impl RegenerationHealthChanged {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("RegenerationHealthChanged parameters: {:?}", val);
|
info!("RegenerationHealthChanged parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "RegenerationHealthChanged::source")?;
|
let source = decode_number!(val, 0, "RegenerationHealthChanged::source")?;
|
||||||
let health = deserialize_float!(val, 3, "RegenerationHealthChanged::health")?;
|
let health = decode_float!(val, 3, "RegenerationHealthChanged::health")?;
|
||||||
let max_health = deserialize_float!(val, 4, "RegenerationHealthChanged::max_health")?;
|
let max_health = decode_float!(val, 4, "RegenerationHealthChanged::max_health")?;
|
||||||
let regeneration_rate =
|
let regeneration_rate =
|
||||||
deserialize_float!(val, 5, "RegenerationHealthChanged::regeneration_rate");
|
decode_float!(val, 5, "RegenerationHealthChanged::regeneration_rate");
|
||||||
|
|
||||||
Some(Message::RegenerationHealthChanged(Self {
|
Some(Message::RegenerationHealthChanged(Self {
|
||||||
source,
|
source,
|
||||||
@@ -232,21 +232,21 @@ pub struct CharacterStats {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl CharacterStats {
|
impl CharacterStats {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("CharacterStats parameters: {:?}", val);
|
info!("CharacterStats parameters: {:?}", val);
|
||||||
if val.len() < 40 {
|
if val.len() < 40 {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let source = deserialize_number!(val, 0, "CharacterStats::source")?;
|
let source = decode_number!(val, 0, "CharacterStats::source")?;
|
||||||
|
|
||||||
let character_name = deserialize_string!(val, 2, "CharacterStats::character_name")?;
|
let character_name = decode_string!(val, 2, "CharacterStats::character_name")?;
|
||||||
|
|
||||||
let health = deserialize_float!(val, 11, "CharacterStats::health")?;
|
let health = decode_float!(val, 11, "CharacterStats::health")?;
|
||||||
let max_health = deserialize_float!(val, 12, "CharacterStats::max_health")?;
|
let max_health = decode_float!(val, 12, "CharacterStats::max_health")?;
|
||||||
|
|
||||||
let energy = deserialize_float!(val, 15, "CharacterStats::energy")?;
|
let energy = decode_float!(val, 15, "CharacterStats::energy")?;
|
||||||
let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?;
|
let max_energy = decode_float!(val, 16, "CharacterStats::max_energy")?;
|
||||||
|
|
||||||
Some(Message::CharacterStats(Self {
|
Some(Message::CharacterStats(Self {
|
||||||
source,
|
source,
|
||||||
@@ -265,9 +265,9 @@ pub struct Leave {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Leave {
|
impl Leave {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("Leave parameters: {:?}", val);
|
info!("Leave parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "Leave::source")?;
|
let source = decode_number!(val, 0, "Leave::source")?;
|
||||||
|
|
||||||
Some(Message::Leave(Leave { source }))
|
Some(Message::Leave(Leave { source }))
|
||||||
}
|
}
|
||||||
@@ -281,11 +281,11 @@ pub struct Died {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Died {
|
impl Died {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("Died parameters: {:?}", val);
|
info!("Died parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "Died::source")?;
|
let source = decode_number!(val, 0, "Died::source")?;
|
||||||
let target = deserialize_number!(val, 3, "Died::target")?;
|
let target = decode_number!(val, 3, "Died::target")?;
|
||||||
let target_name = deserialize_string!(val, 4, "Died::target_name")?;
|
let target_name = decode_string!(val, 4, "Died::target_name")?;
|
||||||
|
|
||||||
Some(Message::Died(Died {
|
Some(Message::Died(Died {
|
||||||
source,
|
source,
|
||||||
@@ -302,10 +302,10 @@ pub struct PartyNew {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl PartyNew {
|
impl PartyNew {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("PartyNew parameters: {:?}", val);
|
info!("PartyNew parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "PartyNew::source")?;
|
let source = decode_number!(val, 0, "PartyNew::source")?;
|
||||||
let players = deserialize_string_vec!(val, 5, "PartyNew::players")?;
|
let players = decode_string_vec!(val, 5, "PartyNew::players")?;
|
||||||
|
|
||||||
Some(Message::PartyNew(PartyNew { source, players }))
|
Some(Message::PartyNew(PartyNew { source, players }))
|
||||||
}
|
}
|
||||||
@@ -318,10 +318,10 @@ pub struct PartyJoin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl PartyJoin {
|
impl PartyJoin {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("PartyJoin parameters: {:?}", val);
|
info!("PartyJoin parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "PartyJoin::source")?;
|
let source = decode_number!(val, 0, "PartyJoin::source")?;
|
||||||
let target_name = deserialize_string!(val, 2, "PartyJoin::target_name")?;
|
let target_name = decode_string!(val, 2, "PartyJoin::target_name")?;
|
||||||
|
|
||||||
Some(Message::PartyJoin(PartyJoin {
|
Some(Message::PartyJoin(PartyJoin {
|
||||||
source,
|
source,
|
||||||
@@ -336,9 +336,9 @@ pub struct PartyDisbanded {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl PartyDisbanded {
|
impl PartyDisbanded {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("PartyDisbanded parameters: {:?}", val);
|
info!("PartyDisbanded parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "PartyDisbanded::source")?;
|
let source = decode_number!(val, 0, "PartyDisbanded::source")?;
|
||||||
|
|
||||||
Some(Message::PartyDisbanded(PartyDisbanded { source }))
|
Some(Message::PartyDisbanded(PartyDisbanded { source }))
|
||||||
}
|
}
|
||||||
@@ -351,10 +351,10 @@ pub struct FameUpdate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl FameUpdate {
|
impl FameUpdate {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("FameUpdate parameters: {:?}", val);
|
info!("FameUpdate parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "FameUpdate::source")?;
|
let source = decode_number!(val, 0, "FameUpdate::source")?;
|
||||||
let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?;
|
let raw_fame = decode_number!(val, 2, "FameUpdate::fame")?;
|
||||||
let fame = raw_fame as f32 / 10000.0;
|
let fame = raw_fame as f32 / 10000.0;
|
||||||
|
|
||||||
Some(Message::FameUpdate(FameUpdate { source, fame }))
|
Some(Message::FameUpdate(FameUpdate { source, fame }))
|
||||||
@@ -368,10 +368,10 @@ pub struct PlayerItems {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl PlayerItems {
|
impl PlayerItems {
|
||||||
fn encode(val: Parameters) -> Option<Message> {
|
fn parse(val: Parameters) -> Option<Message> {
|
||||||
info!("PlayerItems parameters: {:?}", val);
|
info!("PlayerItems parameters: {:?}", val);
|
||||||
let source = deserialize_number!(val, 0, "PlayerItems::source")?;
|
let source = decode_number!(val, 0, "PlayerItems::source")?;
|
||||||
let item_array = deserialize_number_vec!(val, 3, "PlayerItems::items")?;
|
let item_array = decode_number_vec!(val, 3, "PlayerItems::items")?;
|
||||||
let items = Items::from(&item_array);
|
let items = Items::from(&item_array);
|
||||||
|
|
||||||
Some(Message::PlayerItems(PlayerItems { source, items }))
|
Some(Message::PlayerItems(PlayerItems { source, items }))
|
||||||
@@ -399,18 +399,18 @@ impl Packet {
|
|||||||
debug!("Decode: {:?}", &self);
|
debug!("Decode: {:?}", &self);
|
||||||
|
|
||||||
match self.code {
|
match self.code {
|
||||||
1 => Leave::encode(self.parameters),
|
1 => Leave::parse(self.parameters),
|
||||||
6 => HealthUpdate::encode(self.parameters),
|
6 => HealthUpdate::parse(self.parameters),
|
||||||
24 => NewCharacter::encode(self.parameters),
|
24 => NewCharacter::parse(self.parameters),
|
||||||
63 => ChatSay::encode(self.parameters),
|
63 => ChatSay::parse(self.parameters),
|
||||||
80 => RegenerationHealthChanged::encode(self.parameters),
|
80 => RegenerationHealthChanged::parse(self.parameters),
|
||||||
150 => Died::encode(self.parameters),
|
150 => Died::parse(self.parameters),
|
||||||
209 => PartyNew::encode(self.parameters),
|
209 => PartyNew::parse(self.parameters),
|
||||||
211 => PartyJoin::encode(self.parameters),
|
211 => PartyJoin::parse(self.parameters),
|
||||||
213 => PartyDisbanded::encode(self.parameters),
|
213 => PartyDisbanded::parse(self.parameters),
|
||||||
72 => FameUpdate::encode(self.parameters),
|
72 => FameUpdate::parse(self.parameters),
|
||||||
79 => PlayerItems::encode(self.parameters),
|
79 => PlayerItems::parse(self.parameters),
|
||||||
1001 => CharacterStats::encode(self.parameters),
|
1001 => CharacterStats::parse(self.parameters),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
include!(concat!(env!("OUT_DIR"), "/itemdb.rs"));
|
include!(concat!(env!("OUT_DIR"), "/itemdb.rs"));
|
||||||
|
include!(concat!(env!("OUT_DIR"), "/messages.rs"));
|
||||||
mod packet;
|
mod packet;
|
||||||
pub mod message;
|
pub mod message;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user