Skip to content

Forge 1.8.9-1.12.2 handshake protocol support #144

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 8 commits into from
May 12, 2019
Merged

Forge 1.8.9-1.12.2 handshake protocol support #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac0b284
Parse FmlHs::RegistryData packet for 1.8+
iceiix May 11, 2019
55d0568
Handle RegistryData, send ack only once no longer has more
iceiix May 11, 2019
cca3406
Fix RegistryData acknowledgement phase WaitingServerComplete
iceiix May 11, 2019
2f1e0f3
Fix acknowledgement phase for 1.7.10 ModIdData too, somehow it worked…
iceiix May 11, 2019
268b425
Append \0FML\0 to end of server hostname if Forge mods detected
iceiix May 12, 2019
ef9ab70
Add new Forge 1.13 server list ping JSON mod parsing
iceiix May 12, 2019
7e9c00e
Revert "Add new Forge 1.13 server list ping JSON mod parsing"
iceiix May 12, 2019
f1f1ed9
Whitespace
iceiix May 12, 2019
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
24 changes: 17 additions & 7 deletions src/protocol/forge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,13 @@ pub enum FmlHs {
ModList {
mods: LenPrefixed<VarInt, ForgeMod>,
},
/* TODO: 1.8+ https://wiki.vg/Minecraft_Forge_Handshake#Differences_from_Forge_1.7.10
RegistryData {
has_more: bool,
name: String,
ids: LenPrefixed<VarInt, ModIdMapping>,
substitutions: LenPrefixed<VarInt, String>,
dummies: LenPrefixed<VarInt, String>,
},
*/
ModIdData {
mappings: LenPrefixed<VarInt, ModIdMapping>,
block_substitutions: LenPrefixed<VarInt, String>,
Expand Down Expand Up @@ -145,11 +143,23 @@ impl Serializable for FmlHs {
})
},
3 => {
Ok(FmlHs::ModIdData {
mappings: Serializable::read_from(buf)?,
block_substitutions: Serializable::read_from(buf)?,
item_substitutions: Serializable::read_from(buf)?,
})
let protocol_version = unsafe { crate::protocol::CURRENT_PROTOCOL_VERSION };

if protocol_version >= 47 {
Ok(FmlHs::RegistryData {
has_more: Serializable::read_from(buf)?,
name: Serializable::read_from(buf)?,
ids: Serializable::read_from(buf)?,
substitutions: Serializable::read_from(buf)?,
dummies: Serializable::read_from(buf)?,
})
} else {
Ok(FmlHs::ModIdData {
mappings: Serializable::read_from(buf)?,
block_substitutions: Serializable::read_from(buf)?,
item_substitutions: Serializable::read_from(buf)?,
})
}
},
255 => {
Ok(FmlHs::HandshakeAck {
Expand Down
14 changes: 12 additions & 2 deletions src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ impl Server {
pub fn connect(resources: Arc<RwLock<resources::Manager>>, profile: mojang::Profile, address: &str, protocol_version: i32, forge_mods: Vec<forge::ForgeMod>) -> Result<Server, protocol::Error> {
let mut conn = protocol::Conn::new(address, protocol_version)?;

let host = conn.host.clone();
let tag = if forge_mods.len() != 0 { "\0FML\0" } else { "" };
let host = conn.host.clone() + tag;
let port = conn.port;
conn.write_packet(protocol::packet::handshake::serverbound::Handshake {
protocol_version: protocol::VarInt(protocol_version),
Expand Down Expand Up @@ -711,7 +712,16 @@ impl Server {
self.write_fmlhs_plugin_message(&HandshakeAck { phase: WaitingServerData });
},
ModIdData { mappings: _, block_substitutions: _, item_substitutions: _ } => {
self.write_fmlhs_plugin_message(&HandshakeAck { phase: WaitingServerData });
println!("Received FML|HS ModIdData");
self.write_fmlhs_plugin_message(&HandshakeAck { phase: WaitingServerComplete });
// TODO: dynamically register mod blocks
},
RegistryData { has_more, name, ids: _, substitutions: _, dummies: _ } => {
println!("Received FML|HS RegistryData for {}", name);
if !has_more {
self.write_fmlhs_plugin_message(&HandshakeAck { phase: WaitingServerComplete });
}
// TODO: dynamically register mod blocks
},
HandshakeAck { phase } => {
match phase {
Expand Down