diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2022-11-27 16:25:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 16:25:07 -0600 |
| commit | 631ed63dbdc7167df4de02a55b5c2ef1cea909e9 (patch) | |
| tree | 104e567c332f2aeb30ea6acefef8c73f9b2f158b /azalea/examples | |
| parent | 962b9fcaae917c7e5bef718469fba31f6ff7c3cb (diff) | |
| download | azalea-drasl-631ed63dbdc7167df4de02a55b5c2ef1cea909e9.tar.xz | |
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
Diffstat (limited to 'azalea/examples')
| -rw-r--r--[-rwxr-xr-x] | azalea/examples/mine_a_chunk.rs | 29 | ||||
| -rwxr-xr-x | azalea/examples/potatobot/autoeat.rs | 2 | ||||
| -rwxr-xr-x | azalea/examples/potatobot/main.rs | 2 | ||||
| -rwxr-xr-x | azalea/examples/pvp.rs | 4 |
4 files changed, 23 insertions, 14 deletions
diff --git a/azalea/examples/mine_a_chunk.rs b/azalea/examples/mine_a_chunk.rs index 2e30b2c5..f9b208a2 100755..100644 --- a/azalea/examples/mine_a_chunk.rs +++ b/azalea/examples/mine_a_chunk.rs @@ -1,13 +1,16 @@ -use azalea::{Account, Accounts, Client, Event, Swarm}; +use azalea::{prelude::*, SwarmEvent}; +use azalea::{Account, Client, Event, Swarm}; use parking_lot::Mutex; use std::sync::Arc; #[tokio::main] async fn main() { - let accounts = Accounts::new(); + let mut accounts = Vec::new(); + let mut states = Vec::new(); for i in 0..10 { - accounts.add(Account::offline(&format!("bot{}", i))); + accounts.push(Account::offline(&format!("bot{}", i))); + states.push(Arc::new(Mutex::new(State::default()))); } azalea::start_swarm(azalea::SwarmOptions { @@ -15,13 +18,15 @@ async fn main() { address: "localhost", swarm_state: State::default(), - state: State::default(), + states, - swarm_plugins: plugins![azalea_pathfinder::Plugin::default()], + swarm_plugins: plugins![], plugins: plugins![], - handle: Box::new(handle), - swarm_handle: Box::new(swarm_handle), + handle, + swarm_handle, + + join_delay: None, }) .await .unwrap(); @@ -37,9 +42,13 @@ async fn handle(bot: Client, event: Event, state: State) -> anyhow::Result<()> { Ok(()) } -async fn swarm_handle(swarm: Swarm, event: Event, state: SwarmState) -> anyhow::Result<()> { - match event { - Event::Login => { +async fn swarm_handle( + swarm: Swarm<State>, + event: SwarmEvent, + state: SwarmState, +) -> anyhow::Result<()> { + match &event { + SwarmEvent::Login => { swarm.goto(azalea::BlockPos::new(0, 70, 0)).await; // or bots.goto_goal(pathfinder::Goals::Goto(azalea::BlockPos(0, 70, 0))).await; diff --git a/azalea/examples/potatobot/autoeat.rs b/azalea/examples/potatobot/autoeat.rs index 0f0ccc6d..89934fa2 100755 --- a/azalea/examples/potatobot/autoeat.rs +++ b/azalea/examples/potatobot/autoeat.rs @@ -14,7 +14,7 @@ pub struct Plugin { pub struct State {} #[async_trait] -impl azalea::Plugin for Plugin { +impl azalea::PluginState for Plugin { async fn handle(self: Box<Self>, event: Event, bot: Client) { match event { Event::UpdateHunger => { diff --git a/azalea/examples/potatobot/main.rs b/azalea/examples/potatobot/main.rs index e585c41d..8d40c48e 100755 --- a/azalea/examples/potatobot/main.rs +++ b/azalea/examples/potatobot/main.rs @@ -15,7 +15,7 @@ async fn main() { account, address: "localhost", state: State::default(), - plugins: plugins![autoeat::Plugin::default(), pathfinder::Plugin::default(),], + plugins: plugins![autoeat::Plugin, pathfinder::Plugin], handle, }) .await diff --git a/azalea/examples/pvp.rs b/azalea/examples/pvp.rs index 87d83c6d..157ad9e2 100755 --- a/azalea/examples/pvp.rs +++ b/azalea/examples/pvp.rs @@ -15,7 +15,7 @@ async fn main() { swarm_state: State::default(), state: State::default(), - swarm_plugins: plugins![pathfinder::Plugin::default()], + swarm_plugins: plugins![pathfinder::Plugin], plugins: plugins![], handle: Box::new(handle), @@ -32,7 +32,7 @@ struct State {} struct SwarmState {} async fn handle(bot: Client, event: Event, state: State) {} -async fn swarm_handle(swarm: Swarm, event: Event, state: State) { +async fn swarm_handle<S>(swarm: Swarm<S>, event: Event, state: State) { match event { Event::Tick => { // choose an arbitrary player within render distance to target |
