From 631ed63dbdc7167df4de02a55b5c2ef1cea909e9 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Sun, 27 Nov 2022 16:25:07 -0600 Subject: Swarm (#36) * make azalea-pathfinder dir * start writing d* lite impl * more work on d* lite * work more on implementing d* lite * full d* lite impl * updated edges * add next() function * add NoPathError * why does dstar lite not work * fix d* lite implementation * make the test actually check the coords * replace while loop with if statement * fix clippy complaints * make W only have to be PartialOrd * fix PartialOrd issues * implement mtd* lite * add a test to mtd* lite * remove normal d* lite * make heuristic only take in one arg * add `success` function * Update README.md * evil black magic to make .entity not need dimension * start adding moves * slightly improve the vec3/position situation new macro that implements all the useful functions * moves stuff * make it compile * update deps in az-pathfinder * make it compile again * more pathfinding stuff * add Bot::look_at * replace EntityMut and EntityRef with just Entity * block pos pathfinding stuff * rename movedirection to walkdirection * execute path every tick * advance path * change az-pf version * make azalea_client keep plugin state * fix Plugins::get * why does it think there is air * start debugging incorrect air * update some From methods to use rem_euclid * start adding swarm * fix deadlock i still don't understand why it was happening but the solution was to keep the Client::player lock for shorter so it didn't overlap with the Client::dimension lock * make lookat actually work probably * fix going too fast * Update main.rs * make a thing immutable * direction_looking_at * fix rotations * import swarm in an example * fix stuff from merge * remove azalea_pathfinder import * delete azalea-pathfinder crate already in azalea::pathfinder module * swarms * start working on shared dimensions * Shared worlds work * start adding Swarm::add_account * add_account works * change "client" to "bot" in some places * Fix issues from merge * Update world.rs * add SwarmEvent::Disconnect(Account) * almost add SwarmEvent::Chat and new plugin system it panics rn * make plugins have to provide the State associated type * improve comments * make fn build slightly cleaner * fix SwarmEvent::Chat * change a println in bot/main.rs * Client::shutdown -> disconnect * polish fix clippy warnings + improve some docs a bit * fix shared worlds* *there's a bug that entities and bots will have their positions exaggerated because the relative movement packet is applied for every entity once per bot * i am being trolled by rust for some reason some stuff is really slow for literally no reason and it makes no sense i am going insane * make world an RwLock again * remove debug messages * fix skipping event ticks unfortunately now sending events is `.send().await?` instead of just `.send()` * fix deadlock + warnings * turns out my floor_mod impl was wrong and i32::rem_euclid has the correct behavior LOL * still errors with lots of bots * make swarm iter & fix new chunks not loading * improve docs * start fixing tests * fix all the tests except the examples i don't know how to exclude them from the tests * improve docs some more --- azalea-chat/src/base_component.rs | 2 +- azalea-chat/src/component.rs | 5 +++-- azalea-chat/src/style.rs | 2 +- azalea-chat/src/text_component.rs | 2 +- azalea-chat/src/translatable_component.rs | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'azalea-chat/src') diff --git a/azalea-chat/src/base_component.rs b/azalea-chat/src/base_component.rs index c2f3513d..e532de11 100755 --- a/azalea-chat/src/base_component.rs +++ b/azalea-chat/src/base_component.rs @@ -1,6 +1,6 @@ use crate::{style::Style, Component}; -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq)] pub struct BaseComponent { // implements mutablecomponent pub siblings: Vec, diff --git a/azalea-chat/src/component.rs b/azalea-chat/src/component.rs index 882a521a..9362a66b 100755 --- a/azalea-chat/src/component.rs +++ b/azalea-chat/src/component.rs @@ -13,7 +13,7 @@ use std::{ }; /// A chat component, basically anything you can see in chat. -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq)] pub enum Component { Text(TextComponent), Translatable(TranslatableComponent), @@ -63,13 +63,14 @@ impl Component { /// /// ```rust /// use azalea_chat::Component; + /// use serde::de::Deserialize; /// /// let component = Component::deserialize(&serde_json::json!({ /// "text": "Hello, world!", /// "color": "red", /// })).unwrap(); /// - /// println!("{}", component.to_ansi()); + /// println!("{}", component.to_ansi(None)); /// ``` pub fn to_ansi(&self, default_style: Option<&Style>) -> String { // default the default_style to white if it's not set diff --git a/azalea-chat/src/style.rs b/azalea-chat/src/style.rs index 1243d56f..cdf8f86f 100755 --- a/azalea-chat/src/style.rs +++ b/azalea-chat/src/style.rs @@ -274,7 +274,7 @@ impl TryFrom for TextColor { } } -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug, Default, PartialEq)] pub struct Style { // these are options instead of just bools because None is different than false in this case pub color: Option, diff --git a/azalea-chat/src/text_component.rs b/azalea-chat/src/text_component.rs index eea66bb7..0d88ca05 100755 --- a/azalea-chat/src/text_component.rs +++ b/azalea-chat/src/text_component.rs @@ -3,7 +3,7 @@ use std::fmt::Display; use crate::{base_component::BaseComponent, style::ChatFormatting, Component}; /// A component that contains text that's the same in all locales. -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug, Default, PartialEq)] pub struct TextComponent { pub base: BaseComponent, pub text: String, diff --git a/azalea-chat/src/translatable_component.rs b/azalea-chat/src/translatable_component.rs index d187adda..28725c44 100755 --- a/azalea-chat/src/translatable_component.rs +++ b/azalea-chat/src/translatable_component.rs @@ -4,14 +4,14 @@ use crate::{ base_component::BaseComponent, style::Style, text_component::TextComponent, Component, }; -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq)] pub enum StringOrComponent { String(String), Component(Component), } /// A message whose content depends on the client's language. -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq)] pub struct TranslatableComponent { pub base: BaseComponent, pub key: String, -- cgit v1.2.3