tom/dockermcmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add command works ,fix warnings, proxy repaired, docker start arguments defined

Browse Source
This commit is contained in:
tomoron
2026-06-05 22:03:22 +02:00
parent e52763c35e
commit 25d7a6ffd1
19 changed files with 819 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/minecraft/client/client.rs
View File

@ -6,13 +6,12 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2026/05/07 17:23:09 by tomoron #+# #+# */
/* Updated: 2026/05/31 23:23:05 by tomoron ### ########.fr */
/* Updated: 2026/06/05 12:36:46 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
use tokio::net::TcpStream;
use crate::minecraft::handshake::Handshake;
use crate::minecraft::varint::varint_write;
use std::fmt;
use crate::models::Servers;
@ -29,7 +28,7 @@ pub struct Client {
pub server: Option<Result<Servers,diesel::result::Error>>,
pub dbPool: DbPool
pub db_pool: DbPool
}
use crate::DbPool;
@ -54,7 +53,7 @@ impl Client {
server: None,
dbPool: pool
db_pool: pool
}
}
@ -66,7 +65,7 @@ impl Client {
}
let conn = &mut self.dbPool.get().unwrap();
let conn = &mut self.db_pool.get().unwrap();
let reg = Regex::new(r"^(?:([a-zA-Z-_]*)\.)?mc\.tmoron\.fr$").unwrap();
let mut found: Option<String> = None;

1
src/minecraft/client/login.rs
View File

@ -3,7 +3,6 @@ use crate::minecraft::client::client::Client;
use json::object;
use crate::minecraft::varint::varint_write;
use std::collections::VecDeque;
use tokio::net::TcpStream;
impl Client {
pub async fn login_intent_handle(&mut self, mut _packet: &mut VecDeque<u8>, _packet_id: i32) -> Result<(),String> {

10
src/minecraft/client/packet.rs
View File

@ -2,11 +2,9 @@ use crate::minecraft::client::client::Client;
use crate::minecraft::varint::{varint_read, varint_write};
use crate::minecraft::handshake::Handshake;
use crate::models;
use crate::status::ServerStatus;
use std::collections::VecDeque;
use diesel::result::Error::NotFound;
use tokio::net::TcpStream;
impl Client {
@ -20,9 +18,11 @@ impl Client {
}
self.handshake = Some(Handshake::from_packet(&mut packet)?);
self.server = Some(self.get_server().await);
// if self.server.as_ref().unwrap().status == ServerStatus::Running {
// return self.proxy_start().await;
// }
if let Some(Ok(server)) = &self.server {
if server.status == ServerStatus::Running {
return self.proxy_start().await;
}
}
if self.handshake.as_ref().unwrap().intent == 2 {
self.login_intent_handle(&mut packet, packet_id).await?;

3
src/minecraft/client/status.rs
View File

@ -1,9 +1,6 @@
use crate::minecraft::client::client::Client;
use diesel::prelude::*;
use diesel::result::Error::NotFound;
use crate::schema;
use crate::models;
use json::object;