tamipes/mc-ingress
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: tamipes:e403d93dc28a9fc541195996522e024a5270fda5
Branches Tags
tamipes:main
..
compare: tamipes:8a9ae9f7358e82d77523165df4047c2ee1ba9cb9
Branches Tags
tamipes:main

2 commits
e403d93dc2 ... 8a9ae9f735

Author SHA1 Message Date
Tamipes
8a9ae9f735 feat: add Text component format or raw JSON text disconnect messages 2026-02-03 21:04:21 +01:00
Tamipes
6fab222d1e feat: add dependency derivation to flake output, so it can be pinned 
If you write nix build .#deps ,then the result link gets added
as a gc root so it doesn't get garbage collected.
 2026-02-03 21:03:20 +01:00
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -119,6 +119,7 @@
packages = {
default = my-crate;
deps = cargoArtifacts;
} // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
my-crate-llvm-coverage = craneLibLLvmTools.cargoLlvmCov (commonArgs // {
inherit cargoArtifacts;

13
src/main.rs
View file

@ -20,6 +20,8 @@ mod opaque_error;
mod packets;
mod types;
static BYE_MESSAGE: &str = concat!("§dTami§r with §d<3§r §8(rev: ", env!("COMMIT_HASH"), ")§r");
#[tokio::main]
async fn main() {
// ---- Tracing setup ----
@ -160,7 +162,6 @@ async fn handle_status<T: MinecraftServerHandle>(
let commit_hash: &'static str = env!("COMMIT_HASH");
let mut status_struct = StatusStructNew::create();
status_struct.version.protocol = handshake.protocol_version.get_int();
let bye_message = format!(" - §dTami§r with §d<3§r §8(rev: {commit_hash})§r");
let server = match api
.query_server(
@ -175,7 +176,7 @@ async fn handle_status<T: MinecraftServerHandle>(
status_struct.players.max = 0;
status_struct.players.online = 0;
status_struct.description.text = format!(
"Could not find §kserver§r: §f§o{server_addr}§r\nMinecraft Ingress {bye_message}"
"Could not find §kserver§r: §f§o{server_addr}§r\nMinecraft Ingress - {BYE_MESSAGE}"
);
mc_server::complete_status_request(client_stream, status_struct)
@ -219,12 +220,12 @@ async fn handle_status<T: MinecraftServerHandle>(
status_struct.players.max = 1;
status_struct.players.online = 1;
status_struct.description.text =
format!("{motd}\n§2Starting!§r §b§oWait a bit§r§b ^^§r{bye_message}");
format!("{motd}\n§2Starting!§r §b§oWait a bit§r§b ^^§r - {BYE_MESSAGE}");
}
ServerDeploymentStatus::Offline => {
status_struct.players.max = 1;
status_struct.description.text =
format!("{motd}\n§4Offline§r §oJoin to start!§r{bye_message}");
format!("{motd}\n§4Offline§r §oJoin to start!§r - {BYE_MESSAGE}");
}
};
@ -289,13 +290,13 @@ async fn handle_login<T: MinecraftServerHandle>(
}
}
ServerDeploymentStatus::PodOk | ServerDeploymentStatus::Starting => {
mc_server::send_disconnect(client_stream, "Starting...§d<3§r").await?;
mc_server::send_disconnect(client_stream, format!("[\"\",{{\"text\":\"The server is still starting up...\n wait a bit more please ^^\n\n\"}},{{\"text\":\"{BYE_MESSAGE}\"}}]").as_str()).await?;
}
ServerDeploymentStatus::Offline => {
server.start().await?;
api.start_watch(server.clone(), Duration::from_secs(600))
.await?;
mc_server::send_disconnect(client_stream, "Okayy_starting_it...§d<3§r").await?;
mc_server::send_disconnect(client_stream, format!("[\"\",{{\"text\":\"Okayy, §2starting§r the server!\n\n\"}},{{\"text\":\"{BYE_MESSAGE}\"}}]").as_str()).await?;
}
}
Ok(())