i love codecs :D i am not going insane :D mojang's java is very reada…

…ble :D
azalea-rs · mat-1 · Apr 23, 2024 · Jan 18, 2024 · Feb 26, 2024 · Mar 6, 2024
commit 2ead339b246dc50326c64fa57861a3ad28167c44
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
@@ -28,7 +28,6 @@ bevy_ecs = "0.13.0"
 bevy_log = { version = "0.13.0", optional = true }
 bevy_tasks = "0.13.0"
 bevy_time = "0.13.0"
-azalea-inventory = { path = "../azalea-inventory", version = "0.9.0" }
 derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
 futures = "0.3.30"
 tracing = "0.1.40"
@@ -39,7 +38,6 @@ regex = "1.10.3"
 thiserror = "^1.0.57"
 tokio = { version = "^1.36.0", features = ["sync"] }
 uuid = "^1.7.0"
-azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
 serde_json = "1.0.113"
 serde = "1.0.196"
 minecraft_folder_path = "0.1.2"

diff --git a/azalea-client/src/inventory.rs b/azalea-client/src/inventory.rs
@@ -273,9 +273,9 @@ impl InventoryComponent {
                             &mut new_carried,
                             slot_item_count,
                         );
-                        let max_stack_size = i8::min(
+                        let max_stack_size = i32::min(
                             new_carried.kind.max_stack_size(),
-                            i8::min(
+                            i32::min(
                                 new_carried.kind.max_stack_size(),
                                 slot.kind.max_stack_size(),
                             ),
@@ -391,7 +391,7 @@ impl InventoryComponent {
                     };
                     if self.menu().may_place(source_slot_index, target_item) {
                         let source_max_stack = self.menu().max_stack_size(source_slot_index);
-                        if target_slot.count() > source_max_stack as i8 {
+                        if target_slot.count() > source_max_stack as i32 {
                             // if there's more than the max stack size in the target slot
 
                             let target_slot = self.menu_mut().slot_mut(target_slot_index).unwrap();
@@ -449,7 +449,7 @@ impl InventoryComponent {
                     ThrowClick::All { .. } => slot_item.count,
                 };
 
-                let _dropping = slot_item.split(dropping_count as u8);
+                let _dropping = slot_item.split(dropping_count as u32);
                 // player.drop(dropping, true);
             }
             ClickOperation::PickupAll(PickupAllClick {
@@ -492,7 +492,7 @@ impl InventoryComponent {
                                     let checking_slot = self.menu_mut().slot_mut(i).unwrap();
 
                                     let taken_item =
-                                        checking_slot.split(checking_slot.count() as u8);
+                                        checking_slot.split(checking_slot.count() as u32);
 
                                     // now extend the carried item
                                     let target_slot = &mut self.carried;
@@ -537,7 +537,7 @@ fn can_item_quick_replace(
         return false;
     };
 
-    if !item.is_same_item_and_nbt(target_slot) {
+    if !item.is_same_item_and_components(target_slot) {
         return false;
     }
     let count = target_slot.count as u16
@@ -553,10 +553,10 @@ fn get_quick_craft_slot_count(
     quick_craft_slots: &HashSet<u16>,
     quick_craft_kind: &QuickCraftKind,
     item: &mut ItemSlotData,
-    slot_item_count: i8,
+    slot_item_count: i32,
 ) {
     item.count = match quick_craft_kind {
-        QuickCraftKind::Left => item.count / quick_craft_slots.len() as i8,
+        QuickCraftKind::Left => item.count / quick_craft_slots.len() as i32,
         QuickCraftKind::Right => 1,
         QuickCraftKind::Middle => item.kind.max_stack_size(),
     };

diff --git a/azalea-core/src/lib.rs b/azalea-core/src/lib.rs
@@ -1,5 +1,6 @@
 #![doc = include_str!("../README.md")]
 #![feature(lazy_cell)]
+#![feature(trait_upcasting)]
 #![allow(incomplete_features)]
 #![feature(generic_const_exprs)]
 
@@ -10,10 +11,11 @@ pub mod cursor3d;
 pub mod delta;
 pub mod difficulty;
 pub mod direction;
+pub mod entity;
 pub mod game_type;
+pub mod inventory;
 pub mod math;
 pub mod objectives;
-pub mod particle;
 pub mod position;
 pub mod registry_holder;
 pub mod resource_location;

diff --git a/azalea-entity/src/lib.rs b/azalea-entity/src/lib.rs
@@ -10,14 +10,14 @@ pub mod mining;
 mod plugin;
 
 use self::attributes::AttributeInstance;
-pub use attributes::Attributes;
-use azalea_block::BlockState;
-use azalea_core::{
+use crate::{
     aabb::AABB,
     math,
     position::{BlockPos, ChunkPos, Vec3},
     resource_location::ResourceLocation,
 };
+pub use attributes::Attributes;
+use azalea_block::BlockState;
 use azalea_world::{ChunkStorage, InstanceName};
 use bevy_ecs::{bundle::Bundle, component::Component};
 pub use data::*;

diff --git a/azalea-inventory/README.md b/azalea-inventory/README.md