mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
Merge branch 'main' of https://github.com/mat-1/azalea into main
This commit is contained in:
commit
7bfca9d228
5 changed files with 25 additions and 4 deletions
4
.github/workflows/check.yml
vendored
4
.github/workflows/check.yml
vendored
|
@ -1,4 +1,6 @@
|
||||||
on: push
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
name: Clippy check
|
name: Clippy check
|
||||||
jobs:
|
jobs:
|
||||||
clippy_check:
|
clippy_check:
|
||||||
|
|
|
@ -149,6 +149,7 @@ impl Client {
|
||||||
entity: self.entity,
|
entity: self.entity,
|
||||||
content: content.to_string(),
|
content: content.to_string(),
|
||||||
});
|
});
|
||||||
|
self.run_schedule_sender.send(()).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -228,9 +229,15 @@ fn handle_send_chat_kind_event(
|
||||||
mut send_packet_events: EventWriter<SendPacketEvent>,
|
mut send_packet_events: EventWriter<SendPacketEvent>,
|
||||||
) {
|
) {
|
||||||
for event in events.iter() {
|
for event in events.iter() {
|
||||||
|
let content = event
|
||||||
|
.content
|
||||||
|
.chars()
|
||||||
|
.filter(|c| !matches!(c, '\x00'..='\x1F' | '\x7F' | '§'))
|
||||||
|
.take(256)
|
||||||
|
.collect::<String>();
|
||||||
let packet = match event.kind {
|
let packet = match event.kind {
|
||||||
ChatPacketKind::Message => ServerboundChatPacket {
|
ChatPacketKind::Message => ServerboundChatPacket {
|
||||||
message: event.content.clone(),
|
message: content,
|
||||||
timestamp: SystemTime::now()
|
timestamp: SystemTime::now()
|
||||||
.duration_since(UNIX_EPOCH)
|
.duration_since(UNIX_EPOCH)
|
||||||
.expect("Time shouldn't be before epoch")
|
.expect("Time shouldn't be before epoch")
|
||||||
|
@ -245,7 +252,7 @@ fn handle_send_chat_kind_event(
|
||||||
ChatPacketKind::Command => {
|
ChatPacketKind::Command => {
|
||||||
// TODO: chat signing
|
// TODO: chat signing
|
||||||
ServerboundChatCommandPacket {
|
ServerboundChatCommandPacket {
|
||||||
command: event.content.clone(),
|
command: content,
|
||||||
timestamp: SystemTime::now()
|
timestamp: SystemTime::now()
|
||||||
.duration_since(UNIX_EPOCH)
|
.duration_since(UNIX_EPOCH)
|
||||||
.expect("Time shouldn't be before epoch")
|
.expect("Time shouldn't be before epoch")
|
||||||
|
|
|
@ -23,7 +23,7 @@ pub fn minecraft_dir() -> Option<PathBuf> {
|
||||||
pub fn home_env_var() -> &'static str {
|
pub fn home_env_var() -> &'static str {
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
{
|
{
|
||||||
"USERPROFILE"
|
"APPDATA"
|
||||||
}
|
}
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
{
|
{
|
||||||
|
|
|
@ -106,6 +106,12 @@ where
|
||||||
self.handler = Some(handler);
|
self.handler = Some(handler);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Set the client state instead of initializing defaults.
|
||||||
|
#[must_use]
|
||||||
|
pub fn set_state(mut self, state: S) -> Self {
|
||||||
|
self.state = state;
|
||||||
|
self
|
||||||
|
}
|
||||||
/// Add a plugin to the client.
|
/// Add a plugin to the client.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn add_plugin<T: Plugin>(mut self, plugin: T) -> Self {
|
pub fn add_plugin<T: Plugin>(mut self, plugin: T) -> Self {
|
||||||
|
|
|
@ -199,6 +199,12 @@ where
|
||||||
self.swarm_handler = Some(handler);
|
self.swarm_handler = Some(handler);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Set the swarm state instead of initializing defaults.
|
||||||
|
#[must_use]
|
||||||
|
pub fn set_swarm_state(mut self, swarm_state: SS) -> Self {
|
||||||
|
self.swarm_state = swarm_state;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
/// Add a plugin to the swarm.
|
/// Add a plugin to the swarm.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
|
|
Loading…
Add table
Reference in a new issue