Pumpkin-MC/BotMark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port 26.2

Browse Source
This commit is contained in:
Alexander Medvedev 2026-06-25 14:01:53 +02:00
parent a7296b4522
commit 4f493976ea
3 changed files with 502 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

911
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -14,11 +14,11 @@ simple_logger = "5.2.0"
# CLI # CLI
clap = { version = "4.6.1", features = ["derive"] } clap = { version = "4.6.1", features = ["derive"] }
# Networking # Networking
tokio = { version = "1.52.1", features = ["net", "io-util"] } tokio = { version = "1.52.3", features = ["net", "io-util"] }
pumpkin-protocol = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-protocol", default-features = false, features = ["serverbound", "clientbound"]} pumpkin-protocol = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-protocol", default-features = false, features = ["serverbound", "clientbound"]}
pumpkin-util = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-util"} pumpkin-util = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-util"}
pumpkin-data = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-data"} pumpkin-data = { git = "https://github.com/Pumpkin-MC/Pumpkin", package = "pumpkin-data"}
crossbeam = "0.8.4" crossbeam = "0.8.4"
uuid = "1.23.1" uuid = "1.23.4"
rand = { git = "https://github.com/rust-random/rand"} rand = { git = "https://github.com/rust-random/rand"}

10
src/client.rs
View File

@ -22,7 +22,7 @@ use pumpkin_protocol::{
RawPacket, ServerPacket, RawPacket, ServerPacket,
}; };
use pumpkin_util::math::vector3::Vector3; use pumpkin_util::math::vector3::Vector3;
use pumpkin_util::version::MinecraftVersion; use pumpkin_util::version::JavaMinecraftVersion;
use std::io::Write; use std::io::Write;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::atomic::{AtomicI32, AtomicU32, Ordering}; use std::sync::atomic::{AtomicI32, AtomicU32, Ordering};
@ -41,7 +41,7 @@ use uuid::Uuid;
use crate::Args; use crate::Args;
pub const VERSION: MinecraftVersion = MinecraftVersion::V_26_1; pub const VERSION: JavaMinecraftVersion = JavaMinecraftVersion::V_26_2;
/// Everything which makes a Connection with our Server is a `Client`. /// Everything which makes a Connection with our Server is a `Client`.
#[expect(dead_code)] #[expect(dead_code)]
@ -372,7 +372,7 @@ impl Client {
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.expect("Time went backwards"); .expect("Time went backwards");
self.send_packet(&SChatMessage { self.send_packet(&SChatMessage {
message, message: message.into_boxed_str(),
timestamp: since_the_epoch.as_millis() as i64, timestamp: since_the_epoch.as_millis() as i64,
salt: rand::random(), salt: rand::random(),
signature: None, signature: None,
@ -421,14 +421,14 @@ impl Client {
pub async fn join_server(&self, address: SocketAddr, name: String) { pub async fn join_server(&self, address: SocketAddr, name: String) {
self.send_packet(&SHandShake { self.send_packet(&SHandShake {
protocol_version: VarInt(VERSION.protocol_version()), protocol_version: VarInt(VERSION.protocol_version()),
server_address: address.ip().to_string(), server_address: address.ip().to_string().into_boxed_str(),
server_port: address.port(), server_port: address.port(),
next_state: pumpkin_protocol::ConnectionState::Login, next_state: pumpkin_protocol::ConnectionState::Login,
}) })
.await; .await;
self.connection_state.store(ConnectionState::Login); self.connection_state.store(ConnectionState::Login);
self.send_packet(&SLoginStart { self.send_packet(&SLoginStart {
name, name: name.into_boxed_str(),
uuid: Uuid::new_v4(), uuid: Uuid::new_v4(),
}) })
.await; .await;