From f64750afdd9b18379f706df66c32806b6d21bbe8 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 10 Dec 2021 02:06:33 +0000 Subject: commit files --- minecraft-protocol/src/packets/game/mod.rs | 1 + .../packets/handshake/client_intention_packet.rs | 30 ++++++++++++++++++++++ minecraft-protocol/src/packets/handshake/mod.rs | 1 + minecraft-protocol/src/packets/login/mod.rs | 1 + .../status/clientbound_status_response_packet.rs | 28 ++++++++++++++++++++ minecraft-protocol/src/packets/status/mod.rs | 2 ++ .../status/serverbound_status_request_packet.rs | 18 +++++++++++++ 7 files changed, 81 insertions(+) create mode 100644 minecraft-protocol/src/packets/game/mod.rs create mode 100644 minecraft-protocol/src/packets/handshake/client_intention_packet.rs create mode 100644 minecraft-protocol/src/packets/handshake/mod.rs create mode 100644 minecraft-protocol/src/packets/login/mod.rs create mode 100644 minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs create mode 100644 minecraft-protocol/src/packets/status/mod.rs create mode 100644 minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs (limited to 'minecraft-protocol/src') diff --git a/minecraft-protocol/src/packets/game/mod.rs b/minecraft-protocol/src/packets/game/mod.rs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/minecraft-protocol/src/packets/game/mod.rs @@ -0,0 +1 @@ + diff --git a/minecraft-protocol/src/packets/handshake/client_intention_packet.rs b/minecraft-protocol/src/packets/handshake/client_intention_packet.rs new file mode 100644 index 00000000..7dd358eb --- /dev/null +++ b/minecraft-protocol/src/packets/handshake/client_intention_packet.rs @@ -0,0 +1,30 @@ +use std::hash::Hash; + +use crate::{ + mc_buf, + packets::{ConnectionProtocol, Packet, PacketTrait}, +}; + +#[derive(Hash)] +pub struct ClientIntentionPacket<'a> { + pub protocol_version: u32, + pub hostname: &'a String, + pub port: u16, + /// 1 for status, 2 for login + pub intention: ConnectionProtocol, +} + +impl<'a> PacketTrait for ClientIntentionPacket<'a> { + fn get(&self) -> Packet { + Packet::ClientIntentionPacket(self) + } + + fn write(&self, buf: &mut Vec) { + mc_buf::write_varint(buf, self.protocol_version as i32); + mc_buf::write_utf(buf, &self.hostname); + mc_buf::write_short(buf, self.port); + mc_buf::write_varint(buf, self.intention.clone() as i32); + } + + fn parse(&self, buf: T) -> () {} +} diff --git a/minecraft-protocol/src/packets/handshake/mod.rs b/minecraft-protocol/src/packets/handshake/mod.rs new file mode 100644 index 00000000..667b00f2 --- /dev/null +++ b/minecraft-protocol/src/packets/handshake/mod.rs @@ -0,0 +1 @@ +pub mod client_intention_packet; diff --git a/minecraft-protocol/src/packets/login/mod.rs b/minecraft-protocol/src/packets/login/mod.rs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/minecraft-protocol/src/packets/login/mod.rs @@ -0,0 +1 @@ + diff --git a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs new file mode 100644 index 00000000..ada86667 --- /dev/null +++ b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs @@ -0,0 +1,28 @@ +use async_trait::async_trait; +use std::hash::Hash; + +use crate::{ + mc_buf, + packets::{Packet, PacketTrait}, +}; + +#[derive(Hash)] +pub struct ClientboundStatusRequestPacket { + status: String, +} + +impl PacketTrait for ClientboundStatusRequestPacket { + fn get(&self) -> Packet { + Packet::ClientboundStatusRequestPacket(self) + } + + fn write(&self, _buf: &mut Vec) {} + + fn parse( + buf: &mut T, + ) -> Result, String> { + let status = mc_buf::read_utf(&mut buf).await?; + // this.status = GsonHelper.fromJson(GSON, friendlyByteBuf.readUtf(32767), ServerStatus.class); + Ok(ClientboundStatusRequestPacket { status }.get()) + } +} diff --git a/minecraft-protocol/src/packets/status/mod.rs b/minecraft-protocol/src/packets/status/mod.rs new file mode 100644 index 00000000..efc03631 --- /dev/null +++ b/minecraft-protocol/src/packets/status/mod.rs @@ -0,0 +1,2 @@ +pub mod clientbound_status_response_packet; +pub mod serverbound_status_request_packet; diff --git a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs new file mode 100644 index 00000000..f2e6fe9a --- /dev/null +++ b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs @@ -0,0 +1,18 @@ +use std::hash::Hash; + +use crate::{ + mc_buf, + packets::{Packet, PacketTrait}, +}; + +#[derive(Hash)] +pub struct ServerboundStatusRequestPacket {} + +// implement "Packet" for "ClientIntentionPacket" +impl PacketTrait for ServerboundStatusRequestPacket { + fn get(&self) -> Packet { + Packet::ServerboundStatusRequestPacket(self) + } + fn write(&self, _buf: &mut Vec) {} + fn parse(&self, buf: T) -> () {} +} -- cgit v1.2.3