voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 06:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

rewriting on_inventory_interact

Browse source
This commit is contained in:
Xertis 2026-03-16 00:53:57 +03:00
parent f2684edf1f
commit 8ae35c0a5e
6 changed files with 62 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/en/scripting/events.md
View file

@ -221,6 +221,18 @@ function on_hud_close(playerid: int)
Called on world close (before saving) Called on world close (before saving)
```lua
function on_inventory_interact(invid: int, slot: int, mode: int, action: int)
```
Triggered when a player interacts with inventory slots.
| ACTION / MODE | (0) PRIMARY | (1) SECONDARY |
| ------------- | -------------------------------------------------- | ------------------------------------------------------ |
| (0) PUT | Places all items; if occupied, swaps them. | Places a single item from the cursor into the slot. |
| (1) TAKE | Picks up all items from the slot. | Picks up half of the items from the slot (rounded up). |
| (2) SHARE | Triggers the share event for the inventory layout. | Undefined |
## *events* library ## *events* library
```lua ```lua

10
doc/ru/scripting/events.md
View file

@ -231,11 +231,15 @@ function on_hud_close(playerid: int)
Вызывается при выходе из мира, перед его сохранением. Вызывается при выходе из мира, перед его сохранением.
```lua ```lua
function on_hud_inventory_interact"(invid: int, slot: int, action: int) function on_inventory_interact(invid: int, slot: int, mode: int, action: int)
``` ```
Вызывается при взаимодействии со слотом игрока. Вызывается при взаимодействии со слотами игроком
**action** отвечает за тип взаимодействия (0 - левый клик, 1 - правый клик, 2 - левый клик + шифт) | ACTION / MODE | (0) PRIMARY | (1) SECONDARY |
| --------------- | ---------------------------------------------------------------------------- | -------------------------------------------------------- |
| `(0) PUT` | Кладёт все предметы в слот, если другой предмет в слоте - обмен | Кладёт в слот один предмет из слота курсора |
| `(1) TAKE` | Забирает все предметы из слота | Берёт половину предметов из слота (округление вверх) |
| `(2) SHARE` | Вызывает share ивент у макета инвентаря | Не определён |
## События ECS ## События ECS
События **ECS** описаны [тут](ecs.md#события-компонента) События **ECS** описаны [тут](ecs.md#события-компонента)

39
src/graphics/ui/elements/InventoryView.cpp
View file

@ -350,57 +350,68 @@ bool SlotView::isHighlighted() const {
void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) { void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
const auto& input = gui.getInput(); const auto& input = gui.getInput();
const int action = 0; const int mode = PRIMARY;
int action;
if (layout.taking && input.pressed(Keycode::LEFT_SHIFT)) { if (layout.taking && input.pressed(Keycode::LEFT_SHIFT)) {
action = SHARE;
if (layout.shareFunc) { if (layout.shareFunc) {
layout.shareFunc(layout.index, stack); layout.shareFunc(layout.index, stack);
} }
if (layout.updateFunc) { if (layout.updateFunc) {
layout.updateFunc(layout.index, stack); layout.updateFunc(layout.index, stack);
} }
scripting::on_inventory_interact(inventoryId, layout.index, action | 2); scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
return; return;
} }
if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) { if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
action = PUT;
stack.move(grabbed, *content->getIndices()); stack.move(grabbed, *content->getIndices());
} else { } else {
if (layout.itemSource) { if (layout.itemSource) {
if (grabbed.isEmpty()) { if (grabbed.isEmpty()) {
action = TAKE;
grabbed.set(stack); grabbed.set(stack);
} else { } else {
action = PUT;
grabbed.clear(); grabbed.clear();
} }
} else if (grabbed.isEmpty()) { } else if (grabbed.isEmpty()) {
if (layout.taking) { if (layout.taking) {
action = TAKE;
std::swap(grabbed, stack); std::swap(grabbed, stack);
} }
} else if (layout.taking && layout.placing) { } else if (layout.taking && layout.placing) {
action = PUT;
std::swap(grabbed, stack); std::swap(grabbed, stack);
} }
} }
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
} }
void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) { void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
const auto& input = gui.getInput(); const auto& input = gui.getInput();
const int action = 1; const int mode = SECONDARY;
int action = PUT;
if (layout.rightClick) { if (layout.rightClick) {
layout.rightClick(inventoryId, stack); layout.rightClick(inventoryId, stack);
if (layout.updateFunc) { if (layout.updateFunc) {
layout.updateFunc(layout.index, stack); layout.updateFunc(layout.index, stack);
} }
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, PUT);
return; return;
} }
if (layout.itemSource) { if (layout.itemSource) {
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, TAKE);
return; return;
} }
if (grabbed.isEmpty()) { if (grabbed.isEmpty()) {
if (!stack.isEmpty() && layout.taking) { if (!stack.isEmpty() && layout.taking) {
action = TAKE;
grabbed.set(std::move(stack)); grabbed.set(std::move(stack));
int halfremain = stack.getCount() / 2; int halfremain = stack.getCount() / 2;
grabbed.setCount(stack.getCount() - halfremain); grabbed.setCount(stack.getCount() - halfremain);
@ -411,17 +422,19 @@ void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
stack = ItemStack(0, 0); stack = ItemStack(0, 0);
} }
} }
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
return; return;
} }
auto& stackDef = content->getIndices()->items.require(stack.getItemId());
if (!layout.placing) { if (!layout.placing) {
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, PUT);
return; return;
} }
auto& stackDef = content->getIndices()->items.require(stack.getItemId());
if (stack.isEmpty()) { if (stack.isEmpty()) {
action = PUT;
itemcount_t count = grabbed.getCount(); itemcount_t count = grabbed.getCount();
stack.set(std::move(grabbed)); stack.set(std::move(grabbed));
stack.setCount(1); stack.setCount(1);
@ -430,13 +443,13 @@ void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
} else { } else {
grabbed = ItemStack(stack.getItemId(), count - 1); grabbed = ItemStack(stack.getItemId(), count - 1);
} }
} else if (stack.accepts(grabbed) && } else if (stack.accepts(grabbed) && stack.getCount() < stackDef.stackSize) {
stack.getCount() < stackDef.stackSize) { action = PUT;
stack.setCount(stack.getCount() + 1); stack.setCount(stack.getCount() + 1);
grabbed.setCount(grabbed.getCount() - 1); grabbed.setCount(grabbed.getCount() - 1);
} }
scripting::on_inventory_interact(inventoryId, layout.index, action); scripting::on_inventory_interact(inventoryId, layout.index, mode, action);
} }
void SlotView::clicked(Mousecode button) { void SlotView::clicked(Mousecode button) {

11
src/graphics/ui/elements/InventoryView.hpp
View file

@ -56,6 +56,17 @@ namespace gui {
ItemStack stack {}; ItemStack stack {};
std::wstring countStr; std::wstring countStr;
} cache; } cache;
enum InteractionMode {
PRIMARY = 0,
SECONDARY = 1
};
enum InteractionAction {
PUT = 0,
TAKE = 1,
SHARE = 2,
};
const Content* content = nullptr; const Content* content = nullptr;
SlotLayout layout; SlotLayout layout;

2
src/logic/scripting/scripting.hpp
View file

@ -108,7 +108,7 @@ namespace scripting {
void on_inventory_open(const Player* player, const Inventory& inventory); void on_inventory_open(const Player* player, const Inventory& inventory);
void on_inventory_closed(const Player* player, const Inventory& inventory); void on_inventory_closed(const Player* player, const Inventory& inventory);
void on_inventory_interact(int invid, int slot, int action); void on_inventory_interact(int invid, int slot, int mode, int action);
void on_player_tick(Player* player, int tps); void on_player_tick(Player* player, int tps);

9
src/logic/scripting/scripting_hud.cpp
View file

@ -93,17 +93,18 @@ void scripting::on_frontend_close() {
scripting::post_processing = nullptr; scripting::post_processing = nullptr;
} }
void scripting::on_inventory_interact(int invid, int slot, int action) { void scripting::on_inventory_interact(int invid, int slot, int mode, int action) {
auto L = lua::get_main_state(); auto L = lua::get_main_state();
for (auto& pack : content_control->getAllContentPacks()) { for (auto& pack : content_control->getAllContentPacks()) {
lua::emit_event( lua::emit_event(
L, L,
pack.id + ":.hudinventoryinteract", pack.id + ":.inventoryinteract",
[&](lua::State* L) { [&](lua::State* L) {
lua::pushinteger(L, invid); lua::pushinteger(L, invid);
lua::pushinteger(L, slot); lua::pushinteger(L, slot);
lua::pushinteger(L, mode);
lua::pushinteger(L, action); lua::pushinteger(L, action);
return 3; return 4;
} }
); );
} }
@ -125,7 +126,7 @@ void scripting::load_hud_script(
register_event(env, "on_hud_open", packid + ":.hudopen"); register_event(env, "on_hud_open", packid + ":.hudopen");
register_event(env, "on_hud_render", packid + ":.hudrender"); register_event(env, "on_hud_render", packid + ":.hudrender");
register_event(env, "on_hud_close", packid + ":.hudclose"); register_event(env, "on_hud_close", packid + ":.hudclose");
register_event(env, "on_hud_inventory_interact", packid + ":.hudinventoryinteract"); register_event(env, "on_inventory_interact", packid + ":.inventoryinteract");
} }
gui::PageLoaderFunc scripting::create_page_loader() { gui::PageLoaderFunc scripting::create_page_loader() {