Skip to content

Forge 1.13.2 protocol handshake support #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 21, 2020
Merged

Forge 1.13.2 protocol handshake support #145

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c5ff54
Add new Forge 1.13 server list ping JSON mod parsing
iceiix May 12, 2019
0f72acb
Add sent bytes logging
iceiix May 12, 2019
01eef9f
Fix network debug compiling on master due to #267
iceiix Jan 11, 2020
b023fce
Merge branch 'master' into forge113
iceiix Jun 21, 2020
3209a8f
Remove network debug changes
iceiix Jun 21, 2020
b139d49
Add todo
iceiix Jun 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions protocol/src/protocol/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,23 @@ impl Conn {
}
}
}
// Forge 1.13+ TODO: update for 1.14+ and test
if let Some(forge_data) = val.get("forgeData") {
if let Some(mods) = forge_data.get("mods") {
if let Value::Array(items) = mods {
for item in items {
if let Value::Object(obj) = item {
let modid = obj.get("modId").unwrap().as_str().unwrap().to_string();
let modmarker = obj.get("modmarker").unwrap().as_str().unwrap().to_string();

let version = modmarker;

forge_mods.push(crate::protocol::forge::ForgeMod { modid, version });
}
}
}
}
}

Ok((Status {
version: StatusVersion {
Expand Down