From c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:29:47 -0500
Subject: All block shapes & collisions (#22)

* start adding shapes

* add more collision stuff

* DiscreteCubeMerger

* more mergers

* start adding BitSetDiscreteVoxelShape::join

* i love rust :smiley: :smiley: :smiley:

* r

* IT COMPILES????

* fix warning

* fix error

* fix more clippy issues

* add box_shape

* more shape stuff

* make DiscreteVoxelShape an enum

* Update shape.rs

* also make VoxelShape an enum

* implement BitSet::clear

* add more missing things

* it compiles

W

* start block shape codegen

* optimize shape codegen

* make az-block/blocks.rs look better (broken)

* almost new block macro

* make the codegen not generate 'type'

* try to fix

* work more on the blocks macro

* wait it compiles

* fix clippy issues

* shapes codegen works

* well it's almost working

* simplify some shape codegen

* enum type names are correct

* W it compiles

* cargo check no longer warns

* fix some clippy issues

* start making it so the shape impl is on BlockStates

* insane code

* new impl compiles

* fix wrong find_bits + TESTS PASS!

* add a test for slab collision

* fix clippy issues

* ok rust

* fix error that happens when on stairs

* add test for top slabs

* start adding join_is_not_empty

* add more to join_is_not_empty

* top slabs still don't work!!

* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:

* remove comment since i added more useful names

* remove some printlns

* fix walls in some configurations erroring

* fix some warnings

* change comment to \`\`\`ignore instead of \`\`\`no_run

* players are .6 wide not .8

* fix clippy's complaints

* i missed one clippy warning
---
 azalea-brigadier/src/command_dispatcher.rs | 5 ++---
 azalea-brigadier/src/lib.rs                | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'azalea-brigadier/src')

diff --git a/azalea-brigadier/src/command_dispatcher.rs b/azalea-brigadier/src/command_dispatcher.rs
index eab42dd8..6d1f28b1 100755
--- a/azalea-brigadier/src/command_dispatcher.rs
+++ b/azalea-brigadier/src/command_dispatcher.rs
@@ -159,7 +159,6 @@ impl<S> CommandDispatcher<S> {
     }
 
     pub fn add_paths(
-        &self,
         node: Rc<RefCell<CommandNode<S>>>,
         result: &mut Vec<Vec<Rc<RefCell<CommandNode<S>>>>>,
         parents: Vec<Rc<RefCell<CommandNode<S>>>>,
@@ -169,14 +168,14 @@ impl<S> CommandDispatcher<S> {
         result.push(current.clone());
 
         for child in node.borrow().children.values() {
-            self.add_paths(child.clone(), result, current.clone());
+            Self::add_paths(child.clone(), result, current.clone());
         }
     }
 
     pub fn get_path(&self, target: CommandNode<S>) -> Vec<String> {
         let rc_target = Rc::new(RefCell::new(target));
         let mut nodes: Vec<Vec<Rc<RefCell<CommandNode<S>>>>> = Vec::new();
-        self.add_paths(self.root.clone(), &mut nodes, vec![]);
+        Self::add_paths(self.root.clone(), &mut nodes, vec![]);
 
         for list in nodes {
             if *list.last().expect("Nothing in list").borrow() == *rc_target.borrow() {
diff --git a/azalea-brigadier/src/lib.rs b/azalea-brigadier/src/lib.rs
index c2ac7e14..3c37b7f3 100755
--- a/azalea-brigadier/src/lib.rs
+++ b/azalea-brigadier/src/lib.rs
@@ -7,5 +7,5 @@ pub mod message;
 pub mod modifier;
 pub mod parse_results;
 pub mod string_reader;
-pub mod tree;
 pub mod suggestion;
+pub mod tree;
-- 
cgit v1.2.3