Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: adding to empty slot and max_stack_size #535

Merged
merged 5 commits into from
Oct 30, 2024
Merged

fix: adding to empty slot and max_stack_size #535

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa3cdfb
fix adding to empty slots
CuzImClicks Oct 30, 2024
1a12e61
Merge branch 'andrewgazelka:main' into fix_adding_to_empty_slot
CuzImClicks Oct 30, 2024
60bc79b
remove todo
CuzImClicks Oct 30, 2024
58ba7fb
Merge remote-tracking branch 'origin/main' into fix_adding_to_empty_slot
andrewgazelka Oct 30, 2024
26db9aa
fmt
andrewgazelka Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions crates/hyperion-inventory/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::cmp::min;

use flecs_ecs::macros::Component;
use roaring::RoaringBitmap;
use valence_protocol::{ItemKind, ItemStack};
Expand Down Expand Up @@ -160,33 +162,38 @@ impl<const T: usize> Inventory<T> {
to_add: &mut ItemStack,
can_add_to_empty: bool,
) -> Result<TryAddSlot, InventoryAccessError> {
const MAX_STACK_SIZE: i8 = 64; // TODO: Make this variable based on item type
let max_stack_size: i8 = to_add.item.max_stack();

let existing_stack = self.get_mut(slot)?;

if existing_stack.is_empty() {
return if can_add_to_empty {
*existing_stack = to_add.clone();
to_add.count = 0;
let new_count = min(to_add.count, max_stack_size);
*existing_stack = to_add.clone().with_count(new_count);
to_add.count -= new_count;
self.updated_since_last_tick.insert(u32::from(slot));
Ok(TryAddSlot::Complete)
return if to_add.count > 0 {
Ok(TryAddSlot::Partial)
} else {
Ok(TryAddSlot::Complete)
};
} else {
Ok(TryAddSlot::Skipped)
};
}

let stackable = existing_stack.item == to_add.item && existing_stack.nbt == to_add.nbt;

if stackable && existing_stack.count < MAX_STACK_SIZE {
let space_left = MAX_STACK_SIZE - existing_stack.count;
if stackable && existing_stack.count < max_stack_size {
let space_left = max_stack_size - existing_stack.count;

return if to_add.count <= space_left {
existing_stack.count += to_add.count;
*to_add = ItemStack::EMPTY;
self.updated_since_last_tick.insert(u32::from(slot));
Ok(TryAddSlot::Complete)
} else {
existing_stack.count = MAX_STACK_SIZE;
existing_stack.count = max_stack_size;
to_add.count -= space_left;
self.updated_since_last_tick.insert(u32::from(slot));
Ok(TryAddSlot::Partial)
Expand Down