Skip to content

Commit

Permalink
Clean up code
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bafran
Bafran committed Dec 28, 2024
1 parent 1fb9360 commit ac58735
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 82 deletions.
6 changes: 3 additions & 3 deletions pumpkin-inventory/src/player.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,21 @@ impl PlayerInventory {
_ => continue,
}
}

None
}

pub fn get_pick_item_hotbar_slot(&self) -> usize {
if self.items[self.selected + 36 - 9].is_none() {
return self.selected
return self.selected;
}

for slot in 0..9 {
if self.items[slot + 36 - 9].is_none() {
return slot;
}
}

self.selected
}

Expand Down
4 changes: 2 additions & 2 deletions pumpkin-protocol/src/server/play/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ mod s_confirm_teleport;
mod s_cookie_response;
mod s_interact;
mod s_keep_alive;
mod s_pick_item;
mod s_ping_request;
mod s_player_abilities;
mod s_player_action;
mod s_player_command;
mod s_player_ground;
mod s_pick_item;
mod s_player_input;
mod s_player_position;
mod s_player_position_rotation;
Expand All @@ -38,12 +38,12 @@ pub use s_confirm_teleport::*;
pub use s_cookie_response::*;
pub use s_interact::*;
pub use s_keep_alive::*;
pub use s_pick_item::*;
pub use s_ping_request::*;
pub use s_player_abilities::*;
pub use s_player_action::*;
pub use s_player_command::*;
pub use s_player_ground::*;
pub use s_pick_item::*;
pub use s_player_input::*;
pub use s_player_position::*;
pub use s_player_position_rotation::*;
Expand Down
154 changes: 81 additions & 73 deletions pumpkin/src/client/player_packet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ use pumpkin_protocol::{
},
server::play::{
Action, ActionType, SChatCommand, SChatMessage, SClientCommand, SClientInformationPlay,
SConfirmTeleport, SInteract, SPlayPingRequest, SPlayerAbilities, SPlayerAction,
SPlayerCommand, SPlayerPosition, SPlayerPositionRotation, SPlayerRotation,
SSetCreativeSlot, SSetHeldItem, SSwingArm, SUseItemOn, Status, SPickItemFromBlock,
SConfirmTeleport, SInteract, SPickItemFromBlock, SPlayPingRequest, SPlayerAbilities,
SPlayerAction, SPlayerCommand, SPlayerPosition, SPlayerPositionRotation, SPlayerRotation,
SSetCreativeSlot, SSetHeldItem, SSwingArm, SUseItemOn, Status,
},
};
use pumpkin_world::block::{block_registry::get_block_by_item, BlockFace};
use pumpkin_world::item::item_registry::get_item_by_id;
use pumpkin_world::item::{self, ItemStack};
use pumpkin_world::item::ItemStack;
use thiserror::Error;

fn modulus(a: f32, b: f32) -> f32 {
Expand Down Expand Up @@ -314,80 +314,88 @@ impl Player {
}

pub async fn handle_pick_item_from_block(&self, pick_item: SPickItemFromBlock) {
let pos = pick_item.pos;
// TODO: Include block data
let _include_data = pick_item.include_data;

if self.can_interact_with_block_at(&pos, 1.0) {
let world = self.world();
let block = world.get_block(pos).await;
if let Ok(block) = block {
let item_id = block.item_id;
let mut inventory = self.inventory().lock().await;

let source_slot = inventory.get_slot_with_item(item_id);
let mut dest_slot = inventory.get_pick_item_hotbar_slot();

let slot_index = if let Some(source_slot) = source_slot {
source_slot
} else {
// Cases if we DONT have the item in our inventory
if self.gamemode.load() == GameMode::Creative {
// If player is in creative mode, create the item and place it in an empty slot
let item_stack = ItemStack::new(1, item_id);
let slot = Slot::from(&item_stack);
inventory.state_id += 1;
let packet = CSetContainerSlot::new(
0,
(inventory.state_id) as i32,
dest_slot + 36, // dest_slot is the hotbar slot, so we need to add 36 to get the correct slot index
&slot,
);
self.client.send_packet(&packet).await;
// Let slot_index be 0 to bypass the if statement below
0
} else {
// Handle survival mode case
return;
}
};

if !(slot_index > 36 && slot_index <= 44) {
let item_stack = match inventory.get_slot(slot_index) {
Ok(Some(stack)) => stack,
Ok(None) => return, // or handle empty slot
Err(_) => return, // or handle error case
};

// Set dest hotbar slot to picked item
let slot = Slot::from(&*item_stack);
inventory.state_id += 1;
let packet = CSetContainerSlot::new(
0,
(inventory.state_id) as i32,
dest_slot + 36, // dest_slot is the hotbar slot, so we need to add 36 to get the correct slot index
&slot,
);
self.client.send_packet(&packet).await;
// Clear source slot
let slot = Slot::from(None);
inventory.state_id += 1;
let packet = CSetContainerSlot::new(
0,
(inventory.state_id) as i32,
slot_index,
&slot,
);
self.client.send_packet(&packet).await;
} else {
dest_slot = slot_index - 36;
if !self.can_interact_with_block_at(&pick_item.pos, 1.0) {
return;
}

let Ok(block) = self.world().get_block(pick_item.pos).await else {
return;
};

let mut inventory = self.inventory().lock().await;
let source_slot = inventory.get_slot_with_item(block.item_id);
let mut dest_slot = inventory.get_pick_item_hotbar_slot();

// Early return if no source slot and not in creative mode
if source_slot.is_none() && self.gamemode.load() != GameMode::Creative {
return;
}

match source_slot {
Some(slot_index) if !(slot_index > 36 && slot_index <= 44) => {
// Handle existing item case
let item_stack = match inventory.get_slot(slot_index) {
Ok(Some(stack)) => *stack,
_ => return,
};

// Update destination slot
let slot_data = Slot::from(&item_stack);
inventory.state_id += 1;
let dest_packet = CSetContainerSlot::new(
0,
inventory.state_id as i32,
dest_slot + 36,
&slot_data,
);
self.client.send_packet(&dest_packet).await;

if inventory.set_slot(dest_slot + 36, Some(item_stack), false).is_err() {
log::error!("Pick item set slot error!");
return;
}

// Set held item
let packet = CSetHeldItem::new(dest_slot as i8);
// Clear source slot
let slot_data = Slot::from(None);
inventory.state_id += 1;
let source_packet =
CSetContainerSlot::new(0, inventory.state_id as i32, slot_index, &slot_data);
self.client.send_packet(&source_packet).await;

if inventory.set_slot(slot_index, None, false).is_err() {
log::error!("Failed to clear source slot!");
return;
}
}
Some(slot_index) => {
dest_slot = slot_index - 36;
}
None if self.gamemode.load() == GameMode::Creative => {
// Handle creative mode case
let item_stack = ItemStack::new(1, block.item_id);
let slot_data = Slot::from(&item_stack);
inventory.state_id += 1;
let packet = CSetContainerSlot::new(
0,
inventory.state_id as i32,
dest_slot + 36,
&slot_data,
);
self.client.send_packet(&packet).await;

if inventory.set_slot(dest_slot + 36, Some(item_stack), false).is_err() {
log::error!("Pick item set slot error!");
return;
}
}
_ => return,
}

// Update held item
inventory.set_selected(dest_slot);
self.client
.send_packet(&CSetHeldItem::new(dest_slot as i8))
.await;
}

pub async fn handle_player_command(&self, command: SPlayerCommand) {
Expand Down
11 changes: 7 additions & 4 deletions pumpkin/src/entity/player.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ use pumpkin_protocol::{
},
server::play::{
SChatCommand, SChatMessage, SClientCommand, SClientInformationPlay, SClientTickEnd,
SCommandSuggestion, SConfirmTeleport, SInteract, SPlayerAbilities, SPlayerAction,
SPlayerCommand, SPlayerInput, SPlayerPosition, SPlayerPositionRotation, SPlayerRotation,
SSetCreativeSlot, SSetHeldItem, SSetPlayerGround, SSwingArm, SUseItem, SUseItemOn, SPickItemFromBlock,
SCommandSuggestion, SConfirmTeleport, SInteract, SPickItemFromBlock, SPlayerAbilities,
SPlayerAction, SPlayerCommand, SPlayerInput, SPlayerPosition, SPlayerPositionRotation,
SPlayerRotation, SSetCreativeSlot, SSetHeldItem, SSetPlayerGround, SSwingArm, SUseItem,
SUseItemOn,
},
RawPacket, ServerPacket, SoundCategory, VarInt,
};
Expand Down Expand Up @@ -661,6 +662,7 @@ impl Player {
}
}

#[allow(clippy::too_many_lines)]
pub async fn handle_play_packet(
self: &Arc<Self>,
server: &Arc<Server>,
Expand Down Expand Up @@ -713,7 +715,8 @@ impl Player {
self.handle_player_ground(&SSetPlayerGround::read(bytebuf)?);
}
SPickItemFromBlock::PACKET_ID => {
self.handle_pick_item_from_block(SPickItemFromBlock::read(bytebuf)?).await;
self.handle_pick_item_from_block(SPickItemFromBlock::read(bytebuf)?)
.await;
}
SPlayerAbilities::PACKET_ID => {
self.handle_player_abilities(SPlayerAbilities::read(bytebuf)?)
Expand Down

0 comments on commit ac58735

Please sign in to comment.