alexander.nutz/barecopper
1
0
Fork 0
forked from EXTERNAL/bareiron
Code Pull Requests Activity

add item pickup animations

Browse Source
This commit is contained in:
p2r3
2025-08-30 20:48:01 +03:00
parent d9888f2e0f
commit a824c2d63b
4 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/packets.c
View File

@@ -1147,6 +1147,18 @@ int cs_playerCommand (int client_fd) {
return 0;
}
// S->C Pickup Item (take_item_entity)
int sc_pickupItem (int client_fd, int collected, int collector, uint8_t count) {
writeVarInt(client_fd, 1 + sizeVarInt(collected) + sizeVarInt(collector) + sizeVarInt(count));
writeByte(client_fd, 0x75);
writeVarInt(client_fd, collected);
writeVarInt(client_fd, collector);
writeVarInt(client_fd, count);
}
// S->C Registry Data (multiple packets) and Update Tags (configuration, multiple packets)
int sc_registries (int client_fd) {

46
src/procedures.c
View File

@@ -4,6 +4,7 @@
#include "globals.h"
#include "tools.h"
#include "varnum.h"
#include "packets.h"
#include "registries.h"
#include "worldgen.h"
@@ -847,6 +848,41 @@ void checkFluidUpdate (short x, uint8_t y, short z, uint8_t block) {
}
#ifdef ENABLE_PICKUP_ANIMATION
// Plays the item pickup animation with the given item at the given coordinates
void playPickupAnimation (PlayerData *player, uint16_t item, double x, double y, double z) {
// Spawn a new item entity at the input coordinates
// ID -1 is safe, as elsewhere it's reserved as a placeholder
// The player's name is used as the UUID as it's cheap and unique enough
sc_spawnEntity(player->client_fd, -1, (uint8_t *)player->name, 69, x + 0.5, y + 0.5, z + 0.5, 0, 0);
// Write a Set Entity Metadata packet for the item
// There's no packets.c entry for this, as it's not cheaply generalizable
writeVarInt(player->client_fd, 12 + sizeVarInt(item));
writeByte(player->client_fd, 0x5C);
writeVarInt(player->client_fd, -1);
// Describe slot data array entry
writeByte(player->client_fd, 8);
writeByte(player->client_fd, 7);
// Send slot data
writeByte(player->client_fd, 1);
writeVarInt(player->client_fd, item);
writeByte(player->client_fd, 0);
writeByte(player->client_fd, 0);
// Terminate entity metadata array
writeByte(player->client_fd, 0xFF);
// Send the Pickup Item packet targeting this entity
sc_pickupItem(player->client_fd, -1, player->client_fd, 1);
// Remove the item entity from the client right away
sc_removeEntity(player->client_fd, -1);
}
#endif
void handlePlayerAction (PlayerData *player, int action, short x, short y, short z) {
// Re-sync slot when player drops an item
@@ -884,11 +920,17 @@ void handlePlayerAction (PlayerData *player, int action, short x, short y, short
// Don't continue if the block change failed
if (makeBlockChange(x, y, z, 0)) return;
bumpToolDurability(player);
uint16_t held_item = player->inventory_items[player->hotbar];
uint16_t item = getMiningResult(held_item, block);
if (item) givePlayerItem(player, item, 1);
bumpToolDurability(player);
if (item) {
#ifdef ENABLE_PICKUP_ANIMATION
playPickupAnimation(player, item, x, y, z);
#endif
givePlayerItem(player, item, 1);
}
// Update nearby fluids
uint8_t block_above = getBlockAt(x, y + 1, z);