Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clippy + format

Browse Source
This commit is contained in:
Edvin Bryntesson 2024-09-05 16:46:30 +02:00
parent 55765fccc1
commit 602c1c0859
No known key found for this signature in database
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pumpkin-inventory/src/drag_handler.rs
View File

@ -89,12 +89,12 @@ impl DragHandler {
// Checked in any function that uses this function. // Checked in any function that uses this function.
MouseDragType::Middle => { MouseDragType::Middle => {
for slot in &drag.slots { for slot in &drag.slots {
*slots[*slot] = carried_item.clone(); *slots[*slot] = *carried_item;
} }
} }
MouseDragType::Right => { MouseDragType::Right => {
let amount_of_items = carried_item.unwrap().item_count as usize; let amount_of_items = carried_item.unwrap().item_count as usize;
let mut single_item = carried_item.clone().unwrap(); let mut single_item = carried_item.unwrap();
single_item.item_count = 1; single_item.item_count = 1;
let changing_slots = drag.changing_slots( let changing_slots = drag.changing_slots(
amount_of_items, amount_of_items,
@ -104,7 +104,7 @@ impl DragHandler {
let mut amount_removed = 0; let mut amount_removed = 0;
changing_slots.for_each(|slot| { changing_slots.for_each(|slot| {
amount_removed += 1; amount_removed += 1;
*slots[slot] = Some(single_item.clone()) *slots[slot] = Some(single_item)
}); });
let mut remaining = carried_item.unwrap(); let mut remaining = carried_item.unwrap();
@ -128,12 +128,12 @@ impl DragHandler {
let amount_of_slots = changing_slots.clone().count(); let amount_of_slots = changing_slots.clone().count();
let (amount_per_slot, remainder) = let (amount_per_slot, remainder) =
(carried_item.unwrap().item_count as usize).div_rem_euclid(&amount_of_slots); (carried_item.unwrap().item_count as usize).div_rem_euclid(&amount_of_slots);
let mut item_in_each_slot = carried_item.unwrap().clone(); let mut item_in_each_slot = carried_item.unwrap();
item_in_each_slot.item_count = amount_per_slot as u8; item_in_each_slot.item_count = amount_per_slot as u8;
changing_slots.for_each(|slot| *slots[slot] = Some(item_in_each_slot.clone())); changing_slots.for_each(|slot| *slots[slot] = Some(item_in_each_slot));
if remainder > 0 { if remainder > 0 {
let mut remaining = carried_item.unwrap().clone(); let mut remaining = carried_item.unwrap();
remaining.item_count = remainder as u8; remaining.item_count = remainder as u8;
*carried_item = Some(remaining) *carried_item = Some(remaining)
} else { } else {

2
pumpkin-inventory/src/lib.rs
View File

@ -73,7 +73,7 @@ pub trait Container: Sync + Send {
mouse_click: MouseClick, mouse_click: MouseClick,
) -> Result<(), InventoryError> { ) -> Result<(), InventoryError> {
let mut all_slots = self.all_slots(); let mut all_slots = self.all_slots();
if slot > all_slots.len() || slot < 0 { if slot > all_slots.len() {
Err(InventoryError::InvalidSlot)? Err(InventoryError::InvalidSlot)?
} }
handle_item_change(carried_item, all_slots[slot], mouse_click); handle_item_change(carried_item, all_slots[slot], mouse_click);

1
pumpkin/src/client/container.rs
View File

@ -142,7 +142,6 @@ impl Player {
packet.slot, packet.slot,
); );
let slot = click.slot.clone();
match click.click_type { match click.click_type {
ClickType::MouseClick(mouse_click) => { ClickType::MouseClick(mouse_click) => {
self.mouse_click(opened_container, mouse_click, click.slot) self.mouse_click(opened_container, mouse_click, click.slot)

5
pumpkin/src/server/mod.rs
View File

@ -138,10 +138,7 @@ impl Server {
player_id: EntityId, player_id: EntityId,
container_id: u64, container_id: u64,
) -> Option<&Mutex<Box<dyn Container>>> { ) -> Option<&Mutex<Box<dyn Container>>> {
self.open_containers self.open_containers.get(&container_id)?.try_open(player_id)
.get(&container_id)?
.try_open(player_id)
.map(|container| container)
} }
/// Sends a Packet to all Players in all worlds /// Sends a Packet to all Players in all worlds